Ticket #5716: bind_connect_enhancements.diff

src/add-ons/kernel/network/protocols/l2cap/l2cap_address.cpp

@@ -100 +100 @@
         && (!checkPort || ((sockaddr_l2cap *)address)->l2cap_psm == 0) );
 }
 
+/*! Checks if the given \a address is L2CAP address.
+    \return false if \a address is NULL, or with family different from AF_BLUETOOTH
+        true if it has AF_BLUETOOTH address family
+*/
+static bool
+l2cap_is_same_family(const sockaddr *address)
+{
+    if (address == NULL)
+        return false;
+ 
+    return address->sa_family == AF_BLUETOOTH;
+}
 
 /*!
     Compares the IP-addresses of the two given address structures \a a and \a b.
@@ -401 +413 @@
     l2cap_equal_addresses_and_ports,
     l2cap_equal_masked_addresses,
     l2cap_is_empty_address,
+    l2cap_is_same_family,
     l2cap_first_mask_bit,
     l2cap_check_mask,
     l2cap_print_address,
@@ -413 +426 @@
     l2cap_update_to,
     l2cap_hash_address_pair,
     l2cap_checksum_address,
-    NULL // l2cap_matches_broadcast_address,
+    NULL,   // l2cap_matches_broadcast_address,
+    NULL    // get_loopback_address
 };

src/add-ons/kernel/network/protocols/ipv4/ipv4_address.cpp

@@ -107 +107 @@
         && (!checkPort || ((sockaddr_in *)address)->sin_port == 0);
 }
 
+/*! Checks if the given \a address is an IPv4 address.
+    \return false if \a address is NULL, or with family different from AF_INET
+        true if it has AF_INET address family
+*/
+static bool
+ipv4_is_same_family(const sockaddr *address)
+{
+    if (address == NULL)
+        return false;
 
+    return address->sa_family == AF_INET;
+}
+
 /*! Compares the IP-addresses of the two given address structures \a a and \a b.
     \return true if IP-addresses of \a a and \a b are equal, false if not
 */
@@ -477 +489 @@
     return B_OK;
 }
 
+static void
+ipv4_get_loopback_address(sockaddr *result)
+{
+    sockaddr_in *resultIn = (sockaddr_in *)result;
+    memset(resultIn, 0, sizeof(resultIn));
+    resultIn->sin_len = sizeof(sockaddr_in);
+    resultIn->sin_family = AF_INET;
+    resultIn->sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+}
 
+
 net_address_module_info gIPv4AddressModule = {
     {
         NULL,
@@ -491 +513 @@
     ipv4_equal_addresses_and_ports,
     ipv4_equal_masked_addresses,
     ipv4_is_empty_address,
+    ipv4_is_same_family,
     ipv4_first_mask_bit,
     ipv4_check_mask,
     ipv4_print_address,
@@ -503 +526 @@
     ipv4_update_to,
     ipv4_hash_address_pair,
     ipv4_checksum_address,
-    NULL // ipv4_matches_broadcast_address,
+    NULL, // ipv4_matches_broadcast_address,
+    ipv4_get_loopback_address
 };

src/add-ons/kernel/network/protocols/unix/UnixAddress.cpp

@@ -112 +112 @@
         && memcmp(address, &kEmptyAddress, kEmptyAddress.sun_len) == 0;
 }
 
+static bool
+unix_is_same_family(const sockaddr *address)
+{
+    if (address == NULL)
+        return false;
+ 
+    return address->sa_family == AF_UNIX;
+}
 
 static int32
 unix_first_mask_bit(const sockaddr *mask)
@@ -290 +298 @@
     unix_equal_addresses_and_ports,
     unix_equal_masked_addresses,
     unix_is_empty_address,
+    unix_is_same_family,
     unix_first_mask_bit,
     unix_check_mask,
     unix_print_address,
@@ -302 +311 @@
     unix_update_to,
     unix_hash_address_pair,
     unix_checksum_address,
