Changeset 26269

Timestamp:

07/05/08 18:37:06 (5 months ago)

Author:

zooey

Message:

Resolved a couple of problems in BNetAddress implementation:
* fixed several byte order inconsistencies, it does not make sense to always

convert the byte order input/output values - no we convert where it can
be expected and leave it where it is confusing

* fixed size inconsistencies with respect to family and port, both of which

were sometimes handled as int8, as int16 and as int32 in different places
(now they are always int16)

These fixes make Beam connect to the correct address and port, but it still doesn't work, as it seems to be using UDP instead of TCP (doh!). Will look into that tomorrow.

Location:

haiku/trunk

Files:

• headers/os/net/NetAddress.h (modified) (1 diff)
• src/kits/network/libnetapi/NetAddress.cpp (modified) (10 diffs)

haiku/trunk/headers/os/net/NetAddress.h

@@ -53 +53 @@
 
                 status_t fInit;
-                int32   fFamily;
-                int32   fPort;
+                int16   fFamily;
+                int16   fPort;
                 int32   fAddress;
-                int32   fPrivateData[6];
+                int32   fPrivateData[7];
 };
 

haiku/trunk/src/kits/network/libnetapi/NetAddress.cpp

@@ -1 +1 @@
 /*
- * Copyright 2002-2006, Haiku, Inc. All Rights Reserved.
+ * Copyright 2002-2006,2008, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
  *              Scott T. Mansfield, thephantom@mac.com
+ *              Oliver Tappe, zooey@hirschkaefer.de
  */
 
@@ -10 +11 @@
         NetAddress.cpp -- Implementation of the BNetAddress class.
         Remarks:
-         * In all accessors, address and port are converted from network to
+         * In all accessors, non-struct output values are converted from network to
            host byte order.
-         * In all mutators, address and port are converted from host to
+         * In all mutators, non-struct input values are converted from host to
            network byte order.
          * No trouts were harmed during the development of this class.
@@ -77 +78 @@
 BNetAddress::BNetAddress(BMessage* archive)
 {
-    int8 int8value;
-    if (archive->FindInt8("bnaddr_family", &int8value) != B_OK)
+    int16 int16value;
+    if (archive->FindInt16("bnaddr_family", &int16value) != B_OK)
         return;
 
-    fFamily = int8value;
-
-    if (archive->FindInt8("bnaddr_port", &int8value) != B_OK)
+    fFamily = int16value;
+
+    if (archive->FindInt16("bnaddr_port", &int16value) != B_OK)
         return;
 
-    fPort = int8value;
+    fPort = int16value;
 
     if (archive->FindInt32("bnaddr_addr", &fAddress) != B_OK)
@@ -188 +189 @@
     }
 
-    sa.sin_family = ( uint8 )fFamily;
-    sa.sin_port = ( uint8 )fPort;
-    sa.sin_addr.s_addr = ( in_addr_t )fAddress;
+    sa.sin_family = fFamily;
+    sa.sin_port = fPort;
+    sa.sin_addr.s_addr = fAddress;
 
     return B_OK;
@@ -209 +210 @@
  *
  * Remarks:
- *     Output parameters will be in network byte order, so it is not
- *     necessary to call htons after calling this method.
+ *     Output port will be in host byte order, but addr will be in the usual
+ *     network byte order (ready to be used by other network functions).
  */
 status_t BNetAddress::GetAddr( in_addr& addr, unsigned short* port ) const
 {
     if ( fInit != B_OK )
-    {
         return B_NO_INIT;
-    }
 
     addr.s_addr = fAddress;
 
     if ( port != NULL )
-    {
-        *port = fPort;
-    }
+        *port = ntohs(fPort);
 
     return B_OK;
@@ -262 +259 @@
 {
     if ( fInit != B_OK )
-    {
         return B_NO_INIT;
-    }
-
-    if ( into->AddInt8( "bnaddr_family", fFamily ) != B_OK )
-    {
+
+    if ( into->AddInt16( "bnaddr_family", fFamily ) != B_OK )
         return B_ERROR;
-    }
-
-    if ( into->AddInt8( "bnaddr_port", fPort ) != B_OK )
-    {
+
+    if ( into->AddInt16( "bnaddr_port", fPort ) != B_OK )
         return B_ERROR;
-    }
 
     if ( into->AddInt32( "bnaddr_addr", fAddress ) != B_OK )
-    {
         return B_ERROR;
-    }
 
     return B_OK;
@@ -355 +344 @@
         fFamily = AF_INET;
         fPort = htons(port);
-        fAddress = htonl(addr);
+        fAddress = addr;
 
         return fInit = B_OK;
@@ -371 +360 @@
 {
         fFamily = addr.sin_family;
-        fPort = htons(addr.sin_port);
-        fAddress = htonl(addr.sin_addr.s_addr);
+        fPort = addr.sin_port;
+        fAddress = addr.sin_addr.s_addr;
 
         return fInit = B_OK;
@@ -390 +379 @@
 {
         fFamily = AF_INET;
-        fPort = htons(port);
-        fAddress = htonl(addr.s_addr);
+        fPort = htons((short)port);
+        fAddress = addr.s_addr;
 
         return fInit = B_OK;
@@ -409 +398 @@
 {
         fFamily = AF_INET;
-        fPort = htons(port);
-        fAddress = htonl(addr);
+        fPort = htons((short)port);
+        fAddress = addr;
 
         return fInit = B_OK;