[haiku-commits] r39612 - haiku/trunk/src/kits/network/libnetapi

From: philippe.houdoin@xxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Wed, 24 Nov 2010 18:55:46 +0100 (CET)
Author: phoudoin
Date: 2010-11-24 18:55:46 +0100 (Wed, 24 Nov 2010)
New Revision: 39612
Changeset: http://dev.haiku-os.org/changeset/39612

Modified:
   haiku/trunk/src/kits/network/libnetapi/NetworkAddress.cpp
Log:
Factorized a bit more, and update fStatus in some place it was missing
but make sense. Please review.


Modified: haiku/trunk/src/kits/network/libnetapi/NetworkAddress.cpp
===================================================================
--- haiku/trunk/src/kits/network/libnetapi/NetworkAddress.cpp   2010-11-24 
16:51:34 UTC (rev 39611)
+++ haiku/trunk/src/kits/network/libnetapi/NetworkAddress.cpp   2010-11-24 
17:55:46 UTC (rev 39612)
@@ -274,6 +274,7 @@
        fAddress.ss_len = sizeof(sockaddr_in);
        SetAddress(inetAddress);
        SetPort(port);
+
        fStatus = B_OK;
 }
 
@@ -306,12 +307,8 @@
        if (family != AF_INET)
                return fStatus = B_NOT_SUPPORTED;
 
-       memset(&fAddress, 0, sizeof(sockaddr_storage));
-       fAddress.ss_family = family;
-       fAddress.ss_len = sizeof(sockaddr_in);
-       SetAddress(INADDR_BROADCAST);
-       SetPort(port);
-       return fStatus = B_OK;
+       SetTo(INADDR_BROADCAST, port);
+       return B_OK;
 }
 
 
@@ -319,7 +316,7 @@
 BNetworkAddress::SetToLocal()
 {
        // TODO: choose a local address from the network interfaces
-       return B_NOT_SUPPORTED;
+       return fStatus = B_NOT_SUPPORTED;
 }
 
 
@@ -375,10 +372,10 @@
                }
 
                default:
-                       return B_NOT_SUPPORTED;
+                       return fStatus = B_NOT_SUPPORTED;
        }
 
-       return B_OK;
+       return fStatus = B_OK;
 }
 
 
@@ -387,24 +384,18 @@
 {
        switch (family) {
                case AF_INET:
-                       memset(&fAddress, 0, sizeof(sockaddr_storage));
-                       fAddress.ss_len = sizeof(sockaddr_in);
-                       SetAddress(INADDR_ANY);
+                       SetTo(INADDR_ANY, port);
                        break;
 
                case AF_INET6:
-                       memset(&fAddress, 0, sizeof(sockaddr_storage));
-                       fAddress.ss_len = sizeof(sockaddr_in6);
-                       SetAddress(in6addr_any);
+                       SetTo(in6addr_any, port);
                        break;
 
                default:
-                       return B_NOT_SUPPORTED;
+                       return fStatus = B_NOT_SUPPORTED;
        }
 
-       fAddress.ss_family = family;
-       SetPort(port);
-       return fStatus = B_OK;
+       return B_OK;
 }
[haiku-commits] r39612 - haiku/trunk/src/kits/network/libnetapi

Other related posts:
