Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump

[tcpdump] / print-syslog.c

diff --git a/print-syslog.c b/print-syslog.c
index 3685d62042a09d57334c36f532f0df839be45114..89019bf54b532bcecde22c7a87386a7a02805f22 100644 (file)
--- a/print-syslog.c
+++ b/print-syslog.c
@@ -30,9 +30,10 @@ static const char rcsid[] _U_ =
 
 #include "interface.h"
 #include "extract.h"
-#include "addrtoname.h"
 
-/* 
+static const char tstr[] = "[|syslog]";
+
+/*
  * tokenlists and #defines taken from Ethereal - Network traffic analyzer
  * by Gerald Combs <[email protected]>
  */
@@ -94,40 +95,30 @@ syslog_print(register const u_char *pptr, register u_int len)
      * severity and facility values
      */
 
-    if (!TTEST2(*pptr, 1))
-        goto trunc;
-
+    TCHECK2(*pptr, 1);
     if (*(pptr+msg_off) == '<') {
         msg_off++;
-
-        if (!TTEST2(*(pptr+msg_off), 1))
-            goto trunc;
-
+        TCHECK2(*(pptr+msg_off), 1);
         while ( *(pptr+msg_off) >= '0' &&
                 *(pptr+msg_off) <= '9' &&
                 msg_off <= SYSLOG_MAX_DIGITS) {
-
-            if (!TTEST2(*(pptr+msg_off), 1))
-                goto trunc;
-
             pri = pri * 10 + (*(pptr+msg_off) - '0');
             msg_off++;
-
-            if (!TTEST2(*(pptr+msg_off), 1))
-                goto trunc;
-
-        if (*(pptr+msg_off) == '>')
-            msg_off++;
+            TCHECK2(*(pptr+msg_off), 1);
+        }
+        if (*(pptr+msg_off) != '>') {
+            printf("%s", tstr);
+            return;
         }
+        msg_off++;
     } else {
-        printf("[|syslog]");
+        printf("%s", tstr);
         return;
     }
 
     facility = (pri & SYSLOG_FACILITY_MASK) >> 3;
     severity = pri & SYSLOG_SEVERITY_MASK;
 
-    
     if (vflag < 1 )
     {
         printf("SYSLOG %s.%s, length: %u",
@@ -136,7 +127,7 @@ syslog_print(register const u_char *pptr, register u_int len)
                len);
         return;
     }
-       
+
     printf("SYSLOG, length: %u\n\tFacility %s (%u), Severity %s (%u)\n\tMsg: ",
            len,
            tok2str(syslog_facility_values, "unknown (%u)", facility),
@@ -146,18 +137,15 @@ syslog_print(register const u_char *pptr, register u_int len)
 
     /* print the syslog text in verbose mode */
     for (; msg_off < len; msg_off++) {
-        if (!TTEST2(*(pptr+msg_off), 1))
-            goto trunc;
-        safeputchar(*(pptr+msg_off));        
+        TCHECK2(*(pptr+msg_off), 1);
+        safeputchar(*(pptr+msg_off));
     }
 
-    if (vflag > 1) {
-        if(!print_unknown_data(pptr,"\n\t",len))
-            return;
-    }
-    
+    if (vflag > 1)
+        print_unknown_data(gndo,pptr,"\n\t",len);
+
     return;
 
 trunc:
-        printf("[|syslog]");
+        printf("%s", tstr);
 }