NDOize safeputs() and safeputchar()

[tcpdump] / print-sip.c

diff --git a/print-sip.c b/print-sip.c
index 48562f8c38bca066ee91b0e8152492e79c53d7c7..71d1bc3434539c86276bf11e9a82d96c7a191fe4 100644 (file)
--- a/print-sip.c
+++ b/print-sip.c
@@ -13,11 +13,6 @@
  * Original code by Hannes Gredler ([email protected])
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-sip.c,v 1.1 2004-07-27 17:04:20 hannes Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -30,8 +25,6 @@ static const char rcsid[] _U_ =
 #include "interface.h"
 #include "extract.h"
 
-#include "udp.h"
-
 void
 sip_print(register const u_char *pptr, register u_int len)
 {
@@ -44,8 +37,9 @@ sip_print(register const u_char *pptr, register u_int len)
         return;
 
     for (idx = 0; idx < len; idx++) {
+        TCHECK2(*(pptr+idx), 2);
         if (EXTRACT_16BITS(pptr+idx) != 0x0d0a) { /* linefeed ? */
-            safeputchar(*(pptr+idx));
+            safeputchar(gndo, *(pptr + idx));
         } else {
             printf("\n\t");
             idx+=1;
@@ -54,7 +48,10 @@ sip_print(register const u_char *pptr, register u_int len)
 
     /* do we want to see an additionally hexdump ? */
     if (vflag> 1)
-        print_unknown_data(pptr,"\n\t",len);
+        print_unknown_data(gndo,pptr,"\n\t",len);
 
     return;
+
+trunc:
+    printf("[|sip]");
 }