NDOize EAP, IEEE CFM, lwres, SIP & Syslog decoders

[tcpdump] / print-syslog.c

diff --git a/print-syslog.c b/print-syslog.c
index d332f67f5012f0937b29bebbe5b413d09ec2c320..87ce1dc798291942d148cfce9e3f7cb01e5307df 100644 (file)
--- a/print-syslog.c
+++ b/print-syslog.c
@@ -14,15 +14,13 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "interface.h"
 #include "extract.h"
 
@@ -78,7 +76,8 @@ static const struct tok syslog_facility_values[] = {
 };
 
 void
-syslog_print(register const u_char *pptr, register u_int len)
+syslog_print(netdissect_options *ndo,
+             register const u_char *pptr, register u_int len)
 {
     u_int16_t msg_off = 0;
     u_int16_t pri = 0;
@@ -90,57 +89,57 @@ syslog_print(register const u_char *pptr, register u_int len)
      * severity and facility values
      */
 
-    TCHECK2(*pptr, 1);
+    ND_TCHECK2(*pptr, 1);
     if (*(pptr+msg_off) == '<') {
         msg_off++;
-        TCHECK2(*(pptr+msg_off), 1);
+        ND_TCHECK2(*(pptr + msg_off), 1);
         while ( *(pptr+msg_off) >= '0' &&
                 *(pptr+msg_off) <= '9' &&
                 msg_off <= SYSLOG_MAX_DIGITS) {
             pri = pri * 10 + (*(pptr+msg_off) - '0');
             msg_off++;
-            TCHECK2(*(pptr+msg_off), 1);
+            ND_TCHECK2(*(pptr + msg_off), 1);
         }
         if (*(pptr+msg_off) != '>') {
-            printf("%s", tstr);
+            ND_PRINT((ndo, "%s", tstr));
             return;
         }
         msg_off++;
     } else {
-        printf("%s", tstr);
+        ND_PRINT((ndo, "%s", tstr));
         return;
     }
 
     facility = (pri & SYSLOG_FACILITY_MASK) >> 3;
     severity = pri & SYSLOG_SEVERITY_MASK;
 
-    if (vflag < 1 )
+    if (ndo->ndo_vflag < 1 )
     {
-        printf("SYSLOG %s.%s, length: %u",
+        ND_PRINT((ndo, "SYSLOG %s.%s, length: %u",
                tok2str(syslog_facility_values, "unknown (%u)", facility),
                tok2str(syslog_severity_values, "unknown (%u)", severity),
-               len);
+               len));
         return;
     }
 
-    printf("SYSLOG, length: %u\n\tFacility %s (%u), Severity %s (%u)\n\tMsg: ",
+    ND_PRINT((ndo, "SYSLOG, length: %u\n\tFacility %s (%u), Severity %s (%u)\n\tMsg: ",
            len,
            tok2str(syslog_facility_values, "unknown (%u)", facility),
            facility,
            tok2str(syslog_severity_values, "unknown (%u)", severity),
-           severity);
+           severity));
 
     /* print the syslog text in verbose mode */
     for (; msg_off < len; msg_off++) {
-        TCHECK2(*(pptr+msg_off), 1);
-        safeputchar(gndo, *(pptr + msg_off));
+        ND_TCHECK2(*(pptr + msg_off), 1);
+        safeputchar(ndo, *(pptr + msg_off));
     }
 
-    if (vflag > 1)
-        print_unknown_data(gndo,pptr,"\n\t",len);
+    if (ndo->ndo_vflag > 1)
+        print_unknown_data(ndo, pptr, "\n\t", len);
 
     return;
 
 trunc:
-        printf("%s", tstr);
+    ND_PRINT((ndo, "%s", tstr));
 }