Add changes in 4.2.1.

[tcpdump] / print-cfm.c

diff --git a/print-cfm.c b/print-cfm.c
index dc6c3e3e528f09ff5e107109db93833b9e86789b..fb0476f5584cf6497573413490d268db82786a26 100644 (file)
--- a/print-cfm.c
+++ b/print-cfm.c
@@ -19,7 +19,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-cfm.c,v 1.3 2006-10-29 23:10:07 hannes Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-cfm.c,v 1.5 2007-07-24 16:01:42 hannes Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -260,9 +260,11 @@ cfm_mgmt_addr_print(register const u_char *tptr) {
         printf(", %s", ipaddr_string(tptr + 1));
         break;
 
+#ifdef INET6
     case AFNUM_INET6:
         printf(", %s", ip6addr_string(tptr + 1));
         break;
+#endif
 
     default:
         hexdump = TRUE;
@@ -374,7 +376,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:
@@ -407,7 +409,7 @@ cfm_print(register const u_char *pptr, register u_int length) {
         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 */
@@ -421,6 +423,8 @@ cfm_print(register const u_char *pptr, register u_int length) {
         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));
 
@@ -435,6 +439,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));
 
@@ -580,7 +586,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: