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
|
--- iptraf-3.0.1.orig/src/othptab.c 2007-09-25 11:47:35.000000000 +0200
+++ iptraf-3.0.1/src/othptab.c 2013-03-04 11:39:50.000000000 +0100
@@ -20,7 +20,6 @@ details.
#include <asm/types.h>
#include <sys/socket.h>
#include <linux/if_ether.h>
-#include <linux/if_tr.h>
#include <linux/netdevice.h>
#include <linux/if_fddi.h>
#include <winops.h>
@@ -142,16 +141,6 @@ struct othptabent *add_othp_entry(struct
new_entry->smacaddr);
convmacaddr(((struct ethhdr *) packet)->h_dest,
new_entry->dmacaddr);
- } else if (linkproto == LINK_FDDI) {
- convmacaddr(((struct fddihdr *) packet)->saddr,
- new_entry->smacaddr);
- convmacaddr(((struct fddihdr *) packet)->daddr,
- new_entry->dmacaddr);
- } else if (linkproto == LINK_TR) {
- convmacaddr(((struct trh_hdr *) packet)->saddr,
- new_entry->smacaddr);
- convmacaddr(((struct trh_hdr *) packet)->daddr,
- new_entry->dmacaddr);
}
}
@@ -376,8 +365,7 @@ void printothpentry(struct othptable *ta
strcat(msgstring, scratchpad);
if ((entry->linkproto == LINK_ETHERNET) ||
- (entry->linkproto == LINK_PLIP) ||
- (entry->linkproto == LINK_FDDI)) {
+ (entry->linkproto == LINK_PLIP)) {
sprintf(scratchpad, " from %s to %s on %s",
entry->smacaddr, entry->dmacaddr, entry->iface);
|
