| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950 |
- $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
- --- iptraf-3.0.0.orig/src/othptab.c 2005-09-13 08:42:54.000000000 +0200
- +++ iptraf-3.0.0/src/othptab.c 2009-05-21 23:02:50.000000000 +0200
- @@ -17,13 +17,12 @@ details.
- ***/
-
- #include <asm/types.h>
- +#include "options.h"
- +#include "tcptable.h"
- #include <linux/if_ether.h>
- #include <linux/if_tr.h>
- -#include <linux/if_fddi.h>
- #include <winops.h>
- #include "arphdr.h"
- -#include "options.h"
- -#include "tcptable.h"
- #include "othptab.h"
- #include "deskman.h"
- #include "attrs.h"
- @@ -128,7 +127,7 @@ struct othptabent *add_othp_entry(struct
- *nomem = 1;
- return NULL;
- }
- - bzero(new_entry, sizeof(struct othptabent));
- + memset(new_entry, 0, sizeof(struct othptabent));
-
- new_entry->is_ip = is_ip;
- new_entry->fragment = fragment;
- @@ -139,11 +138,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);
- @@ -373,8 +367,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);
-
|
