Add program_name field in the netdissect_options structure

[tcpdump] / print-cfm.c

diff --git a/print-cfm.c b/print-cfm.c
index a4602369d39978f56e2532b433f9644a063c766a..5ec177a6ddebade8730c5d7b34074d51909260e4 100644 (file)
--- a/print-cfm.c
+++ b/print-cfm.c
@@ -17,7 +17,6 @@
  * Original code by Hannes Gredler ([email protected])
  */
 
  * Original code by Hannes Gredler ([email protected])
  */
 

-#define NETDISSECT_REWORKED

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


@@ -26,7 +25,7 @@
 
 #include <stdio.h>
 
 
 #include <stdio.h>
 

-#include "interface.h"
+#include "netdissect.h"

 #include "extract.h"
 #include "ether.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "ether.h"
 #include "addrtoname.h"


@@ -227,8 +226,8 @@ static const struct tok cfm_tlv_senderid_chassisid_values[] = {
 
 static int
 cfm_mgmt_addr_print(netdissect_options *ndo,
 
 static int
 cfm_mgmt_addr_print(netdissect_options *ndo,

-                    register const u_char *tptr) {
-
+                    register const u_char *tptr)
+{

     u_int mgmt_addr_type;
     u_int hexdump =  FALSE;
 
     u_int mgmt_addr_type;
     u_int hexdump =  FALSE;
 


@@ -268,7 +267,8 @@ cfm_mgmt_addr_print(netdissect_options *ndo,
  * The egress-ID string is a 16-Bit string plus a MAC address.
  */
 static const char *
  * The egress-ID string is a 16-Bit string plus a MAC address.
  */
 static const char *

-cfm_egress_id_string(netdissect_options *ndo, register const u_char *tptr) {
+cfm_egress_id_string(netdissect_options *ndo, register const u_char *tptr)
+{

     static char egress_id_buffer[80];
 
     snprintf(egress_id_buffer, sizeof(egress_id_buffer),
     static char egress_id_buffer[80];
 
     snprintf(egress_id_buffer, sizeof(egress_id_buffer),


@@ -281,8 +281,8 @@ cfm_egress_id_string(netdissect_options *ndo, register const u_char *tptr) {
 
 void
 cfm_print(netdissect_options *ndo,
 
 void
 cfm_print(netdissect_options *ndo,

-          register const u_char *pptr, register u_int length) {
-
+          register const u_char *pptr, register u_int length)
+{

     const struct cfm_common_header_t *cfm_common_header;
     const struct cfm_tlv_header_t *cfm_tlv_header;
     const uint8_t *tptr, *tlv_ptr, *ma_name, *ma_nameformat, *ma_namelength;
     const struct cfm_common_header_t *cfm_common_header;
     const struct cfm_tlv_header_t *cfm_tlv_header;
     const uint8_t *tptr, *tlv_ptr, *ma_name, *ma_nameformat, *ma_namelength;


@@ -371,7 +371,7 @@ cfm_print(netdissect_options *ndo,
                 break;
 
             case CFM_CCM_MD_FORMAT_MAC:
                 break;
 
             case CFM_CCM_MD_FORMAT_MAC:

-                ND_PRINT((ndo, "\n\t  MAC %s", etheraddr_string(ndo, 
+                ND_PRINT((ndo, "\n\t  MAC %s", etheraddr_string(ndo,

                            msg_ptr.cfm_ccm->md_name)));
                 break;
 
                            msg_ptr.cfm_ccm->md_name)));
                 break;