X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/fb2479d733dbe8a991d11909b319341f7db62ab1..c2d6a5db5b15f08b9e858e3fcf1e6847aaebe26b:/print-syslog.c?ds=sidebyside

diff --git a/print-syslog.c b/print-syslog.c
index cdb81148..ede1d6ba 100644
--- a/print-syslog.c
+++ b/print-syslog.c
@@ -25,7 +25,6 @@
 #include "netdissect.h"
 #include "extract.h"
 
-static const char tstr[] = "[|syslog]";
 
 /*
  * tokenlists and #defines taken from Ethereal - Network traffic analyzer
@@ -34,7 +33,7 @@ static const char tstr[] = "[|syslog]";
 
 #define SYSLOG_SEVERITY_MASK 0x0007  /* 0000 0000 0000 0111 */
 #define SYSLOG_FACILITY_MASK 0x03f8  /* 0000 0011 1111 1000 */
-#define SYSLOG_MAX_DIGITS 3 /* The maximum number if priority digits to read in. */
+#define SYSLOG_MAX_DIGITS 3 /* The maximum number of priority digits to read in. */
 
 static const struct tok syslog_severity_values[] = {
   { 0,      "emergency" },
@@ -84,6 +83,7 @@ syslog_print(netdissect_options *ndo,
     uint16_t pri = 0;
     uint16_t facility,severity;
 
+    ndo->ndo_protocol = "syslog";
     /* extract decimal figures that are
      * encapsulated within < > tags
      * based on this decimal figure extract the
@@ -91,23 +91,23 @@ syslog_print(netdissect_options *ndo,
      */
 
     ND_TCHECK_1(pptr);
-    if (EXTRACT_U_1(pptr + msg_off) == '<') {
+    if (GET_U_1(pptr + msg_off) == '<') {
         msg_off++;
         ND_TCHECK_1(pptr + msg_off);
         while (msg_off <= SYSLOG_MAX_DIGITS &&
-               EXTRACT_U_1(pptr + msg_off) >= '0' &&
-               EXTRACT_U_1(pptr + msg_off) <= '9') {
-            pri = pri * 10 + (EXTRACT_U_1(pptr + msg_off) - '0');
+               GET_U_1(pptr + msg_off) >= '0' &&
+               GET_U_1(pptr + msg_off) <= '9') {
+            pri = pri * 10 + (GET_U_1(pptr + msg_off) - '0');
             msg_off++;
             ND_TCHECK_1(pptr + msg_off);
         }
-        if (EXTRACT_U_1(pptr + msg_off) != '>') {
-            ND_PRINT("%s", tstr);
+        if (GET_U_1(pptr + msg_off) != '>') {
+            nd_print_trunc(ndo);
             return;
         }
         msg_off++;
     } else {
-        ND_PRINT("%s", tstr);
+        nd_print_trunc(ndo);
         return;
     }
 
@@ -133,7 +133,7 @@ syslog_print(netdissect_options *ndo,
     /* print the syslog text in verbose mode */
     for (; msg_off < len; msg_off++) {
         ND_TCHECK_1(pptr + msg_off);
-        safeputchar(ndo, EXTRACT_U_1(pptr + msg_off));
+        fn_print_char(ndo, GET_U_1(pptr + msg_off));
     }
 
     if (ndo->ndo_vflag > 1)
@@ -142,5 +142,5 @@ syslog_print(netdissect_options *ndo,
     return;
 
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }