diff options
Diffstat (limited to 'net/howl/patches/patch-aa')
| -rw-r--r-- | net/howl/patches/patch-aa | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/net/howl/patches/patch-aa b/net/howl/patches/patch-aa index 7b76b32d355..fefbf802254 100644 --- a/net/howl/patches/patch-aa +++ b/net/howl/patches/patch-aa @@ -1,22 +1,30 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/06/05 19:03:12 nathanw Exp $ +$NetBSD: patch-aa,v 1.2 2004/11/20 14:43:32 mjl Exp $ ---- src/lib/howl/socket.c.orig 2004-02-18 13:05:46.000000000 -0500 -+++ src/lib/howl/socket.c 2004-06-04 18:22:49.000000000 -0400 -@@ -363,7 +363,7 @@ +--- src/lib/howl/socket.c.orig 2004-11-20 14:57:33.000000000 +0100 ++++ src/lib/howl/socket.c 2004-11-20 14:57:38.000000000 +0100 +@@ -261,7 +261,7 @@ + err = sw_translate_error(self->m_desc != SW_INVALID_SOCKET, sw_socket_errno()); + sw_check_okay_log(err, exit); + +-#if defined(__APPLE__) || defined(__VXWORKS__) || defined(__FreeBSD__) ++#if defined(__APPLE__) || defined(__VXWORKS__) || defined(__FreeBSD__) || defined(__NetBSD__) + res = setsockopt(self->m_desc, SOL_SOCKET, SO_REUSEPORT, (char*) &opt, sizeof(opt)); #else - sw_ulong real_ttl = ttl; + res = setsockopt(self->m_desc, SOL_SOCKET, SO_REUSEADDR, (char*) &opt, sizeof(opt)); +@@ -375,6 +375,7 @@ #endif -- -+ sw_uchar mttl = (sw_uchar) ttl; + int res; + sw_result err; ++ sw_uchar mttl = (sw_uchar) ttl; + /* initialize the group membership - */ -@@ -422,7 +422,7 @@ - return sw_system_error(); - } +@@ -425,7 +426,7 @@ + err = sw_translate_error(res == 0, sw_socket_errno()); + sw_check_okay_log(err, exit); + +- res = setsockopt(self->m_desc, IPPROTO_IP, IP_MULTICAST_TTL, (char*) &real_ttl, sizeof(real_ttl)); ++ res = setsockopt(self->m_desc, IPPROTO_IP, IP_MULTICAST_TTL, (char*) &mttl, sizeof(mttl)); + err = sw_translate_error(res == 0, sw_socket_errno()); + sw_check_okay_log(err, exit); -- if (setsockopt(self->m_fd, IPPROTO_IP, IP_MULTICAST_TTL, (char*) &real_ttl, sizeof(real_ttl)) == -1) -+ if (setsockopt(self->m_fd, IPPROTO_IP, IP_MULTICAST_TTL, (char*) &mttl, sizeof(mttl)) == -1) - { - sw_log(SW_LOG_ERROR, "sw_socket_join_multicast_group", "setsockopt(IP_MULTICAST_TTL) failed: %d\n", sw_socket_error_code()); - return sw_system_error(); |