1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
$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>
#include <linux/if_ether.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
wprintw(table->tabwin, "Ethernet");
else if (entry->un.desc.linktype == LINK_PLIP)
wprintw(table->tabwin, "PLIP");
- else if (entry->un.desc.linktype == LINK_FDDI)
- wprintw(table->tabwin, "FDDI");
wprintw(table->tabwin, " HW addr: %s", entry->un.desc.ascaddr);
@@ -722,7 +719,7 @@ 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
initethtab(&table, options->actmode);
loaddesclist(&elist, LINK_ETHERNET, WITHETCETHERS);
- loaddesclist(&flist, LINK_FDDI, WITHETCETHERS);
if (logging) {
if (strcmp(current_logfile, "") == 0) {
@@ -900,9 +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 (fromaddr.sll_protocol == htons(ETH_P_IP))
is_ip = 1;
@@ -920,12 +914,6 @@ void hostmon(const struct OPTIONS *optio
memcpy(scratch_daddr, ((struct ethhdr *) buf)->h_dest,
ETH_ALEN);
list = &elist;
- } else if (linktype == LINK_FDDI) {
- memcpy(scratch_saddr, ((struct fddihdr *) buf)->saddr,
- FDDI_K_ALEN);
- 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);
|
