summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@fastmq.commkdir>2010-01-23 11:14:53 +0100
committerMartin Sustrik <sustrik@fastmq.commkdir>2010-01-23 11:14:53 +0100
commitfca9a2159a1fb963901d11dc6f734a622baa92d6 (patch)
tree3722031b431491d61d7d44575477e5b4dc687bf3 /src
parent079d327670d9137d93f4dbe9eb6cfa6d4165b903 (diff)
parent454f43a45b2d453b53984387e8a8a50cad568f41 (diff)
Merge branch 'master' of git@github.com:sustrik/zeromq2
Diffstat (limited to 'src')
-rw-r--r--src/ip.cpp20
1 files changed, 14 insertions, 6 deletions
diff --git a/src/ip.cpp b/src/ip.cpp
index 17008fd..2654d36 100644
--- a/src/ip.cpp
+++ b/src/ip.cpp
@@ -185,7 +185,7 @@ int zmq::resolve_ip_interface (sockaddr_storage* addr_, socklen_t *addr_len_,
}
// Separate the name/port.
- std::string interface (interface_, delimiter - interface_);
+ std::string iface (interface_, delimiter - interface_);
std::string service (delimiter + 1);
// Initialize the output parameter.
@@ -196,7 +196,6 @@ int zmq::resolve_ip_interface (sockaddr_storage* addr_, socklen_t *addr_len_,
ip4_addr.sin_family = AF_INET;
ip4_addr.sin_port = htons ((uint16_t) atoi (service.c_str()));
-
// Initialize temporary output pointers with ip4_addr
sockaddr *out_addr = (sockaddr *) &ip4_addr;
size_t out_addrlen = sizeof (ip4_addr);
@@ -208,7 +207,7 @@ int zmq::resolve_ip_interface (sockaddr_storage* addr_, socklen_t *addr_len_,
}
// * resolves to INADDR_ANY.
- if (interface.compare("*") == 0) {
+ if (iface.compare("*") == 0) {
ip4_addr.sin_addr.s_addr = htonl (INADDR_ANY);
zmq_assert (out_addrlen <= sizeof (*addr_));
memcpy (addr_, out_addr, out_addrlen);
@@ -217,7 +216,7 @@ int zmq::resolve_ip_interface (sockaddr_storage* addr_, socklen_t *addr_len_,
}
// Try to resolve the string as a NIC name.
- int rc = resolve_nic_name (&ip4_addr.sin_addr, interface.c_str());
+ int rc = resolve_nic_name (&ip4_addr.sin_addr, iface.c_str());
if (rc != 0 && errno != ENODEV)
return rc;
if (rc == 0) {
@@ -227,15 +226,24 @@ int zmq::resolve_ip_interface (sockaddr_storage* addr_, socklen_t *addr_len_,
return 0;
}
+#if defined ZMQ_HAVE_WINDOWS
+ // Old versions of Windows don't support inet_pton
+ // so let's rather use inet_addr instead.
+ ip4_addr.sin_addr.S_un.S_addr = inet_addr (iface.c_str ());
+ if (ip4_addr.sin_addr.S_un.S_addr == INADDR_NONE) {
+ errno = ENODEV;
+ return -1;
+ }
+#else
// There's no such interface name. Assume literal address.
- rc = inet_pton (AF_INET, interface.c_str(), &ip4_addr.sin_addr);
-
+ rc = inet_pton (AF_INET, iface.c_str(), &ip4_addr.sin_addr);
if (rc == 0) {
errno = ENODEV;
return -1;
}
if (rc < 0)
return -1;
+#endif
zmq_assert (out_addrlen <= sizeof (*addr_));
memcpy (addr_, out_addr, out_addrlen);