diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2020-08-02 11:50:35 +0200 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2020-08-02 11:50:46 +0200 |
| commit | e2e1906cff6ab7d5de40f587b89039713dac6d82 (patch) | |
| tree | 745cc1a99a3b1ab94cb2f8a47763becf2d069662 /print-cip.c | |
| parent | cfbae609a18fa6d61d09a8b263ceaf389f510e9b (diff) | |
| download | tcpdump-e2e1906cff6ab7d5de40f587b89039713dac6d82.tar.gz | |
CIP: Update the link-layer dissector to a void function
Moreover:
Remove trailing "_if" from the protocol name.
Diffstat (limited to 'print-cip.c')
| -rw-r--r-- | print-cip.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/print-cip.c b/print-cip.c index e69999a0..8838dc99 100644 --- a/print-cip.c +++ b/print-cip.c @@ -56,7 +56,7 @@ cip_print(netdissect_options *ndo, u_int length) * 'h->len' is the length of the packet off the wire, and 'h->caplen' * is the number of bytes actually captured. */ -u_int +void cip_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) { u_int caplen = h->caplen; @@ -64,7 +64,7 @@ cip_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char size_t cmplen; int llc_hdrlen; - ndo->ndo_protocol = "cip_if"; + ndo->ndo_protocol = "cip"; cmplen = sizeof(rfcllc); if (cmplen > caplen) cmplen = caplen; @@ -76,7 +76,7 @@ cip_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char if (cmplen == 0) { nd_print_trunc(ndo); - return 0; + return; } if (memcmp(rfcllc, p, cmplen) == 0) { /* @@ -97,5 +97,5 @@ cip_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char ip_print(ndo, p, length); } - return (llc_hdrlen); + ndo->ndo_ll_hdr_len += llc_hdrlen; } |