diff options
author | Guy Harris <guy@alum.mit.edu> | 2014-04-23 00:20:40 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2014-04-23 00:20:40 -0700 |
commit | ed85e20e4d6a27d5405f37366dd34b64c10a9211 (patch) | |
tree | 1dd34201f8777a4aba0ecbc39e8f480ba1407c41 /print-igmp.c | |
parent | 595f1b5414c37b6ba31ed876343fd278a4c058ca (diff) | |
download | tcpdump-ed85e20e4d6a27d5405f37366dd34b64c10a9211.tar.gz |
u_intN_t is dead, long live uintN_t.
And, as we require at least autoconf 2.61, and as autoconf 2.61 and
later have AC_TYPE_UINTn_T and AC_TYPE_INTn_T macros, we use them to
define the uintN_t and intN_t macros if the system doesn't define them
for us.
This lets us get rid of bitypes.h as well.
Diffstat (limited to 'print-igmp.c')
-rw-r--r-- | print-igmp.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/print-igmp.c b/print-igmp.c index 728fcaf1..e4808a77 100644 --- a/print-igmp.c +++ b/print-igmp.c @@ -42,10 +42,10 @@ static const char tstr[] = "[|igmp]"; * The packet format for a traceroute request. */ struct tr_query { - u_int32_t tr_src; /* traceroute source */ - u_int32_t tr_dst; /* traceroute destination */ - u_int32_t tr_raddr; /* traceroute response address */ - u_int32_t tr_rttlqid; /* response ttl and qid */ + uint32_t tr_src; /* traceroute source */ + uint32_t tr_dst; /* traceroute destination */ + uint32_t tr_raddr; /* traceroute response address */ + uint32_t tr_rttlqid; /* response ttl and qid */ }; #define TR_GETTTL(x) (int)(((x) >> 24) & 0xff) @@ -56,17 +56,17 @@ struct tr_query { * beginning, followed by one tr_resp for each hop taken. */ struct tr_resp { - u_int32_t tr_qarr; /* query arrival time */ - u_int32_t tr_inaddr; /* incoming interface address */ - u_int32_t tr_outaddr; /* outgoing interface address */ - u_int32_t tr_rmtaddr; /* parent address in source tree */ - u_int32_t tr_vifin; /* input packet count on interface */ - u_int32_t tr_vifout; /* output packet count on interface */ - u_int32_t tr_pktcnt; /* total incoming packets for src-grp */ - u_int8_t tr_rproto; /* routing proto deployed on router */ - u_int8_t tr_fttl; /* ttl required to forward on outvif */ - u_int8_t tr_smask; /* subnet mask for src addr */ - u_int8_t tr_rflags; /* forwarding error codes */ + uint32_t tr_qarr; /* query arrival time */ + uint32_t tr_inaddr; /* incoming interface address */ + uint32_t tr_outaddr; /* outgoing interface address */ + uint32_t tr_rmtaddr; /* parent address in source tree */ + uint32_t tr_vifin; /* input packet count on interface */ + uint32_t tr_vifout; /* output packet count on interface */ + uint32_t tr_pktcnt; /* total incoming packets for src-grp */ + uint8_t tr_rproto; /* routing proto deployed on router */ + uint8_t tr_fttl; /* ttl required to forward on outvif */ + uint8_t tr_smask; /* subnet mask for src addr */ + uint8_t tr_rflags; /* forwarding error codes */ }; /* defs within mtrace */ |