SCTP: Use GET_IPADDR_STRING()/GET_IP6ADDR_STRING() calls

[tcpdump] / print-syslog.c

diff --git a/print-syslog.c b/print-syslog.c
index ede1d6baf07009042c4f743c1ee0727d7a423453..a3b56ce46acb51fff1f6da69748c35b4791397cc 100644 (file)
--- a/print-syslog.c
+++ b/print-syslog.c
@@ -90,16 +90,13 @@ syslog_print(netdissect_options *ndo,
      * severity and facility values
      */
 
      * severity and facility values
      */
 

-    ND_TCHECK_1(pptr);
-    if (GET_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 &&
                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++;
         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++;

-            ND_TCHECK_1(pptr + msg_off);

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


@@ -132,15 +129,9 @@ syslog_print(netdissect_options *ndo,
 
     /* 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++) {

-        ND_TCHECK_1(pptr + msg_off);

         fn_print_char(ndo, GET_U_1(pptr + msg_off));
     }
 
     if (ndo->ndo_vflag > 1)
         print_unknown_data(ndo, pptr, "\n\t", len);
         fn_print_char(ndo, GET_U_1(pptr + msg_off));
     }
 
     if (ndo->ndo_vflag > 1)
         print_unknown_data(ndo, pptr, "\n\t", len);

-
-    return;
-
-trunc:
-    nd_print_trunc(ndo);

 }
 }