From f3e84309257b915cb8820917a8dd5578f02fe974 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 24 May 2009 20:11:16 +0200 Subject: patches and update for gcc 4.4.0 allmodconfig * update gcc to 4.4.0 * update gnutls and ruby * fix c++ issues for some packages --- package/iptraf/patches/patch-src_tcptable_c | 37 +++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) (limited to 'package/iptraf/patches/patch-src_tcptable_c') diff --git a/package/iptraf/patches/patch-src_tcptable_c b/package/iptraf/patches/patch-src_tcptable_c index 83ba44ff3..6ac96e6d1 100644 --- a/package/iptraf/patches/patch-src_tcptable_c +++ b/package/iptraf/patches/patch-src_tcptable_c @@ -1,7 +1,40 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- iptraf-3.0.0.orig/src/tcptable.c 2005-09-13 08:42:54.000000000 +0200 -+++ iptraf-3.0.0/src/tcptable.c 2008-10-09 17:34:11.000000000 +0200 -@@ -600,8 +600,6 @@ void updateentry(struct tcptable *table, ++++ iptraf-3.0.0/src/tcptable.c 2009-05-21 23:07:02.000000000 +0200 +@@ -17,6 +17,7 @@ details. + + ***/ + ++#include + #include + #include "options.h" + #include "tcptable.h" +@@ -143,7 +144,7 @@ int add_tcp_hash_entry(struct tcptable * + entry->daddr.s_addr, entry->dport, entry->ifname); + + ptmp = malloc(sizeof(struct tcp_hashentry)); +- bzero(ptmp, sizeof(struct tcp_hashentry)); ++ memset(ptmp, 0, sizeof(struct tcp_hashentry)); + + if (ptmp == NULL) + return 1; +@@ -337,8 +338,8 @@ struct tcptableent *addentry(struct tcpt + * Zero out MAC address fields + */ + +- bzero(new_entry->smacaddr, 15); +- bzero(new_entry->oth_connection->smacaddr, 15); ++ memset(new_entry->smacaddr, 0, 15); ++ memset(new_entry->oth_connection->smacaddr, 0, 15); + + /* + * Set raw port numbers +@@ -596,12 +597,10 @@ void updateentry(struct tcptable *table, + tableentry->spanbr += bcount; + + if (opts->mac) { +- bzero(newmacaddr, 15); ++ memset(newmacaddr, 0, 15); if ((linkproto == LINK_ETHERNET) || (linkproto == LINK_PLIP)) { convmacaddr(((struct ethhdr *) packet)->h_source, newmacaddr); -- cgit v1.2.3