More UNALIGNED_MEM{CPY,CMP} on IP addresses.

[tcpdump] / print-ospf.c

diff --git a/print-ospf.c b/print-ospf.c
index f8ff4aeac5b0d770ca4f72a99321e623b062f82d..23fb1ce0b310f71013603c1afb5b929b091188a6 100644 (file)
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -21,11 +21,6 @@
  * OSPF support contributed by Jeffrey Honig ([email protected])
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ospf.c,v 1.66 2007-10-08 07:53:21 hannes Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -43,7 +38,9 @@ static const char rcsid[] _U_ =
 
 #include "ip.h"
 
-static struct tok ospf_option_values[] = {
+static const char tstr[] = " [|ospf2]";
+
+static const struct tok ospf_option_values[] = {
         { OSPF_OPTION_T,       "MultiTopology" }, /* draft-ietf-ospf-mt-09 */
        { OSPF_OPTION_E,        "External" },
        { OSPF_OPTION_MC,       "Multicast" },
@@ -55,14 +52,14 @@ static struct tok ospf_option_values[] = {
        { 0,                    NULL }
 };
 
-static struct tok ospf_authtype_values[] = {
+static const struct tok ospf_authtype_values[] = {
        { OSPF_AUTH_NONE,       "none" },
        { OSPF_AUTH_SIMPLE,     "simple" },
        { OSPF_AUTH_MD5,        "MD5" },
        { 0,                    NULL }
 };
 
-static struct tok ospf_rla_flag_values[] = {
+static const struct tok ospf_rla_flag_values[] = {
        { RLA_FLAG_B,           "ABR" },
        { RLA_FLAG_E,           "ASBR" },
        { RLA_FLAG_W1,          "Virtual" },
@@ -70,7 +67,7 @@ static struct tok ospf_rla_flag_values[] = {
        { 0,                    NULL }
 };
 
-static struct tok type2str[] = {
+static const struct tok type2str[] = {
        { OSPF_TYPE_UMD,        "UMD" },
        { OSPF_TYPE_HELLO,      "Hello" },
        { OSPF_TYPE_DD,         "Database Description" },
@@ -80,7 +77,7 @@ static struct tok type2str[] = {
        { 0,                    NULL }
 };
 
-static struct tok lsa_values[] = {
+static const struct tok lsa_values[] = {
        { LS_TYPE_ROUTER,       "Router" },
        { LS_TYPE_NETWORK,      "Network" },
        { LS_TYPE_SUM_IP,       "Summary" },
@@ -94,7 +91,7 @@ static struct tok lsa_values[] = {
        { 0,                    NULL }
 };
 
-static struct tok ospf_dd_flag_values[] = {
+static const struct tok ospf_dd_flag_values[] = {
        { OSPF_DB_INIT,         "Init" },
        { OSPF_DB_MORE,         "More" },
        { OSPF_DB_MASTER,       "Master" },
@@ -102,20 +99,20 @@ static struct tok ospf_dd_flag_values[] = {
        { 0,                    NULL }
 };
 
-static struct tok lsa_opaque_values[] = {
+static const struct tok lsa_opaque_values[] = {
        { LS_OPAQUE_TYPE_TE,    "Traffic Engineering" },
        { LS_OPAQUE_TYPE_GRACE, "Graceful restart" },
        { LS_OPAQUE_TYPE_RI,    "Router Information" },
        { 0,                    NULL }
 };
 
-static struct tok lsa_opaque_te_tlv_values[] = {
+static const struct tok lsa_opaque_te_tlv_values[] = {
        { LS_OPAQUE_TE_TLV_ROUTER, "Router Address" },
        { LS_OPAQUE_TE_TLV_LINK,   "Link" },
        { 0,                    NULL }
 };
 
-static struct tok lsa_opaque_te_link_tlv_subtlv_values[] = {
+static const struct tok lsa_opaque_te_link_tlv_subtlv_values[] = {
        { LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE,            "Link Type" },
        { LS_OPAQUE_TE_LINK_SUBTLV_LINK_ID,              "Link ID" },
        { LS_OPAQUE_TE_LINK_SUBTLV_LOCAL_IP,             "Local Interface IP address" },
@@ -133,14 +130,14 @@ static struct tok lsa_opaque_te_link_tlv_subtlv_values[] = {
        { 0,                    NULL }
 };
 
-static struct tok lsa_opaque_grace_tlv_values[] = {
+static const struct tok lsa_opaque_grace_tlv_values[] = {
        { LS_OPAQUE_GRACE_TLV_PERIOD,             "Grace Period" },
        { LS_OPAQUE_GRACE_TLV_REASON,             "Graceful restart Reason" },
        { LS_OPAQUE_GRACE_TLV_INT_ADDRESS,        "IPv4 interface address" },
        { 0,                    NULL }
 };
 
-static struct tok lsa_opaque_grace_tlv_reason_values[] = {
+static const struct tok lsa_opaque_grace_tlv_reason_values[] = {
        { LS_OPAQUE_GRACE_TLV_REASON_UNKNOWN,     "Unknown" },
        { LS_OPAQUE_GRACE_TLV_REASON_SW_RESTART,  "Software Restart" },
        { LS_OPAQUE_GRACE_TLV_REASON_SW_UPGRADE,  "Software Reload/Upgrade" },
@@ -148,18 +145,18 @@ static struct tok lsa_opaque_grace_tlv_reason_values[] = {
        { 0,                    NULL }
 };
 
-static struct tok lsa_opaque_te_tlv_link_type_sub_tlv_values[] = {
+static const struct tok lsa_opaque_te_tlv_link_type_sub_tlv_values[] = {
        { LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE_PTP, "Point-to-point" },
        { LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE_MA,  "Multi-Access" },
        { 0,                    NULL }
 };
 
-static struct tok lsa_opaque_ri_tlv_values[] = {
+static const struct tok lsa_opaque_ri_tlv_values[] = {
        { LS_OPAQUE_RI_TLV_CAP, "Router Capabilities" },
        { 0,                    NULL }
 };
 
-static struct tok lsa_opaque_ri_tlv_cap_values[] = {
+static const struct tok lsa_opaque_ri_tlv_cap_values[] = {
        { 1, "Reserved" },
        { 2, "Reserved" },
        { 4, "Reserved" },
@@ -173,24 +170,18 @@ static struct tok lsa_opaque_ri_tlv_cap_values[] = {
        { 0,                    NULL }
 };
 
-static struct tok ospf_lls_tlv_values[] = {
+static const struct tok ospf_lls_tlv_values[] = {
        { OSPF_LLS_EO,  "Extended Options" },
        { OSPF_LLS_MD5, "MD5 Authentication" },
        { 0,    NULL }
 };
 
-static struct tok ospf_lls_eo_options[] = {
+static const struct tok ospf_lls_eo_options[] = {
        { OSPF_LLS_EO_LR,       "LSDB resync" },
        { OSPF_LLS_EO_RS,       "Restart" },
        { 0,    NULL }
 };
 
-static char tstr[] = " [|ospf2]";
-
-#ifdef WIN32
-#define inline __inline
-#endif /* WIN32 */
-
 static int ospf_print_lshdr(const struct lsa_hdr *);
 static const u_char *ospf_print_lsa(const struct lsa *);
 static int ospf_decode_v2(const struct ospfhdr *, const u_char *);
@@ -212,7 +203,7 @@ ospf_print_grace_lsa (const u_int8_t *tptr, u_int ls_length) {
         tlv_length = EXTRACT_16BITS(tptr+2);
         tptr+=4;
         ls_length-=4;
-                    
+
         printf("\n\t    %s TLV (%u), length %u, value: ",
                tok2str(lsa_opaque_grace_tlv_values,"unknown",tlv_type),
                tlv_type,
@@ -260,7 +251,7 @@ ospf_print_grace_lsa (const u_int8_t *tptr, u_int ls_length) {
 
         default:
             if (vflag <= 1) {
-                if(!print_unknown_data(tptr,"\n\t      ",tlv_length))
+                if(!print_unknown_data(gndo,tptr,"\n\t      ",tlv_length))
                     return -1;
             }
             break;
@@ -284,7 +275,7 @@ ospf_print_te_lsa (const u_int8_t *tptr, u_int ls_length) {
     u_int tlv_type, tlv_length, subtlv_type, subtlv_length;
     u_int priority_level, te_class, count_srlg;
     union { /* int to float conversion buffer for several subTLVs */
-        float f; 
+        float f;
         u_int32_t i;
     } bw;
 
@@ -298,7 +289,7 @@ ospf_print_te_lsa (const u_int8_t *tptr, u_int ls_length) {
         tlv_length = EXTRACT_16BITS(tptr+2);
         tptr+=4;
         ls_length-=4;
-                    
+
         printf("\n\t    %s TLV (%u), length: %u",
                tok2str(lsa_opaque_te_tlv_values,"unknown",tlv_type),
                tlv_type,
@@ -328,12 +319,12 @@ ospf_print_te_lsa (const u_int8_t *tptr, u_int ls_length) {
                 subtlv_length = EXTRACT_16BITS(tptr+2);
                 tptr+=4;
                 tlv_length-=4;
-                            
+
                 printf("\n\t      %s subTLV (%u), length: %u",
                        tok2str(lsa_opaque_te_link_tlv_subtlv_values,"unknown",subtlv_type),
                        subtlv_type,
                        subtlv_length);
-                            
+
                 TCHECK2(*tptr, subtlv_length);
                 switch(subtlv_type) {
                 case LS_OPAQUE_TE_LINK_SUBTLV_ADMIN_GROUP:
@@ -420,7 +411,7 @@ ospf_print_te_lsa (const u_int8_t *tptr, u_int ls_length) {
 
                 default:
                     if (vflag <= 1) {
-                        if(!print_unknown_data(tptr,"\n\t\t",subtlv_length))
+                        if(!print_unknown_data(gndo,tptr,"\n\t\t",subtlv_length))
                             return -1;
                     }
                     break;
@@ -428,13 +419,13 @@ ospf_print_te_lsa (const u_int8_t *tptr, u_int ls_length) {
                 /* in OSPF everything has to be 32-bit aligned, including subTLVs */
                 if (subtlv_length%4 != 0)
                     subtlv_length+=4-(subtlv_length%4);
-                            
+
                 tlv_length-=subtlv_length;
                 tptr+=subtlv_length;
-                            
+
             }
             break;
-                        
+
         case LS_OPAQUE_TE_TLV_ROUTER:
             if (tlv_length < 4) {
                 printf("\n\t    TLV length %u < 4", tlv_length);
@@ -443,10 +434,10 @@ ospf_print_te_lsa (const u_int8_t *tptr, u_int ls_length) {
             TCHECK2(*tptr, 4);
             printf(", %s", ipaddr_string(tptr));
             break;
-                        
+
         default:
             if (vflag <= 1) {
-                if(!print_unknown_data(tptr,"\n\t      ",tlv_length))
+                if(!print_unknown_data(gndo,tptr,"\n\t      ",tlv_length))
                     return -1;
             }
             break;
@@ -498,7 +489,7 @@ ospf_print_lshdr(register const struct lsa_hdr *lshp)
                           *(&lshp->un_lsa_id.opaque_field.opaque_type)),
                   *(&lshp->un_lsa_id.opaque_field.opaque_type),
                   EXTRACT_24BITS(&lshp->un_lsa_id.opaque_field.opaque_id)
-                   
+
                    );
             break;
 
@@ -520,7 +511,7 @@ trunc:
 }
 
 /* draft-ietf-ospf-mt-09 */
-static struct tok ospf_topology_values[] = {
+static const struct tok ospf_topology_values[] = {
     { 0, "default " },
     { 1, "multicast " },
     { 2, "management " },
@@ -542,7 +533,7 @@ ospf_print_tos_metrics(const union un_tos *tos)
     /*
      * All but the first metric contain a valid topology id.
      */
-    while (toscount) { 
+    while (toscount) {
         printf("\n\t\ttopology %s(%u), metric %u",
                tok2str(ospf_topology_values, "",
                        metric_count ? tos->metrics.tos_type : 0),
@@ -596,7 +587,7 @@ ospf_print_lsa(register const struct lsa *lsap)
                        case RLA_TYPE_VIRTUAL:
                                printf("\n\t      Virtual Link: Neighbor Router-ID: %s, Interface Address: %s",
                                    ipaddr_string(&rlp->link_id),
-                                   ipaddr_string(&rlp->link_data)); 
+                                   ipaddr_string(&rlp->link_data));
                                 break;
 
                        case RLA_TYPE_ROUTER:
@@ -743,7 +734,7 @@ ospf_print_lsa(register const struct lsa *lsap)
                break;
 
        case LS_TYPE_OPAQUE_LL: /* fall through */
-       case LS_TYPE_OPAQUE_AL: 
+       case LS_TYPE_OPAQUE_AL:
        case LS_TYPE_OPAQUE_DW:
 
            switch (*(&lsap->ls_hdr.un_lsa_id.opaque_field.opaque_type)) {
@@ -760,7 +751,7 @@ ospf_print_lsa(register const struct lsa *lsap)
                     tlv_length = EXTRACT_16BITS(tptr+2);
                     tptr+=4;
                     ls_length-=4;
-                    
+
                     printf("\n\t    %s TLV (%u), length: %u, value: ",
                            tok2str(lsa_opaque_ri_tlv_values,"unknown",tlv_type),
                            tlv_type,
@@ -784,7 +775,7 @@ ospf_print_lsa(register const struct lsa *lsap)
                         break;
                     default:
                         if (vflag <= 1) {
-                            if(!print_unknown_data(tptr,"\n\t      ",tlv_length))
+                            if(!print_unknown_data(gndo,tptr,"\n\t      ",tlv_length))
                                 return(ls_end);
                         }
                         break;
@@ -811,21 +802,21 @@ ospf_print_lsa(register const struct lsa *lsap)
 
             default:
                 if (vflag <= 1) {
-                    if(!print_unknown_data((u_int8_t *)lsap->lsa_un.un_unknown,
+                    if(!print_unknown_data(gndo,(u_int8_t *)lsap->lsa_un.un_unknown,
                                            "\n\t    ", ls_length))
                         return(ls_end);
-                } 
+                }
                 break;
             }
         }
 
         /* do we want to see an additionally hexdump ? */
         if (vflag> 1)
-            if(!print_unknown_data((u_int8_t *)lsap->lsa_un.un_unknown,
+            if(!print_unknown_data(gndo,(u_int8_t *)lsap->lsa_un.un_unknown,
                                    "\n\t    ", ls_length)) {
                 return(ls_end);
             }
-        
+
        return (ls_end);
 trunc:
        return (NULL);
@@ -1019,7 +1010,7 @@ ospf_decode_v2(register const struct ospfhdr *op,
                                ipaddr_string(&lsrp->un_ls_stateid.ls_stateid));
                         break;
                     }
-                    
+
                     ++lsrp;
                 }
                break;