Use more the EXTRACT_U_1() macro (40/n)

[tcpdump] / netdissect.h

diff --git a/netdissect.h b/netdissect.h
index d11f60f1f981f2a2c0d3b8a3b9c616b7273b2fab..2782796edc5f2e2167441bce331de0a2979e87d8 100644 (file)
--- a/netdissect.h
+++ b/netdissect.h
@@ -54,16 +54,16 @@ typedef unsigned char nd_uint64_t[8];
  * Use this for IPv4 addresses.  It's defined as an array of octets, so
  * that it's not aligned on its "natural" boundary, and it's defined as
  * a structure in the hopes that this makes it harder to naively use
  * Use this for IPv4 addresses.  It's defined as an array of octets, so
  * that it's not aligned on its "natural" boundary, and it's defined as
  * a structure in the hopes that this makes it harder to naively use

- * EXTRACT_BE_32BITS() to extract the value - in many cases you just want
+ * EXTRACT_BE_U_4() to extract the value - in many cases you just want

  * to use UNALIGNED_MEMCPY() to copy its value, so that it remains in
  * network byte order.
  *
  * (Among other things, we don't want somebody thinking "IPv4 addresses,
  * to use UNALIGNED_MEMCPY() to copy its value, so that it remains in
  * network byte order.
  *
  * (Among other things, we don't want somebody thinking "IPv4 addresses,

- * they're in network byte order, so we want EXTRACT_BE_32BITS(), right?"
+ * they're in network byte order, so we want EXTRACT_BE_U_4(), right?"

  * and then handing the result to system APIs that expect network-order
  * IPv4 addresses, such as inet_ntop(), on their little-endian PCs, getting
  * the wrong behavior, and concluding "oh, it must be in *little*-endian
  * and then handing the result to system APIs that expect network-order
  * IPv4 addresses, such as inet_ntop(), on their little-endian PCs, getting
  * the wrong behavior, and concluding "oh, it must be in *little*-endian

- * order" and "fixing" it to use EXTRACT_LE_32BITS().  Yes, people do this;
+ * order" and "fixing" it to use EXTRACT_LE_U_4().  Yes, people do this;

  * that's why Wireshark has tvb_get_ipv4(), to extract an IPv4 address from
  * a packet data buffer; it was introduced in reaction to somebody who
  * *had* done that.)
  * that's why Wireshark has tvb_get_ipv4(), to extract an IPv4 address from
  * a packet data buffer; it was introduced in reaction to somebody who
  * *had* done that.)


@@ -506,7 +506,7 @@ extern void dvmrp_print(netdissect_options *, const u_char *, u_int);
 extern void eap_print(netdissect_options *, const u_char *, u_int);
 extern void egp_print(netdissect_options *, const u_char *, u_int);
 extern void eigrp_print(netdissect_options *, const u_char *, u_int);
 extern void eap_print(netdissect_options *, const u_char *, u_int);
 extern void egp_print(netdissect_options *, const u_char *, u_int);
 extern void eigrp_print(netdissect_options *, const u_char *, u_int);

-extern int esp_print(netdissect_options *, const u_char *, const int, const u_char *, int *, int *);
+extern int esp_print(netdissect_options *, const u_char *, const int, const u_char *, u_int *, u_int *);

 extern u_int ether_print(netdissect_options *, const u_char *, u_int, u_int, void (*)(netdissect_options *, const u_char *), const u_char *);
 extern int ethertype_print(netdissect_options *, u_short, const u_char *, u_int, u_int, const struct lladdr_info *, const struct lladdr_info *);
 extern u_int fddi_print(netdissect_options *, const u_char *, u_int, u_int);
 extern u_int ether_print(netdissect_options *, const u_char *, u_int, u_int, void (*)(netdissect_options *, const u_char *), const u_char *);
 extern int ethertype_print(netdissect_options *, u_short, const u_char *, u_int, u_int, const struct lladdr_info *, const struct lladdr_info *);
 extern u_int fddi_print(netdissect_options *, const u_char *, u_int, u_int);


@@ -600,7 +600,7 @@ extern void rrcp_print(netdissect_options *, const u_char *, u_int, const struct
 extern void rsvp_print(netdissect_options *, const u_char *, u_int);
 extern int rt6_print(netdissect_options *, const u_char *, const u_char *);
 extern void rtsp_print(netdissect_options *, const u_char *, u_int);
 extern void rsvp_print(netdissect_options *, const u_char *, u_int);
 extern int rt6_print(netdissect_options *, const u_char *, const u_char *);
 extern void rtsp_print(netdissect_options *, const u_char *, u_int);

-extern void rx_print(netdissect_options *, register const u_char *, int, int, int, const u_char *);
+extern void rx_print(netdissect_options *, register const u_char *, u_int, u_int, u_int, const u_char *);

 extern void sctp_print(netdissect_options *, const u_char *, const u_char *, u_int);
 extern void sflow_print(netdissect_options *, const u_char *, u_int);
 extern void sip_print(netdissect_options *, const u_char *, u_int);
 extern void sctp_print(netdissect_options *, const u_char *, const u_char *, u_int);
 extern void sflow_print(netdissect_options *, const u_char *, u_int);
 extern void sip_print(netdissect_options *, const u_char *, u_int);