diff options
Diffstat (limited to 'epan/dissectors/packet-cpfi.c')
| -rw-r--r-- | epan/dissectors/packet-cpfi.c | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/epan/dissectors/packet-cpfi.c b/epan/dissectors/packet-cpfi.c index 5fd31316da..59f1a22f27 100644 --- a/epan/dissectors/packet-cpfi.c +++ b/epan/dissectors/packet-cpfi.c @@ -51,30 +51,30 @@ static guint gbl_cpfi_ttot_udp_port = CPFI_DEFAULT_TTOT_UDP_PORT; static gboolean cpfi_arrow_moves = TRUE; /* Initialize the protocol and registered fields */ -static int proto_cpfi = -1; -static int hf_cpfi_word_one = -1; -static int hf_cpfi_word_two = -1; +static int proto_cpfi; +static int hf_cpfi_word_one; +static int hf_cpfi_word_two; /* SOF word 1: */ -static int hf_cpfi_frame_type = -1; -static int hf_cpfi_source = -1; -static int hf_cpfi_dest = -1; -static int hf_cpfi_SOF_type = -1; -static int hf_cpfi_speed = -1; -static int hf_cpfi_OPM_error = -1; -static int hf_cpfi_from_LCM = -1; +static int hf_cpfi_frame_type; +static int hf_cpfi_source; +static int hf_cpfi_dest; +static int hf_cpfi_SOF_type; +static int hf_cpfi_speed; +static int hf_cpfi_OPM_error; +static int hf_cpfi_from_LCM; /* EOF */ -static int hf_cpfi_CRC_32 = -1; -static int hf_cpfi_EOF_type = -1; +static int hf_cpfi_CRC_32; +static int hf_cpfi_EOF_type; /* Hidden items */ -static int hf_cpfi_t_instance = -1; -static int hf_cpfi_t_src_instance = -1; -static int hf_cpfi_t_dst_instance = -1; -static int hf_cpfi_t_board = -1; -static int hf_cpfi_t_src_board = -1; -static int hf_cpfi_t_dst_board = -1; -static int hf_cpfi_t_port = -1; -static int hf_cpfi_t_src_port = -1; -static int hf_cpfi_t_dst_port = -1; +static int hf_cpfi_t_instance; +static int hf_cpfi_t_src_instance; +static int hf_cpfi_t_dst_instance; +static int hf_cpfi_t_board; +static int hf_cpfi_t_src_board; +static int hf_cpfi_t_dst_board; +static int hf_cpfi_t_port; +static int hf_cpfi_t_src_port; +static int hf_cpfi_t_dst_port; static char src_str[20]; static char dst_str[20]; @@ -87,10 +87,11 @@ static const char direction_and_port_string[] = "[%s %s %s] "; /* Initialize the subtree pointers */ -static gint ett_cpfi = -1; -static gint ett_cpfi_header = -1; -static gint ett_cpfi_footer = -1; +static gint ett_cpfi; +static gint ett_cpfi_header; +static gint ett_cpfi_footer; +static dissector_handle_t cpfi_handle; static dissector_handle_t fc_handle; @@ -181,7 +182,7 @@ dissect_cpfi_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) src_board = tda >> 4; src_port = tda & 0x0f; src = (1 << 24) + (src_instance << 16) + (src_board << 8) + src_port; - g_snprintf(src_str, sizeof(src_str), "%u.%u.%u", src_instance, src_board, src_port); + snprintf(src_str, sizeof(src_str), "%u.%u.%u", src_instance, src_board, src_port); } /* Figure out where the frame is going. srcTDA is destination of frame! */ @@ -203,7 +204,7 @@ dissect_cpfi_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dst_board = tda >> 4; dst_port = tda & 0x0f; dst = (1 << 24) + (dst_instance << 16) + (dst_board << 8) + dst_port; - g_snprintf(dst_str, sizeof(dst_str), "%u.%u.%u", dst_instance, dst_board, dst_port); + snprintf(dst_str, sizeof(dst_str), "%u.%u.%u", dst_instance, dst_board, dst_port); } /* Set up the source and destination and arrow per user configuration. */ @@ -506,19 +507,18 @@ proto_register_cpfi(void) " is always on the left.", &cpfi_arrow_moves); + cpfi_handle = register_dissector("cpfi", dissect_cpfi, proto_cpfi); } void proto_reg_handoff_cpfi(void) { static gboolean cpfi_init_complete = FALSE; - static dissector_handle_t cpfi_handle; static guint cpfi_ttot_udp_port; if ( !cpfi_init_complete ) { - fc_handle = find_dissector_add_dependency("fc", proto_cpfi); - cpfi_handle = create_dissector_handle(dissect_cpfi, proto_cpfi); + fc_handle = find_dissector_add_dependency("fc", proto_cpfi); dissector_add_uint_with_preference("udp.port", CPFI_DEFAULT_UDP_PORT, cpfi_handle); cpfi_init_complete = TRUE; } |