Fri Jan 11 00:02:13 2013 UTC ()
PCAP handler callback is void.


(joerg)
diff -r1.12 -r1.13 pkgsrc/net/sniffit/distinfo
diff -r1.2 -r1.3 pkgsrc/net/sniffit/patches/patch-ai
diff -r1.2 -r1.3 pkgsrc/net/sniffit/patches/patch-sniffit_h
diff -r1.1 -r1.2 pkgsrc/net/sniffit/patches/patch-sn__interface.h

cvs diff -r1.12 -r1.13 pkgsrc/net/sniffit/distinfo (expand / switch to unified diff)

--- pkgsrc/net/sniffit/distinfo 2012/04/07 09:23:11 1.12
+++ pkgsrc/net/sniffit/distinfo 2013/01/11 00:02:13 1.13
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.12 2012/04/07 09:23:11 obache Exp $ 1$NetBSD: distinfo,v 1.13 2013/01/11 00:02:13 joerg Exp $
2 2
3SHA1 (sniffit.0.3.5.tar.gz) = df9183fca2eec29a56bcfdc68a983c4e7d57bf9d 3SHA1 (sniffit.0.3.5.tar.gz) = df9183fca2eec29a56bcfdc68a983c4e7d57bf9d
4RMD160 (sniffit.0.3.5.tar.gz) = 9508f357c6fe74a9147a735fd0eb419b9a1124eb 4RMD160 (sniffit.0.3.5.tar.gz) = 9508f357c6fe74a9147a735fd0eb419b9a1124eb
5Size (sniffit.0.3.5.tar.gz) = 197255 bytes 5Size (sniffit.0.3.5.tar.gz) = 197255 bytes
6SHA1 (patch-ab) = 146c4d57cb94aa66c9fee9075e141e8b1c4c6b32 6SHA1 (patch-ab) = 146c4d57cb94aa66c9fee9075e141e8b1c4c6b32
7SHA1 (patch-ac) = 05ab42b3499edd550de6f1bb667adce34e26a503 7SHA1 (patch-ac) = 05ab42b3499edd550de6f1bb667adce34e26a503
8SHA1 (patch-ad) = 9eadda884f4575f5e5facd66e3d5a39b65e686f7 8SHA1 (patch-ad) = 9eadda884f4575f5e5facd66e3d5a39b65e686f7
9SHA1 (patch-ae) = c430e434309135189de7b3e61e4d0a1e63e50426 9SHA1 (patch-ae) = c430e434309135189de7b3e61e4d0a1e63e50426
10SHA1 (patch-ah) = 50959ea602f9c31bd71a966b1c4b1903db2711d5 10SHA1 (patch-ah) = 50959ea602f9c31bd71a966b1c4b1903db2711d5
11SHA1 (patch-ai) = d8e5641d1fd729feea93d3b0a8b4d24e12ce9954 11SHA1 (patch-ai) = 2c49efc6f94b490b6d4bb1b9703218cbc9805574
12SHA1 (patch-aj) = db87dccf1c952e188aebb7bbb699c6257287c87d 12SHA1 (patch-aj) = db87dccf1c952e188aebb7bbb699c6257287c87d
13SHA1 (patch-ak) = 6909bb66b1ce6f9a4a78b548d00c41b1b0845d56 13SHA1 (patch-ak) = 6909bb66b1ce6f9a4a78b548d00c41b1b0845d56
14SHA1 (patch-sn__cfgfile_c) = ae761ad7ec853d86a5dc458e47271125e8b75555 14SHA1 (patch-sn__cfgfile_c) = ae761ad7ec853d86a5dc458e47271125e8b75555
15SHA1 (patch-sn__cfgfile_h) = 40dd73a556d0a48576baaa00b7ab8be5fbbf48eb 15SHA1 (patch-sn__cfgfile_h) = 40dd73a556d0a48576baaa00b7ab8be5fbbf48eb
16SHA1 (patch-sn__interface.h) = eaf9368a981ce18b579c26db0c574c7ff91f9b53 16SHA1 (patch-sn__interface.h) = 32d9823b22fb788b449314b9f30fe7d8beac0d7d
17SHA1 (patch-sn__logfile_c) = 07248e3ebd524a4f4f10f1d9b6aee33c70c5457f 17SHA1 (patch-sn__logfile_c) = 07248e3ebd524a4f4f10f1d9b6aee33c70c5457f
18SHA1 (patch-sniffit_h) = 7ccc919e4a2de6a23d5b04c6242a80d336baeb46 18SHA1 (patch-sniffit_h) = 7bd90aad29bc1be934e613fbaf04a84448a5a71d

cvs diff -r1.2 -r1.3 pkgsrc/net/sniffit/patches/patch-ai (expand / switch to unified diff)

