head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.114 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.112 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.110 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.108 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.106 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.104 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.102 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.100 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.98 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.96 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.94 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.92 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.90 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.88 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.86 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.84 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.82 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.80 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.78 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.76 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.74 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.72 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.70 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.66 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.46 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.68 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.64 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.62 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.60 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.58 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.56 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.54 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.52 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.50 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.48 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.44 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.42 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.40 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.38 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.36 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.34 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.32 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.30 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.28 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.26 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.24 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.22 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.20 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.18 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.16 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.14 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.12 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.10 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.8 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.6 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.4 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.2 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.1.0.52 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.50 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.48 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.46 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.44 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.42 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.40 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.38 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.36 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.34 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.32 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.30 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.28 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.26 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.24 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.22 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.20 pkgsrc-2008Q1:1.1.0.18 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.16 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.14 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.12 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.10 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.8 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.6 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.4 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.2 pkgsrc-2006Q1-base:1.1; locks; strict; comment @# @; 1.2 date 2012.03.31.08.31.06; author dholland; state Exp; branches; next 1.1; 1.1 date 2006.01.08.11.02.10; author wiz; state Exp; branches; next ; desc @@ 1.2 log @Patch up various lethal compiler warnings. This still doesn't build on NetBSD current or probably -6 because of bpf issues, but now stands a chance of being able to run on LP64 platforms and/or at all when that's fixed. @ text @$NetBSD: patch-ak,v 1.1 2006/01/08 11:02:10 wiz Exp $ - use standard headers - unclear other changes from a long time back --- sn_packets.c.orig 1997-04-18 09:33:58.000000000 +0000 +++ sn_packets.c @@@@ -4,6 +4,7 @@@@ #include "sn_config.h" #include "sn_defines.h" #include "sn_structs.h" +#include #include extern int PROTO_HEAD; @@@@ -43,6 +44,7 @@@@ int unwrap_packet (unsigned char *sp, st struct UDP_header UDPhead; int i; + short int dummy; /* 2 bytes, important */ memcpy(&IPhead,(sp+PROTO_HEAD),sizeof(struct IP_header)); /* IP header Conversion */ @@@@ -51,6 +53,7 @@@@ int unwrap_packet (unsigned char *sp, st unwrapped->TCP_len = 0; /* Reset structure NEEDED!!! */ unwrapped->UDP_len = 0; unwrapped->DATA_len = 0; + unwrapped->FRAG_nf = 0; if(NO_CHKSUM == 0) { @@@@ -75,32 +78,74 @@@@ int unwrap_packet (unsigned char *sp, st /* restore orig buffer */ /* general programming rule */ } + +#ifdef DEBUG_ONSCREEN + printf("IPheadlen: %d total length: %d\n", unwrapped->IP_len, + ntohs(IPhead.length)); +#endif + + dummy=ntohs(IPhead.flag_offset); dummy<<=3; + if( dummy!=0 ) /* we have offset */ + { + unwrapped->FRAG_nf = 1; + } + if(IPhead.protocol == TCP ) /* TCP */ { - memcpy(&TCPhead,(sp+PROTO_HEAD+(unwrapped->IP_len)), + if(unwrapped->FRAG_nf == 0) + { + if( (ntohs(IPhead.length)-(unwrapped->IP_len))<20 ) + {return CORRUPT_IP;}; + + memcpy(&TCPhead,(sp+PROTO_HEAD+(unwrapped->IP_len)), sizeof(struct TCP_header)); - unwrapped->TCP_len = ntohs(TCPhead.offset_flag) & 0xF000; - unwrapped->TCP_len >>= 10; - unwrapped->DATA_len = ntohs(IPhead.length) - + unwrapped->TCP_len = ntohs(TCPhead.offset_flag) & 0xF000; + unwrapped->TCP_len >>= 10; + unwrapped->DATA_len = ntohs(IPhead.length) - (unwrapped->IP_len) - (unwrapped->TCP_len); + } + else + { + unwrapped->DATA_len = ntohs(IPhead.length) - (unwrapped->IP_len); + } return TCP; } if(IPhead.protocol == ICMP ) /* ICMP */ { - memcpy(&ICMPhead,(sp+PROTO_HEAD+(unwrapped->IP_len)), + if(unwrapped->FRAG_nf == 0) + { + if( (ntohs(IPhead.length)-(unwrapped->IP_len))<4 ) + {return CORRUPT_IP;}; + + memcpy(&ICMPhead,(sp+PROTO_HEAD+(unwrapped->IP_len)), sizeof(struct ICMP_header)); - unwrapped->ICMP_len = ICMP_HEADLENGTH; - unwrapped->DATA_len = ntohs(IPhead.length) - + unwrapped->ICMP_len = ICMP_HEADLENGTH; + unwrapped->DATA_len = ntohs(IPhead.length) - (unwrapped->IP_len) - (unwrapped->ICMP_len); - return ICMP; + return ICMP; + } + else + { + return -1; /* don't handle fragmented ICMP */ + } } if(IPhead.protocol == UDP ) /* UDP */ { - memcpy(&UDPhead,(sp+PROTO_HEAD+(unwrapped->IP_len)), + if(unwrapped->FRAG_nf == 0) + { + if( (ntohs(IPhead.length)-(unwrapped->IP_len))<8 ) + {return CORRUPT_IP;}; + + memcpy(&UDPhead,(sp+PROTO_HEAD+(unwrapped->IP_len)), sizeof(struct UDP_header)); - unwrapped->UDP_len = UDP_HEADLENGTH; - unwrapped->DATA_len = ntohs(IPhead.length) - + unwrapped->UDP_len = UDP_HEADLENGTH; + unwrapped->DATA_len = ntohs(IPhead.length) - (unwrapped->IP_len) - (unwrapped->UDP_len); + } + else + { + unwrapped->DATA_len = ntohs(IPhead.length)-(unwrapped->IP_len); + } return UDP; } return -1; @ 1.1 log @This package contains a hardwired list of device driver names(ewww). Assume that x86_64 has the same drivers as i386, addresses PR 32332. No PKGREVISION bump since it didn't compile on amd64 before. While here: remove superfluous patches patch-af, patch-ag to config.sub files (get replaced by CONFIG_SUB_OVERRIDE anyway) split up multi-patch patch-aa into four patches patch-a[hijk] @ text @d1 1 a1 1 $NetBSD$ d3 4 a6 1 --- sn_packets.c.orig 1997-04-18 11:33:58.000000000 +0200 d8 9 a16 1 @@@@ -43,6 +43,7 @@@@ int unwrap_packet (unsigned char *sp, st d24 1 a24 1 @@@@ -51,6 +52,7 @@@@ int unwrap_packet (unsigned char *sp, st d32 1 a32 1 @@@@ -75,32 +77,74 @@@@ int unwrap_packet (unsigned char *sp, st @