diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-01-31 00:43:45 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-01-31 00:43:45 -0800 |
| commit | 0dad1934af3db3f97d4371463089c8725dbfa26d (patch) | |
| tree | eaedbdb157d6aae6e44ade1830a6144b08a1eaaf /print-pgm.c | |
| parent | 44c822e9f671b7a9b2e52b781cdbf38933cbdeaf (diff) | |
| download | tcpdump-0dad1934af3db3f97d4371463089c8725dbfa26d.tar.gz | |
Have ip{6}addr_string take a u_char * as the second argument.
Fix warnings that introduces.
Diffstat (limited to 'print-pgm.c')
| -rw-r--r-- | print-pgm.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/print-pgm.c b/print-pgm.c index 171acce9..e7bad48a 100644 --- a/print-pgm.c +++ b/print-pgm.c @@ -168,12 +168,12 @@ pgm_print(netdissect_options *ndo, if (!ND_TTEST_2(pgm->pgm_dport)) { if (ip6) { ND_PRINT("%s > %s: [|pgm]", - ip6addr_string(ndo, &ip6->ip6_src), - ip6addr_string(ndo, &ip6->ip6_dst)); + ip6addr_string(ndo, ip6->ip6_src), + ip6addr_string(ndo, ip6->ip6_dst)); } else { ND_PRINT("%s > %s: [|pgm]", - ipaddr_string(ndo, &ip->ip_src), - ipaddr_string(ndo, &ip->ip_dst)); + ipaddr_string(ndo, ip->ip_src), + ipaddr_string(ndo, ip->ip_dst)); } return; } @@ -184,9 +184,9 @@ pgm_print(netdissect_options *ndo, if (ip6) { if (EXTRACT_U_1(ip6->ip6_nxt) == IPPROTO_PGM) { ND_PRINT("%s.%s > %s.%s: ", - ip6addr_string(ndo, &ip6->ip6_src), + ip6addr_string(ndo, ip6->ip6_src), tcpport_string(ndo, sport), - ip6addr_string(ndo, &ip6->ip6_dst), + ip6addr_string(ndo, ip6->ip6_dst), tcpport_string(ndo, dport)); } else { ND_PRINT("%s > %s: ", @@ -195,9 +195,9 @@ pgm_print(netdissect_options *ndo, } else { if (EXTRACT_U_1(ip->ip_p) == IPPROTO_PGM) { ND_PRINT("%s.%s > %s.%s: ", - ipaddr_string(ndo, &ip->ip_src), + ipaddr_string(ndo, ip->ip_src), tcpport_string(ndo, sport), - ipaddr_string(ndo, &ip->ip_dst), + ipaddr_string(ndo, ip->ip_dst), tcpport_string(ndo, dport)); } else { ND_PRINT("%s > %s: ", |