Changeset 1543

Timestamp:

05/23/10 08:09:59 (15 years ago)

Author:

rsinfu

Message:

Fixed bugzilla 2835: std.socket.TcpSocket? doesn't actually connect.
Thanks to Unknown W. Brackets and Alexey Ivanov for the patch!

sockaddr_in.sin_family is auto-initialized with AF_INET only on Windows
(compare std.c.windows.winsock & core.sys.posix.netinet.in_). TcpSocket?
should explicitly set sin_family to AF_INET.

Files:

• trunk/phobos/std/socket.d (modified) (1 diff)

trunk/phobos/std/socket.d

@@ -724 +724 @@
-        uint uiaddr = parse(addr);
-        if(ADDR_NONE == uiaddr)
-        {
-            InternetHost ih = new InternetHost;
-            if(!ih.getHostByName(addr))
-                //throw new AddressException("Invalid internet address");
-                            throw new AddressException(
-                                 "Unable to resolve host '" ~ addr ~ "'");
-            uiaddr = ih.addrList[0];
-        }
+        sin.sin_family = AddressFamily.INET;
-        sin.sin_addr.s_addr = htonl(uiaddr);
-        sin.sin_port = htons(port);
-    }
-
-    /**
-     * Construct a new Address. addr may be ADDR_ANY (default) and port may
-     * be PORT_ANY, and the actual numbers may not be known until a connection
-     * is made.
-     */
-    this(uint addr, ushort port)
-    {
+        sin.sin_family = AddressFamily.INET;
-        sin.sin_addr.s_addr = htonl(addr);
-        sin.sin_port = htons(port);
-    }
-
-    /// ditto
-    this(ushort port)
-    {
+        sin.sin_family = AddressFamily.INET;
-        sin.sin_addr.s_addr = 0; //any, "0.0.0.0"
-        sin.sin_port = htons(port);
-    }
-
-    /// Human readable string representing the IPv4 address in dotted-decimal form.
-    string toAddrString()
-    {
-            return to!string(inet_ntoa(sin.sin_addr)).idup;
-    }
-