diff options
Diffstat (limited to 'package/iptraf/patches/patch-src_hostmon_c')
| -rw-r--r-- | package/iptraf/patches/patch-src_hostmon_c | 51 |
1 files changed, 31 insertions, 20 deletions
diff --git a/package/iptraf/patches/patch-src_hostmon_c b/package/iptraf/patches/patch-src_hostmon_c index 0c77aad22..da8d6ff69 100644 --- a/package/iptraf/patches/patch-src_hostmon_c +++ b/package/iptraf/patches/patch-src_hostmon_c @@ -1,15 +1,14 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- iptraf-3.0.0.orig/src/hostmon.c 2005-09-13 08:42:54.000000000 +0200 -+++ iptraf-3.0.0/src/hostmon.c 2008-10-09 17:34:11.000000000 +0200 -@@ -30,7 +30,6 @@ details. - #include <netinet/in.h> - #include <linux/if_packet.h> +--- iptraf-3.0.1.orig/src/hostmon.c 2007-09-25 11:18:56.000000000 +0200 ++++ iptraf-3.0.1/src/hostmon.c 2013-03-04 11:41:08.000000000 +0100 +@@ -32,7 +32,6 @@ details. #include <linux/if_ether.h> --#include <linux/if_fddi.h> - #include <linux/if_tr.h> + #include <linux/netdevice.h> + #include <linux/if_fddi.h> +-#include <linux/if_tr.h> #include <net/if_arp.h> #include <stdlib.h> -@@ -293,8 +292,6 @@ void printethent(struct ethtab *table, s + #include <time.h> +@@ -294,8 +293,6 @@ void printethent(struct ethtab *table, s wprintw(table->tabwin, "Ethernet"); else if (entry->un.desc.linktype == LINK_PLIP) wprintw(table->tabwin, "PLIP"); @@ -18,16 +17,15 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ wprintw(table->tabwin, " HW addr: %s", entry->un.desc.ascaddr); -@@ -722,7 +719,7 @@ void hostmon(const struct OPTIONS *optio +@@ -723,7 +720,6 @@ void hostmon(const struct OPTIONS *optio unsigned long long updtime_usec = 0; struct desclist elist; /* Ethernet description list */ - struct desclist flist; /* FDDI description list */ -+ struct desclist flist; /* Other links description list */ struct desclist *list = NULL; FILE *logfile = NULL; -@@ -786,7 +783,6 @@ void hostmon(const struct OPTIONS *optio +@@ -787,7 +783,6 @@ void hostmon(const struct OPTIONS *optio initethtab(&table, options->actmode); loaddesclist(&elist, LINK_ETHERNET, WITHETCETHERS); @@ -35,18 +33,17 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ if (logging) { if (strcmp(current_logfile, "") == 0) { -@@ -900,9 +896,7 @@ void hostmon(const struct OPTIONS *optio +@@ -901,8 +896,7 @@ void hostmon(const struct OPTIONS *optio if (pkt_result != PACKET_OK) continue; - if ((linktype == LINK_ETHERNET) || (linktype == LINK_FDDI) - || (linktype == LINK_PLIP) || (linktype == LINK_TR) || -- (linktype == LINK_VLAN)) { -+ if ((linktype == LINK_ETHERNET) || (linktype == LINK_PLIP) || (linktype == LINK_TR) || (linktype == LINK_VLAN)) { ++ if ((linktype == LINK_ETHERNET) || (linktype == LINK_PLIP) || + (linktype == LINK_VLAN)) { if (fromaddr.sll_protocol == htons(ETH_P_IP)) - is_ip = 1; -@@ -920,12 +914,6 @@ void hostmon(const struct OPTIONS *optio +@@ -921,18 +915,6 @@ void hostmon(const struct OPTIONS *optio memcpy(scratch_daddr, ((struct ethhdr *) buf)->h_dest, ETH_ALEN); list = &elist; @@ -56,6 +53,20 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ - memcpy(scratch_daddr, ((struct fddihdr *) buf)->daddr, - FDDI_K_ALEN); - list = &flist; - } else if (linktype == LINK_TR) { - memcpy(scratch_saddr, ((struct trh_hdr *) buf)->saddr, - TR_ALEN); +- } else if (linktype == LINK_TR) { +- memcpy(scratch_saddr, ((struct trh_hdr *) buf)->saddr, +- TR_ALEN); +- memcpy(scratch_daddr, ((struct trh_hdr *) buf)->daddr, +- TR_ALEN); +- list = &flist; + } + + entry = in_ethtable(&table, linktype, scratch_saddr); +@@ -999,7 +981,6 @@ void hostmon(const struct OPTIONS *optio + doupdate(); + destroyethtab(&table); + destroydesclist(&elist); +- destroydesclist(&flist); + unmark_facility(LANMONIDFILE, ifptr); + strcpy(current_logfile, ""); + } |