don't pass on src & dst MAC adresses to the isoclns decoder as MAC adresses

[tcpdump] / print-ospf.c

diff --git a/print-ospf.c b/print-ospf.c
index bab455243196c6b132f86464fccc87bab045e336..020dbec90336c53e61e24d72d2a28009463d49bb 100644 (file)
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -23,7 +23,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ospf.c,v 1.33 2002-11-07 23:46:23 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ospf.c,v 1.36 2002-12-23 19:57:49 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -36,6 +36,7 @@ static const char rcsid[] =
 
 #include "interface.h"
 #include "addrtoname.h"
+#include "extract.h"
 
 #include "ospf.h"
 
@@ -52,6 +53,13 @@ static struct tok ospf_option_values[] = {
        { 0,                    NULL }
 };
 
+static struct tok ospf_authtype_values[] = {
+       { OSPF_AUTH_NONE,       "none" },
+       { OSPF_AUTH_NONE,       "simple" },
+       { OSPF_AUTH_MD5,        "MD5" },
+       { 0,                    NULL }
+};
+
 static struct tok ospf_rla_flag_values[] = {
        { RLA_FLAG_B,           "ABR" },
        { RLA_FLAG_E,           "ASBR" },
@@ -107,16 +115,16 @@ ospf_print_lshdr(register const struct lsa_hdr *lshp) {
        TCHECK(lshp->ls_type);
        TCHECK(lshp->ls_options);
 
-        printf("\n\t  %s LSA (%d), LSA-ID: %s, Advertising Router: %s, seq 0x%08x, age %ds",
+        printf("\n\t  %s LSA (%d), LSA-ID: %s, Advertising Router: %s, seq 0x%08x, age %us",
                tok2str(lsa_values,"unknown",lshp->ls_type),
                lshp->ls_type,
                ipaddr_string(&lshp->ls_stateid),
                ipaddr_string(&lshp->ls_router),
-               ntohl(lshp->ls_seq),
-               ntohs(lshp->ls_age));
+               EXTRACT_32BITS(&lshp->ls_seq),
+               EXTRACT_16BITS(&lshp->ls_age));
         printf("\n\t    Options: %s", bittok2str(ospf_option_values,"none",lshp->ls_options));
 
-       return (0);
+return (0);
 trunc:
        return (1);
 }
@@ -136,17 +144,17 @@ ospf_print_lsa(register const struct lsa *lsap)
        register const u_int32_t *lp;
        register int j, k;
 
-        printf("\n\t  %s LSA (%d), LSA-ID: %s, Advertising Router: %s, seq 0x%08x, age %ds",
+        printf("\n\t  %s LSA (%d), LSA-ID: %s, Advertising Router: %s, seq 0x%08x, age %us",
                tok2str(lsa_values,"unknown",lsap->ls_hdr.ls_type),
                lsap->ls_hdr.ls_type,
                ipaddr_string(&lsap->ls_hdr.ls_stateid),
                ipaddr_string(&lsap->ls_hdr.ls_router),
-               ntohl(lsap->ls_hdr.ls_seq),
-               ntohs(lsap->ls_hdr.ls_age));
+               EXTRACT_32BITS(&lsap->ls_hdr.ls_seq),
+               EXTRACT_16BITS(&lsap->ls_hdr.ls_age));
         printf("\n\t    Options: %s", bittok2str(ospf_option_values,"none",lsap->ls_hdr.ls_options));
 
        TCHECK(lsap->ls_hdr.ls_length);
-       ls_end = (u_char *)lsap + ntohs(lsap->ls_hdr.ls_length);
+       ls_end = (u_char *)lsap + EXTRACT_16BITS(&lsap->ls_hdr.ls_length);
        switch (lsap->ls_hdr.ls_type) {
 
        case LS_TYPE_ROUTER:
@@ -154,7 +162,7 @@ ospf_print_lsa(register const struct lsa *lsap)
                 printf("\n\t    Router LSA Options: %s", bittok2str(ospf_rla_flag_values,"unknown (%u)",lsap->lsa_un.un_rla.rla_flags));
 
                TCHECK(lsap->lsa_un.un_rla.rla_count);
-               j = ntohs(lsap->lsa_un.un_rla.rla_count);
+               j = EXTRACT_16BITS(&lsap->lsa_un.un_rla.rla_count);
                TCHECK(lsap->lsa_un.un_rla.rla_link);
                rlp = lsap->lsa_un.un_rla.rla_link;
                while (j--) {
@@ -190,14 +198,14 @@ ospf_print_lsa(register const struct lsa *lsap)
                                    rlp->link_type);
                                return (0);
                        }
-                       printf(", tos 0, metric: %d", ntohs(rlp->link_tos0metric));
+                       printf(", tos 0, metric: %d", EXTRACT_16BITS(&rlp->link_tos0metric));
                        tosp = (struct tos_metric *)
                            ((sizeof rlp->link_tos0metric) + (u_char *) rlp);
                        for (k = 0; k < (int) rlp->link_toscount; ++k, ++tosp) {
                                TCHECK(*tosp);
                                printf(", tos %d, metric: %d",
                                    tosp->tos_type,
-                                   ntohs(tosp->tos_metric));
+                                   EXTRACT_16BITS(&tosp->tos_metric));
                        }
                        rlp = (struct rlalink *)((u_char *)(rlp + 1) +
                            ((rlp->link_toscount) * sizeof(*tosp)));
