mirrors/tcpdump
0
0
Fork 0
mirror of https://github.com/the-tcpdump-group/tcpdump.git synced 2024-11-27 03:53:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

FDDI: Update the link-layer dissector to a void function

Browse Source 
Moreover:
Remove trailing "_if" from the protocol name.
This commit is contained in:
Francois-Xavier Le Bail 2020-08-02 12:03:19 +02:00
parent e2e1906cff
commit 770b67da76
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netdissect.h
View File

@ -478,7 +478,7 @@ extern void dsa_if_print IF_PRINTER_ARGS;
extern void edsa_if_print IF_PRINTER_ARGS;
extern void enc_if_print IF_PRINTER_ARGS;
extern void ether_if_print IF_PRINTER_ARGS;
extern u_int fddi_if_print IF_PRINTER_ARGS;
extern void fddi_if_print IF_PRINTER_ARGS;
extern u_int fr_if_print IF_PRINTER_ARGS;
extern void ieee802_11_if_print IF_PRINTER_ARGS;
extern void ieee802_11_radio_avs_if_print IF_PRINTER_ARGS;

6
print-fddi.c
View File

@ -342,9 +342,9 @@ fddi_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
* 'h->len' is the length of the packet off the wire, and 'h->caplen'
* is the number of bytes actually captured.
*/
u_int
void
fddi_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
{
ndo->ndo_protocol = "fddi_if";
return (fddi_print(ndo, p, h->len, h->caplen));
ndo->ndo_protocol = "fddi";
ndo->ndo_ll_hdr_len += fddi_print(ndo, p, h->len, h->caplen);
}

2
print.c
View File

@ -69,7 +69,6 @@ static const struct uint_printer uint_printers[] = {
{ pflog_if_print, DLT_PFLOG },
#endif
{ token_if_print, DLT_IEEE802 },
{ fddi_if_print, DLT_FDDI },
#ifdef DLT_LINUX_SLL
{ sll_if_print, DLT_LINUX_SLL },
#endif
@ -135,6 +134,7 @@ static const struct void_printer void_printers[] = {
{ enc_if_print, DLT_ENC },
#endif
{ ether_if_print, DLT_EN10MB },
{ fddi_if_print, DLT_FDDI },
#ifdef DLT_IEEE802_11
{ ieee802_11_if_print, DLT_IEEE802_11},
#endif