From f2e72955d8453b1d5f02f5579e6cc41329cbbdad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sat, 11 Oct 2008 22:46:38 +0000 Subject: [PATCH] * datalink_send_datagram() can be called with a NULL protocol which I missed with the last commit. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27984 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/network/stack/datalink.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/add-ons/kernel/network/stack/datalink.cpp b/src/add-ons/kernel/network/stack/datalink.cpp index 5047d014fc..ec4f80724b 100644 --- a/src/add-ons/kernel/network/stack/datalink.cpp +++ b/src/add-ons/kernel/network/stack/datalink.cpp @@ -387,7 +387,7 @@ datalink_send_datagram(net_protocol *protocol, net_domain *domain, net_route *route = NULL; status_t status; - if (protocol->socket->bound_to_device > 0) { + if (protocol != NULL && protocol->socket->bound_to_device > 0) { status = get_device_route(domain, protocol->socket->bound_to_device, &route); } else @@ -408,7 +408,7 @@ datalink_send_datagram(net_protocol *protocol, net_domain *domain, \param _matchedType will be set to either zero or MSG_BCAST if non-NULL. */ bool -datalink_is_local_address(net_domain *_domain, const struct sockaddr *address, +datalink_is_local_address(net_domain *_domain, const struct sockaddr *address, net_interface **_interface, uint32 *_matchedType) { net_domain_private *domain = (net_domain_private *)_domain; @@ -437,7 +437,7 @@ datalink_is_local_address(net_domain *_domain, const struct sockaddr *address, // check for matching broadcast address if interface support broadcasting if (interface->flags & IFF_BROADCAST - && domain->address_module->equal_addresses(interface->destination, + && domain->address_module->equal_addresses(interface->destination, address)) { matchedType = MSG_BCAST; break;