more consistent use of the length: output;

[tcpdump] / print-pptp.c

diff --git a/print-pptp.c b/print-pptp.c
index e4c02b16c5bf7211d6599b146b4f64daf9397f4d..585b2f942567647f1c13b4185bda63d168ef9371 100644 (file)
--- a/print-pptp.c
+++ b/print-pptp.c
@@ -23,19 +23,17 @@
 
 
 #ifndef lint
-static const char rcsid[] = 
-     "@(#) $Header: /tcpdump/master/tcpdump/print-pptp.c,v 1.1 2001-03-09 05:38:21 guy Exp $";
+static const char rcsid[] =
+     "@(#) $Header: /tcpdump/master/tcpdump/print-pptp.c,v 1.5 2002-08-01 08:53:25 risso Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include <tcpdump-stdinc.h>
+
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 
 #include "interface.h"
 
@@ -55,7 +53,7 @@ static char tstr[] = " [|pptp]";
 
 #define PPTP_CTRL_MSG_TYPE_SCCRQ       1
 #define PPTP_CTRL_MSG_TYPE_SCCRP       2
-#define PPTP_CTRL_MSG_TYPE_StopCCRQ    3 
+#define PPTP_CTRL_MSG_TYPE_StopCCRQ    3
 #define PPTP_CTRL_MSG_TYPE_StopCCRP    4
 #define PPTP_CTRL_MSG_TYPE_ECHORQ      5
 #define PPTP_CTRL_MSG_TYPE_ECHORP      6
@@ -185,8 +183,8 @@ struct pptp_msg_icrq {
        u_int16_t call_ser;
        u_int32_t bearer_type;
        u_int32_t phy_chan_id;
-       u_int16_t dialed_no_len;                
-       u_int16_t dialing_no_len;               
+       u_int16_t dialed_no_len;
+       u_int16_t dialing_no_len;
        u_char dialed_no[64];           /* DNIS */
        u_char dialing_no[64];          /* CLID */
        u_char subaddr[64];
@@ -245,7 +243,7 @@ struct pptp_msg_sli {
 
 /* attributes that appear more than once in above messages:
 
-   Number of         
+   Number of
    occurence    attributes
   --------------------------------------
       2         u_int32_t bearer_cap;
@@ -272,7 +270,7 @@ struct pptp_msg_sli {
       2         u_char subaddr[64];
       2         u_char vendor[64];
 
-  so I will prepare print out functions for these attributes (except for 
+  so I will prepare print out functions for these attributes (except for
   reserved*).
 */
 
@@ -308,11 +306,11 @@ pptp_bearer_type_print(const u_int32_t *bearer_type)
        case 2:
                printf("D");    /* Digital */
                break;
-       case 3: 
+       case 3:
                printf("Any");
                break;
        default:
-               printf("???");
+               printf("?");
                break;
         }
        printf(")");
@@ -370,7 +368,7 @@ pptp_err_code_print(const u_int8_t *err_code)
                        printf(":PAC-Error");
                        break;
                default:
-                       printf(":???");
+                       printf(":?");
                        break;
                }
        }
@@ -411,7 +409,7 @@ pptp_framing_type_print(const u_int32_t *framing_type)
                printf("E");            /* Either */
                break;
        default:
-               printf("???");
+               printf("?");
                break;
        }
        printf(")");
@@ -450,7 +448,7 @@ pptp_phy_chan_id_print(const u_int32_t *phy_chan_id)
 static void
 pptp_pkt_proc_delay_print(const u_int16_t *pkt_proc_delay)
 {
-       printf(" PHY_CHAN_ID(%u)", ntohs(*pkt_proc_delay));
+       printf(" PROC_DELAY(%u)", ntohs(*pkt_proc_delay));
 }
 
 static void
@@ -490,7 +488,7 @@ pptp_result_code_print(const u_int8_t *result_code, int ctrl_msg_type)
                                printf(":The protocol version of the requester is not supported");
                                break;
                        default:
