Clean up comments.

[tcpdump] / print-syslog.c

diff --git a/print-syslog.c b/print-syslog.c
index 1b02ff842eb548d49c03dee50fb0ccf7a5ea46dd..ede1d6baf07009042c4f743c1ee0727d7a423453 100644 (file)
--- a/print-syslog.c
+++ b/print-syslog.c
@@ -17,15 +17,14 @@
 /* \summary: Syslog protocol printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: Syslog protocol printer */
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"

 
 #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


@@ -91,23 +91,23 @@ syslog_print(netdissect_options *ndo,
      */
 
     ND_TCHECK_1(pptr);
      */
 
     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 &&
         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);
         }
             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 {
             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, GET_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);

 }
 }