--- a/src/dirs.h +++ b/src/dirs.h @@ -155,7 +155,6 @@ */ #define ETHFILE get_path(T_WORKDIR, "ethernet.desc") -#define FDDIFILE get_path(T_WORKDIR, "fddi.desc") /* * The rvnamed program file --- a/src/hostmon.c +++ b/src/hostmon.c @@ -31,7 +31,6 @@ details. #include #include #include -#include #include #include #include @@ -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"); - else if (entry->un.desc.linktype == LINK_FDDI) - wprintw(table->tabwin, "FDDI"); wprintw(table->tabwin, " HW addr: %s", entry->un.desc.ascaddr); @@ -723,7 +720,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; @@ -787,7 +784,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) { @@ -901,9 +897,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; @@ -921,12 +915,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); --- a/src/ifaces.c +++ b/src/ifaces.c @@ -37,7 +37,7 @@ extern int accept_unsupported_interfaces extern int daemonized; char ifaces[][6] = - { "lo", "eth", "sl", "ppp", "ippp", "plip", "fddi", "isdn", "dvb", + { "lo", "eth", "sl", "ppp", "ippp", "plip", "isdn", "dvb", "pvc", "hdlc", "ipsec", "sbni", "tr", "wvlan", "wlan", "sm2", "sm3", "pent", "lec", "brg", "tun", "tap", "cipcb", "tunl", "vlan" }; --- a/src/landesc.c +++ b/src/landesc.c @@ -83,8 +83,6 @@ void loaddesclist(struct desclist *list, if (linktype == LINK_ETHERNET) fd = fopen(ETHFILE, "r"); - else if (linktype == LINK_FDDI) - fd = fopen(FDDIFILE, "r"); if (fd == NULL) { return; @@ -205,8 +203,6 @@ void savedesclist(struct desclist *list, if (linktype == LINK_ETHERNET) fd = fopen(ETHFILE, "w"); - else if (linktype == LINK_FDDI) - fd = fopen(FDDIFILE, "w"); if (fd < 0) { etherr(); --- a/src/links.h +++ b/src/links.h @@ -6,7 +6,6 @@ #define LINK_ISDN_RAWIP 6 #define LINK_ISDN_CISCOHDLC 7 #define LINK_CISCOHDLC 7 -#define LINK_FDDI 8 #define LINK_FRAD 9 #define LINK_DLCI 10 #define LINK_TR 11 --- a/src/log.c +++ b/src/log.c @@ -491,8 +491,6 @@ void writeethlog(struct ethtabent *list, ptmp->un.desc.ascaddr); else if (ptmp->un.desc.linktype == LINK_PLIP) fprintf(fd, "\nPLIP address: %s", ptmp->un.desc.ascaddr); - else if (ptmp->un.desc.linktype == LINK_FDDI) - fprintf(fd, "\nFDDI address: %s", ptmp->un.desc.ascaddr); if (ptmp->un.desc.withdesc) fprintf(fd, " (%s)", ptmp->un.desc.desc); --- a/src/options.c +++ b/src/options.c @@ -68,8 +68,6 @@ void makeoptionmenu(struct MENU *menu) tx_additem(menu, NULL, NULL); tx_additem(menu, " ^E^thernet/PLIP host descriptions...", "Manages descriptions for Ethernet and PLIP addresses"); - tx_additem(menu, " ^F^DDI/Token Ring host descriptions...", - "Manages descriptions for FDDI and FDDI addresses"); tx_additem(menu, NULL, NULL); tx_additem(menu, " E^x^it configuration", "Returns to main menu"); } @@ -371,9 +369,6 @@ void setoptions(struct OPTIONS *options, case 14: ethdescmgr(LINK_ETHERNET); break; - case 15: - ethdescmgr(LINK_FDDI); - break; } indicatesetting(row, options, statwin); --- a/src/othptab.c +++ b/src/othptab.c @@ -22,7 +22,6 @@ details. #include #include #include -#include #include #include "arphdr.h" #include "options.h" @@ -142,11 +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); @@ -376,8 +370,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); --- a/src/packet.c +++ b/src/packet.c @@ -35,7 +35,6 @@ details. #include #include #include -#include #include #include #include @@ -81,8 +80,6 @@ unsigned short getlinktype(unsigned shor result = LINK_ETHERNET; else if (strncmp(ifname, "plip", 4) == 0) result = LINK_PLIP; - else if (strncmp(ifname, "fddi", 4) == 0) /* For some Ethernet- */ - result = LINK_ETHERNET; /* emulated FDDI ifaces */ else if (strncmp(ifname, "dvb", 3) == 0) result = LINK_ETHERNET; else if (strncmp(ifname, "sbni", 4) == 0) @@ -136,9 +133,6 @@ unsigned short getlinktype(unsigned shor case ARPHRD_PPP: result = LINK_PPP; break; - case ARPHRD_FDDI: - result = LINK_FDDI; - break; case ARPHRD_IEEE802: case ARPHRD_IEEE802_TR: result = LINK_TR; @@ -194,19 +188,6 @@ void adjustpacket(char *tpacket, unsigne *packet = tpacket + 4; *readlen -= 4; break; - case LINK_FDDI: - *packet = tpacket + sizeof(struct fddihdr); - *readlen -= sizeof(struct fddihdr); - - /* - * Move IP data into an aligned buffer. 96 bytes should be sufficient - * for IP and TCP headers with reasonable numbers of options and some - * data. - */ - - memmove(aligned_buf, *packet, min(SNAPSHOT_LEN, *readlen)); - *packet = aligned_buf; - break; case LINK_TR: /* * Token Ring patch supplied by Tomas Dvorak --- a/src/promisc.c +++ b/src/promisc.c @@ -81,8 +81,8 @@ void init_promisc_list(struct promisc_st */ if ((strncmp(buf, "eth", 3) == 0) || - (strncmp(buf, "fddi", 4) == 0) || (strncmp(buf, "tr", 2) == 0) || + (strncmp(buf, "vlan", 4) == 0) || (strncmp(ptmp->params.ifname, "wvlan", 4) == 0) || (strncmp(ptmp->params.ifname, "lec", 3) == 0) || (accept_unsupported_interfaces)) { @@ -195,7 +195,7 @@ void srpromisc(int mode, struct promisc_ while (ptmp != NULL) { if (((strncmp(ptmp->params.ifname, "eth", 3) == 0) || - (strncmp(ptmp->params.ifname, "fddi", 4) == 0) || + (strncmp(ptmp->params.ifname, "vlan", 4) == 0) || (strncmp(ptmp->params.ifname, "tr", 2) == 0) || (strncmp(ptmp->params.ifname, "wvlan", 4) == 0) || (strncmp(ptmp->params.ifname, "lec", 3) == 0)) && --- a/src/rvnamed.h +++ b/src/rvnamed.h @@ -1,9 +1,9 @@ #include #include -#define CHILDSOCKNAME "/dev/rvndcldcomsk" -#define PARENTSOCKNAME "/dev/rvndpntcomsk" -#define IPTSOCKNAME "/dev/rvndiptcomsk" +#define CHILDSOCKNAME "/tmp/rvndcldcomsk" +#define PARENTSOCKNAME "/tmp/rvndpntcomsk" +#define IPTSOCKNAME "/tmp/rvndiptcomsk" #define SOCKET_PREFIX "isock" --- a/src/tcptable.c +++ b/src/tcptable.c @@ -600,8 +600,6 @@ void updateentry(struct tcptable *table, if ((linkproto == LINK_ETHERNET) || (linkproto == LINK_PLIP)) { 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); } --- a/src/tcptable.h +++ b/src/tcptable.h @@ -23,7 +23,6 @@ #include #include #include -#include #include // #include #include