Changeset 1548

Timestamp:

05/23/10 23:40:02 (15 years ago)

Author:

rsinfu

Message:

Fixed bugzilla 2835: std.socket.TcpSocket? doesn't actually connect.
Merged from trunk; see r1543.

Files:

• branches/phobos-1.x/phobos/std/socket.d (modified) (1 diff)

branches/phobos-1.x/phobos/std/socket.d

@@ -686 +686 @@
-                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 std.string.toString(inet_ntoa(sin.sin_addr)).dup;
-        }
-