bgp: Parse BGP extended message support capability

[tcpdump] / ip.h

diff --git a/ip.h b/ip.h
index 8179061ef13143a924ed8f72195cc956b6dfeed3..ca87548fd096ca2d31a7534f8c2e72caf8865b90 100644 (file)
--- a/ip.h
+++ b/ip.h
@@ -51,13 +51,13 @@
  */
 struct ip {
        nd_uint8_t      ip_vhl;         /* header length, version */
  */
 struct ip {
        nd_uint8_t      ip_vhl;         /* header length, version */

-#define IP_V(ip)       (((ip)->ip_vhl & 0xf0) >> 4)
-#define IP_HL(ip)      ((ip)->ip_vhl & 0x0f)
+#define IP_V(ip)       ((GET_U_1((ip)->ip_vhl) & 0xf0) >> 4)
+#define IP_HL(ip)      (GET_U_1((ip)->ip_vhl) & 0x0f)

        nd_uint8_t      ip_tos;         /* type of service */
        nd_uint16_t     ip_len;         /* total length */
        nd_uint16_t     ip_id;          /* identification */
        nd_uint16_t     ip_off;         /* fragment offset field */
        nd_uint8_t      ip_tos;         /* type of service */
        nd_uint16_t     ip_len;         /* total length */
        nd_uint16_t     ip_id;          /* identification */
        nd_uint16_t     ip_off;         /* fragment offset field */

-#define        IP_DF 0x4000                    /* dont fragment flag */
+#define        IP_DF 0x4000                    /* don't fragment flag */

 #define        IP_MF 0x2000                    /* more fragments flag */
 #define        IP_OFFMASK 0x1fff               /* mask for fragmenting bits */
        nd_uint8_t      ip_ttl;         /* time to live */
 #define        IP_MF 0x2000                    /* more fragments flag */
 #define        IP_OFFMASK 0x1fff               /* mask for fragmenting bits */
        nd_uint8_t      ip_ttl;         /* time to live */