diff options
author | Bruce M Simpson <bms@FreeBSD.org> | 2006-12-13 23:02:52 +0000 |
---|---|---|
committer | Bruce M Simpson <bms@FreeBSD.org> | 2006-12-13 23:02:52 +0000 |
commit | d851d9fc361628ae219bb55d820b2cb9cc192415 (patch) | |
tree | 9de9b76910111e1fe07840c59292a7256e464914 /net-mgmt | |
parent | tDiary - Injection Vulnerability (diff) |
Fix for gcc 4.1.
Notes
Notes:
svn path=/head/; revision=179685
Diffstat (limited to 'net-mgmt')
-rw-r--r-- | net-mgmt/trafd/files/patch-ah | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/net-mgmt/trafd/files/patch-ah b/net-mgmt/trafd/files/patch-ah index 832f7e5333d7..700118649959 100644 --- a/net-mgmt/trafd/files/patch-ah +++ b/net-mgmt/trafd/files/patch-ah @@ -1,6 +1,23 @@ ---- trafd/traffic.c.buggy Mon Aug 7 18:45:54 2000 -+++ trafd/traffic.c Mon Aug 7 18:46:42 2000 -@@ -253,7 +253,7 @@ +--- trafd/traffic.c.orig Thu Nov 25 11:31:15 1999 ++++ trafd/traffic.c Wed Dec 13 22:59:42 2006 +@@ -29,6 +29,7 @@ + + /* traffic.c - collect network traffic */ + ++#include <stdlib.h> + #include <stdio.h> + #include <string.h> + #include <unistd.h> +@@ -69,7 +70,7 @@ + static int dlen; + typedef struct t_entry *p_entry; + static struct t_entry t; +-static struct timeval begin_time; ++struct timeval begin_time; + static u_char s_port_big[IPPORT_RESERVED]; + + /* +@@ -214,7 +215,7 @@ t.p_port = tp->th_sport, t.who_srv = 1; else if (tp->th_sport > tp->th_dport) t.p_port = tp->th_dport, t.who_srv = 2; @@ -9,7 +26,7 @@ t.p_port = tp->th_sport, t.who_srv = 3; if (t.p_port > IPPORT_RESERVED) { if (s_port_big[tp->th_sport & (IPPORT_RESERVED-1)] & IPPROTO_TCP) { -@@ -263,7 +263,7 @@ +@@ -224,7 +225,7 @@ t.p_port = tp->th_dport; t.who_srv = 2; } @@ -18,7 +35,7 @@ } traf_add(insertentry(&t), t.n_bytes, t.n_psize); -@@ -300,7 +300,7 @@ +@@ -261,7 +262,7 @@ t.p_port = up->uh_sport, t.who_srv = 1; else if (up->uh_sport > up->uh_dport) t.p_port = up->uh_dport, t.who_srv = 2; @@ -27,7 +44,7 @@ t.p_port = up->uh_sport, t.who_srv = 3; if (t.p_port > IPPORT_RESERVED) { if (s_port_big[up->uh_sport & (IPPORT_RESERVED-1)] & IPPROTO_UDP) { -@@ -310,7 +310,7 @@ +@@ -271,7 +272,7 @@ t.p_port = up->uh_dport; t.who_srv = 2; } @@ -36,4 +53,3 @@ } traf_add(insertentry(&t), t.n_bytes, t.n_psize); - |