X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/bed843855d69cfc7c6bef96b4e6d43301bc7c290..refs/pull/377/head:/print-fr.c

diff --git a/print-fr.c b/print-fr.c
index c8e67bd1..ae476528 100644
--- a/print-fr.c
+++ b/print-fr.c
@@ -29,8 +29,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "addrtoname.h"
 #include "interface.h"
+#include "addrtoname.h"
 #include "ethertype.h"
 #include "nlpid.h"
 #include "extract.h"
@@ -96,7 +96,7 @@ static const struct tok frf_flag_values[] = {
  * save the flags dep. on address length
  */
 static int parse_q922_addr(const u_char *p, u_int *dlci,
-                           u_int *addr_len, u_int8_t *flags)
+                           u_int *addr_len, uint8_t *flags)
 {
 	if ((p[0] & FR_EA_BIT))
 		return -1;
@@ -133,7 +133,7 @@ static int parse_q922_addr(const u_char *p, u_int *dlci,
 char *q922_string(const u_char *p) {
 
     static u_int dlci, addr_len;
-    static u_int8_t flags[4];
+    static uint8_t flags[4];
     static char buffer[sizeof("DLCI xxxxxxxxxx")];
     memset(buffer, 0, sizeof(buffer));
 
@@ -182,7 +182,7 @@ fr_hdrlen(const u_char *p, u_int addr_len)
 
 static void
 fr_hdr_print(netdissect_options *ndo,
-             int length, u_int addr_len, u_int dlci, u_int8_t *flags, u_int16_t nlpid)
+             int length, u_int addr_len, u_int dlci, uint8_t *flags, uint16_t nlpid)
 {
     if (ndo->ndo_qflag) {
         ND_PRINT((ndo, "Q.922, DLCI %u, length %u: ",
@@ -230,12 +230,12 @@ u_int
 fr_print(netdissect_options *ndo,
          register const u_char *p, u_int length)
 {
-	u_int16_t extracted_ethertype;
+	uint16_t extracted_ethertype;
 	u_int dlci;
 	u_int addr_len;
-	u_int16_t nlpid;
+	uint16_t nlpid;
 	u_int hdr_len;
-	u_int8_t flags[4];
+	uint8_t flags[4];
 
 	if (parse_q922_addr(p, &dlci, &addr_len, flags)) {
 		ND_PRINT((ndo, "Q.922, invalid address"));
@@ -290,7 +290,7 @@ fr_print(netdissect_options *ndo,
 	case NLPID_CLNP:
 	case NLPID_ESIS:
 	case NLPID_ISIS:
-                isoclns_print(p-1, length+1, length+1); /* OSI printers need the NLPID field */
+		isoclns_print(ndo, p - 1, length + 1, length + 1); /* OSI printers need the NLPID field */
 		break;
 
 	case NLPID_SNAP:
@@ -300,7 +300,7 @@ fr_print(netdissect_options *ndo,
                             fr_hdr_print(ndo, length + hdr_len, hdr_len,
                                          dlci, flags, nlpid);
 			if (!ndo->ndo_suppress_default_print)
-                            ndo->ndo_default_print(ndo, p - hdr_len, length + hdr_len);
+				ND_DEFAULTPRINT(p - hdr_len, length + hdr_len);
 		}
 		break;
 
@@ -313,7 +313,7 @@ fr_print(netdissect_options *ndo,
                 break;
 
         case NLPID_PPP:
-                ppp_print(p, length);
+                ppp_print(ndo, p, length);
                 break;
 
 	default:
@@ -321,7 +321,7 @@ fr_print(netdissect_options *ndo,
                     fr_hdr_print(ndo, length + hdr_len, addr_len,
 				     dlci, flags, nlpid);
 		if (!ndo->ndo_xflag)
-			ndo->ndo_default_print(ndo, p, length);
+			ND_DEFAULTPRINT(p, length);
 	}
 
 	return hdr_len;
@@ -390,8 +390,8 @@ static const struct tok mfr_ctrl_ie_values[] = {
 #define MFR_ID_STRING_MAXLEN 50
 
 struct ie_tlv_header_t {
-    u_int8_t ie_type;
-    u_int8_t ie_len;
+    uint8_t ie_type;
+    uint8_t ie_len;
 };
 
 u_int
@@ -399,9 +399,9 @@ mfr_print(netdissect_options *ndo,
           register const u_char *p, u_int length)
 {
     u_int tlen,idx,hdr_len = 0;
-    u_int16_t sequence_num;
-    u_int8_t ie_type,ie_len;
-    const u_int8_t *tptr;
+    uint16_t sequence_num;
+    uint8_t ie_type,ie_len;
+    const uint8_t *tptr;
 
 
 /*
@@ -461,7 +461,7 @@ mfr_print(netdissect_options *ndo,
             case MFR_CTRL_IE_LINK_ID:
                 for (idx = 0; idx < ie_len && idx < MFR_ID_STRING_MAXLEN; idx++) {
                     if (*(tptr+idx) != 0) /* don't print null termination */
-                        safeputchar(*(tptr+idx));
+                        safeputchar(ndo, *(tptr + idx));
                     else
                         break;
                 }
@@ -469,7 +469,7 @@ mfr_print(netdissect_options *ndo,
 
             case MFR_CTRL_IE_TIMESTAMP:
                 if (ie_len == sizeof(struct timeval)) {
-                    ts_print((const struct timeval *)tptr);
+                    ts_print(ndo, (const struct timeval *)tptr);
                     break;
                 }
                 /* fall through and hexdump if no unix timestamp */
@@ -558,7 +558,7 @@ static void
 frf15_print(netdissect_options *ndo,
             const u_char *p, u_int length) {
 
-    u_int16_t sequence_num, flags;
+    uint16_t sequence_num, flags;
 
     flags = p[0]&MFR_BEC_MASK;
     sequence_num = (p[0]&0x1e)<<7 | p[1];