i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

L2CAP: Remove dependency on userland bdaddrUtils.h.

Browse Source 
And do some other code cleanup too.
This commit is contained in:
Augustin Cavalier
2026-03-23 14:35:09 -04:00
parent 7e813b6181
commit 0e5639ad74
1 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/protocols/l2cap/l2cap_address.cpp
+38 -27
View File
@@ -18,16 +18,22 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <bluetooth/bdaddrUtils.h>
#include <bluetooth/L2CAP/btL2CAP.h> #include <bluetooth/L2CAP/btL2CAP.h>
static bool
bdaddrs_equal(const bdaddr_t& ba1, const bdaddr_t& ba2)
{
return memcmp(&ba1, &ba2, sizeof(bdaddr_t)) == 0;
}
static status_t static status_t
l2cap_copy_address(const sockaddr *from, sockaddr **to, l2cap_copy_address(const sockaddr *from, sockaddr **to,
bool replaceWithZeros = false, const sockaddr *mask = NULL) bool replaceWithZeros = false, const sockaddr *mask = NULL)
{ {
if (replaceWithZeros) { if (replaceWithZeros) {
*to = (sockaddr *)malloc(sizeof(sockaddr_in)); *to = (sockaddr *)malloc(sizeof(sockaddr_l2cap));
if (*to == NULL) if (*to == NULL)
return B_NO_MEMORY; return B_NO_MEMORY;
@@ -40,7 +46,7 @@ l2cap_copy_address(const sockaddr *from, sockaddr **to,
if (from->sa_family != AF_BLUETOOTH) if (from->sa_family != AF_BLUETOOTH)
return B_MISMATCHED_VALUES; return B_MISMATCHED_VALUES;
*to = (sockaddr *)malloc(sizeof(sockaddr_in)); *to = (sockaddr *)malloc(sizeof(sockaddr_l2cap));
if (*to == NULL) if (*to == NULL)
return B_NO_MEMORY; return B_NO_MEMORY;
@@ -52,15 +58,16 @@ l2cap_copy_address(const sockaddr *from, sockaddr **to,
static bool static bool
l2cap_is_empty_address(const sockaddr *address, bool checkPort) l2cap_is_empty_address(const sockaddr *_address, bool checkPort)
{ {
if (address == NULL || address->sa_len == 0 if (_address == NULL || _address->sa_len == 0
|| address->sa_family == AF_UNSPEC) || _address->sa_family == AF_UNSPEC)
return true; return true;
return ((bdaddrUtils::Compare( const sockaddr_l2cap *address = (const sockaddr_l2cap *)_address;
((const sockaddr_l2cap *)address)->l2cap_bdaddr, BDADDR_NULL))
&& (!checkPort || ((sockaddr_l2cap *)address)->l2cap_psm == 0)); return bdaddrs_equal(address->l2cap_bdaddr, BDADDR_NULL)
&& (!checkPort || address->l2cap_psm == 0);
} }
@@ -75,17 +82,19 @@ l2cap_is_same_family(const sockaddr *address)
static bool static bool
l2cap_equal_addresses(const sockaddr *a, const sockaddr *b) l2cap_equal_addresses(const sockaddr *_a, const sockaddr *_b)
{ {
if (a == NULL && b == NULL) if (_a == NULL && _b == NULL)
return true; return true;
if (a != NULL && b == NULL) if (_a != NULL && _b == NULL)
return l2cap_is_empty_address(a, false); return l2cap_is_empty_address(_a, false);
if (a == NULL && b != NULL) if (_a == NULL && _b != NULL)
return l2cap_is_empty_address(b, false); return l2cap_is_empty_address(_b, false);
return bdaddrUtils::Compare(((const sockaddr_l2cap*)a)->l2cap_bdaddr, const sockaddr_l2cap *a = (const sockaddr_l2cap *)_a;
((sockaddr_l2cap*)b)->l2cap_bdaddr); const sockaddr_l2cap *b = (const sockaddr_l2cap *)_b;
return bdaddrs_equal(a->l2cap_bdaddr, b->l2cap_bdaddr);
} }
@@ -99,18 +108,20 @@ l2cap_equal_ports(const sockaddr *a, const sockaddr *b)
static bool static bool
l2cap_equal_addresses_and_ports(const sockaddr *a, const sockaddr *b) l2cap_equal_addresses_and_ports(const sockaddr *_a, const sockaddr *_b)
{ {
if (a == NULL && b == NULL) if (_a == NULL && _b == NULL)
return true; return true;
if (a != NULL && b == NULL) if (_a != NULL && _b == NULL)
return l2cap_is_empty_address(a, true); return l2cap_is_empty_address(_a, true);
if (a == NULL && b != NULL) if (_a == NULL && _b != NULL)
return l2cap_is_empty_address(b, true); return l2cap_is_empty_address(_b, true);
return (bdaddrUtils::Compare(((const sockaddr_l2cap *)a)->l2cap_bdaddr, const sockaddr_l2cap *a = (const sockaddr_l2cap *)_a;
((const sockaddr_l2cap *)b)->l2cap_bdaddr)) const sockaddr_l2cap *b = (const sockaddr_l2cap *)_b;
&& ((sockaddr_l2cap *)a)->l2cap_psm == ((sockaddr_l2cap *)b)->l2cap_psm;
return bdaddrs_equal(a->l2cap_bdaddr, b->l2cap_bdaddr)
&& (a->l2cap_psm == b->l2cap_psm);
} }
@@ -241,7 +252,7 @@ l2cap_update_to(sockaddr *_address, const sockaddr *_from)
address->l2cap_family = AF_BLUETOOTH; address->l2cap_family = AF_BLUETOOTH;
address->l2cap_len = sizeof(sockaddr_l2cap); address->l2cap_len = sizeof(sockaddr_l2cap);
if (bdaddrUtils::Compare(address->l2cap_bdaddr, BDADDR_NULL)) if (bdaddrs_equal(address->l2cap_bdaddr, BDADDR_NULL))
address->l2cap_bdaddr = from->l2cap_bdaddr; address->l2cap_bdaddr = from->l2cap_bdaddr;
if (address->l2cap_psm == 0) if (address->l2cap_psm == 0)