head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.116 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.114 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.112 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.110 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.108 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.106 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.104 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.102 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.100 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.98 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.96 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.94 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.92 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.90 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.88 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.86 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.84 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.82 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.80 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.78 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.76 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.74 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.72 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.68 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.48 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.70 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.66 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.64 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.62 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.60 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.58 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.56 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.54 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.52 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.50 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.46 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.44 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.42 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.40 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.38 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.36 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.34 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.32 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.30 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.28 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.26 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.24 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.22 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.20 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.18 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.16 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.14 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.12 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.10 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.8 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.6 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.4 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.2 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.1.0.76 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.74 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.72 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.70 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.68 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.66 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.64 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.62 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.60 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.58 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.56 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.54 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.52 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.50 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.48 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.46 pkgsrc-2008Q1:1.1.0.44 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.42 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.40 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.38 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.36 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.34 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.32 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.30 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.28 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.26 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.24 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.22 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.20 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.18 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.16 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.14 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.12 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.10 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1; locks; strict; comment @# @; 1.2 date 2011.12.05.22.46.12; author joerg; state Exp; branches; next 1.1; 1.1 date 2002.01.10.16.43.29; author skrll; state Exp; branches; next ; desc @@ 1.2 log @Don't use "false" as variable name. @ text @$NetBSD: patch-aj,v 1.1 2002/01/10 16:43:29 skrll Exp $ --- uquake/net_udp.c.orig 2000-01-10 16:59:39.000000000 +0000 +++ uquake/net_udp.c @@@@ -32,12 +32,17 @@@@ Foundation, Inc., 59 Temple Place - Suit #include #include #include +#include #ifdef __sun__ #include #undef model_t #endif +#ifndef INADDR_LOOPBACK +#define INADDR_LOOPBACK (u_int32_t)0x7f000001 +#endif + #if defined(sgi) && defined(sa_family) /* Get rid of problematic SGI #def */ #undef sa_family @@@@ -62,6 +67,91 @@@@ static unsigned long myAddr; #include "net_udp.h" //============================================================================= +/* get any of my non-loopback addr. */ +static int +grab_myaddr(family, sa) + int family; + struct sockaddr *sa; +{ + int s; + unsigned int maxif; + struct ifreq *iflist; + struct ifconf ifconf; + struct ifreq *ifr, *ifr_end; + struct myaddrs *p; + struct sockaddr_in *sin; + struct sockaddr_in6 *sin6; + +#if 0 + maxif = if_maxindex() + 1; +#else + maxif = 10; +#endif + iflist = (struct ifreq *)malloc(maxif * BUFSIZ); /* XXX */ + if (!iflist) { + Sys_Error("grab_myaddr: not enough core\n"); + /*NOTREACHED*/ + } + + if ((s = socket(PF_INET, SOCK_DGRAM, 0)) < 0) { + Sys_Error("socket(SOCK_DGRAM)\n"); + /*NOTREACHED*/ + } + memset(&ifconf, 0, sizeof(ifconf)); + ifconf.ifc_req = iflist; + ifconf.ifc_len = maxif * BUFSIZ; /* XXX */ + if (ioctl(s, SIOCGIFCONF, &ifconf) < 0) { + Sys_Error("ioctl(SIOCGIFCONF)\n"); + /*NOTREACHED*/ + } + close(s); + + /* Look for this interface in the list */ + ifr_end = (struct ifreq *) (ifconf.ifc_buf + ifconf.ifc_len); + for (ifr = ifconf.ifc_req; + ifr < ifr_end; + ifr = (struct ifreq *) ((char *) &ifr->ifr_addr + + ifr->ifr_addr.sa_len)) { + switch (ifr->ifr_addr.sa_family) { + case AF_INET: + sin = (struct sockaddr_in *)&ifr->ifr_addr; + if (sin->sin_addr.s_addr == htonl(0)) + continue; + if (sin->sin_addr.s_addr == htonl(INADDR_LOOPBACK)) + continue; + break; + case AF_INET6: + sin6 = (struct sockaddr_in6 *)&ifr->ifr_addr; + if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) + continue; + if (IN6_IS_ADDR_LOOPBACK(&sin6->sin6_addr)) + continue; + if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) + continue; + if (IN6_IS_ADDR_SITELOCAL(&sin6->sin6_addr)) + continue; + break; + } + if (ifr->ifr_addr.sa_family != family) + continue; + + memcpy(sa, &ifr->ifr_addr, ifr->ifr_addr.sa_len); + + { + char hbuf[NI_MAXHOST]; + if (getnameinfo(sa, sa->sa_len, hbuf, sizeof(hbuf), NULL, 0, + NI_NUMERICHOST) == 0) + printf("got %s as local address\n", hbuf); + else { + printf("non-printable local address, family %d\n", + family); + } + } + break; + } + + free(iflist); +} int UDP_Init (void) { @@@@ -74,9 +164,18 @@@@ int UDP_Init (void) return -1; // determine my name & address + memset(&myAddr, 0, sizeof(myAddr)); +#if 0 gethostname(buff, MAXHOSTNAMELEN); local = gethostbyname(buff); myAddr = *(int *)local->h_addr_list[0]; +#else + { + struct sockaddr_in sin; + if (grab_myaddr(AF_INET, (struct sockaddr *)&sin) == 0) + memcpy(&myAddr, &sin.sin_addr, sizeof(myAddr)); + } +#endif // if the quake hostname isn't set, set it to the machine name if (Q_strcmp(hostname.string, "UNNAMED") == 0) @@@@ -137,25 +236,45 @@@@ void UDP_Listen (qboolean state) int UDP_OpenSocket (int port) { + struct addrinfo hints, *res = NULL; + int error; + char pbuf[NI_MAXSERV]; int newsocket; - struct sockaddr_in address; qboolean _true = true; + const int wrong = 0; - if ((newsocket = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) + snprintf(pbuf, sizeof(pbuf), "%d", port); + memset(&hints, 0, sizeof(hints)); + hints.ai_family = PF_INET6; + hints.ai_socktype = SOCK_DGRAM; + hints.ai_flags = AI_PASSIVE; + error = getaddrinfo(NULL, pbuf, &hints, &res); + if (error) return -1; - if (ioctl (newsocket, FIONBIO, (char *)&_true) == -1) + if ((newsocket = socket (res->ai_family, res->ai_socktype, + res->ai_protocol)) < 0) + return -1; + + if (ioctl (newsocket, FIONBIO, (char *)&_true) < 0) goto ErrorReturn; - address.sin_family = AF_INET; - address.sin_addr.s_addr = INADDR_ANY; - address.sin_port = htons(port); - if( bind (newsocket, (void *)&address, sizeof(address)) == -1) +#ifdef IPV6_BINDV6ONLY + if (setsockopt(newsocket, IPPROTO_IPV6, IPV6_BINDV6ONLY, &wrong, + sizeof(wrong)) < 0) { + /* I don't care */ + } +#endif + + if (bind (newsocket, res->ai_addr, res->ai_addrlen) < 0) goto ErrorReturn; + freeaddrinfo(res); return newsocket; ErrorReturn: + if (res) + freeaddrinfo(res); close (newsocket); return -1; } @ 1.1 log @Remove the autoconf BUILD_DEPENDS and have all the patches in one place. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- uquake/net_udp.c.orig Mon Jan 10 16:59:39 2000 d5 1 a5 1 @@@@ -32,12 +32,17 @@@@ d23 1 a23 1 @@@@ -62,6 +67,91 @@@@ d115 1 a115 1 @@@@ -74,9 +164,18 @@@@ d134 1 a134 1 @@@@ -137,25 +236,45 @@@@ d144 1 a144 1 + const int false = 0; d169 2 a170 2 + if (setsockopt(newsocket, IPPROTO_IPV6, IPV6_BINDV6ONLY, &false, + sizeof(false)) < 0) { @