diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-03-29 14:11:02 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-03-29 14:11:02 +0000 |
commit | 8ef7df8963d6cb3d6f646ee77a84e81f72949fdc (patch) | |
tree | 9759aeffd1aac61fed08d6b6db776c7bf7f757ea | |
parent | f9e8727113f42bedde38f42ca30c8dccfacd5c3f (diff) | |
download | ATCD-8ef7df8963d6cb3d6f646ee77a84e81f72949fdc.tar.gz |
ChangeLogTag: Tue Mar 29 15:10:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r-- | ace/SOCK_Dgram.cpp | 14 | ||||
-rw-r--r-- | ace/SOCK_Dgram.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp index 7f9323dc230..aebde901821 100644 --- a/ace/SOCK_Dgram.cpp +++ b/ace/SOCK_Dgram.cpp @@ -501,7 +501,7 @@ ACE_SOCK_Dgram::send (const void *buf, } } -void +int ACE_SOCK_Dgram::set_nic (const char *option_value) { /* The first step would be to get the interface address for the @@ -513,7 +513,7 @@ ACE_SOCK_Dgram::set_nic (const char *option_value) ACE_INET_Addr interface_addr; if (interface_addr.set (mcast_addr.get_port_number (), option_value) == -1) - return; + return -1; multicast_address.imr_interface.s_addr = htonl (interface_addr.get_ip_address ()); #else @@ -529,7 +529,7 @@ ACE_SOCK_Dgram::set_nic (const char *option_value) if (ACE_OS::ioctl (this->get_handle (), SIOCGIFADDR, &if_address) == -1) - return; + return -1; /* Cast this into the required format */ sockaddr_in *socket_address; @@ -542,8 +542,8 @@ ACE_SOCK_Dgram::set_nic (const char *option_value) * Use that to set the nic option. */ - this->ACE_SOCK::set_option (IPPROTO_IP, - IP_MULTICAST_IF, - &multicast_address.imr_interface.s_addr, - sizeof (struct in_addr)); + return this->ACE_SOCK::set_option (IPPROTO_IP, + IP_MULTICAST_IF, + &multicast_address.imr_interface.s_addr, + c sizeof (struct in_addr)); } diff --git a/ace/SOCK_Dgram.h b/ace/SOCK_Dgram.h index 1261d199418..fda77a092af 100644 --- a/ace/SOCK_Dgram.h +++ b/ace/SOCK_Dgram.h @@ -196,7 +196,7 @@ public: /// Dump the state of an object. void dump (void) const; - void set_nic (const char *option_value); + int set_nic (const char *option_value); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; |