NDOize safeputs() and safeputchar()

[tcpdump] / print-tcp.c

diff --git a/print-tcp.c b/print-tcp.c
index 4baabbd05edd5e975ef18c178d0928ca524c1b2c..4e970038bb86c4460944cae87959fd558e8a4a48 100644 (file)
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -142,7 +142,7 @@ static int tcp_cksum(register const struct ip *ip,
                     register const struct tcphdr *tp,
                     register u_int len)
 {
                     register const struct tcphdr *tp,
                     register u_int len)
 {

-       return nextproto4_cksum(ip, (const u_int8_t *)tp, len, len,
+       return nextproto4_cksum(gndo, ip, (const u_int8_t *)tp, len, len,

                                IPPROTO_TCP);
 }
 
                                IPPROTO_TCP);
 }
 


@@ -673,7 +673,7 @@ tcp_print(register const u_char *bp, register u_int length,
                 if (!qflag && vflag)
                         telnet_print(gndo, bp, length);
         } else if (sport == BGP_PORT || dport == BGP_PORT)
                 if (!qflag && vflag)
                         telnet_print(gndo, bp, length);
         } else if (sport == BGP_PORT || dport == BGP_PORT)

-                bgp_print(bp, length);
+                bgp_print(gndo, bp, length);

         else if (sport == PPTP_PORT || dport == PPTP_PORT)
                 pptp_print(gndo, bp);
 #ifdef TCPDUMP_DO_SMB
         else if (sport == PPTP_PORT || dport == PPTP_PORT)
                 pptp_print(gndo, bp);
 #ifdef TCPDUMP_DO_SMB


@@ -684,7 +684,8 @@ tcp_print(register const u_char *bp, register u_int length,
 #endif
         else if (sport == BEEP_PORT || dport == BEEP_PORT)
                 beep_print(gndo, bp, length);
 #endif
         else if (sport == BEEP_PORT || dport == BEEP_PORT)
                 beep_print(gndo, bp, length);

-        else if (sport == OPENFLOW_PORT || dport == OPENFLOW_PORT)
+        else if (sport == OPENFLOW_PORT_OLD || dport == OPENFLOW_PORT_OLD ||
+                 sport == OPENFLOW_PORT_IANA || dport == OPENFLOW_PORT_IANA)

                 openflow_print(gndo, bp, length);
         else if (length > 2 &&
                  (sport == NAMESERVER_PORT || dport == NAMESERVER_PORT ||
                 openflow_print(gndo, bp, length);
         else if (length > 2 &&
                  (sport == NAMESERVER_PORT || dport == NAMESERVER_PORT ||


@@ -693,7 +694,7 @@ tcp_print(register const u_char *bp, register u_int length,
                  * TCP DNS query has 2byte length at the head.
                  * XXX packet could be unaligned, it can go strange
                  */
                  * TCP DNS query has 2byte length at the head.
                  * XXX packet could be unaligned, it can go strange
                  */

-                ns_print(bp + 2, length - 2, 0);
+                ns_print(gndo, bp + 2, length - 2, 0);

         } else if (sport == MSDP_PORT || dport == MSDP_PORT) {
                 msdp_print(gndo, bp, length);
         } else if (sport == RPKI_RTR_PORT || dport == RPKI_RTR_PORT) {
         } else if (sport == MSDP_PORT || dport == MSDP_PORT) {
                 msdp_print(gndo, bp, length);
         } else if (sport == RPKI_RTR_PORT || dport == RPKI_RTR_PORT) {


@@ -722,12 +723,12 @@ tcp_print(register const u_char *bp, register u_int length,
                         direction = (enum sunrpc_msg_type)EXTRACT_32BITS(&rp->rm_direction);
                         if (dport == NFS_PORT && direction == SUNRPC_CALL) {
                                 (void)printf(": NFS request xid %u ", EXTRACT_32BITS(&rp->rm_xid));
                         direction = (enum sunrpc_msg_type)EXTRACT_32BITS(&rp->rm_direction);
                         if (dport == NFS_PORT && direction == SUNRPC_CALL) {
                                 (void)printf(": NFS request xid %u ", EXTRACT_32BITS(&rp->rm_xid));

-                                nfsreq_print_noaddr((u_char *)rp, fraglen, (u_char *)ip);
+                                nfsreq_print_noaddr(gndo, (u_char *)rp, fraglen, (u_char *)ip);

                                 return;
                         }
                         if (sport == NFS_PORT && direction == SUNRPC_REPLY) {
                                 (void)printf(": NFS reply xid %u ", EXTRACT_32BITS(&rp->rm_xid));
                                 return;
                         }
                         if (sport == NFS_PORT && direction == SUNRPC_REPLY) {
                                 (void)printf(": NFS reply xid %u ", EXTRACT_32BITS(&rp->rm_xid));

-                                nfsreply_print_noaddr((u_char *)rp, fraglen, (u_char *)ip);
+                                nfsreply_print_noaddr(gndo, (u_char *)rp, fraglen, (u_char *)ip);

                                 return;
                         }
                 }
                                 return;
                         }
                 }


@@ -776,7 +777,7 @@ print_tcp_rst_data(register const u_char *sp, u_int length)
         putchar(' ');
         while (length-- && sp <= snapend) {
                 c = *sp++;
         putchar(' ');
         while (length-- && sp <= snapend) {
                 c = *sp++;

-                safeputchar(c);
+                safeputchar(gndo, c);

         }
         putchar(']');
 }
         }
         putchar(']');
 }