Clean up comments.

[tcpdump] / print-syslog.c

diff --git a/print-syslog.c b/print-syslog.c
index 3685d62042a09d57334c36f532f0df839be45114..ede1d6baf07009042c4f743c1ee0727d7a423453 100644 (file)
--- a/print-syslog.c
+++ b/print-syslog.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 1998-2004  Hannes Gredler <hannes@tcpdump.org>
+ * Copyright (c) 1998-2004  Hannes Gredler <hannes@gredler.at>

  *      The TCPDUMP project
  *
  * Redistribution and use in source and binary forms, with or without
  *      The TCPDUMP project
  *
  * Redistribution and use in source and binary forms, with or without


@@ -14,32 +14,26 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
  * FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-syslog.c,v 1.1 2004-10-29 11:42:53 hannes Exp $";
-#endif
+/* \summary: Syslog protocol printer */

 
 #ifdef HAVE_CONFIG_H
 
 #ifdef HAVE_CONFIG_H

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

 #endif
 
 #endif
 

-#include <tcpdump-stdinc.h>
-
-#include <stdio.h>
-#include <stdlib.h>
+#include "netdissect-stdinc.h"

 
 

-#include "interface.h"
+#include "netdissect.h"

 #include "extract.h"
 #include "extract.h"

-#include "addrtoname.h"

 
 

-/* 
+
+/*

  * tokenlists and #defines taken from Ethereal - Network traffic analyzer
  * by Gerald Combs <[email protected]>
  */
 
 #define SYSLOG_SEVERITY_MASK 0x0007  /* 0000 0000 0000 0111 */
 #define SYSLOG_FACILITY_MASK 0x03f8  /* 0000 0011 1111 1000 */
  * tokenlists and #defines taken from Ethereal - Network traffic analyzer
  * by Gerald Combs <[email protected]>
  */
 
 #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" },


@@ -82,62 +76,54 @@ static const struct tok syslog_facility_values[] = {
 };
 
 void
 };
 
 void

-syslog_print(register const u_char *pptr, register u_int len)
+syslog_print(netdissect_options *ndo,
+             const u_char *pptr, u_int len)

 {
 {

-    u_int16_t msg_off = 0;
-    u_int16_t pri = 0;
-    u_int16_t facility,severity;
+    uint16_t msg_off = 0;
+    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
      * severity and facility values
      */
 
     /* extract decimal figures that are
      * encapsulated within < > tags
      * based on this decimal figure extract the
      * severity and facility values
      */
 

-    if (!TTEST2(*pptr, 1))
-        goto trunc;
-
-    if (*(pptr+msg_off) == '<') {
+    ND_TCHECK_1(pptr);
+    if (GET_U_1(pptr + msg_off) == '<') {

         msg_off++;
         msg_off++;

-
-        if (!TTEST2(*(pptr+msg_off), 1))
-            goto trunc;
-
-        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) == '>')
+        ND_TCHECK_1(pptr + msg_off);
+        while (msg_off <= SYSLOG_MAX_DIGITS &&
+               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++;
             msg_off++;

+            ND_TCHECK_1(pptr + msg_off);

         }
         }

+        if (GET_U_1(pptr + msg_off) != '>') {
+            nd_print_trunc(ndo);
+            return;
+        }
+        msg_off++;

     } else {
     } else {

-        printf("[|syslog]");
+        nd_print_trunc(ndo);

         return;
     }
 
     facility = (pri & SYSLOG_FACILITY_MASK) >> 3;
     severity = pri & SYSLOG_SEVERITY_MASK;
 
         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("SYSLOG %s.%s, length: %u",

                tok2str(syslog_facility_values, "unknown (%u)", facility),
                tok2str(syslog_severity_values, "unknown (%u)", severity),
                len);
         return;
     }
                tok2str(syslog_facility_values, "unknown (%u)", facility),
                tok2str(syslog_severity_values, "unknown (%u)", severity),
                len);
         return;
     }

-       
-    printf("SYSLOG, length: %u\n\tFacility %s (%u), Severity %s (%u)\n\tMsg: ",
+
+    ND_PRINT("SYSLOG, length: %u\n\tFacility %s (%u), Severity %s (%u)\n\tMsg: ",

            len,
            tok2str(syslog_facility_values, "unknown (%u)", facility),
            facility,
            len,
            tok2str(syslog_facility_values, "unknown (%u)", facility),
            facility,


@@ -146,18 +132,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++) {
 
     /* 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));        
+        ND_TCHECK_1(pptr + msg_off);
+        fn_print_char(ndo, GET_U_1(pptr + msg_off));

     }
 
     }
 

-    if (vflag > 1) {
-        if(!print_unknown_data(pptr,"\n\t",len))
-            return;
-    }
-    
+    if (ndo->ndo_vflag > 1)
+        print_unknown_data(ndo, pptr, "\n\t", len);
+

     return;
 
 trunc:
     return;
 
 trunc:

-        printf("[|syslog]");
+    nd_print_trunc(ndo);

 }
 }