Avoiding conditional directives that break statements

[tcpdump] / print-egp.c

diff --git a/print-egp.c b/print-egp.c
index 1aa01c8721268fd9a21f3c92943d7ef309a79004..e87d0d664c06ed3caf825b832723379a8a06cef1 100644 (file)
--- a/print-egp.c
+++ b/print-egp.c
@@ -18,34 +18,26 @@
  * Initial contribution from Jeff Honig ([email protected]).
  */
 
  * Initial contribution from Jeff Honig ([email protected]).
  */
 

-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-egp.c,v 1.30 2002-08-01 08:53:05 risso Exp $ (LBL)";
-#endif
-

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

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

 
 

-#include <stdio.h>
-
-#include "interface.h"
+#include "netdissect.h"

 #include "addrtoname.h"
 #include "addrtoname.h"

-
-#include "ip.h"
+#include "extract.h"

 
 struct egp_packet {
 
 struct egp_packet {

-       u_char  egp_version;
+       uint8_t  egp_version;

 #define        EGP_VERSION     2
 #define        EGP_VERSION     2

-       u_char  egp_type;
+       uint8_t  egp_type;

 #define  EGPT_ACQUIRE  3
 #define  EGPT_REACH    5
 #define  EGPT_POLL     2
 #define  EGPT_UPDATE   1
 #define  EGPT_ERROR    8
 #define  EGPT_ACQUIRE  3
 #define  EGPT_REACH    5
 #define  EGPT_POLL     2
 #define  EGPT_UPDATE   1
 #define  EGPT_ERROR    8

-       u_char  egp_code;
+       uint8_t  egp_code;

 #define  EGPC_REQUEST  0
 #define  EGPC_CONFIRM  1
 #define  EGPC_REFUSE   2
 #define  EGPC_REQUEST  0
 #define  EGPC_CONFIRM  1
 #define  EGPC_REFUSE   2


@@ -53,7 +45,7 @@ struct egp_packet {
 #define  EGPC_CEASEACK 4
 #define  EGPC_HELLO    0
 #define  EGPC_HEARDU   1
 #define  EGPC_CEASEACK 4
 #define  EGPC_HELLO    0
 #define  EGPC_HEARDU   1

-       u_char  egp_status;
+       uint8_t  egp_status;

 #define  EGPS_UNSPEC   0
 #define  EGPS_ACTIVE   1
 #define  EGPS_PASSIVE  2
 #define  EGPS_UNSPEC   0
 #define  EGPS_ACTIVE   1
 #define  EGPS_PASSIVE  2


@@ -66,13 +58,13 @@ struct egp_packet {
 #define  EGPS_UP       1
 #define  EGPS_DOWN     2
 #define  EGPS_UNSOL    0x80
 #define  EGPS_UP       1
 #define  EGPS_DOWN     2
 #define  EGPS_UNSOL    0x80

-       u_short  egp_checksum;
-       u_short  egp_as;
-       u_short  egp_sequence;
+       uint16_t  egp_checksum;
+       uint16_t  egp_as;
+       uint16_t  egp_sequence;

        union {
        union {

-               u_short  egpu_hello;
-               u_char egpu_gws[2];
-               u_short  egpu_reason;
+               uint16_t  egpu_hello;
+               uint8_t egpu_gws[2];
+               uint16_t  egpu_reason;

 #define  EGPR_UNSPEC   0
 #define  EGPR_BADHEAD  1
 #define  EGPR_BADDATA  2
 #define  EGPR_UNSPEC   0
 #define  EGPR_BADHEAD  1
 #define  EGPR_BADDATA  2


@@ -86,14 +78,14 @@ struct egp_packet {
 #define  egp_extgw  egp_handg.egpu_gws[1]
 #define  egp_reason  egp_handg.egpu_reason
        union {
 #define  egp_extgw  egp_handg.egpu_gws[1]
 #define  egp_reason  egp_handg.egpu_reason
        union {

-               u_short  egpu_poll;
-               u_int32_t egpu_sourcenet;
+               uint16_t  egpu_poll;
+               uint32_t egpu_sourcenet;

        } egp_pands;
 #define  egp_poll  egp_pands.egpu_poll
 #define  egp_sourcenet  egp_pands.egpu_sourcenet
 };
 
        } egp_pands;
 #define  egp_poll  egp_pands.egpu_poll
 #define  egp_sourcenet  egp_pands.egpu_sourcenet
 };
 

-const char *egp_acquire_codes[] = {
+static const char *egp_acquire_codes[] = {

        "request",
        "confirm",
        "refuse",
        "request",
        "confirm",
        "refuse",


@@ -101,7 +93,7 @@ const char *egp_acquire_codes[] = {
        "cease_ack"
 };
 
        "cease_ack"
 };
 

-const char *egp_acquire_status[] = {
+static const char *egp_acquire_status[] = {

        "unspecified",
        "active_mode",
        "passive_mode",
        "unspecified",
        "active_mode",
        "passive_mode",


@@ -112,18 +104,18 @@ const char *egp_acquire_status[] = {
        "protocol_violation"
 };
 
        "protocol_violation"
 };
 

-const char *egp_reach_codes[] = {
+static const char *egp_reach_codes[] = {

        "hello",
        "i-h-u"
 };
 
        "hello",
        "i-h-u"
 };
 

-const char *egp_status_updown[] = {
+static const char *egp_status_updown[] = {

        "indeterminate",
        "up",
        "down"
 };
 
        "indeterminate",
        "up",
        "down"
 };
 

-const char *egp_reasons[] = {
+static const char *egp_reasons[] = {

        "unspecified",
        "bad_EGP_header_format",
        "bad_EGP_data_field_format",
        "unspecified",
        "bad_EGP_header_format",
        "bad_EGP_data_field_format",


@@ -134,15 +126,16 @@ const char *egp_reasons[] = {
 };
 
 static void
 };
 
 static void

-egpnrprint(register const struct egp_packet *egp, register u_int length)
+egpnrprint(netdissect_options *ndo,
+           register const struct egp_packet *egp)

 {
 {

-       register const u_char *cp;
-       u_int32_t addr;
-       register u_int32_t net;
+       register const uint8_t *cp;
+       uint32_t addr;
+       register uint32_t net;

        register u_int netlen;
        int gateways, distances, networks;
        int t_gateways;
        register u_int netlen;
        int gateways, distances, networks;
        int t_gateways;

-       char *comma;
+       const char *comma;

 
        addr = egp->egp_sourcenet;
        if (IN_CLASSA(addr)) {
 
        addr = egp->egp_sourcenet;
        if (IN_CLASSA(addr)) {


@@ -158,13 +151,13 @@ egpnrprint(register const struct egp_packet *egp, register u_int length)
                net = 0;
                netlen = 0;
        }
                net = 0;
                netlen = 0;
        }

-       cp = (u_char *)(egp + 1);
+       cp = (const uint8_t *)(egp + 1);

 
        t_gateways = egp->egp_intgw + egp->egp_extgw;
        for (gateways = 0; gateways < t_gateways; ++gateways) {
                /* Pickup host part of gateway address */
                addr = 0;
 
        t_gateways = egp->egp_intgw + egp->egp_extgw;
        for (gateways = 0; gateways < t_gateways; ++gateways) {
                /* Pickup host part of gateway address */
                addr = 0;

-               TCHECK2(cp[0], 4 - netlen);
+               ND_TCHECK2(cp[0], 4 - netlen);

                switch (netlen) {
 
                case 1:
                switch (netlen) {
 
                case 1:


@@ -177,60 +170,72 @@ egpnrprint(register const struct egp_packet *egp, register u_int length)
                        addr = (addr << 8) | *cp++;
                }
                addr |= net;
                        addr = (addr << 8) | *cp++;
                }
                addr |= net;

-               TCHECK2(cp[0], 1);
+               ND_TCHECK2(cp[0], 1);

                distances = *cp++;
                distances = *cp++;

-               printf(" %s %s ",
+               ND_PRINT((ndo, " %s %s ",

                       gateways < (int)egp->egp_intgw ? "int" : "ext",
                       gateways < (int)egp->egp_intgw ? "int" : "ext",

-                      ipaddr_string(&addr));
+                      ipaddr_string(ndo, &addr)));

 
                comma = "";
 
                comma = "";

-               putchar('(');
+               ND_PRINT((ndo, "("));

                while (--distances >= 0) {
                while (--distances >= 0) {

-                       TCHECK2(cp[0], 2);
-                       printf("%sd%d:", comma, (int)*cp++);
+                       ND_TCHECK2(cp[0], 2);
+                       ND_PRINT((ndo, "%sd%d:", comma, (int)*cp++));

                        comma = ", ";
                        networks = *cp++;
                        while (--networks >= 0) {
                                /* Pickup network number */
                        comma = ", ";
                        networks = *cp++;
                        while (--networks >= 0) {
                                /* Pickup network number */

-                               TCHECK2(cp[0], 1);
-                               addr = (u_int32_t)*cp++ << 24;
+                               ND_TCHECK2(cp[0], 1);
+                               addr = (uint32_t)*cp++ << 24;

                                if (IN_CLASSB(addr)) {
                                if (IN_CLASSB(addr)) {

-                                       TCHECK2(cp[0], 1);
-                                       addr |= (u_int32_t)*cp++ << 16;
+                                       ND_TCHECK2(cp[0], 1);
+                                       addr |= (uint32_t)*cp++ << 16;

                                } else if (!IN_CLASSA(addr)) {
                                } else if (!IN_CLASSA(addr)) {

-                                       TCHECK2(cp[0], 2);
-                                       addr |= (u_int32_t)*cp++ << 16;
-                                       addr |= (u_int32_t)*cp++ << 8;
+                                       ND_TCHECK2(cp[0], 2);
+                                       addr |= (uint32_t)*cp++ << 16;
+                                       addr |= (uint32_t)*cp++ << 8;

                                }
                                }

-                               printf(" %s", ipaddr_string(&addr));
+                               ND_PRINT((ndo, " %s", ipaddr_string(ndo, &addr)));

                        }
                }
                        }
                }

-               putchar(')');
+               ND_PRINT((ndo, ")"));

        }
        return;
 trunc:
        }
        return;
 trunc:

-       fputs("[|]", stdout);
+       ND_PRINT((ndo, "[|]"));

 }
 
 void
 }
 
 void

-egp_print(register const u_char *bp, register u_int length,
-         register const u_char *bp2)
+egp_print(netdissect_options *ndo,
+          register const uint8_t *bp, register u_int length)

 {
        register const struct egp_packet *egp;
 {
        register const struct egp_packet *egp;

-       register const struct ip *ip;

        register int status;
        register int code;
        register int type;
 
        register int status;
        register int code;
        register int type;
 

-       egp = (struct egp_packet *)bp;
-       ip = (struct ip *)bp2;
-       (void)printf("egp: ");
+       egp = (const struct egp_packet *)bp;
+        if (!ND_TTEST2(*egp, length)) {
+               ND_PRINT((ndo, "[|egp]"));
+               return;
+       }
+
+        if (!ndo->ndo_vflag) {
+            ND_PRINT((ndo, "EGPv%u, AS %u, seq %u, length %u",
+                   egp->egp_version,
+                   EXTRACT_16BITS(&egp->egp_as),
+                   EXTRACT_16BITS(&egp->egp_sequence),
+                   length));
+            return;
+        } else
+            ND_PRINT((ndo, "EGPv%u, length %u",
+                   egp->egp_version,
+                   length));

 
        if (egp->egp_version != EGP_VERSION) {
 
        if (egp->egp_version != EGP_VERSION) {

-               printf("[version %d]", egp->egp_version);
+               ND_PRINT((ndo, "[version %d]", egp->egp_version));

                return;
        }
                return;
        }

-       printf("as:%d seq:%d", ntohs(egp->egp_as), ntohs(egp->egp_sequence));

 
        type = egp->egp_type;
        code = egp->egp_code;
 
        type = egp->egp_type;
        code = egp->egp_code;


@@ -238,31 +243,31 @@ egp_print(register const u_char *bp, register u_int length,
 
        switch (type) {
        case EGPT_ACQUIRE:
 
        switch (type) {
        case EGPT_ACQUIRE:

-               printf(" acquire");
+               ND_PRINT((ndo, " acquire"));

                switch (code) {
                case EGPC_REQUEST:
                case EGPC_CONFIRM:
                switch (code) {
                case EGPC_REQUEST:
                case EGPC_CONFIRM:

-                       printf(" %s", egp_acquire_codes[code]);
+                       ND_PRINT((ndo, " %s", egp_acquire_codes[code]));

                        switch (status) {
                        case EGPS_UNSPEC:
                        case EGPS_ACTIVE:
                        case EGPS_PASSIVE:
                        switch (status) {
                        case EGPS_UNSPEC:
                        case EGPS_ACTIVE:
                        case EGPS_PASSIVE:

-                               printf(" %s", egp_acquire_status[status]);
+                               ND_PRINT((ndo, " %s", egp_acquire_status[status]));

                                break;
 
                        default:
                                break;
 
                        default:

-                               printf(" [status %d]", status);
+                               ND_PRINT((ndo, " [status %d]", status));

                                break;
                        }
                                break;
                        }

-                       printf(" hello:%d poll:%d",
-                              ntohs(egp->egp_hello),
-                              ntohs(egp->egp_poll));
+                       ND_PRINT((ndo, " hello:%d poll:%d",
+                              EXTRACT_16BITS(&egp->egp_hello),
+                              EXTRACT_16BITS(&egp->egp_poll)));

                        break;
 
                case EGPC_REFUSE:
                case EGPC_CEASE:
                case EGPC_CEASEACK:
                        break;
 
                case EGPC_REFUSE:
                case EGPC_CEASE:
                case EGPC_CEASEACK:

-                       printf(" %s", egp_acquire_codes[code]);
+                       ND_PRINT((ndo, " %s", egp_acquire_codes[code]));

                        switch (status ) {
                        case EGPS_UNSPEC:
                        case EGPS_NORES:
                        switch (status ) {
                        case EGPS_UNSPEC:
                        case EGPS_NORES:


@@ -270,17 +275,17 @@ egp_print(register const u_char *bp, register u_int length,
                        case EGPS_GODOWN:
                        case EGPS_PARAM:
                        case EGPS_PROTO:
                        case EGPS_GODOWN:
                        case EGPS_PARAM:
                        case EGPS_PROTO:

-                               printf(" %s", egp_acquire_status[status]);
+                               ND_PRINT((ndo, " %s", egp_acquire_status[status]));

                                break;
 
                        default:
                                break;
 
                        default:

-                               printf("[status %d]", status);
+                               ND_PRINT((ndo, "[status %d]", status));

                                break;
                        }
                        break;
 
                default:
                                break;
                        }
                        break;
 
                default:

-                       printf("[code %d]", code);
+                       ND_PRINT((ndo, "[code %d]", code));

                        break;
                }
                break;
                        break;
                }
                break;


@@ -290,61 +295,61 @@ egp_print(register const u_char *bp, register u_int length,
 
                case EGPC_HELLO:
                case EGPC_HEARDU:
 
                case EGPC_HELLO:
                case EGPC_HEARDU:

-                       printf(" %s", egp_reach_codes[code]);
+                       ND_PRINT((ndo, " %s", egp_reach_codes[code]));

                        if (status <= EGPS_DOWN)
                        if (status <= EGPS_DOWN)

-                               printf(" state:%s", egp_status_updown[status]);
+                               ND_PRINT((ndo, " state:%s", egp_status_updown[status]));

                        else
                        else

-                               printf(" [status %d]", status);
+                               ND_PRINT((ndo, " [status %d]", status));

                        break;
 
                default:
                        break;
 
                default:

-                       printf("[reach code %d]", code);
+                       ND_PRINT((ndo, "[reach code %d]", code));

                        break;
                }
                break;
 
        case EGPT_POLL:
                        break;
                }
                break;
 
        case EGPT_POLL:

-               printf(" poll");
+               ND_PRINT((ndo, " poll"));

                if (egp->egp_status <= EGPS_DOWN)
                if (egp->egp_status <= EGPS_DOWN)

-                       printf(" state:%s", egp_status_updown[status]);
+                       ND_PRINT((ndo, " state:%s", egp_status_updown[status]));

                else
                else

-                       printf(" [status %d]", status);
-               printf(" net:%s", ipaddr_string(&egp->egp_sourcenet));
+                       ND_PRINT((ndo, " [status %d]", status));
+               ND_PRINT((ndo, " net:%s", ipaddr_string(ndo, &egp->egp_sourcenet)));

                break;
 
        case EGPT_UPDATE:
                break;
 
        case EGPT_UPDATE:

-               printf(" update");
+               ND_PRINT((ndo, " update"));

                if (status & EGPS_UNSOL) {
                        status &= ~EGPS_UNSOL;
                if (status & EGPS_UNSOL) {
                        status &= ~EGPS_UNSOL;

-                       printf(" unsolicited");
+                       ND_PRINT((ndo, " unsolicited"));

                }
                if (status <= EGPS_DOWN)
                }
                if (status <= EGPS_DOWN)

-                       printf(" state:%s", egp_status_updown[status]);
+                       ND_PRINT((ndo, " state:%s", egp_status_updown[status]));

                else
                else

-                       printf(" [status %d]", status);
-               printf(" %s int %d ext %d",
-                      ipaddr_string(&egp->egp_sourcenet),
+                       ND_PRINT((ndo, " [status %d]", status));
+               ND_PRINT((ndo, " %s int %d ext %d",
+                      ipaddr_string(ndo, &egp->egp_sourcenet),

                       egp->egp_intgw,
                       egp->egp_intgw,

-                      egp->egp_extgw);
-               if (vflag)
-                       egpnrprint(egp, length);
+                      egp->egp_extgw));
+               if (ndo->ndo_vflag)
+                       egpnrprint(ndo, egp);

                break;
 
        case EGPT_ERROR:
                break;
 
        case EGPT_ERROR:

-               printf(" error");
+               ND_PRINT((ndo, " error"));

                if (status <= EGPS_DOWN)
                if (status <= EGPS_DOWN)

-                       printf(" state:%s", egp_status_updown[status]);
+                       ND_PRINT((ndo, " state:%s", egp_status_updown[status]));

                else
                else

-                       printf(" [status %d]", status);
+                       ND_PRINT((ndo, " [status %d]", status));

 
 

-               if (ntohs(egp->egp_reason) <= EGPR_UVERSION)
-                       printf(" %s", egp_reasons[ntohs(egp->egp_reason)]);
+               if (EXTRACT_16BITS(&egp->egp_reason) <= EGPR_UVERSION)
+                       ND_PRINT((ndo, " %s", egp_reasons[EXTRACT_16BITS(&egp->egp_reason)]));

                else
                else

-                       printf(" [reason %d]", ntohs(egp->egp_reason));
+                       ND_PRINT((ndo, " [reason %d]", EXTRACT_16BITS(&egp->egp_reason)));

                break;
 
        default:
                break;
 
        default:

-               printf("[type %d]", type);
+               ND_PRINT((ndo, "[type %d]", type));

                break;
        }
 }
                break;
        }
 }