-                               printf(":???");
+                               printf(":?");
                                break;
                        }
                        break;
@@ -504,7 +502,7 @@ pptp_result_code_print(const u_int8_t *result_code, int ctrl_msg_type)
                                printf(":General Error");
                                break;
                        default:
-                               printf(":???");
+                               printf(":?");
                                break;
                        }
                        break;
@@ -532,7 +530,7 @@ pptp_result_code_print(const u_int8_t *result_code, int ctrl_msg_type)
                                printf(":Do Not Accept");
                                break;
                        default:
-                               printf(":???");
+                               printf(":?");
                                break;
                        }
                        break;
@@ -548,7 +546,7 @@ pptp_result_code_print(const u_int8_t *result_code, int ctrl_msg_type)
                                printf(":Do Not Accept");
                                break;
                        default:
-                               printf(":???");
+                               printf(":?");
                                break;
                        }
                        break;
@@ -566,7 +564,7 @@ pptp_result_code_print(const u_int8_t *result_code, int ctrl_msg_type)
                        case 4:
                                printf(":Request");
                        default:
-                               printf(":???");
+                               printf(":?");
                                break;
                        break;
                        }
@@ -669,7 +667,7 @@ pptp_stopccrq_print(const u_char *dat)
                        printf(":Stop-Local-Shutdown");
                        break;
                default:
-                       printf(":???");
+                       printf(":?");
                        break;
                }
        }
@@ -707,7 +705,7 @@ pptp_echorq_print(const u_char *dat)
 
        TCHECK(ptr->id);
        pptp_id_print(&ptr->id);
-       
+
        return;
 
 trunc:
@@ -726,7 +724,7 @@ pptp_echorp_print(const u_char *dat)
        TCHECK(ptr->err_code);
        pptp_err_code_print(&ptr->err_code);
        TCHECK(ptr->reserved1);
-       
+
        return;
 
 trunc:
@@ -832,7 +830,7 @@ static void
 pptp_icrp_print(const u_char *dat)
 {
        struct pptp_msg_icrp *ptr = (struct pptp_msg_icrp *)dat;
-       
+
        TCHECK(ptr->call_id);
        pptp_call_id_print(&ptr->call_id);
        TCHECK(ptr->peer_call_id);
@@ -927,10 +925,10 @@ pptp_wen_print(const u_char *dat)
        TCHECK(ptr->framing_err);
        printf(" FRAMING_ERR(%lu)", (unsigned long)ntohl(ptr->framing_err));
        TCHECK(ptr->hardware_overrun);
-       printf(" HARDWARE_OVERRUN(%lu)", 
+       printf(" HARDWARE_OVERRUN(%lu)",
               (unsigned long)ntohl(ptr->hardware_overrun));
        TCHECK(ptr->buffer_overrun);
-       printf(" BUFFER_OVERRUN(%lu)", 
+       printf(" BUFFER_OVERRUN(%lu)",
               (unsigned long)ntohl(ptr->buffer_overrun));
        TCHECK(ptr->timeout_err);
        printf(" TIMEOUT_ERR(%lu)", (unsigned long)ntohl(ptr->timeout_err));
@@ -1003,7 +1001,7 @@ pptp_print(const u_char *dat, u_int length)
        TCHECK(hdr->ctrl_msg_type);
        ctrl_msg_type = ntohs(hdr->ctrl_msg_type);
        if (ctrl_msg_type < PPTP_MAX_MSGTYPE_INDEX) {
-               printf(" CTRL_MSGTYPE=%s", 
+               printf(" CTRL_MSGTYPE=%s",
                       pptp_message_type_string[ctrl_msg_type]);
        } else {
                printf(" UNKNOWN_CTRL_MSGTYPE(%u)", ctrl_msg_type);
@@ -1067,4 +1065,4 @@ pptp_print(const u_char *dat, u_int length)
 
 trunc:
        printf("%s", tstr);
-}      
+}