IPv4/IPv6 demux: Rename a printer

Rename ip_print_demux() to ip_demux_print(), with _print suffix like
in most similar cases.

Moreover:
Rename a test.

diff --git a/netdissect.h b/netdissect.h
index 01cc60bba24cf8e6f525293ae17f36159b2fca1f..4fbfad67b62feaa27162b074ba5037022a7bed5a 100644 (file)
--- a/netdissect.h
+++ b/netdissect.h
@@ -719,7 +719,7 @@ extern uint16_t in_cksum(const struct cksum_vec *, int);
 extern uint16_t in_cksum_shouldbe(uint16_t, uint16_t);
 
 /* IP protocol demuxing routines */
-extern void ip_print_demux(netdissect_options *, const u_char *, u_int, u_int, int, u_int, uint8_t, const u_char *);
+extern void ip_demux_print(netdissect_options *, const u_char *, u_int, u_int, int, u_int, uint8_t, const u_char *);
 
 extern uint16_t nextproto4_cksum(netdissect_options *, const struct ip *, const uint8_t *, u_int, u_int, uint8_t);
 

diff --git a/print-esp.c b/print-esp.c
index 0b3ecc910c3d0ced00fbc0d898f1cada09f2969b..0717c5cb4ccd990c0403b78ed1f505851dd08f43 100644 (file)
--- a/print-esp.c
+++ b/print-esp.c
@@ -902,7 +902,7 @@ esp_print(netdissect_options *ndo,
        ND_PRINT(": ");
 
        /* Now dissect the plaintext. */
-       ip_print_demux(ndo, pt, payloadlen - (padlen + 2), ver, fragmented,
+       ip_demux_print(ndo, pt, payloadlen - (padlen + 2), ver, fragmented,
            ttl_hl, nh, bp2);
 
        /* Pop the buffer, freeing it. */

diff --git a/print-ip-demux.c b/print-ip-demux.c
index f18055d6a13fd5706d2d7836f48d00fa4d117203..b6d6b7066850d3babbd26569fadd5bef73c912a2 100644 (file)
--- a/print-ip-demux.c
+++ b/print-ip-demux.c
@@ -37,7 +37,7 @@
 #include "ipproto.h"
 
 void
-ip_print_demux(netdissect_options *ndo,
+ip_demux_print(netdissect_options *ndo,
               const u_char *bp,
               u_int length, u_int ver, int fragmented, u_int ttl_hl,
               uint8_t nh, const u_char *iph)

diff --git a/print-ip.c b/print-ip.c
index 8001f7746661e1630799b1503d9ea50d08984b81..9e26d842459c9ec5f7dc794e7ac68de751bf12f7 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -490,7 +490,7 @@ ip_print(netdissect_options *ndo,
                                     GET_IPADDR_STRING(ip->ip_src),
                                     GET_IPADDR_STRING(ip->ip_dst));
                }
-               ip_print_demux(ndo, (const u_char *)ip + hlen, len, 4,
+               ip_demux_print(ndo, (const u_char *)ip + hlen, len, 4,
                    off & IP_MF, GET_U_1(ip->ip_ttl), nh, bp);
        } else {
                /*

diff --git a/print-ip6.c b/print-ip6.c
index fd28cb23944588b9bdacd0d933f575d080076776..6fef7ba9f35caf310e3a81a44473ba963c81756f 100644 (file)
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -468,7 +468,7 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
                                        len -= total_advance;
                                }
                        }
-                       ip_print_demux(ndo, cp, len, 6, fragmented,
+                       ip_demux_print(ndo, cp, len, 6, fragmented,
                            GET_U_1(ip6->ip6_hlim), nh, bp);
                        nd_pop_packet_info(ndo);
                        return;

diff --git a/tests/TESTLIST b/tests/TESTLIST
index c12259bd75a754d96fe614876d24b2f84bc72bee..150effb9c2766690153ab691483754353cc71beb 100644 (file)
--- a/tests/TESTLIST
+++ b/tests/TESTLIST
@@ -458,7 +458,7 @@ heapoverflow-EXTRACT_16BITS heapoverflow-EXTRACT_16BITS.pcap        heapoverflow-EXTRAC
 heapoverflow-ppp_hdlc_if_print heapoverflow-ppp_hdlc_if_print.pcap     heapoverflow-ppp_hdlc_if_print.out      -v
 heapoverflow-q933_printq       heapoverflow-q933_printq.pcap   heapoverflow-q933_printq.out    -v
 heapoverflow-sl_if_print       heapoverflow-sl_if_print.pcap   heapoverflow-sl_if_print.out    -v
-heapoverflow-ip_print_demux    heapoverflow-ip_print_demux.pcap        heapoverflow-ip_print_demux.out -v
+heapoverflow-ip_demux_print    heapoverflow-ip_demux_print.pcap        heapoverflow-ip_demux_print.out -v
 heapoverflow-in_checksum       heapoverflow-in_checksum.pcap   heapoverflow-in_checksum.out    -v
 heapoverflow-tcp_print heapoverflow-tcp_print.pcap     heapoverflow-tcp_print.out      -v
 gre-heapoverflow-1     gre-heapoverflow-1.pcap gre-heapoverflow-1.out  -v

diff --git a/tests/heapoverflow-ip_print_demux.out b/tests/heapoverflow-ip_demux_print.out
similarity index 100%
rename from tests/heapoverflow-ip_print_demux.out
rename to tests/heapoverflow-ip_demux_print.out

diff --git a/tests/heapoverflow-ip_print_demux.pcap b/tests/heapoverflow-ip_demux_print.pcap
similarity index 100%
rename from tests/heapoverflow-ip_print_demux.pcap
rename to tests/heapoverflow-ip_demux_print.pcap