--- pkgsrc/net/sniffit/patches/patch-ai 2012/03/31 08:31:06 1.2
+++ pkgsrc/net/sniffit/patches/patch-ai 2013/01/11 00:02:13 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ai,v 1.2 2012/03/31 08:31:06 dholland Exp $ 1$NetBSD: patch-ai,v 1.3 2013/01/11 00:02:13 joerg Exp $
2 2
3- use standard headers 3- use standard headers
4- fix signature of signal handler, make it file-static 4- fix signature of signal handler, make it file-static
5- fix signature of pcap handler 5- fix signature of pcap handler
6- make const declarations internally consistent 6- make const declarations internally consistent
7- CORRUPT_IP/DONT_EXAMINE changes from a long time ago 7- CORRUPT_IP/DONT_EXAMINE changes from a long time ago
8 8
9--- sniffit.0.3.5.c.orig 1997-04-18 09:33:58.000000000 +0000 9--- sniffit.0.3.5.c.orig 1997-04-18 09:33:58.000000000 +0000
10+++ sniffit.0.3.5.c 10+++ sniffit.0.3.5.c
11@@ -7,6 +7,8 @@ 11@@ -7,6 +7,8 @@
12 #include <unistd.h> 12 #include <unistd.h>
13 #include <signal.h> 13 #include <signal.h>
14 #include <stdio.h> 14 #include <stdio.h>
@@ -52,33 +52,42 @@ $NetBSD: patch-ai,v 1.2 2012/03/31 08:31 @@ -52,33 +52,42 @@ $NetBSD: patch-ai,v 1.2 2012/03/31 08:31
52+ {printf("Suspicious Packet detected... (Split header)\n"); 52+ {printf("Suspicious Packet detected... (Split header)\n");
53+ return DONT_EXAMINE;} 53+ return DONT_EXAMINE;}
54  54
55 memcpy(&iphead,(sp+PROTO_HEAD),sizeof(struct IP_header)); 55 memcpy(&iphead,(sp+PROTO_HEAD),sizeof(struct IP_header));
56 so=(unsigned char *)&(iphead.source); 56 so=(unsigned char *)&(iphead.source);
57 dest=(unsigned char *)&(iphead.destination); 57 dest=(unsigned char *)&(iphead.destination);
58  58
59+ if(info->FRAG_nf!=0) 59+ if(info->FRAG_nf!=0)
60+ {printf("Fragment Skipped...\n"); return DONT_EXAMINE; }; 60+ {printf("Fragment Skipped...\n"); return DONT_EXAMINE; };
61+ 61+
62 if((proto==TCP)&&(PROTOCOLS&F_TCP))  62 if((proto==TCP)&&(PROTOCOLS&F_TCP))
63 { 63 {
64 #ifdef DEBUG_ONSCREEN 64 #ifdef DEBUG_ONSCREEN
 65@@ -823,7 +831,7 @@ printf("Selected: %d\n",selected);
 66 }
 67
 68 /* Default Processing of packets */
 69-pcap_handler packethandler(unsigned char *ipaddrpoint,
 70+void packethandler(unsigned char *ipaddrpoint,
 71 const struct packetheader *p_header,
 72 const unsigned char *sp)
 73 {
65@@ -1220,6 +1228,10 @@ int check_mask (const struct packetheade 74@@ -1220,6 +1228,10 @@ int check_mask (const struct packetheade
66 proto=unwrap_packet(sp, info); 75 proto=unwrap_packet(sp, info);
67 if(proto == NO_IP) return DONT_EXAMINE; /* no use in trying */ 76 if(proto == NO_IP) return DONT_EXAMINE; /* no use in trying */
68 if(proto == NO_IP_4) return DONT_EXAMINE; /* no use in trying */ 77 if(proto == NO_IP_4) return DONT_EXAMINE; /* no use in trying */
69+ if(proto == CORRUPT_IP) return DONT_EXAMINE; /* no use in trying */ 78+ if(proto == CORRUPT_IP) return DONT_EXAMINE; /* no use in trying */
70+ 79+
71+ if(info->FRAG_nf!=0) 80+ if(info->FRAG_nf!=0)
72+ {return DONT_EXAMINE; }; 81+ {return DONT_EXAMINE; };
73  82
74 (*IP_nr_of_packets)++; 83 (*IP_nr_of_packets)++;
75 if(proto==ICMP)  84 if(proto==ICMP)
76@@ -1272,7 +1284,7 @@ int check_mask (const struct packetheade 85@@ -1272,7 +1284,7 @@ int check_mask (const struct packetheade
77 return TCP_EXAMINE; /* interprete packet */ 86 return TCP_EXAMINE; /* interprete packet */
78 } 87 }
79  88
80-pcap_handler interactive_packethandler( char *dummy,  89-pcap_handler interactive_packethandler( char *dummy,
81+pcap_handler interactive_packethandler( unsigned char *dummy,  90+void interactive_packethandler( unsigned char *dummy,
82 const struct packetheader *p_header,  91 const struct packetheader *p_header,
83 const unsigned char *sp)  92 const unsigned char *sp)
84 {  93 {

cvs diff -r1.2 -r1.3 pkgsrc/net/sniffit/patches/patch-sniffit_h (expand / switch to unified diff)

--- pkgsrc/net/sniffit/patches/patch-sniffit_h 2012/04/07 09:23:11 1.2
+++ pkgsrc/net/sniffit/patches/patch-sniffit_h 2013/01/11 00:02:13 1.3
@@ -1,27 +1,32 @@ @@ -1,27 +1,32 @@
1$NetBSD: patch-sniffit_h,v 1.2 2012/04/07 09:23:11 obache Exp $ 1$NetBSD: patch-sniffit_h,v 1.3 2013/01/11 00:02:13 joerg Exp $
2 2
3- move strlower to sn_cfgfile.h to make it visible in the right places 3- move strlower to sn_cfgfile.h to make it visible in the right places
4- my_exit should be file-static 4- my_exit should be file-static
5- update const to match changes to sniffit.0.3.5.c 5- update const to match changes to sniffit.0.3.5.c
6 6
7--- sniffit.h.orig 1997-04-18 09:33:58.000000000 +0000 7--- sniffit.h.orig 1997-04-18 09:33:58.000000000 +0000
8+++ sniffit.h 8+++ sniffit.h
9@@ -9,20 +9,18 @@ pcap_handler packethandler(unsigned char 9@@ -5,24 +5,22 @@ int check_packet(unsigned long,
 10 const struct packetheader *,
 11 const unsigned char *,char *, char *,
 12 struct unwrap *,char *,int);
 13-pcap_handler packethandler(unsigned char *,const struct packetheader *,
 14+void packethandler(unsigned char *,const struct packetheader *,
10 const unsigned char *); 15 const unsigned char *);
11 int check_mask (const struct packetheader *,const unsigned char *, char *, 16 int check_mask (const struct packetheader *,const unsigned char *, char *,
12 char *,struct unwrap *); 17 char *,struct unwrap *);
13-pcap_handler interactive_packethandler( char *, const struct packetheader *, 18-pcap_handler interactive_packethandler( char *, const struct packetheader *,
14+pcap_handler interactive_packethandler( unsigned char *, const struct packetheader *, 19+void interactive_packethandler( unsigned char *, const struct packetheader *,
15 const unsigned char *);  20 const unsigned char *);
16 void print_iphead (struct IP_header *, char); 21 void print_iphead (struct IP_header *, char);
17 unsigned long getaddrbyname(char *); 22 unsigned long getaddrbyname(char *);
18 void quit (char *); 23 void quit (char *);
19 void reset_all (void); 24 void reset_all (void);
20-char *strlower (char *); 25-char *strlower (char *);
21 struct file_info *add_dynam (char *, char, char, unsigned long, int); 26 struct file_info *add_dynam (char *, char, char, unsigned long, int);
22 void delete_dynam (char *, char, char);  27 void delete_dynam (char *, char, char);
23-void record_buf(struct file_info *, unsigned long, char *, int, int); 28-void record_buf(struct file_info *, unsigned long, char *, int, int);
24+void record_buf(struct file_info *, unsigned long, const char *, int, int); 29+void record_buf(struct file_info *, unsigned long, const char *, int, int);
25 void sb_shift(struct file_info *);  30 void sb_shift(struct file_info *);
26-void sbuf_update(struct file_info *, unsigned long, char *, int); 31-void sbuf_update(struct file_info *, unsigned long, char *, int);
27+void sbuf_update(struct file_info *, unsigned long, const char *, int); 32+void sbuf_update(struct file_info *, unsigned long, const char *, int);

cvs diff -r1.1 -r1.2 pkgsrc/net/sniffit/patches/patch-sn__interface.h (expand / switch to unified diff)

--- pkgsrc/net/sniffit/patches/patch-sn__interface.h 2012/04/07 09:23:11 1.1
+++ pkgsrc/net/sniffit/patches/patch-sn__interface.h 2013/01/11 00:02:13 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-sn__interface.h,v 1.1 2012/04/07 09:23:11 obache Exp $ 1$NetBSD: patch-sn__interface.h,v 1.2 2013/01/11 00:02:13 joerg Exp $
2 2
3- make const declarations internally consistent 3- make const declarations internally consistent
4 4
5--- sn_interface.h.orig 1997-04-18 09:33:58.000000000 +0000 5--- sn_interface.h.orig 1997-04-18 09:33:58.000000000 +0000
6+++ sn_interface.h 6+++ sn_interface.h
7@@ -29,7 +29,7 @@ void sig_blocking(char, int); 7@@ -29,7 +29,7 @@ void sig_blocking(char, int);
8 void stop_logging (void); 8 void stop_logging (void);
9 int check_mask (const struct packetheader *,const unsigned char *, char *,  9 int check_mask (const struct packetheader *,const unsigned char *, char *,
10 char *, struct unwrap *); 10 char *, struct unwrap *);
11-pcap_handler interactive_packethandler( char *, const struct packetheader *, 11-pcap_handler interactive_packethandler( char *, const struct packetheader *,
12+pcap_handler interactive_packethandler(unsigned char *, const struct packetheader *, 12+void interactive_packethandler(unsigned char *, const struct packetheader *,
13 const unsigned char *); 13 const unsigned char *);
14 void stop_packet_info (void); 14 void stop_packet_info (void);
15 void packet_info_handler (int); 15 void packet_info_handler (int);