diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-03-09 20:59:00 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-03-09 20:59:00 +0100 |
| commit | 7744992874e623136797febd669b5b40e0a18178 (patch) | |
| tree | 39bb948e06271e76586906c60466be421120ff55 /package/iptraf/patches/patch-src_tcptable_c | |
| parent | 4a619c92b7a63e852a019186ece93a76eeea4acf (diff) | |
| parent | 2261e8e2b3cda815ac79bd934756b94a3fa67fe5 (diff) | |
Merge branch 'master' of git://www.openadk.org/git/openadk
Diffstat (limited to 'package/iptraf/patches/patch-src_tcptable_c')
| -rw-r--r-- | package/iptraf/patches/patch-src_tcptable_c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/package/iptraf/patches/patch-src_tcptable_c b/package/iptraf/patches/patch-src_tcptable_c index 6ac96e6d1..80b74ba4f 100644 --- a/package/iptraf/patches/patch-src_tcptable_c +++ b/package/iptraf/patches/patch-src_tcptable_c @@ -1,6 +1,6 @@ $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 2009-05-21 23:07:02.000000000 +0200 +--- iptraf-3.0.1.orig/src/tcptable.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.1/src/tcptable.c 2013-03-04 11:38:22.000000000 +0100 @@ -17,6 +17,7 @@ details. ***/ @@ -29,7 +29,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ /* * Set raw port numbers -@@ -596,12 +597,10 @@ void updateentry(struct tcptable *table, +@@ -596,14 +597,10 @@ void updateentry(struct tcptable *table, tableentry->spanbr += bcount; if (opts->mac) { @@ -40,6 +40,8 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ convmacaddr(((struct ethhdr *) packet)->h_source, newmacaddr); - } else if (linkproto == LINK_FDDI) { - convmacaddr(((struct fddihdr *) packet)->saddr, newmacaddr); - } else if (linkproto == LINK_TR) { - convmacaddr(((struct trh_hdr *) packet)->saddr, newmacaddr); +- } else if (linkproto == LINK_TR) { +- convmacaddr(((struct trh_hdr *) packet)->saddr, newmacaddr); } + + if (tableentry->smacaddr[0] != '\0') { |