@@ -224,14 +232,14 @@ ospf_print_lsa(register const struct lsa *lsap)
                lp = lsap->lsa_un.un_sla.sla_tosmetric;
                 /* suppress tos if its not supported */
                 if(!((lsap->ls_hdr.ls_options)&OSPF_OPTION_T)) {
-                    printf(", metric: %d", ntohl(*lp)&SLA_MASK_METRIC);
+                    printf(", metric: %u", EXTRACT_32BITS(lp)&SLA_MASK_METRIC);
                     break;
                 }
                while ((u_char *)lp < ls_end) {
                        register u_int32_t ul;
 
                        TCHECK(*lp);
-                       ul = ntohl(*lp);
+                       ul = EXTRACT_32BITS(lp);
                        printf(", tos %d metric %d",
                            (ul & SLA_MASK_TOS) >> SLA_SHIFT_TOS,
                            ul & SLA_MASK_METRIC);
@@ -244,14 +252,14 @@ ospf_print_lsa(register const struct lsa *lsap)
                lp = lsap->lsa_un.un_sla.sla_tosmetric;
                 /* suppress tos if its not supported */
                 if(!((lsap->ls_hdr.ls_options)&OSPF_OPTION_T)) {
-                    printf(", metric: %d", ntohl(*lp)&SLA_MASK_METRIC);
+                    printf(", metric: %u", EXTRACT_32BITS(lp)&SLA_MASK_METRIC);
                     break;
                 }
                while ((u_char *)lp < ls_end) {
                        register u_int32_t ul;
 
                        TCHECK(*lp);
-                       ul = ntohl(*lp);
+                       ul = EXTRACT_32BITS(lp);
                        printf(", tos %d metric %d",
                            (ul & SLA_MASK_TOS) >> SLA_SHIFT_TOS,
                            ul & SLA_MASK_METRIC);
@@ -270,7 +278,7 @@ ospf_print_lsa(register const struct lsa *lsap)
                        register u_int32_t ul;
 
                        TCHECK(almp->asla_tosmetric);
-                       ul = ntohl(almp->asla_tosmetric);
+                       ul = EXTRACT_32BITS(&almp->asla_tosmetric);
                        printf(", type %d, tos %d metric:",
                            (ul & ASLA_FLAG_EXTERNAL) ? 2 : 1,
                            (ul & ASLA_MASK_TOS) >> ASLA_SHIFT_TOS);
@@ -298,7 +306,7 @@ ospf_print_lsa(register const struct lsa *lsap)
                mcp = lsap->lsa_un.un_mcla;
                while ((u_char *)mcp < ls_end) {
                        TCHECK(mcp->mcla_vid);
-                       switch (ntohl(mcp->mcla_vtype)) {
+                       switch (EXTRACT_32BITS(&mcp->mcla_vtype)) {
 
                        case MCLA_VERTEX_ROUTER:
                                printf("\n\t    Router Router-ID %s",
@@ -312,7 +320,7 @@ ospf_print_lsa(register const struct lsa *lsap)
 
                        default:
                                printf("\n\t    unknown VertexType (%u)",
-                                   (u_int32_t)ntohl(mcp->mcla_vtype));
+                                   EXTRACT_32BITS(&mcp->mcla_vtype));
                                break;
                        }
                ++mcp;
@@ -346,8 +354,8 @@ ospf_decode_v2(register const struct ospfhdr *op,
        case OSPF_TYPE_HELLO:
                 TCHECK(op->ospf_hello.hello_deadint);
                 printf("\n\t  Hello Timer: %us, Dead Timer %us, mask: %s, Priority: %u",
-                       ntohs(op->ospf_hello.hello_helloint),
-                       (u_int32_t)ntohl(op->ospf_hello.hello_deadint),
+                       EXTRACT_16BITS(&op->ospf_hello.hello_helloint),
+                       EXTRACT_32BITS(&op->ospf_hello.hello_deadint),
                        ipaddr_string(&op->ospf_hello.hello_mask),
                        op->ospf_hello.hello_priority);
 
@@ -408,13 +416,13 @@ ospf_decode_v2(register const struct ospfhdr *op,
        case OSPF_TYPE_LS_UPDATE:
                 lsap = op->ospf_lsu.lsu_lsa;
                 TCHECK(op->ospf_lsu.lsu_count);
-                lsa_count = ntohl(op->ospf_lsu.lsu_count);
+                lsa_count = EXTRACT_32BITS(&op->ospf_lsu.lsu_count);
                 printf(", %d LSA%s",lsa_count, lsa_count > 1 ? "s" : "");
                 while (lsa_count--) {
                         if (ospf_print_lsa(lsap))
                                 goto trunc;
                         lsap = (struct lsa *)((u_char *)lsap +
-                                              ntohs(lsap->ls_hdr.ls_length));
+                                              EXTRACT_16BITS(&lsap->ls_hdr.ls_length));
                 }
                break;
 
@@ -448,7 +456,7 @@ ospf_print(register const u_char *bp, register u_int length,
 
         /* XXX Before we do anything else, strip off the MD5 trailer */
         TCHECK(op->ospf_authtype);
-        if (ntohs(op->ospf_authtype) == OSPF_AUTH_MD5) {
+        if (EXTRACT_16BITS(&op->ospf_authtype) == OSPF_AUTH_MD5) {
                 length -= OSPF_AUTH_MD5_LEN;
                 snapend -= OSPF_AUTH_MD5_LEN;
         }
@@ -465,16 +473,14 @@ ospf_print(register const u_char *bp, register u_int length,
                 return;
 
        TCHECK(op->ospf_len);
-       if (length != ntohs(op->ospf_len)) {
-               printf(" [len %d]", ntohs(op->ospf_len));
+       if (length != EXTRACT_16BITS(&op->ospf_len)) {
+               printf(" [len %d]", EXTRACT_16BITS(&op->ospf_len));
                return;
        }
        dataend = bp + length;
 
-       /* Print the routerid if it is not the same as the source */
        TCHECK(op->ospf_routerid);
-       if (ip->ip_src.s_addr != op->ospf_routerid.s_addr)
-               printf("\n\tRouter-ID: %s", ipaddr_string(&op->ospf_routerid));
+        printf("\n\tRouter-ID: %s", ipaddr_string(&op->ospf_routerid));
 
        TCHECK(op->ospf_areaid);
        if (op->ospf_areaid.s_addr != 0)
@@ -485,24 +491,30 @@ ospf_print(register const u_char *bp, register u_int length,
        if (vflag) {
                /* Print authentication data (should we really do this?) */
                TCHECK2(op->ospf_authdata[0], sizeof(op->ospf_authdata));
-               switch (ntohs(op->ospf_authtype)) {
+
+                printf(", Authentication Type: %s (%u)",
+                       tok2str(ospf_authtype_values,"unknown",EXTRACT_16BITS(&op->ospf_authtype)),
+                       EXTRACT_16BITS(&op->ospf_authtype));
+
+               switch (EXTRACT_16BITS(&op->ospf_authtype)) {
 
                case OSPF_AUTH_NONE:
                        break;
 
                case OSPF_AUTH_SIMPLE:
-                       printf(", simple Authentication \"");
                        (void)fn_printn(op->ospf_authdata,
                            sizeof(op->ospf_authdata), NULL);
                        printf("\"");
                        break;
 
                case OSPF_AUTH_MD5:
-                       printf(", MD5 Authentication");
+                        printf("\n\tKey-ID: %u, Auth-Length: %u, Crypto Sequence Number: 0x%08x",
+                               *((op->ospf_authdata)+2),
+                               *((op->ospf_authdata)+3),
+                               EXTRACT_32BITS((op->ospf_authdata)+4));
                        break;
 
                default:
-                       printf(", unknown Authentication Type %d", ntohs(op->ospf_authtype));
                        return;
                }
        }