diff options
| author | James McCoy <vega.james@gmail.com> | 2014-05-01 11:14:31 -0400 |
|---|---|---|
| committer | Tobias Klauser <tklauser@distanz.ch> | 2014-05-03 13:36:36 +0200 |
| commit | 7aa9f970e88382f2508ee55122e27cdcfd8cdbda (patch) | |
| tree | 03ff36cfad0f1cc88c92b7764fd3b8145207d651 /proto_ipv6_mobility_hdr.c | |
| parent | 7231039ec891acee246549410c70f1151a0c0175 (diff) | |
all: Use macros for printf/scanf format specifiers
Any types that are fixed width should use the standard format specifier
macros (PRI... for printf-type functions, SCN... for scanf-type
functions) to ensure proper data access.
Prior to this ifpps was crashing in 32-bit environments due to the
following call
mvwprintw(screen, (*voff)++, 2,
"%s,%s %s (%s%s), t=%lums, cpus=%u%s/%u"
" ", uts.release, machine,
ifname, drvinf.driver, buff, ms_interval, top_cpus,
top_cpus > 0 && top_cpus < cpus ? "+1" : "", cpus);
since ms_interval is a uint64_t but %lu expects an unsigned long, which
is only 32 bits.
Signed-off-by: James McCoy <vega.james@gmail.com>
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'proto_ipv6_mobility_hdr.c')
| -rw-r--r-- | proto_ipv6_mobility_hdr.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/proto_ipv6_mobility_hdr.c b/proto_ipv6_mobility_hdr.c index 5ae5c7c..357dfb9 100644 --- a/proto_ipv6_mobility_hdr.c +++ b/proto_ipv6_mobility_hdr.c @@ -6,6 +6,7 @@ * IPv6 Mobility Header described in RFC6275 */ +#include <inttypes.h> #include <stdio.h> #include <stdint.h> #include <netinet/in.h> /* for ntohs() */ @@ -116,7 +117,7 @@ static void dissect_mobilityhdr_type_1_2(struct pkt_buff *pkt, *message_data_len < 0) return; - tprintf("Init Cookie (0x%lx)", ntohll(type_1_2->init_cookie)); + tprintf("Init Cookie (0x%"PRIx64")", ntohll(type_1_2->init_cookie)); dissect_mobility_options(pkt, message_data_len); } @@ -133,8 +134,8 @@ static void dissect_mobilityhdr_type_3_4(struct pkt_buff *pkt, return; tprintf("HN Index (%u) ", ntohs(type_3_4->nonce_index)); - tprintf("Init Cookie (0x%lx) ", ntohll(type_3_4->init_cookie)); - tprintf("Keygen Token (0x%lx)", ntohll(type_3_4->keygen_token)); + tprintf("Init Cookie (0x%"PRIx64") ", ntohll(type_3_4->init_cookie)); + tprintf("Keygen Token (0x%"PRIx64")", ntohll(type_3_4->keygen_token)); dissect_mobility_options(pkt, message_data_len); } |