More UNALIGNED_MEM{CPY,CMP} on IP addresses.

[tcpdump] / print-cfm.c

diff --git a/print-cfm.c b/print-cfm.c
index 4b728782d19f116b0d1c5da426d48a67b21503c8..d36a50f1a3fad7163d8a4e27ca24bd356d90ec3c 100644 (file)
--- a/print-cfm.c
+++ b/print-cfm.c
@@ -17,11 +17,6 @@
  * Original code by Hannes Gredler ([email protected])
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-cfm.c,v 1.4 2007-02-01 02:28:38 guy Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -280,9 +275,9 @@ cfm_mgmt_addr_print(register const u_char *tptr) {
 const char *
 cfm_egress_id_string(register const u_char *tptr) {
     static char egress_id_buffer[80];
-    
+
     snprintf(egress_id_buffer, sizeof(egress_id_buffer),
-             "MAC %0x4x-%s",
+             "MAC 0x%4x-%s",
              EXTRACT_16BITS(tptr),
              etheraddr_string(tptr+2));
 
@@ -376,7 +371,7 @@ cfm_print(register const u_char *pptr, register u_int length) {
             switch (msg_ptr.cfm_ccm->md_nameformat) {
             case CFM_CCM_MD_FORMAT_DNS:
             case CFM_CCM_MD_FORMAT_CHAR:
-                safeputs(msg_ptr.cfm_ccm->md_name, msg_ptr.cfm_ccm->md_namelength);
+                safeputs((const char *)msg_ptr.cfm_ccm->md_name, msg_ptr.cfm_ccm->md_namelength);
                 break;
 
             case CFM_CCM_MD_FORMAT_MAC:
@@ -387,7 +382,7 @@ cfm_print(register const u_char *pptr, register u_int length) {
                 /* FIXME add printers for those MD formats - hexdump for now */
             case CFM_CCM_MA_FORMAT_8021:
             default:
-                print_unknown_data(msg_ptr.cfm_ccm->md_name, "\n\t    ",
+                print_unknown_data(gndo,msg_ptr.cfm_ccm->md_name, "\n\t    ",
                                    msg_ptr.cfm_ccm->md_namelength);
             }
         }
@@ -404,12 +399,12 @@ cfm_print(register const u_char *pptr, register u_int length) {
                tok2str(cfm_ma_nameformat_values, "Unknown",
                        *ma_nameformat),
                *ma_nameformat,
-               *ma_namelength);        
+               *ma_namelength);
 
         printf("\n\t  MA Name: ");
         switch (*ma_nameformat) {
         case CFM_CCM_MA_FORMAT_CHAR:
-            safeputs(ma_name, *ma_namelength);
+            safeputs((const char *)ma_name, *ma_namelength);
             break;
 
             /* FIXME add printers for those MA formats - hexdump for now */
@@ -418,11 +413,13 @@ cfm_print(register const u_char *pptr, register u_int length) {
         case CFM_CCM_MA_FORMAT_INT:
         case CFM_CCM_MA_FORMAT_VPN:
         default:
-            print_unknown_data(ma_name, "\n\t    ", *ma_namelength);
+            print_unknown_data(gndo,ma_name, "\n\t    ", *ma_namelength);
         }
         break;
 
     case CFM_OPCODE_LTM:
+        msg_ptr.cfm_ltm = (const struct cfm_ltm_t *)tptr;
+
         printf(", Flags [%s]",
                bittok2str(cfm_ltm_flag_values, "none",  cfm_common_header->flags));
 
@@ -437,6 +434,8 @@ cfm_print(register const u_char *pptr, register u_int length) {
         break;
 
     case CFM_OPCODE_LTR:
+        msg_ptr.cfm_ltr = (const struct cfm_ltr_t *)tptr;
+
         printf(", Flags [%s]",
                bittok2str(cfm_ltr_flag_values, "none",  cfm_common_header->flags));
 
@@ -463,7 +462,7 @@ cfm_print(register const u_char *pptr, register u_int length) {
     case CFM_OPCODE_LBM:
     default:
         if (tlen > cfm_common_header->first_tlv_offset) {
-            print_unknown_data(tptr, "\n\t  ",
+            print_unknown_data(gndo,tptr, "\n\t  ",
                                tlen -  cfm_common_header->first_tlv_offset);
         }
         break;
@@ -478,7 +477,7 @@ cfm_print(register const u_char *pptr, register u_int length) {
 
     tptr += cfm_common_header->first_tlv_offset;
     tlen -= cfm_common_header->first_tlv_offset;
-    
+
     while (tlen > 0) {
         cfm_tlv_header = (const struct cfm_tlv_header_t *)tptr;
 
@@ -488,7 +487,7 @@ cfm_print(register const u_char *pptr, register u_int length) {
 
         if (cfm_tlv_type != CFM_TLV_END) {
             /* did we capture enough for fully decoding the object header ? */
-            TCHECK2(*tptr, sizeof(struct cfm_tlv_header_t));            
+            TCHECK2(*tptr, sizeof(struct cfm_tlv_header_t));
             cfm_tlv_len=EXTRACT_16BITS(&cfm_tlv_header->length);
         } else {
             cfm_tlv_len = 0;
@@ -503,7 +502,7 @@ cfm_print(register const u_char *pptr, register u_int length) {
         if ((cfm_tlv_type != CFM_TLV_END) &&
             ((cfm_tlv_len + sizeof(struct cfm_tlv_header_t) > tlen) ||
              (!cfm_tlv_len))) {
-            print_unknown_data(tptr,"\n\t  ",tlen);
+            print_unknown_data(gndo,tptr,"\n\t  ",tlen);
             return;
         }
 
@@ -582,7 +581,7 @@ cfm_print(register const u_char *pptr, register u_int length) {
                 case CFM_CHASSIS_ID_LOCAL:
                 case CFM_CHASSIS_ID_CHASSIS_COMPONENT:
                 case CFM_CHASSIS_ID_PORT_COMPONENT:
-                    safeputs(tptr+1, chassis_id_length);
+                    safeputs((const char *)tptr+1, chassis_id_length);
                     break;
 
                 default:
@@ -630,7 +629,7 @@ cfm_print(register const u_char *pptr, register u_int length) {
         }
         /* do we want to see an additional hexdump ? */
         if (hexdump || vflag > 1)
-            print_unknown_data(tlv_ptr, "\n\t  ", cfm_tlv_len);
+            print_unknown_data(gndo,tlv_ptr, "\n\t  ", cfm_tlv_len);
 
         tptr+=cfm_tlv_len;
         tlen-=cfm_tlv_len;