-    NULL    // matches_broadcast_address
+    NULL,   // matches_broadcast_address
+    NULL    // get_loopback_address
 };

src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp

@@ -584 +584 @@
 {
     TRACE("Connect() on address %s", PrintAddress(address));
 
+    if (!AddressModule()->is_same_family(address))
+        return EAFNOSUPPORT;
+
     MutexLocker locker(fLock);
 
     if (gStackModule->is_restarted_syscall()) {
@@ -604 +607 @@
     } else if (fState != CLOSED)
         return EINPROGRESS;
 
-    // TODO: this is IPv4 specific, and doesn't belong here!
     // consider destination address INADDR_ANY as INADDR_LOOPBACK
-    sockaddr_in _address;
-    if (((sockaddr_in*)address)->sin_addr.s_addr == INADDR_ANY) {
-        memcpy(&_address, address, sizeof(sockaddr_in));
-        _address.sin_len = sizeof(sockaddr_in);
-        _address.sin_addr.s_addr = INADDR_LOOPBACK;
-        address = (sockaddr*)&_address;
+    sockaddr_storage _address;
+    if (AddressModule()->is_empty_address(address, false)) {
+        AddressModule()->get_loopback_address((sockaddr *)&_address);
+        // for IPv4 and IPv6 the port is at the same offset
+        ((sockaddr_in &)_address).sin_port = ((sockaddr_in *)address)->sin_port;
+        address = (sockaddr *)&_address;
     }
 
     status_t status = _PrepareSendPath(address);

src/add-ons/kernel/network/protocols/tcp/EndpointManager.cpp

@@ -362 +362 @@
 status_t
 EndpointManager::Bind(TCPEndpoint* endpoint, const sockaddr* address)
 {
-    // TODO: check the family:
-    // if (!AddressModule()->is_understandable(address))
-    //  return EAFNOSUPPORT;
+    // check the family
+    if (!AddressModule()->is_same_family(address))
+        return EAFNOSUPPORT;
 
     WriteLocker locker(fLock);
 

src/add-ons/kernel/network/protocols/udp/udp.cpp

@@ -287 +287 @@
 UdpDomainSupport::BindEndpoint(UdpEndpoint *endpoint,
     const sockaddr *address)
 {
+    if (!AddressModule()->is_same_family(address))
+        return EAFNOSUPPORT;
+
     MutexLocker _(fLock);
 
     if (endpoint->IsActive())
@@ -312 +315 @@
         // so we reset the peer address:
         endpoint->PeerAddress().SetToEmpty();
     } else {
+        if (!AddressModule()->is_same_family(address))
+            return EAFNOSUPPORT;
+
+        // consider destination address INADDR_ANY as INADDR_LOOPBACK
+        sockaddr_storage _address;
+        if (AddressModule()->is_empty_address(address, false)) {
+            AddressModule()->get_loopback_address((sockaddr *)&_address);
+            // for IPv4 and IPv6 the port is at the same offset
+            ((sockaddr_in&)_address).sin_port = ((sockaddr_in *)address)->sin_port;
+            address = (sockaddr *)&_address;
+        }
+
         status_t status = endpoint->PeerAddress().SetTo(address);
         if (status < B_OK)
             return status;

headers/private/net/net_datalink.h

@@ -113 +113 @@
     bool (*equal_masked_addresses)(const sockaddr *a, const sockaddr *b, 
                     const sockaddr *mask);
     bool (*is_empty_address)(const sockaddr *address, bool checkPort);
+    bool (*is_same_family)(const sockaddr *address);
 
     int32 (*first_mask_bit)(const sockaddr *mask);
 
@@ -142 +143 @@
 
     bool (*matches_broadcast_address)(const sockaddr *address, 
                     const sockaddr *mask, const sockaddr *broadcastAddr);
+
+    void (*get_loopback_address)(sockaddr *result);
 };
 
 #endif  // NET_DATALINK_H