cleaning up after myself 4 years later:
* remove matches_broadcast_address slot in address module, as it doesn't exist anywhere * automatic whitespace cleanup git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36193 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
56f097ebd9
commit
ab1a4bef4f
@ -74,7 +74,7 @@ struct net_datalink_module_info {
|
||||
uint32 *_matchedType);
|
||||
bool (*is_local_link_address)(struct net_domain *domain, bool unconfigured,
|
||||
const struct sockaddr *address, net_interface **_interface);
|
||||
|
||||
|
||||
net_interface *(*get_interface)(struct net_domain *domain, uint32 index);
|
||||
net_interface *(*get_interface_with_address)(struct net_domain *domain,
|
||||
const struct sockaddr *address);
|
||||
@ -104,13 +104,13 @@ struct net_address_module_info {
|
||||
status_t (*copy_address)(const sockaddr *from, sockaddr **to,
|
||||
bool replaceWithZeros, const sockaddr *mask);
|
||||
|
||||
status_t (*mask_address)(const sockaddr *address, const sockaddr *mask,
|
||||
status_t (*mask_address)(const sockaddr *address, const sockaddr *mask,
|
||||
sockaddr *result);
|
||||
|
||||
|
||||
bool (*equal_addresses)(const sockaddr *a, const sockaddr *b);
|
||||
bool (*equal_ports)(const sockaddr *a, const sockaddr *b);
|
||||
bool (*equal_addresses_and_ports)(const sockaddr *a, const sockaddr *b);
|
||||
bool (*equal_masked_addresses)(const sockaddr *a, const sockaddr *b,
|
||||
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);
|
||||
@ -118,8 +118,8 @@ struct net_address_module_info {
|
||||
int32 (*first_mask_bit)(const sockaddr *mask);
|
||||
|
||||
bool (*check_mask)(const sockaddr *address);
|
||||
|
||||
status_t (*print_address)(const sockaddr *address, char **buffer,
|
||||
|
||||
status_t (*print_address)(const sockaddr *address, char **buffer,
|
||||
bool printPort);
|
||||
status_t (*print_address_buffer)(const sockaddr *address, char *buffer,
|
||||
size_t bufferSize, bool printPort);
|
||||
@ -135,15 +135,12 @@ struct net_address_module_info {
|
||||
|
||||
status_t (*update_to)(sockaddr *address, const sockaddr *from);
|
||||
|
||||
uint32 (*hash_address_pair)(const sockaddr *ourAddress,
|
||||
uint32 (*hash_address_pair)(const sockaddr *ourAddress,
|
||||
const sockaddr *peerAddress);
|
||||
|
||||
status_t (*checksum_address)(struct Checksum *checksum,
|
||||
status_t (*checksum_address)(struct Checksum *checksum,
|
||||
const sockaddr *address);
|
||||
|
||||
bool (*matches_broadcast_address)(const sockaddr *address,
|
||||
const sockaddr *mask, const sockaddr *broadcastAddr);
|
||||
|
||||
void (*get_loopback_address)(sockaddr *result);
|
||||
};
|
||||
|
||||
|
@ -526,6 +526,5 @@ net_address_module_info gIPv4AddressModule = {
|
||||
ipv4_update_to,
|
||||
ipv4_hash_address_pair,
|
||||
ipv4_checksum_address,
|
||||
NULL, // ipv4_matches_broadcast_address,
|
||||
ipv4_get_loopback_address
|
||||
};
|
||||
|
@ -109,7 +109,7 @@ l2cap_is_same_family(const sockaddr *address)
|
||||
{
|
||||
if (address == NULL)
|
||||
return false;
|
||||
|
||||
|
||||
return address->sa_family == AF_BLUETOOTH;
|
||||
}
|
||||
|
||||
@ -426,6 +426,5 @@ net_address_module_info gL2cap4AddressModule = {
|
||||
l2cap_update_to,
|
||||
l2cap_hash_address_pair,
|
||||
l2cap_checksum_address,
|
||||
NULL, // l2cap_matches_broadcast_address,
|
||||
NULL // get_loopback_address
|
||||
};
|
||||
|
@ -117,7 +117,7 @@ unix_is_same_family(const sockaddr *address)
|
||||
{
|
||||
if (address == NULL)
|
||||
return false;
|
||||
|
||||
|
||||
return address->sa_family == AF_UNIX;
|
||||
}
|
||||
|
||||
@ -214,7 +214,7 @@ unix_mask_address(const sockaddr *address, const sockaddr *mask,
|
||||
return unix_set_to(result, address);
|
||||
}
|
||||
|
||||
|
||||
|
||||
static status_t
|
||||
unix_set_to_defaults(sockaddr *defaultMask, sockaddr *defaultBroadcast,
|
||||
sockaddr *address, sockaddr *netmask)
|
||||
@ -311,6 +311,5 @@ net_address_module_info gAddressModule = {
|
||||
unix_update_to,
|
||||
unix_hash_address_pair,
|
||||
unix_checksum_address,
|
||||
NULL, // matches_broadcast_address
|
||||
NULL // get_loopback_address
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user