diff options
| author | delphij <delphij@FreeBSD.org> | 2012-05-17 05:11:57 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2012-05-17 05:11:57 +0000 |
| commit | 661b9d94414ea6d11d5b7960aef1f172975ce52b (patch) | |
| tree | 1720d207a135a239a304163c4635810a1094209a /contrib/tcpdump/print-ppp.c | |
| parent | 63ab347efe2621fc79f689a92c4bbda531593626 (diff) | |
| parent | d36dcecdb3228d24b199eb51cfd7ac666f5b8eb8 (diff) | |
| download | FreeBSD-src-661b9d94414ea6d11d5b7960aef1f172975ce52b.zip FreeBSD-src-661b9d94414ea6d11d5b7960aef1f172975ce52b.tar.gz | |
Merge tcpdump 4.2.1.
MFC after: 2 weeks
Diffstat (limited to 'contrib/tcpdump/print-ppp.c')
| -rw-r--r-- | contrib/tcpdump/print-ppp.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/contrib/tcpdump/print-ppp.c b/contrib/tcpdump/print-ppp.c index 6020e03..4bae64a 100644 --- a/contrib/tcpdump/print-ppp.c +++ b/contrib/tcpdump/print-ppp.c @@ -1305,11 +1305,11 @@ ppp_hdlc(const u_char *p, int length) goto cleanup; #ifdef INET6 case PPP_IPV6: - ip6_print(b+1, t - b - 1); - goto cleanup; + ip6_print(gndo, b+1, t - b - 1); + goto cleanup; #endif default: /* no luck - try next guess */ - break; + break; } proto = EXTRACT_16BITS(b); /* next guess - load two octets */ @@ -1370,7 +1370,7 @@ handle_ppp(u_int proto, const u_char *p, int length) #ifdef INET6 case ETHERTYPE_IPV6: /*XXX*/ case PPP_IPV6: - ip6_print(p, length); + ip6_print(gndo, p, length); break; #endif case ETHERTYPE_IPX: /*XXX*/ @@ -1677,11 +1677,11 @@ ppp_bsdos_if_print(const struct pcap_pkthdr *h _U_, register const u_char *p _U_ p += hdrlength; switch (ptype) { case PPP_IP: - ip_print(p, length); + ip_print(gndo, p, length); break; #ifdef INET6 case PPP_IPV6: - ip6_print(p, length); + ip6_print(gndo, p, length); break; #endif case PPP_MPLS_UCAST: @@ -1696,11 +1696,11 @@ ppp_bsdos_if_print(const struct pcap_pkthdr *h _U_, register const u_char *p _U_ p += hdrlength; switch (ptype) { case PPP_IP: - ip_print(p, length); + ip_print(gndo, p, length); break; #ifdef INET6 case PPP_IPV6: - ip6_print(p, length); + ip6_print(gndo, p, length); break; #endif case PPP_MPLS_UCAST: @@ -1732,12 +1732,12 @@ ppp_bsdos_if_print(const struct pcap_pkthdr *h _U_, register const u_char *p _U_ break; #ifdef INET6 case PPP_IPV6: - ip6_print(p, length); + ip6_print(gndo, p, length); break; #endif case PPP_MPLS_UCAST: case PPP_MPLS_MCAST: - mpls_print(p, length); + mpls_print(gndo, p, length); break; default: printf("%s ", tok2str(ppptype2str, "unknown PPP protocol (0x%04x)", ptype)); |
