Handle rpcaps:// URLs as well, for rpcap-over-TLS.

[tcpdump] / print-syslog.c

diff --git a/print-syslog.c b/print-syslog.c
index cdb81148063d3369a7d577b59e3eaad56e381512..3c27fb392dffb380e52c9d2447c74b94892bd7e9 100644 (file)
--- a/print-syslog.c
+++ b/print-syslog.c
@@ -25,7 +25,6 @@
 #include "netdissect.h"
 #include "extract.h"
 
 #include "netdissect.h"
 #include "extract.h"
 

-static const char tstr[] = "[|syslog]";

 
 /*
  * tokenlists and #defines taken from Ethereal - Network traffic analyzer
 
 /*
  * 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_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" },
 
 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;
 
     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
     /* extract decimal figures that are
      * encapsulated within < > tags
      * based on this decimal figure extract the


@@ -102,12 +102,12 @@ syslog_print(netdissect_options *ndo,
             ND_TCHECK_1(pptr + msg_off);
         }
         if (EXTRACT_U_1(pptr + msg_off) != '>') {
             ND_TCHECK_1(pptr + msg_off);
         }
         if (EXTRACT_U_1(pptr + msg_off) != '>') {

-            ND_PRINT("%s", tstr);
+            nd_print_trunc(ndo);

             return;
         }
         msg_off++;
     } else {
             return;
         }
         msg_off++;
     } else {

-        ND_PRINT("%s", tstr);
+        nd_print_trunc(ndo);

         return;
     }
 
         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);
     /* 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, EXTRACT_U_1(pptr + msg_off));

     }
 
     if (ndo->ndo_vflag > 1)
     }
 
     if (ndo->ndo_vflag > 1)


@@ -142,5 +142,5 @@ syslog_print(netdissect_options *ndo,
     return;
 
 trunc:
     return;
 
 trunc:

-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);

 }
 }