From e6bd9d1a8c3b691f342bf7bc9b3ea668ec6a7a16 Mon Sep 17 00:00:00 2001 From: Bill Meier Date: Wed, 21 Sep 2011 18:55:03 +0000 Subject: [PATCH] Whitespace cleanup: Use consistent indentation; Convert "4 space tabs" to spaces; Remove trailing whitespace. svn path=/trunk/; revision=39082 --- epan/dissectors/packet-dnp.c | 62 +- epan/dissectors/packet-gtpv2.c | 18 +- epan/dissectors/packet-h223.c | 38 +- epan/dissectors/packet-hdfs.c | 1150 ++++++++-------- epan/dissectors/packet-iax2.c | 4 +- epan/dissectors/packet-ppi-vector.c | 2 +- epan/dissectors/packet-tcp.c | 16 +- epan/dissectors/packet-wifi-p2p.c | 6 +- epan/nstime.c | 32 +- epan/uat.c | 772 +++++------ file.c | 6 +- gtk/filter_dlg.c | 18 +- gtk/hostlist_table.c | 146 +- gtk/main_menubar.c | 1916 +++++++++++++-------------- gtk/menus.c | 724 +++++----- gtk/prefs_dlg.c | 36 +- gtk/proto_hier_stats_dlg.c | 142 +- 17 files changed, 2544 insertions(+), 2544 deletions(-) diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index 6b48192f5b..b961cbc690 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -469,10 +469,10 @@ /***************************************************************************/ /* File Objects */ -#define AL_OBJ_FILE_CMD 0x4603 /* 70 03 File Control - Command */ -#define AL_OBJ_FILE_STAT 0x4604 /* 70 04 File Control - Status */ -#define AL_OBJ_FILE_TRANS 0x4605 /* 70 05 File Control - Transport */ -#define AL_OBJ_FILE_TRAN_ST 0x4606 /* 70 05 File Control - Transport Status */ +#define AL_OBJ_FILE_CMD 0x4603 /* 70 03 File Control - Command */ +#define AL_OBJ_FILE_STAT 0x4604 /* 70 04 File Control - Status */ +#define AL_OBJ_FILE_TRANS 0x4605 /* 70 05 File Control - Transport */ +#define AL_OBJ_FILE_TRAN_ST 0x4606 /* 70 05 File Control - Transport Status */ /* File Control Mode flags */ #define AL_OBJ_FILE_MODE_NULL 0x00 /* NULL */ @@ -1032,9 +1032,9 @@ static GHashTable *dl_conversation_table = NULL; /* Data-Link-Layer Conversation Key Structure */ typedef struct _dl_conversation_key { - guint32 conversation; /* TCP / UDP conversation index */ - guint16 src; /* DNP3.0 Source Address */ - guint16 dst; /* DNP3.0 Destination Address */ + guint32 conversation; /* TCP / UDP conversation index */ + guint16 src; /* DNP3.0 Source Address */ + guint16 dst; /* DNP3.0 Destination Address */ } dl_conversation_key_t; /* Data-Link-Layer conversation key equality function */ @@ -1058,12 +1058,12 @@ dl_conversation_equal(gconstpointer v, gconstpointer w) static guint dl_conversation_hash(gconstpointer v) { - const dl_conversation_key_t *key = (const dl_conversation_key_t*)v; - guint val; + const dl_conversation_key_t *key = (const dl_conversation_key_t*)v; + guint val; - val = key->conversation + (key->src << 16) + key->dst; + val = key->conversation + (key->src << 16) + key->dst; - return val; + return val; } /* ************************************************************************* */ @@ -2165,7 +2165,7 @@ dnp3_al_process_object(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree switch (al_obj) { case AL_OBJ_AO_32: /* 32-Bit Analog Output Status (Obj:40, Var:01) */ - case AL_OBJ_AOC_32NT: /* 32-Bit Analog Output Event w/o Time (Obj:42, Var:01) */ + case AL_OBJ_AOC_32NT: /* 32-Bit Analog Output Event w/o Time (Obj:42, Var:01) */ case AL_OBJ_AOC_32T: /* 32-Bit Analog Output Event with Time (Obj:42, Var:03) */ al_val32 = tvb_get_letohl(tvb, data_pos); @@ -2175,8 +2175,8 @@ dnp3_al_process_object(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree break; case AL_OBJ_AO_16: /* 16-Bit Analog Output Status (Obj:40, Var:02) */ - case AL_OBJ_AOC_16NT: /* 16-Bit Analog Output Event w/o Time (Obj:42, Var:02) */ - case AL_OBJ_AOC_16T: /* 16-Bit Analog Output Event with Time (Obj:42, Var:04) */ + case AL_OBJ_AOC_16NT: /* 16-Bit Analog Output Event w/o Time (Obj:42, Var:02) */ + case AL_OBJ_AOC_16T: /* 16-Bit Analog Output Event with Time (Obj:42, Var:04) */ al_val16 = tvb_get_letohs(tvb, data_pos); proto_item_append_text(point_item, ", Value: %u", al_val16); @@ -2185,8 +2185,8 @@ dnp3_al_process_object(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree break; case AL_OBJ_AO_FLT: /* 32-Bit Floating Point Output Status (Obj:40, Var:03) */ - case AL_OBJ_AOC_FLTNT: /* 32-Bit Floating Point Output Event w/o Time (Obj:42, Var:05) */ - case AL_OBJ_AOC_FLTT: /* 32-Bit Floating Point Output Event w/ Time (Obj:42, Var:07) */ + case AL_OBJ_AOC_FLTNT: /* 32-Bit Floating Point Output Event w/o Time (Obj:42, Var:05) */ + case AL_OBJ_AOC_FLTT: /* 32-Bit Floating Point Output Event w/ Time (Obj:42, Var:07) */ al_valflt = tvb_get_letohieee_float(tvb, data_pos); proto_item_append_text(point_item, ", Value: %g", al_valflt); @@ -2195,8 +2195,8 @@ dnp3_al_process_object(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree break; case AL_OBJ_AO_DBL: /* 64-Bit Floating Point Output Status (Obj:40, Var:04) */ - case AL_OBJ_AOC_DBLNT: /* 64-Bit Floating Point Output Event w/o Time (Obj:42, Var:06) */ - case AL_OBJ_AOC_DBLT: /* 64-Bit Floating Point Output Event w/ Time (Obj:42, Var:08) */ + case AL_OBJ_AOC_DBLNT: /* 64-Bit Floating Point Output Event w/o Time (Obj:42, Var:06) */ + case AL_OBJ_AOC_DBLT: /* 64-Bit Floating Point Output Event w/ Time (Obj:42, Var:08) */ al_valdbl = tvb_get_letohieee_double(tvb, data_pos); proto_item_append_text(point_item, ", Value: %g", al_valdbl); @@ -2391,7 +2391,7 @@ dnp3_al_process_object(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree offset = data_pos; break; - case AL_OBJ_FILE_TRAN_ST: /* File Control Tansport Status (Obj:70, Var:06) */ + case AL_OBJ_FILE_TRAN_ST: /* File Control Tansport Status (Obj:70, Var:06) */ /* File Handle */ proto_tree_add_item(point_tree, hf_dnp3_al_file_handle, tvb, data_pos, 4, ENC_LITTLE_ENDIAN); @@ -2416,7 +2416,7 @@ dnp3_al_process_object(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree proto_item_set_len(point_item, data_pos - offset); offset = data_pos; - break; + break; case AL_OBJ_IIN: /* IIN Data Object */ @@ -2656,9 +2656,9 @@ dissect_dnp3_al(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; - case AL_FUNC_OPENFILE: /* Open File Function Code 0x19 */ - case AL_FUNC_CLOSEFILE: /* Close File Function Code 0x1A */ - case AL_FUNC_DELETEFILE: /* Delete File Function Code 0x1B */ + case AL_FUNC_OPENFILE: /* Open File Function Code 0x19 */ + case AL_FUNC_CLOSEFILE: /* Close File Function Code 0x1A */ + case AL_FUNC_DELETEFILE: /* Delete File Function Code 0x1B */ /* Create File Data Objects Tree */ t_robj = proto_tree_add_text(al_tree, tvb, offset, -1, "File Data Objects"); @@ -2941,11 +2941,11 @@ dissect_dnp3_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Look up the conversation to get the fragment reassembly id */ conversation = find_or_create_conversation(pinfo); - /* - * The TCP/UDP conversation is not sufficient to identify a conversation - * on a multi-drop DNP network. Lookup conversation data based on TCP/UDP - * conversation and the DNP src and dst addresses - */ + /* + * The TCP/UDP conversation is not sufficient to identify a conversation + * on a multi-drop DNP network. Lookup conversation data based on TCP/UDP + * conversation and the DNP src and dst addresses + */ dl_conversation_key.conversation = conversation->index; dl_conversation_key.src = dl_src; @@ -2958,14 +2958,14 @@ dissect_dnp3_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dl_conversation_key_t* new_dl_conversation_key = NULL; new_dl_conversation_key = se_alloc(sizeof(dl_conversation_key_t)); *new_dl_conversation_key = dl_conversation_key; - + conv_data_ptr = se_alloc(sizeof(dnp3_conv_t)); - + /*** Increment static global fragment reassembly id ***/ conv_data_ptr->conv_seq_number = seq_number++; g_hash_table_insert(dl_conversation_table, new_dl_conversation_key, conv_data_ptr); - } + } conv_seq_number = conv_data_ptr->conv_seq_number; diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index 91d045c116..e2b71bd392 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -1853,22 +1853,22 @@ dissect_diameter_3gpp_uli(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) length = tvb_length(tvb); flags_3gpp = tvb_get_guint8(tvb,offset); - proto_tree_add_item(tree, hf_gtpv2_glt, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_gtpv2_glt, tvb, offset, 1, ENC_BIG_ENDIAN); switch(flags_3gpp) { - case 0: + case 0: /* CGI */ flags = GTPv2_ULI_CGI_MASK; - break; - case 1: + break; + case 1: /* SAI */ flags = GTPv2_ULI_SAI_MASK; - break; - case 2: + break; + case 2: /* RAI */ flags = GTPv2_ULI_RAI_MASK; - break; + break; case 128: /* TAI */ flags = GTPv2_ULI_TAI_MASK; @@ -1882,7 +1882,7 @@ dissect_diameter_3gpp_uli(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) flags = GTPv2_ULI_TAI_MASK + GTPv2_ULI_ECGI_MASK; break; default: - proto_tree_add_text(tree, tvb, 1, -1, "Geographic Location"); + proto_tree_add_text(tree, tvb, 1, -1, "Geographic Location"); return length; } @@ -4626,7 +4626,7 @@ void proto_register_gtpv2(void) FT_BOOLEAN, 8, NULL, GTPv2_ULI_CGI_MASK, NULL, HFILL} }, - { &hf_gtpv2_glt, + { &hf_gtpv2_glt, {"Geographic Location Type", "gtpv2.glt", FT_UINT8, BASE_DEC, VALS(geographic_location_type_vals), 0x0, NULL, HFILL} diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c index 7fa16f888b..6ded1dc05e 100644 --- a/epan/dissectors/packet-h223.c +++ b/epan/dissectors/packet-h223.c @@ -635,7 +635,7 @@ static guint8 h223_al2_crc8bit( tvbuff_t *tvb ) { static void dissect_mux_al_pdu( tvbuff_t *tvb, packet_info *pinfo, proto_tree *vc_tree, /* circuit_t* vc_circuit, */ - h223_lc_params* lc_params ) + h223_lc_params* lc_params ) { proto_tree *al_tree = NULL; proto_item *al_item, *hidden_item; @@ -739,9 +739,9 @@ dissect_mux_al_pdu( tvbuff_t *tvb, packet_info *pinfo, proto_tree *vc_tree, */ static void dissect_mux_sdu_fragment(tvbuff_t *volatile next_tvb, packet_info *pinfo, - guint32 pkt_offset, proto_tree *pdu_tree, - h223_call_info* call_info, guint16 vc, - gboolean end_of_mux_sdu) + guint32 pkt_offset, proto_tree *pdu_tree, + h223_call_info* call_info, guint16 vc, + gboolean end_of_mux_sdu) { /* update the circuit details before passing to a subdissector */ guint32 orig_circuit = pinfo->circuit_id; @@ -856,10 +856,10 @@ mux_element_sublist_size( h223_mux_element* me ) */ static guint32 dissect_mux_payload_by_me_list( tvbuff_t *tvb, packet_info *pinfo, - guint32 pkt_offset, proto_tree *pdu_tree, - h223_call_info* call_info, - h223_mux_element *me, guint32 offset, - gboolean endOfMuxSdu ) + guint32 pkt_offset, proto_tree *pdu_tree, + h223_call_info* call_info, + h223_mux_element *me, guint32 offset, + gboolean endOfMuxSdu ) { guint32 len = tvb_reported_length(tvb); guint32 frag_len; @@ -909,8 +909,8 @@ dissect_mux_payload_by_me_list( tvbuff_t *tvb, packet_info *pinfo, */ static void dissect_mux_payload( tvbuff_t *tvb, packet_info *pinfo, guint32 pkt_offset, - proto_tree *pdu_tree, h223_call_info *call_info, - guint8 mc, gboolean endOfMuxSdu ) + proto_tree *pdu_tree, h223_call_info *call_info, + guint8 mc, gboolean endOfMuxSdu ) { guint32 len = tvb_reported_length(tvb); @@ -944,7 +944,7 @@ dissect_mux_payload( tvbuff_t *tvb, packet_info *pinfo, guint32 pkt_offset, */ static void dissect_mux_pdu( tvbuff_t *tvb, packet_info *pinfo, guint32 pkt_offset, - proto_tree *h223_tree, h223_call_info *call_info) + proto_tree *h223_tree, h223_call_info *call_info) { guint32 offset = 0; /* actual (as opposed to reported) payload len */ @@ -1188,8 +1188,8 @@ h223_mux_check_hdlc(int h223_level, guint32 nbytes, guint32 tail_buf) static gint dissect_mux_pdu_fragment( tvbuff_t *tvb, guint32 start_offset, - packet_info *pinfo, proto_tree *h223_tree, - h223_call_info *call_info) + packet_info *pinfo, proto_tree *h223_tree, + h223_call_info *call_info) { tvbuff_t *volatile next_tvb; volatile guint32 offset = start_offset; @@ -1265,16 +1265,16 @@ dissect_mux_pdu_fragment( tvbuff_t *tvb, guint32 start_offset, } CATCH2(BoundsError,ReportedBoundsError) { - /* Restore the private_data structure in case one of the - * called dissectors modified it (and, due to the exception, - * was unable to restore it). - */ - pinfo->private_data = pd_save; + /* Restore the private_data structure in case one of the + * called dissectors modified it (and, due to the exception, + * was unable to restore it). + */ + pinfo->private_data = pd_save; col_append_str(pinfo->cinfo, COL_INFO, "[Malformed Packet]"); proto_tree_add_protocol_format(h223_tree, proto_malformed, tvb, 0, 0, "[Malformed Packet: %s]", - pinfo->current_proto); + pinfo->current_proto); } ENDTRY; diff --git a/epan/dissectors/packet-hdfs.c b/epan/dissectors/packet-hdfs.c index d062e4b19c..a050a5c739 100644 --- a/epan/dissectors/packet-hdfs.c +++ b/epan/dissectors/packet-hdfs.c @@ -80,7 +80,7 @@ static int hf_hdfs_rest = -1; static int hf_hdfs_fileperm = -1; static int hf_hdfs_blockloc = -1; static int hf_hdfs_endblockloc = -1; -static int hf_hdfs_blockgen = -1; +static int hf_hdfs_blockgen = -1; static int hf_hdfs_prover = -1; static int hf_hdfs_objname = -1; static int hf_hdfs_filename = -1; @@ -131,101 +131,101 @@ void proto_reg_handoff_hdfs(void); static void dissect_params (tvbuff_t *tvb, proto_tree *hdfs_tree, guint offset, int params) { - guint length; - int i = 0; - const guint8* type_name; - for (i = 0; i < params; i++) { + guint length; + int i = 0; + const guint8* type_name; + for (i = 0; i < params; i++) { - /* get length that we just dissected */ - length = tvb_get_ntohs(tvb, offset); + /* get length that we just dissected */ + length = tvb_get_ntohs(tvb, offset); - /* 2 bytes = parameter type length */ - proto_tree_add_item(hdfs_tree, hf_hdfs_namelentwo, tvb, offset, 2, ENC_BIG_ENDIAN); - offset += 2; + /* 2 bytes = parameter type length */ + proto_tree_add_item(hdfs_tree, hf_hdfs_namelentwo, tvb, offset, 2, ENC_BIG_ENDIAN); + offset += 2; - /* length bytes = parameter type */ - proto_tree_add_item(hdfs_tree, hf_hdfs_paramtype, tvb, offset, length, ENC_BIG_ENDIAN); - offset += length; + /* length bytes = parameter type */ + proto_tree_add_item(hdfs_tree, hf_hdfs_paramtype, tvb, offset, length, ENC_BIG_ENDIAN); + offset += length; - if (offset >= length && (!tvb_memeql(tvb, offset - length, "long", length) || !tvb_memeql(tvb, offset - length, "int", length) || - !tvb_memeql(tvb, offset - length, "short", length) || !tvb_memeql(tvb, offset - length, "char", length) || - !tvb_memeql(tvb, offset - length, "byte", length) || !tvb_memeql(tvb, offset - length, "float", length) - || !tvb_memeql(tvb, offset - length, "double", length) || !tvb_memeql(tvb, offset - length, "boolean", length))) { + if (offset >= length && (!tvb_memeql(tvb, offset - length, "long", length) || !tvb_memeql(tvb, offset - length, "int", length) || + !tvb_memeql(tvb, offset - length, "short", length) || !tvb_memeql(tvb, offset - length, "char", length) || + !tvb_memeql(tvb, offset - length, "byte", length) || !tvb_memeql(tvb, offset - length, "float", length) + || !tvb_memeql(tvb, offset - length, "double", length) || !tvb_memeql(tvb, offset - length, "boolean", length))) { if (!tvb_memeql(tvb, offset - length, "boolean", length)) { length = 1; } else if (!tvb_memeql(tvb, offset - length, "short", length)) { length = 2; } else { - length = sizeof(type_name); + length = sizeof(type_name); } - - proto_tree_add_item(hdfs_tree, hf_hdfs_paramvalnum, tvb, offset, length, ENC_BIG_ENDIAN); - offset += length; - } else { - /* get length */ - length = tvb_get_ntohs(tvb, offset); + proto_tree_add_item(hdfs_tree, hf_hdfs_paramvalnum, tvb, offset, length, ENC_BIG_ENDIAN); + offset += length; - /* 2 bytes = parameter value length */ - proto_tree_add_item(hdfs_tree, hf_hdfs_namelentwo, tvb, offset, 2, ENC_BIG_ENDIAN); - offset += 2; + } else { + /* get length */ + length = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(hdfs_tree, hf_hdfs_paramval, tvb, offset, length, ENC_BIG_ENDIAN); - offset += length; - - if (!tvb_memeql(tvb, offset - length, "org.apache.hadoop.fs.permission.FsPermission", length)) { - proto_tree_add_item(hdfs_tree, hf_hdfs_fileperm, tvb, offset, 2, ENC_BIG_ENDIAN); - offset += 2; - } - } - } + /* 2 bytes = parameter value length */ + proto_tree_add_item(hdfs_tree, hf_hdfs_namelentwo, tvb, offset, 2, ENC_BIG_ENDIAN); + offset += 2; + + proto_tree_add_item(hdfs_tree, hf_hdfs_paramval, tvb, offset, length, ENC_BIG_ENDIAN); + offset += length; + + if (!tvb_memeql(tvb, offset - length, "org.apache.hadoop.fs.permission.FsPermission", length)) { + proto_tree_add_item(hdfs_tree, hf_hdfs_fileperm, tvb, offset, 2, ENC_BIG_ENDIAN); + offset += 2; + } + } + } } /* Dissects a data packet of the form: - method name length : 2B - method name : above value - number of parameters : 4B + method name length : 2B + method name : above value + number of parameters : 4B -- list of parameters the length of above -- - parameter type length : 2B - parameter type : above value + parameter type length : 2B + parameter type : above value -- if the type is variable size -- - parameter value length : 2B - parameter value : above value + parameter value length : 2B + parameter value : above value -- otherwise -- - parameter value : length of the type */ + parameter value : length of the type */ static void dissect_data (tvbuff_t *tvb, proto_tree *hdfs_tree, guint offset) { - int params = 0; - guint length = 0; + int params = 0; + guint length = 0; - /* get length */ - length = tvb_get_ntohs(tvb, offset); + /* get length */ + length = tvb_get_ntohs(tvb, offset); - /* method name length = 2 B */ - proto_tree_add_item(hdfs_tree, hf_hdfs_namelentwo, tvb, offset, 2, ENC_BIG_ENDIAN); - offset += 2; + /* method name length = 2 B */ + proto_tree_add_item(hdfs_tree, hf_hdfs_namelentwo, tvb, offset, 2, ENC_BIG_ENDIAN); + offset += 2; - /* length bytes = method name */ - proto_tree_add_item(hdfs_tree, hf_hdfs_strcall, tvb, offset, length, ENC_BIG_ENDIAN); - offset += length; + /* length bytes = method name */ + proto_tree_add_item(hdfs_tree, hf_hdfs_strcall, tvb, offset, length, ENC_BIG_ENDIAN); + offset += length; - /* we only want to parse the packet if it is not a heartbeat (random looking numbers are the decimal - representation of sendHeartbeat */ - if (!(tvb_get_ntohl(tvb, offset - SEND_OFFSET) == SEND_DEC && tvb_get_ntohl(tvb, offset - HEAR_OFFSET) == HEAR_DEC && - tvb_get_ntohl(tvb, offset - TBEA_OFFSET) == TBEA_DEC && tvb_get_guint8(tvb, offset - T_OFFSET) == T_DEC)) { + /* we only want to parse the packet if it is not a heartbeat (random looking numbers are the decimal + representation of sendHeartbeat */ + if (!(tvb_get_ntohl(tvb, offset - SEND_OFFSET) == SEND_DEC && tvb_get_ntohl(tvb, offset - HEAR_OFFSET) == HEAR_DEC && + tvb_get_ntohl(tvb, offset - TBEA_OFFSET) == TBEA_DEC && tvb_get_guint8(tvb, offset - T_OFFSET) == T_DEC)) { - /* get number of params */ - params = tvb_get_ntohl(tvb, offset); + /* get number of params */ + params = tvb_get_ntohl(tvb, offset); - /* 4 bytes = # of parameters */ - proto_tree_add_item(hdfs_tree, hf_hdfs_params, tvb, offset, 4, ENC_BIG_ENDIAN); - offset += 4; + /* 4 bytes = # of parameters */ + proto_tree_add_item(hdfs_tree, hf_hdfs_params, tvb, offset, 4, ENC_BIG_ENDIAN); + offset += 4; - /* go through all params and dissect their type length, type, value length and value */ - dissect_params (tvb, hdfs_tree, offset, params); - } + /* go through all params and dissect their type length, type, value length and value */ + dissect_params (tvb, hdfs_tree, offset, params); + } } /* @@ -244,7 +244,7 @@ dissect_resp_long (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) { /* length bytes = parameter type */ proto_tree_add_item(hdfs_tree, hf_hdfs_paramtype, tvb, offset, length, ENC_BIG_ENDIAN); offset += length; - + /* the value */ proto_tree_add_item(hdfs_tree, hf_hdfs_prover, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; @@ -260,8 +260,8 @@ dissect_resp_filestatus (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) { /* file status */ proto_tree_add_item(hdfs_tree, hf_hdfs_fileperm, tvb, offset, 2, ENC_BIG_ENDIAN); - offset += 2; - + offset += 2; + /* get length */ length = tvb_get_ntohs(tvb, offset); @@ -271,25 +271,25 @@ dissect_resp_filestatus (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) { /* file name */ proto_tree_add_item(hdfs_tree, hf_hdfs_filename, tvb, offset, length, ENC_BIG_ENDIAN); - offset += length; - + offset += length; + /* 8 file size / end location */ proto_tree_add_item(hdfs_tree, hf_hdfs_endblockloc, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - + /* is directory */ proto_tree_add_item(hdfs_tree, hf_hdfs_isdir, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - + /* block replication factor */ proto_tree_add_item(hdfs_tree, hf_hdfs_blockrep, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - + /* block size */ proto_tree_add_item(hdfs_tree, hf_hdfs_blocksize, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - + /* modified time */ proto_tree_add_item(hdfs_tree, hf_hdfs_modtime, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; @@ -301,7 +301,7 @@ dissect_resp_filestatus (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) { /* 2 of file permissions */ proto_tree_add_item(hdfs_tree, hf_hdfs_fileperm, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - + /* get length */ length = tvb_get_guint8 (tvb, offset); @@ -313,7 +313,7 @@ dissect_resp_filestatus (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) { /* owner name */ proto_tree_add_item(hdfs_tree, hf_hdfs_ownername, tvb, offset, length, ENC_BIG_ENDIAN); offset += length; - + /* get length */ length = tvb_get_guint8 (tvb, offset); @@ -333,60 +333,60 @@ parses the sent back information about each blcok */ static int dissect_block_info (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) { - + int length; - + length = tvb_get_guint8(tvb, offset); - + /* identifier length */ proto_tree_add_item(hdfs_tree, hf_hdfs_namelenone, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - + /* identifier */ proto_tree_add_item(hdfs_tree, hf_hdfs_identifier, tvb, offset, length, ENC_BIG_ENDIAN); offset += length; - + length = tvb_get_guint8(tvb, offset); - + /* password length */ proto_tree_add_item(hdfs_tree, hf_hdfs_namelenone, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - + /* password */ proto_tree_add_item(hdfs_tree, hf_hdfs_password, tvb, offset, length, ENC_BIG_ENDIAN); offset += length; - + length = tvb_get_guint8(tvb, offset); - + /* kind length */ proto_tree_add_item(hdfs_tree, hf_hdfs_namelenone, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - + /* kind */ proto_tree_add_item(hdfs_tree, hf_hdfs_kind, tvb, offset, length, ENC_BIG_ENDIAN); offset += length; - + length = tvb_get_guint8(tvb, offset); - + /* service length */ proto_tree_add_item(hdfs_tree, hf_hdfs_namelenone, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - + /* service */ proto_tree_add_item(hdfs_tree, hf_hdfs_service, tvb, offset, length, ENC_BIG_ENDIAN); offset += length; - + /* corrupt */ proto_tree_add_item(hdfs_tree, hf_hdfs_corrupt, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - + /* offset */ proto_tree_add_item(hdfs_tree, hf_hdfs_offset, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - - + + /* block info section */ - + /* block location */ proto_tree_add_item(hdfs_tree, hf_hdfs_blockloc, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; @@ -394,11 +394,11 @@ dissect_block_info (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) { /* block size */ proto_tree_add_item(hdfs_tree, hf_hdfs_blocksize, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - + /* gen id 8 */ proto_tree_add_item(hdfs_tree, hf_hdfs_blockgen, tvb, offset, 8, ENC_BIG_ENDIAN); - offset += 8; - + offset += 8; + /* locations */ proto_tree_add_item(hdfs_tree, hf_hdfs_locations, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -416,9 +416,9 @@ dissect_block_info (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) { /* datanode id */ proto_tree_add_item(hdfs_tree, hf_hdfs_datanodeid, tvb, offset, length, ENC_BIG_ENDIAN); offset += length; - + length = tvb_get_ntohs(tvb, offset); - + /* length of addr */ proto_tree_add_item(hdfs_tree, hf_hdfs_namelentwo, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; @@ -426,11 +426,11 @@ dissect_block_info (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) { /* storageid */ proto_tree_add_item(hdfs_tree, hf_hdfs_storageid, tvb, offset, length, ENC_BIG_ENDIAN); offset += length; - + /* info port */ proto_tree_add_item(hdfs_tree, hf_hdfs_infoport, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - + /* default name node port */ proto_tree_add_item(hdfs_tree, hf_hdfs_ipcport, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -439,79 +439,79 @@ dissect_block_info (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) { /* capacity */ proto_tree_add_item(hdfs_tree, hf_hdfs_capacity, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - + /* dfs used */ proto_tree_add_item(hdfs_tree, hf_hdfs_dfsused, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - + /* remaining */ proto_tree_add_item(hdfs_tree, hf_hdfs_remaining, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - + /* last update */ proto_tree_add_item(hdfs_tree, hf_hdfs_lastupdate, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - + /* num active connections */ proto_tree_add_item(hdfs_tree, hf_hdfs_activecon, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - - + + length = tvb_get_guint8(tvb, offset); - + /* location rack length */ proto_tree_add_item(hdfs_tree, hf_hdfs_namelenone, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - + /* location rack */ proto_tree_add_item(hdfs_tree, hf_hdfs_rackloc, tvb, offset, length, ENC_BIG_ENDIAN); offset += length; - + length = tvb_get_guint8(tvb, offset); - + /* hostname length */ proto_tree_add_item(hdfs_tree, hf_hdfs_namelenone, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - + /* hostname */ proto_tree_add_item(hdfs_tree, hf_hdfs_hostname, tvb, offset, length, ENC_BIG_ENDIAN); offset += length; - + length = tvb_get_guint8(tvb, offset); - + /* admin state length */ proto_tree_add_item(hdfs_tree, hf_hdfs_namelenone, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - + /* admin state */ proto_tree_add_item(hdfs_tree, hf_hdfs_adminstate, tvb, offset, length, ENC_BIG_ENDIAN); offset += length; - + return offset; } -/* -dissects the response from get block info. +/* +dissects the response from get block info. */ static void dissect_resp_locatedblocks (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) { - - + + /* file length = 8 */ proto_tree_add_item(hdfs_tree, hf_hdfs_filelen, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - + /* under construction = 1 */ proto_tree_add_item(hdfs_tree, hf_hdfs_construct, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - + /* number of blocks */ proto_tree_add_item(hdfs_tree, hf_hdfs_blockcount, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - + /* dissect info for each block */ while (tvb_reported_length(tvb) - offset > 0) { offset = dissect_block_info (tvb, hdfs_tree, offset); @@ -523,143 +523,143 @@ dissect_resp_locatedblocks (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) { static void dissect_hdfs_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset = 0; - int success = 0; - guint length = 0; + guint offset = 0; + int success = 0; + guint length = 0; - col_set_str(pinfo->cinfo, COL_PROTOCOL, "HDFS"); - /* Clear out stuff in the info column */ - col_clear(pinfo->cinfo,COL_INFO); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "HDFS"); + /* Clear out stuff in the info column */ + col_clear(pinfo->cinfo,COL_INFO); - if (tree) { + if (tree) { - proto_item *ti = NULL; - proto_tree *hdfs_tree = NULL; + proto_item *ti = NULL; + proto_tree *hdfs_tree = NULL; - ti = proto_tree_add_item(tree, proto_hdfs, tvb, 0, -1, ENC_BIG_ENDIAN); - hdfs_tree = proto_item_add_subtree(ti, ett_hdfs); + ti = proto_tree_add_item(tree, proto_hdfs, tvb, 0, -1, ENC_BIG_ENDIAN); + hdfs_tree = proto_item_add_subtree(ti, ett_hdfs); - /* Response */ - if (pinfo->srcport == NAMENODE_PORT) { - /* 4 bytes = sequence number */ - proto_tree_add_item(hdfs_tree, hf_hdfs_packetno, tvb, offset, 4, ENC_BIG_ENDIAN); - offset += 4; + /* Response */ + if (pinfo->srcport == NAMENODE_PORT) { + /* 4 bytes = sequence number */ + proto_tree_add_item(hdfs_tree, hf_hdfs_packetno, tvb, offset, 4, ENC_BIG_ENDIAN); + offset += 4; - /* 4 bytes = status -> 0000 = success, 0001 = error, ffff = fatal */ - success = tvb_get_ntohl(tvb, offset); - proto_tree_add_item(hdfs_tree, hf_hdfs_success, tvb, offset, 4, ENC_BIG_ENDIAN); - offset += 4; + /* 4 bytes = status -> 0000 = success, 0001 = error, ffff = fatal */ + success = tvb_get_ntohl(tvb, offset); + proto_tree_add_item(hdfs_tree, hf_hdfs_success, tvb, offset, 4, ENC_BIG_ENDIAN); + offset += 4; - if (success != 0) { - return; - } - - if (!tvb_memeql(tvb, offset + 2, "long", 4)) { - dissect_resp_long (tvb, hdfs_tree, offset); - - } else { - - /* name length = 2 B */ - length = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(hdfs_tree, hf_hdfs_namelentwo, tvb, offset, 2, ENC_BIG_ENDIAN); - offset += 2; + if (success != 0) { + return; + } - /* length bytes = method name */ - proto_tree_add_item(hdfs_tree, hf_hdfs_objname, tvb, offset, length, ENC_BIG_ENDIAN); - offset += length; + if (!tvb_memeql(tvb, offset + 2, "long", 4)) { + dissect_resp_long (tvb, hdfs_tree, offset); + + } else { + + /* name length = 2 B */ + length = tvb_get_ntohs(tvb, offset); + proto_tree_add_item(hdfs_tree, hf_hdfs_namelentwo, tvb, offset, 2, ENC_BIG_ENDIAN); + offset += 2; + + /* length bytes = method name */ + proto_tree_add_item(hdfs_tree, hf_hdfs_objname, tvb, offset, length, ENC_BIG_ENDIAN); + offset += length; /* get length that we just dissected */ - length = tvb_get_ntohs(tvb, offset); + length = tvb_get_ntohs(tvb, offset); - /* 2 bytes = objects length */ - proto_tree_add_item(hdfs_tree, hf_hdfs_namelentwo, tvb, offset, 2, ENC_BIG_ENDIAN); - offset += 2; + /* 2 bytes = objects length */ + proto_tree_add_item(hdfs_tree, hf_hdfs_namelentwo, tvb, offset, 2, ENC_BIG_ENDIAN); + offset += 2; - /* length bytes = object name */ - proto_tree_add_item(hdfs_tree, hf_hdfs_objname, tvb, offset, length, ENC_BIG_ENDIAN); - offset += length; - - /* responses about block location info */ - if (!tvb_memeql(tvb, offset - length, "org.apache.hadoop.hdfs.protocol.LocatedBlocks", length)) { + /* length bytes = object name */ + proto_tree_add_item(hdfs_tree, hf_hdfs_objname, tvb, offset, length, ENC_BIG_ENDIAN); + offset += length; + + /* responses about block location info */ + if (!tvb_memeql(tvb, offset - length, "org.apache.hadoop.hdfs.protocol.LocatedBlocks", length)) { dissect_resp_locatedblocks (tvb, hdfs_tree, offset); - - /* responses about file statuses */ - } else if (!tvb_memeql(tvb, offset - length, "org.apache.hadoop.hdfs.protocol.HdfsFileStatus", length)) { - dissect_resp_filestatus (tvb, hdfs_tree, offset); - - } else { - /* get length */ - length = tvb_get_ntohs(tvb, offset); - /* 2 bytes = parameter value length */ - proto_tree_add_item(hdfs_tree, hf_hdfs_namelentwo, tvb, offset, 2, ENC_BIG_ENDIAN); - offset += 2; + /* responses about file statuses */ + } else if (!tvb_memeql(tvb, offset - length, "org.apache.hadoop.hdfs.protocol.HdfsFileStatus", length)) { + dissect_resp_filestatus (tvb, hdfs_tree, offset); + + } else { + /* get length */ + length = tvb_get_ntohs(tvb, offset); + + /* 2 bytes = parameter value length */ + proto_tree_add_item(hdfs_tree, hf_hdfs_namelentwo, tvb, offset, 2, ENC_BIG_ENDIAN); + offset += 2; /* the value of the parameter */ - proto_tree_add_item(hdfs_tree, hf_hdfs_paramval, tvb, offset, length, ENC_BIG_ENDIAN); - offset += length; + proto_tree_add_item(hdfs_tree, hf_hdfs_paramval, tvb, offset, length, ENC_BIG_ENDIAN); + offset += length; } - } + } - /* Request to namenode */ - } else { + /* Request to namenode */ + } else { - /* check the packet length */ - guint auth = tvb_get_ntohl(tvb, offset); + /* check the packet length */ + guint auth = tvb_get_ntohl(tvb, offset); - /* first setup packet starts with "hrpc" */ - if (!tvb_memeql(tvb, offset, REQUEST_STR, sizeof(REQUEST_STR) - 1)) { - - proto_tree_add_item(hdfs_tree, hf_hdfs_sequenceno, tvb, offset, sizeof(REQUEST_STR) - 1, ENC_BIG_ENDIAN); - offset += sizeof(REQUEST_STR) - 1; + /* first setup packet starts with "hrpc" */ + if (!tvb_memeql(tvb, offset, REQUEST_STR, sizeof(REQUEST_STR) - 1)) { - proto_tree_add_item(hdfs_tree, hf_hdfs_pdu_type, tvb, offset, 1, ENC_BIG_ENDIAN); - offset += 1; + proto_tree_add_item(hdfs_tree, hf_hdfs_sequenceno, tvb, offset, sizeof(REQUEST_STR) - 1, ENC_BIG_ENDIAN); + offset += sizeof(REQUEST_STR) - 1; - proto_tree_add_item(hdfs_tree, hf_hdfs_flags, tvb, offset, 1, ENC_BIG_ENDIAN); - offset += 1; + proto_tree_add_item(hdfs_tree, hf_hdfs_pdu_type, tvb, offset, 1, ENC_BIG_ENDIAN); + offset += 1; - } else { - /* second authentication packet */ - if (auth + 4 != tvb_reported_length(tvb)) { - - /* authentication length (read out of first 4 bytes) */ - length = tvb_get_ntohl(tvb, offset); - proto_tree_add_item(hdfs_tree, hf_hdfs_authlen, tvb, offset, 4, ENC_BIG_ENDIAN); - offset += 4; + proto_tree_add_item(hdfs_tree, hf_hdfs_flags, tvb, offset, 1, ENC_BIG_ENDIAN); + offset += 1; - /* authentication (length the number we just got) */ - proto_tree_add_item(hdfs_tree, hf_hdfs_auth, tvb, offset, length, ENC_BIG_ENDIAN); - offset += length; - } + } else { + /* second authentication packet */ + if (auth + 4 != tvb_reported_length(tvb)) { - /* data packets */ + /* authentication length (read out of first 4 bytes) */ + length = tvb_get_ntohl(tvb, offset); + proto_tree_add_item(hdfs_tree, hf_hdfs_authlen, tvb, offset, 4, ENC_BIG_ENDIAN); + offset += 4; - /* 4 bytes = length */ - proto_tree_add_item(hdfs_tree, hf_hdfs_len, tvb, offset, 4, ENC_BIG_ENDIAN); - offset += 4; + /* authentication (length the number we just got) */ + proto_tree_add_item(hdfs_tree, hf_hdfs_auth, tvb, offset, length, ENC_BIG_ENDIAN); + offset += length; + } - /* 4 bytes = sequence number */ - proto_tree_add_item(hdfs_tree, hf_hdfs_packetno, tvb, offset, 4, ENC_BIG_ENDIAN); - offset += 4; + /* data packets */ - /* dissect packet data */ - dissect_data (tvb, hdfs_tree, offset); - } - } - } + /* 4 bytes = length */ + proto_tree_add_item(hdfs_tree, hf_hdfs_len, tvb, offset, 4, ENC_BIG_ENDIAN); + offset += 4; + + /* 4 bytes = sequence number */ + proto_tree_add_item(hdfs_tree, hf_hdfs_packetno, tvb, offset, 4, ENC_BIG_ENDIAN); + offset += 4; + + /* dissect packet data */ + dissect_data (tvb, hdfs_tree, offset); + } + } + } } /* determine PDU length of protocol */ static guint get_hdfs_message_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset _U_) { int len = tvb_reported_length(tvb); - + if (tvb_reported_length(tvb) == 1448 || tvb_reported_length(tvb) == 1321) { - len = 150 * tvb_get_ntohs(tvb, 113) + 115 ; + len = 150 * tvb_get_ntohs(tvb, 113) + 115 ; } - + return len; } @@ -669,14 +669,14 @@ dissect_hdfs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { int frame_header_len = 0; gboolean need_reassemble = FALSE; - + frame_header_len = tvb_reported_length(tvb); - + if (frame_header_len == 1448 || frame_header_len == 1321) { need_reassemble = TRUE; } - - + + tcp_dissect_pdus(tvb, pinfo, tree, need_reassemble, frame_header_len, get_hdfs_message_len, dissect_hdfs_message); } @@ -687,346 +687,346 @@ proto_register_hdfs(void) static hf_register_info hf[] = { - /* list of all options for dissecting the protocol */ + /* list of all options for dissecting the protocol */ - /************************************************* - First packet - **************************************************/ - { &hf_hdfs_sequenceno, - { "HDFS protocol type", "hdfs.type", - FT_STRING, BASE_NONE, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_pdu_type, - { "HDFS protocol version", "hdfs.version", - FT_UINT8, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_flags, - { "HDFS authentication type", "hdfs.auth", - FT_UINT8, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - /*********************************************** - Authentication packet - ***********************************************/ - { &hf_hdfs_authlen, - { "HDFS authentication length", "hdfs.authlen", - FT_STRING, BASE_NONE, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_auth, - { "HDFS authorization bits", "hdfs.auth", - FT_STRING, BASE_NONE, - NULL, 0x0, - NULL, HFILL } - }, - /********************************************** - Response - **********************************************/ - { &hf_hdfs_packetno, - { "HDFS packet number", "hdfs.seqno", - FT_UINT32, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_success, - { "HDFS success", "hdfs.success", - FT_UINT32, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_strcall, - { "HDFS method name", "hdfs.strcall", - FT_STRING, BASE_NONE, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_rest, - { "HDFS value", "hdfs.rest", - FT_STRING, BASE_NONE, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_blockloc, - { "HDFS block location", "hdfs.blockloc", - FT_UINT64, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_blocksize, - { "HDFS block size", "hdfs.blocksize", - FT_UINT64, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_endblockloc, - { "HDFS file size", "hdfs.endblockloc", - FT_UINT64, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_blockgen, - { "HDFS block gen", "hdfs.blockgen", - FT_UINT64, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_prover, - { "HDFS protocol version", "hdfs.prover", - FT_UINT64, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_objname, - { "HDFS object name", "hdfs.objname", - FT_STRING, BASE_NONE, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_filename, - { "HDFS file name", "hdfs.filename", - FT_STRING, BASE_NONE, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_blockcount, - { "HDFS block count", "hdfs.blockcount", - FT_UINT32, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_ownername, - { "HDFS owner name", "hdfs.ownername", - FT_STRING, BASE_NONE, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_groupname, - { "HDFS group name", "hdfs.groupname", - FT_STRING, BASE_NONE, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_accesstime, - { "HDFS access time", "hdfs.accesstime", - FT_UINT64, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_modtime, - { "HDFS modified time", "hdfs.modtime", - FT_UINT64, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_blockrep, - { "HDFS block replication factor", "hdfs.blockrep", - FT_UINT16, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_isdir, - { "HDFS is directory", "hdfs.isdir", - FT_UINT8, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_filelen, - { "HDFS file length", "hdfs.filelen", - FT_UINT64, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_construct, - { "HDFS under construction", "hdfs.construct", - FT_UINT8, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_rackloc, - { "HDFS rack location", "hdfs.rackloc", - FT_STRING, BASE_NONE, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_adminstate, - { "HDFS admin state", "hdfs.adminstate", - FT_STRING, BASE_NONE, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_hostname, - { "HDFS hostname", "hdfs.hostname", - FT_STRING, BASE_NONE, - NULL, 0x0, - NULL, HFILL } - }, - - - { &hf_hdfs_namelenone, - { "HDFS name length", "hdfs.namelenone", - FT_UINT8, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_namelentwo, - { "HDFS name length", "hdfs.namelentwo", - FT_UINT16, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - - - /*************************************** - file info response - ***************************************/ - { &hf_hdfs_activecon, - { "HDFS active connections", "hdfs.activecon", - FT_UINT32, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_lastupdate, - { "HDFS lastupdate", "hdfs.lastupdate", - FT_UINT64, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_remaining, - { "HDFS remaining", "hdfs.remaining", - FT_UINT64, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_dfsused, - { "HDFS dfs used", "hdfs.dfsused", - FT_UINT64, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_capacity, - { "HDFS capacity", "hdfs.capacity", - FT_UINT64, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_ipcport, - { "HDFS ipcport", "hdfs.ipcport", - FT_UINT16, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_infoport, - { "HDFS info port", "hdfs.infoport", - FT_UINT16, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_storageid, - { "HDFS storage id", "hdfs.storageid", - FT_STRING, BASE_NONE, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_datanodeid, - { "HDFS datanodeid", "hdfs.datanodeid", - FT_STRING, BASE_NONE, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_locations, - { "HDFS locations", "hdfs.locations", - FT_UINT32, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - - { &hf_hdfs_identifier, - { "HDFS locations", "hdfs.identifier", - FT_STRING, BASE_NONE, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_password, - { "HDFS password", "hdfs.password", - FT_STRING, BASE_NONE, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_kind, - { "HDFS kind", "hdfs.kind", - FT_STRING, BASE_NONE, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_service, - { "HDFS locations", "hdfs.service", - FT_STRING, BASE_NONE, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_corrupt, - { "HDFS corrupt", "hdfs.corrupt", - FT_UINT8, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_offset, - { "HDFS offset", "hdfs.offset", - FT_UINT64, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - - - /*********************************************** - Data request - ***********************************************/ - { &hf_hdfs_len, - { "HDFS length", "hdfs.len", - FT_UINT32, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - /* packet number, same as in response - method name length, same as in response - string call, same as in response */ - { &hf_hdfs_params, - { "HDFS number of parameters", "hdfs.params", - FT_UINT32, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_paramtype, - { "HDFS parameter type", "hdfs.paramtype", - FT_STRING, BASE_NONE, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_paramval, - { "HDFS parameter value", "hdfs.paramval", - FT_STRING, BASE_NONE, - NULL, 0x0, - NULL, HFILL } - }, - /* param value that is displayed as a number not a string */ - { &hf_hdfs_paramvalnum, - { "HDFS parameter value", "hdfs.paramvalnum", - FT_INT64, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, - { &hf_hdfs_fileperm, - { "HDFS File permission", "hdfs.fileperm", - FT_INT16, BASE_DEC, - NULL, 0x0, - NULL, HFILL } - }, + /************************************************* + First packet + **************************************************/ + { &hf_hdfs_sequenceno, + { "HDFS protocol type", "hdfs.type", + FT_STRING, BASE_NONE, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_pdu_type, + { "HDFS protocol version", "hdfs.version", + FT_UINT8, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_flags, + { "HDFS authentication type", "hdfs.auth", + FT_UINT8, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + /*********************************************** + Authentication packet + ***********************************************/ + { &hf_hdfs_authlen, + { "HDFS authentication length", "hdfs.authlen", + FT_STRING, BASE_NONE, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_auth, + { "HDFS authorization bits", "hdfs.auth", + FT_STRING, BASE_NONE, + NULL, 0x0, + NULL, HFILL } + }, + /********************************************** + Response + **********************************************/ + { &hf_hdfs_packetno, + { "HDFS packet number", "hdfs.seqno", + FT_UINT32, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_success, + { "HDFS success", "hdfs.success", + FT_UINT32, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_strcall, + { "HDFS method name", "hdfs.strcall", + FT_STRING, BASE_NONE, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_rest, + { "HDFS value", "hdfs.rest", + FT_STRING, BASE_NONE, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_blockloc, + { "HDFS block location", "hdfs.blockloc", + FT_UINT64, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_blocksize, + { "HDFS block size", "hdfs.blocksize", + FT_UINT64, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_endblockloc, + { "HDFS file size", "hdfs.endblockloc", + FT_UINT64, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_blockgen, + { "HDFS block gen", "hdfs.blockgen", + FT_UINT64, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_prover, + { "HDFS protocol version", "hdfs.prover", + FT_UINT64, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_objname, + { "HDFS object name", "hdfs.objname", + FT_STRING, BASE_NONE, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_filename, + { "HDFS file name", "hdfs.filename", + FT_STRING, BASE_NONE, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_blockcount, + { "HDFS block count", "hdfs.blockcount", + FT_UINT32, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_ownername, + { "HDFS owner name", "hdfs.ownername", + FT_STRING, BASE_NONE, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_groupname, + { "HDFS group name", "hdfs.groupname", + FT_STRING, BASE_NONE, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_accesstime, + { "HDFS access time", "hdfs.accesstime", + FT_UINT64, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_modtime, + { "HDFS modified time", "hdfs.modtime", + FT_UINT64, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_blockrep, + { "HDFS block replication factor", "hdfs.blockrep", + FT_UINT16, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_isdir, + { "HDFS is directory", "hdfs.isdir", + FT_UINT8, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_filelen, + { "HDFS file length", "hdfs.filelen", + FT_UINT64, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_construct, + { "HDFS under construction", "hdfs.construct", + FT_UINT8, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_rackloc, + { "HDFS rack location", "hdfs.rackloc", + FT_STRING, BASE_NONE, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_adminstate, + { "HDFS admin state", "hdfs.adminstate", + FT_STRING, BASE_NONE, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_hostname, + { "HDFS hostname", "hdfs.hostname", + FT_STRING, BASE_NONE, + NULL, 0x0, + NULL, HFILL } + }, + + + { &hf_hdfs_namelenone, + { "HDFS name length", "hdfs.namelenone", + FT_UINT8, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_namelentwo, + { "HDFS name length", "hdfs.namelentwo", + FT_UINT16, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + + + /*************************************** + file info response + ***************************************/ + { &hf_hdfs_activecon, + { "HDFS active connections", "hdfs.activecon", + FT_UINT32, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_lastupdate, + { "HDFS lastupdate", "hdfs.lastupdate", + FT_UINT64, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_remaining, + { "HDFS remaining", "hdfs.remaining", + FT_UINT64, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_dfsused, + { "HDFS dfs used", "hdfs.dfsused", + FT_UINT64, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_capacity, + { "HDFS capacity", "hdfs.capacity", + FT_UINT64, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_ipcport, + { "HDFS ipcport", "hdfs.ipcport", + FT_UINT16, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_infoport, + { "HDFS info port", "hdfs.infoport", + FT_UINT16, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_storageid, + { "HDFS storage id", "hdfs.storageid", + FT_STRING, BASE_NONE, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_datanodeid, + { "HDFS datanodeid", "hdfs.datanodeid", + FT_STRING, BASE_NONE, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_locations, + { "HDFS locations", "hdfs.locations", + FT_UINT32, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + + { &hf_hdfs_identifier, + { "HDFS locations", "hdfs.identifier", + FT_STRING, BASE_NONE, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_password, + { "HDFS password", "hdfs.password", + FT_STRING, BASE_NONE, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_kind, + { "HDFS kind", "hdfs.kind", + FT_STRING, BASE_NONE, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_service, + { "HDFS locations", "hdfs.service", + FT_STRING, BASE_NONE, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_corrupt, + { "HDFS corrupt", "hdfs.corrupt", + FT_UINT8, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_offset, + { "HDFS offset", "hdfs.offset", + FT_UINT64, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + + + /*********************************************** + Data request + ***********************************************/ + { &hf_hdfs_len, + { "HDFS length", "hdfs.len", + FT_UINT32, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + /* packet number, same as in response + method name length, same as in response + string call, same as in response */ + { &hf_hdfs_params, + { "HDFS number of parameters", "hdfs.params", + FT_UINT32, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_paramtype, + { "HDFS parameter type", "hdfs.paramtype", + FT_STRING, BASE_NONE, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_paramval, + { "HDFS parameter value", "hdfs.paramval", + FT_STRING, BASE_NONE, + NULL, 0x0, + NULL, HFILL } + }, + /* param value that is displayed as a number not a string */ + { &hf_hdfs_paramvalnum, + { "HDFS parameter value", "hdfs.paramvalnum", + FT_INT64, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, + { &hf_hdfs_fileperm, + { "HDFS File permission", "hdfs.fileperm", + FT_INT16, BASE_DEC, + NULL, 0x0, + NULL, HFILL } + }, }; @@ -1049,11 +1049,11 @@ proto_register_hdfs(void) hdfs_module = prefs_register_protocol(proto_hdfs, proto_reg_handoff_hdfs); prefs_register_uint_preference(hdfs_module, - "tcp.port", - "TCP port for HDFS", - "Set the TCP port for HDFS", - 10, - &tcp_port); + "tcp.port", + "TCP port for HDFS", + "Set the TCP port for HDFS", + 10, + &tcp_port); register_dissector("hdfs", dissect_hdfs, proto_hdfs); } @@ -1084,11 +1084,11 @@ proto_reg_handoff_hdfs(void) * Editor modelines * * Local Variables: - * c-basic-offset: 2 + * c-basic-offset: 4 * tab-width: 8 * indent-tabs-mode: nil * End: * - * ex: set shiftwidth=2 tabstop=8 expandtab: - * :indentSize=2:tabSize=8:noTabs=true: + * ex: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: */ diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index 3fe37d3571..5fdb124b66 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -1922,7 +1922,7 @@ static guint32 dissect_trunkpacket (tvbuff_t * tvb, guint32 offset, /* Timestamp */ proto_tree_add_item(iax2_tree, hf_iax2_trunk_ts, tvb, offset + 2, 4, FALSE); } - + offset += 6; if( trunkts ) { @@ -2807,7 +2807,7 @@ proto_reg_handoff_iax2 (void) dissector_add_uint("udp.port", IAX2_PORT, find_dissector("iax2")); v110_handle = find_dissector("v110"); if(v110_handle) - dissector_add_uint("iax2.dataformat", AST_DATAFORMAT_V110, v110_handle); + dissector_add_uint("iax2.dataformat", AST_DATAFORMAT_V110, v110_handle); data_handle = find_dissector("data"); } diff --git a/epan/dissectors/packet-ppi-vector.c b/epan/dissectors/packet-ppi-vector.c index cfc3e7b03b..ebfcf8f262 100644 --- a/epan/dissectors/packet-ppi-vector.c +++ b/epan/dissectors/packet-ppi-vector.c @@ -4,7 +4,7 @@ * * See * - * http://new.11mercenary.net/~johnycsh/ppi_geolocation_spec/ + * http://new.11mercenary.net/~johnycsh/ppi_geolocation_spec/ * * for specifications. * diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index c9dcfedcea..f84b4ccb84 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -270,8 +270,8 @@ static gint ett_tcp_opt_rvbd_trpy_flags = -1; #define TCPOPT_MOOD 25 /* RFC5841 TCP Packet Mood */ #define TCPOPT_QS 27 /* RFC4782 */ #define TCPOPT_USER_TO 28 /* RFC5482 */ -#define TCPOPT_EXP_FD 0xfd /* Experimental, reserved */ -#define TCPOPT_EXP_FE 0xfe /* Experimental, reserved */ +#define TCPOPT_EXP_FD 0xfd /* Experimental, reserved */ +#define TCPOPT_EXP_FE 0xfe /* Experimental, reserved */ /* Non IANA registered option numbers */ #define TCPOPT_RVBD_PROBE 76 /* Riverbed probe option */ #define TCPOPT_RVBD_TRPY 78 /* Riverbed transparency option */ @@ -300,7 +300,7 @@ static gint ett_tcp_opt_rvbd_trpy_flags = -1; #define TCPOLEN_USER_TO 4 #define TCPOLEN_RVBD_PROBE_MIN 3 #define TCPOLEN_RVBD_TRPY_MIN 16 -#define TCPOLEN_EXP_MIN 2 +#define TCPOLEN_EXP_MIN 2 static const true_false_string tcp_option_user_to_granularity = { "Minutes", "Seconds" @@ -2270,12 +2270,12 @@ dissect_tcpopt_exp(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, proto_tree *exp_tree; item = proto_tree_add_item(opt_tree, hf_tcp_option_exp, tvb, - offset, optlen, FALSE); + offset, optlen, FALSE); exp_tree = proto_item_add_subtree(item, ett_tcp_option_exp); proto_tree_add_item(exp_tree, hf_tcp_option_kind, tvb, offset, 1, FALSE); proto_tree_add_item(exp_tree, hf_tcp_option_len, tvb, offset + 1, 1, FALSE); proto_tree_add_item(exp_tree, hf_tcp_option_exp_data, tvb, - offset + 2, optlen - 2, FALSE); + offset + 2, optlen - 2, FALSE); tcp_info_append_uint(pinfo, "Expxx", TRUE); } @@ -2305,7 +2305,7 @@ dissect_tcpopt_mss(const ip_tcp_opt *optp, tvbuff_t *tvb, mss = tvb_get_ntohs(tvb, offset + 2); item = proto_tree_add_none_format(opt_tree, hf_tcp_option_mss, tvb, offset, - optlen, "%s: %u bytes", optp->name, mss); + optlen, "%s: %u bytes", optp->name, mss); exp_tree = proto_item_add_subtree(item, ett_tcp_option_mss); proto_tree_add_item(exp_tree, hf_tcp_option_kind, tvb, offset, 1, FALSE); proto_tree_add_item(exp_tree, hf_tcp_option_len, tvb, offset + 1, 1, FALSE); @@ -2476,8 +2476,8 @@ dissect_tcpopt_timestamp(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, proto_item_append_text(ti, "TSval %u, TSecr %u", ts_val, ts_ecr); if (tcp_ignore_timestamps == FALSE) { - tcp_info_append_uint(pinfo, "TSval", ts_val); - tcp_info_append_uint(pinfo, "TSecr", ts_ecr); + tcp_info_append_uint(pinfo, "TSval", ts_val); + tcp_info_append_uint(pinfo, "TSecr", ts_ecr); } } diff --git a/epan/dissectors/packet-wifi-p2p.c b/epan/dissectors/packet-wifi-p2p.c index 73b512fd58..027d2e9497 100644 --- a/epan/dissectors/packet-wifi-p2p.c +++ b/epan/dissectors/packet-wifi-p2p.c @@ -660,9 +660,9 @@ static void dissect_wifi_p2p_group_id(proto_item *tlv_root, } static void dissect_wifi_p2p_group_bssid(packet_info *pinfo, - proto_item *tlv_root, - proto_item *tlv_item, tvbuff_t *tvb, - int offset, guint16 slen) + proto_item *tlv_root, + proto_item *tlv_item, tvbuff_t *tvb, + int offset, guint16 slen) { int s_offset; guint8 addr[6]; diff --git a/epan/nstime.c b/epan/nstime.c index 490f0c35ae..3d05c575ba 100644 --- a/epan/nstime.c +++ b/epan/nstime.c @@ -36,18 +36,18 @@ /* set the given nstime_t to zero */ void nstime_set_zero(nstime_t *nstime) { - nstime->secs = 0; - nstime->nsecs = 0; + nstime->secs = 0; + nstime->nsecs = 0; } /* is the given nstime_t currently zero? */ gboolean nstime_is_zero(nstime_t *nstime) { - if(nstime->secs == 0 && nstime->nsecs == 0) { - return TRUE; - } else { - return FALSE; - } + if(nstime->secs == 0 && nstime->nsecs == 0) { + return TRUE; + } else { + return FALSE; + } } /* set the given nstime_t to (0,maxint) to mark it as "unset" @@ -56,18 +56,18 @@ gboolean nstime_is_zero(nstime_t *nstime) */ void nstime_set_unset(nstime_t *nstime) { - nstime->secs = 0; - nstime->nsecs = G_MAXINT; + nstime->secs = 0; + nstime->nsecs = G_MAXINT; } /* is the given nstime_t currently (0,maxint)? */ gboolean nstime_is_unset(nstime_t *nstime) { - if(nstime->secs == 0 && nstime->nsecs == G_MAXINT) { - return TRUE; - } else { - return FALSE; - } + if(nstime->secs == 0 && nstime->nsecs == G_MAXINT) { + return TRUE; + } else { + return FALSE; + } } @@ -77,8 +77,8 @@ gboolean nstime_is_unset(nstime_t *nstime) */ void nstime_copy(nstime_t *a, const nstime_t *b) { - a->secs = b->secs; - a->nsecs = b->nsecs; + a->secs = b->secs; + a->nsecs = b->nsecs; } /* diff --git a/epan/uat.c b/epan/uat.c index 8219347ea5..645503b691 100644 --- a/epan/uat.c +++ b/epan/uat.c @@ -53,204 +53,204 @@ static GPtrArray* all_uats = NULL; void uat_init(void) { - all_uats = g_ptr_array_new(); + all_uats = g_ptr_array_new(); } uat_t* uat_new(const char* name, - size_t size, - const char* filename, - gboolean from_profile, - void** data_ptr, - guint* numitems_ptr, - const char* category, - const char* help, - uat_copy_cb_t copy_cb, - uat_update_cb_t update_cb, - uat_free_cb_t free_cb, - uat_post_update_cb_t post_update_cb, - uat_field_t* flds_array) { - /* Create new uat */ - uat_t* uat = g_malloc(sizeof(uat_t)); - guint i; + size_t size, + const char* filename, + gboolean from_profile, + void** data_ptr, + guint* numitems_ptr, + const char* category, + const char* help, + uat_copy_cb_t copy_cb, + uat_update_cb_t update_cb, + uat_free_cb_t free_cb, + uat_post_update_cb_t post_update_cb, + uat_field_t* flds_array) { + /* Create new uat */ + uat_t* uat = g_malloc(sizeof(uat_t)); + guint i; - /* Add to global array of uats */ - if (!all_uats) - all_uats = g_ptr_array_new(); + /* Add to global array of uats */ + if (!all_uats) + all_uats = g_ptr_array_new(); - g_ptr_array_add(all_uats,uat); + g_ptr_array_add(all_uats,uat); - /* Check params */ - g_assert(name && size && filename && data_ptr && numitems_ptr); + /* Check params */ + g_assert(name && size && filename && data_ptr && numitems_ptr); - /* Set uat values from inputs */ - uat->name = g_strdup(name); - uat->record_size = size; - uat->filename = g_strdup(filename); - uat->from_profile = from_profile; - uat->user_ptr = data_ptr; - uat->nrows_p = numitems_ptr; - uat->copy_cb = copy_cb; - uat->update_cb = update_cb; - uat->free_cb = free_cb; - uat->post_update_cb = post_update_cb; - uat->fields = flds_array; - uat->user_data = g_array_new(FALSE,FALSE,(guint)uat->record_size); - uat->changed = FALSE; - uat->loaded = FALSE; - uat->rep = NULL; - uat->free_rep = NULL; - uat->help = help; - uat->category = category; + /* Set uat values from inputs */ + uat->name = g_strdup(name); + uat->record_size = size; + uat->filename = g_strdup(filename); + uat->from_profile = from_profile; + uat->user_ptr = data_ptr; + uat->nrows_p = numitems_ptr; + uat->copy_cb = copy_cb; + uat->update_cb = update_cb; + uat->free_cb = free_cb; + uat->post_update_cb = post_update_cb; + uat->fields = flds_array; + uat->user_data = g_array_new(FALSE,FALSE,(guint)uat->record_size); + uat->changed = FALSE; + uat->loaded = FALSE; + uat->rep = NULL; + uat->free_rep = NULL; + uat->help = help; + uat->category = category; - for (i=0;flds_array[i].title;i++) { - fld_data_t* f = g_malloc(sizeof(fld_data_t)); + for (i=0;flds_array[i].title;i++) { + fld_data_t* f = g_malloc(sizeof(fld_data_t)); - f->colnum = i+1; - f->rep = NULL; - f->free_rep = NULL; + f->colnum = i+1; + f->rep = NULL; + f->free_rep = NULL; - flds_array[i].priv = f; - } + flds_array[i].priv = f; + } - uat->ncols = i; + uat->ncols = i; - *data_ptr = NULL; - *numitems_ptr = 0; + *data_ptr = NULL; + *numitems_ptr = 0; - return uat; + return uat; } void* uat_add_record(uat_t* uat, const void* data) { - void* rec; + void* rec; - g_array_append_vals (uat->user_data, data, 1); + g_array_append_vals (uat->user_data, data, 1); - rec = uat->user_data->data + (uat->record_size * (uat->user_data->len-1)); + rec = uat->user_data->data + (uat->record_size * (uat->user_data->len-1)); - if (uat->copy_cb) { - uat->copy_cb(rec, data, (unsigned int) uat->record_size); - } + if (uat->copy_cb) { + uat->copy_cb(rec, data, (unsigned int) uat->record_size); + } - UAT_UPDATE(uat); + UAT_UPDATE(uat); - return rec; + return rec; } void uat_swap(uat_t* uat, guint a, guint b) { - size_t s = uat->record_size; - void* tmp = ep_alloc(s); + size_t s = uat->record_size; + void* tmp = ep_alloc(s); - g_assert( a < uat->user_data->len && b < uat->user_data->len ); + g_assert( a < uat->user_data->len && b < uat->user_data->len ); - if (a == b) return; + if (a == b) return; - memcpy(tmp, UAT_INDEX_PTR(uat,a), s); - memcpy(UAT_INDEX_PTR(uat,a), UAT_INDEX_PTR(uat,b), s); - memcpy(UAT_INDEX_PTR(uat,b), tmp, s); + memcpy(tmp, UAT_INDEX_PTR(uat,a), s); + memcpy(UAT_INDEX_PTR(uat,a), UAT_INDEX_PTR(uat,b), s); + memcpy(UAT_INDEX_PTR(uat,b), tmp, s); } void uat_remove_record_idx(uat_t* uat, guint idx) { - g_assert( idx < uat->user_data->len ); + g_assert( idx < uat->user_data->len ); - if (uat->free_cb) { - uat->free_cb(UAT_INDEX_PTR(uat,idx)); - } + if (uat->free_cb) { + uat->free_cb(UAT_INDEX_PTR(uat,idx)); + } - g_array_remove_index(uat->user_data, idx); + g_array_remove_index(uat->user_data, idx); - UAT_UPDATE(uat); + UAT_UPDATE(uat); } /* The returned filename was g_malloc()'d so the caller must free it */ gchar* uat_get_actual_filename(uat_t* uat, gboolean for_writing) { - gchar* pers_fname = get_persconffile_path(uat->filename, uat->from_profile, for_writing); + gchar* pers_fname = get_persconffile_path(uat->filename, uat->from_profile, for_writing); - if (! for_writing ) { - gchar* data_fname = get_datafile_path(uat->filename); + if (! for_writing ) { + gchar* data_fname = get_datafile_path(uat->filename); - if ((! file_exists(pers_fname) ) && file_exists(data_fname)) { - g_free(pers_fname); - return data_fname; - } + if ((! file_exists(pers_fname) ) && file_exists(data_fname)) { + g_free(pers_fname); + return data_fname; + } - g_free(data_fname); - } + g_free(data_fname); + } - if ((! file_exists(pers_fname) ) && (! for_writing ) ) { - g_free(pers_fname); - return NULL; - } + if ((! file_exists(pers_fname) ) && (! for_writing ) ) { + g_free(pers_fname); + return NULL; + } - return pers_fname; + return pers_fname; } uat_t* uat_get_table_by_name(const char* name) { - guint i; + guint i; - for (i=0; i < all_uats->len; i++) { - uat_t* u = g_ptr_array_index(all_uats,i); - if ( g_str_equal(u->name,name) ) { - return (u); - } - } + for (i=0; i < all_uats->len; i++) { + uat_t* u = g_ptr_array_index(all_uats,i); + if ( g_str_equal(u->name,name) ) { + return (u); + } + } - return NULL; + return NULL; } static void putfld(FILE* fp, void* rec, uat_field_t* f) { - guint fld_len; - const char* fld_ptr; + guint fld_len; + const char* fld_ptr; - f->cb.tostr(rec,&fld_ptr,&fld_len,f->cbdata.tostr,f->fld_data); + f->cb.tostr(rec,&fld_ptr,&fld_len,f->cbdata.tostr,f->fld_data); - switch(f->mode){ - case PT_TXTMOD_ENUM: - case PT_TXTMOD_FILENAME: - case PT_TXTMOD_DIRECTORYNAME: - case PT_TXTMOD_STRING: { - guint i; + switch(f->mode){ + case PT_TXTMOD_ENUM: + case PT_TXTMOD_FILENAME: + case PT_TXTMOD_DIRECTORYNAME: + case PT_TXTMOD_STRING: { + guint i; - putc('"',fp); + putc('"',fp); - for(i=0;iuser_data->len ; i++ ) { - void* rec = uat->user_data->data + (uat->record_size * i); - uat_field_t* f; - guint j; + for ( i = 0 ; i < uat->user_data->len ; i++ ) { + void* rec = uat->user_data->data + (uat->record_size * i); + uat_field_t* f; + guint j; - f = uat->fields; + f = uat->fields; - for( j=0 ; j < uat->ncols ; j++ ) { - putfld(fp, rec, &(f[j])); - fputs((j == uat->ncols - 1) ? "\n" : "," ,fp); - } + for( j=0 ; j < uat->ncols ; j++ ) { + putfld(fp, rec, &(f[j])); + fputs((j == uat->ncols - 1) ? "\n" : "," ,fp); + } - } + } - fclose(fp); + fclose(fp); - uat->changed = FALSE; + uat->changed = FALSE; - return TRUE; + return TRUE; } void uat_destroy(uat_t* uat) { - /* XXX still missing a destructor */ - g_ptr_array_remove(all_uats,uat); + /* XXX still missing a destructor */ + g_ptr_array_remove(all_uats,uat); } uat_t *uat_find(gchar *name) { guint i; - for (i=0; i < all_uats->len; i++) { - uat_t* u = g_ptr_array_index(all_uats,i); + for (i=0; i < all_uats->len; i++) { + uat_t* u = g_ptr_array_index(all_uats,i); if (strcmp(u->name, name) == 0 || strcmp(u->filename, name) == 0) { return u; } - } + } return NULL; } void uat_clear(uat_t* uat) { - guint i; + guint i; - for ( i = 0 ; i < uat->user_data->len ; i++ ) { - if (uat->free_cb) { - uat->free_cb(UAT_INDEX_PTR(uat,i)); - } - } + for ( i = 0 ; i < uat->user_data->len ; i++ ) { + if (uat->free_cb) { + uat->free_cb(UAT_INDEX_PTR(uat,i)); + } + } - g_array_set_size(uat->user_data,0); + g_array_set_size(uat->user_data,0); - *((uat)->user_ptr) = NULL; - *((uat)->nrows_p) = 0; + *((uat)->user_ptr) = NULL; + *((uat)->nrows_p) = 0; } void* uat_dup(uat_t* uat, guint* len_p) { - guint size = (guint) (uat->record_size * uat->user_data->len); - *len_p = size; - return size ? g_memdup(uat->user_data->data,size) : NULL ; + guint size = (guint) (uat->record_size * uat->user_data->len); + *len_p = size; + return size ? g_memdup(uat->user_data->data,size) : NULL ; } void* uat_se_dup(uat_t* uat, guint* len_p) { - guint size = (guint) (uat->record_size * uat->user_data->len); - *len_p = (guint) size; - return size ? se_memdup(uat->user_data->data,size) : NULL ; + guint size = (guint) (uat->record_size * uat->user_data->len); + *len_p = (guint) size; + return size ? se_memdup(uat->user_data->data,size) : NULL ; } void uat_unload_all(void) { - guint i; + guint i; - for (i=0; i < all_uats->len; i++) { - uat_t* u = g_ptr_array_index(all_uats,i); + for (i=0; i < all_uats->len; i++) { + uat_t* u = g_ptr_array_index(all_uats,i); /* Do not unload if not in profile */ if (u->from_profile) { uat_clear(u); u->loaded = FALSE; } - } + } } void uat_cleanup(void) { - while( all_uats->len ) { - uat_destroy((uat_t*)all_uats->pdata); - } + while( all_uats->len ) { + uat_destroy((uat_t*)all_uats->pdata); + } - g_ptr_array_free(all_uats,TRUE); + g_ptr_array_free(all_uats,TRUE); } void uat_foreach_table(uat_cb_t cb,void* user_data) { - guint i; + guint i; - for (i=0; i < all_uats->len; i++) - cb(g_ptr_array_index(all_uats,i), user_data); + for (i=0; i < all_uats->len; i++) + cb(g_ptr_array_index(all_uats,i), user_data); } void uat_load_all(void) { - guint i; - gchar* err; + guint i; + gchar* err; - for (i=0; i < all_uats->len; i++) { - uat_t* u = g_ptr_array_index(all_uats,i); - err = NULL; + for (i=0; i < all_uats->len; i++) { + uat_t* u = g_ptr_array_index(all_uats,i); + err = NULL; - if (!u->loaded) - uat_load(u, &err); + if (!u->loaded) + uat_load(u, &err); - if (err) { - report_failure("Error loading table '%s': %s",u->name,err); - } - } + if (err) { + report_failure("Error loading table '%s': %s",u->name,err); + } + } } gboolean uat_fld_chk_str(void* u1 _U_, const char* strptr, unsigned len _U_, const void* u2 _U_, const void* u3 _U_, const char** err) { - if (strptr == NULL) { - *err = "NULL pointer"; - return FALSE; - } + if (strptr == NULL) { + *err = "NULL pointer"; + return FALSE; + } - *err = NULL; - return TRUE; + *err = NULL; + return TRUE; } gboolean uat_fld_chk_oid(void* u1 _U_, const char* strptr, unsigned len, const void* u2 _U_, const void* u3 _U_, const char** err) { unsigned int i; - *err = NULL; - - if (strptr == NULL) { - *err = "NULL pointer"; - return FALSE; - } + *err = NULL; - for(i = 0; i < len; i++) - if(!(isdigit(strptr[i]) || strptr[i] == '.')) { - *err = "Only digits [0-9] and \".\" allowed in an OID"; - break; - } + if (strptr == NULL) { + *err = "NULL pointer"; + return FALSE; + } - if(strptr[len-1] == '.') - *err = "OIDs must not be terminated with a \".\""; + for(i = 0; i < len; i++) + if(!(isdigit(strptr[i]) || strptr[i] == '.')) { + *err = "Only digits [0-9] and \".\" allowed in an OID"; + break; + } - if(!((*strptr == '0' || *strptr == '1' || *strptr =='2') && (len > 1 && strptr[1] == '.'))) - *err = "OIDs must start with \"0.\" (ITU-T assigned), \"1.\" (ISO assigned) or \"2.\" (joint ISO/ITU-T assigned)"; + if(strptr[len-1] == '.') + *err = "OIDs must not be terminated with a \".\""; - /* should also check that the second arc is in the range 0-39 */ + if(!((*strptr == '0' || *strptr == '1' || *strptr =='2') && (len > 1 && strptr[1] == '.'))) + *err = "OIDs must start with \"0.\" (ITU-T assigned), \"1.\" (ISO assigned) or \"2.\" (joint ISO/ITU-T assigned)"; - return *err == NULL; + /* should also check that the second arc is in the range 0-39 */ + + return *err == NULL; } gboolean uat_fld_chk_proto(void* u1 _U_, const char* strptr, unsigned len, const void* u2 _U_, const void* u3 _U_, const char** err) { - if (len) { - char* name = ep_strndup(strptr,len); - ascii_strdown_inplace(name); - g_strchug(name); + if (len) { + char* name = ep_strndup(strptr,len); + ascii_strdown_inplace(name); + g_strchug(name); - if (find_dissector(name)) { - *err = NULL; - return TRUE; - } else { - *err = "dissector not found"; - return FALSE; - } - } else { - *err = NULL; - return TRUE; - } + if (find_dissector(name)) { + *err = NULL; + return TRUE; + } else { + *err = "dissector not found"; + return FALSE; + } + } else { + *err = NULL; + return TRUE; + } } gboolean uat_fld_chk_num_dec(void* u1 _U_, const char* strptr, unsigned len, const void* u2 _U_, const void* u3 _U_, const char** err) { @@ -456,8 +456,8 @@ gboolean uat_fld_chk_num_dec(void* u1 _U_, const char* strptr, unsigned len, con } } - *err = NULL; - return TRUE; + *err = NULL; + return TRUE; } gboolean uat_fld_chk_num_hex(void* u1 _U_, const char* strptr, unsigned len, const void* u2 _U_, const void* u3 _U_, const char** err) { @@ -471,197 +471,197 @@ gboolean uat_fld_chk_num_hex(void* u1 _U_, const char* strptr, unsigned len, con } } - *err = NULL; - return TRUE; + *err = NULL; + return TRUE; } gboolean uat_fld_chk_enum(void* u1 _U_, const char* strptr, unsigned len, const void* v, const void* u3 _U_, const char** err) { - char* str = ep_strndup(strptr,len); - guint i; - const value_string* vs = v; + char* str = ep_strndup(strptr,len); + guint i; + const value_string* vs = v; - for(i=0;vs[i].strptr;i++) { - if (g_str_equal(vs[i].strptr,str)) { - *err = NULL; - return TRUE; - } - } + for(i=0;vs[i].strptr;i++) { + if (g_str_equal(vs[i].strptr,str)) { + *err = NULL; + return TRUE; + } + } - *err = ep_strdup_printf("invalid value: %s",str); - return FALSE; + *err = ep_strdup_printf("invalid value: %s",str); + return FALSE; } gboolean uat_fld_chk_range(void* u1 _U_, const char* strptr, unsigned len, const void* v _U_, const void* u3, const char** err) { - char* str = ep_strndup(strptr,len); - range_t* r = NULL; - convert_ret_t ret = range_convert_str(&r, str,GPOINTER_TO_UINT(u3)); + char* str = ep_strndup(strptr,len); + range_t* r = NULL; + convert_ret_t ret = range_convert_str(&r, str,GPOINTER_TO_UINT(u3)); - switch ( ret ) { - case CVT_NO_ERROR: - *err = NULL; - return TRUE; - case CVT_SYNTAX_ERROR: - *err = ep_strdup_printf("syntax error in range: %s",str); - return FALSE; - case CVT_NUMBER_TOO_BIG: - *err = ep_strdup_printf("value too large in range: '%s' (max = %u)",str,GPOINTER_TO_UINT(u3)); - return FALSE; - default: - *err = "This should not happen, it is a bug in wireshark! please report to wireshark-dev@wireshark.org"; - return FALSE; - } + switch ( ret ) { + case CVT_NO_ERROR: + *err = NULL; + return TRUE; + case CVT_SYNTAX_ERROR: + *err = ep_strdup_printf("syntax error in range: %s",str); + return FALSE; + case CVT_NUMBER_TOO_BIG: + *err = ep_strdup_printf("value too large in range: '%s' (max = %u)",str,GPOINTER_TO_UINT(u3)); + return FALSE; + default: + *err = "This should not happen, it is a bug in wireshark! please report to wireshark-dev@wireshark.org"; + return FALSE; + } } static int xton(char d) { - switch(d) { - case '0': return 0; - case '1': return 1; - case '2': return 2; - case '3': return 3; - case '4': return 4; - case '5': return 5; - case '6': return 6; - case '7': return 7; - case '8': return 8; - case '9': return 9; - case 'a': case 'A': return 10; - case 'b': case 'B': return 11; - case 'c': case 'C': return 12; - case 'd': case 'D': return 13; - case 'e': case 'E': return 14; - case 'f': case 'F': return 15; - default: return -1; - } + switch(d) { + case '0': return 0; + case '1': return 1; + case '2': return 2; + case '3': return 3; + case '4': return 4; + case '5': return 5; + case '6': return 6; + case '7': return 7; + case '8': return 8; + case '9': return 9; + case 'a': case 'A': return 10; + case 'b': case 'B': return 11; + case 'c': case 'C': return 12; + case 'd': case 'D': return 13; + case 'e': case 'E': return 14; + case 'f': case 'F': return 15; + default: return -1; + } } char* uat_unbinstring(const char* si, guint in_len, guint* len_p) { - guint8* buf; - guint len = in_len/2; - int i = 0; - int d0, d1; + guint8* buf; + guint len = in_len/2; + int i = 0; + int d0, d1; - if (in_len%2) { - return NULL; - } + if (in_len%2) { + return NULL; + } - buf= g_malloc0(len+1); - if (len_p) *len_p = len; + buf= g_malloc0(len+1); + if (len_p) *len_p = len; - while(in_len) { - d1 = xton(*(si++)); - d0 = xton(*(si++)); + while(in_len) { + d1 = xton(*(si++)); + d0 = xton(*(si++)); - buf[i++] = (d1 * 16) + d0; + buf[i++] = (d1 * 16) + d0; - in_len -= 2; - } + in_len -= 2; + } - return (char*)buf; + return (char*)buf; } char* uat_unesc(const char* si, guint in_len, guint* len_p) { - char* buf = g_malloc0(in_len+1); - char* p = buf; - guint len = 0; - const char* s; - const char* in_end = si+in_len; + char* buf = g_malloc0(in_len+1); + char* p = buf; + guint len = 0; + const char* s; + const char* in_end = si+in_len; - for (s = (void*)si; s < in_end; s++) { - switch(*s) { - case '\\': - switch(*(++s)) { - case 'a': *(p++) = '\a'; len++; break; - case 'b': *(p++) = '\b'; len++; break; - case 'e': *(p++) = '\033' /* '\e' is non ANSI-C */; len++; break; - case 'f': *(p++) = '\f'; len++; break; - case 'n': *(p++) = '\n'; len++; break; - case 'r': *(p++) = '\r'; len++; break; - case 't': *(p++) = '\t'; len++; break; - case 'v': *(p++) = '\v'; len++; break; + for (s = (void*)si; s < in_end; s++) { + switch(*s) { + case '\\': + switch(*(++s)) { + case 'a': *(p++) = '\a'; len++; break; + case 'b': *(p++) = '\b'; len++; break; + case 'e': *(p++) = '\033' /* '\e' is non ANSI-C */; len++; break; + case 'f': *(p++) = '\f'; len++; break; + case 'n': *(p++) = '\n'; len++; break; + case 'r': *(p++) = '\r'; len++; break; + case 't': *(p++) = '\t'; len++; break; + case 'v': *(p++) = '\v'; len++; break; - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - { - int c0 = 0; - int c1 = 0; - int c2 = 0; - int c = 0; + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + { + int c0 = 0; + int c1 = 0; + int c2 = 0; + int c = 0; - c0 = (*s) - '0'; + c0 = (*s) - '0'; - if ( s[1] >= '0' && s[1] <= '7' ) { - c1 = c0; - c0 = (*++s) - '0'; + if ( s[1] >= '0' && s[1] <= '7' ) { + c1 = c0; + c0 = (*++s) - '0'; - if ( s[1] >= '0' && s[1] <= '7' ) { - c2 = c1; - c1 = c0; - c0 = (*++s) - '0'; - } - } - c = (64 * c2) + (8 * c1) + c0; - *(p++) = (char) (c > 255 ? 255 : c); - len++; - break; - } + if ( s[1] >= '0' && s[1] <= '7' ) { + c2 = c1; + c1 = c0; + c0 = (*++s) - '0'; + } + } + c = (64 * c2) + (8 * c1) + c0; + *(p++) = (char) (c > 255 ? 255 : c); + len++; + break; + } - case 'x': - { - char c1 = *(s+1); - char c0 = *(s+2); + case 'x': + { + char c1 = *(s+1); + char c0 = *(s+2); - if (isxdigit((guchar)c1) && isxdigit((guchar)c0)) { - *(p++) = (xton(c1) * 0x10) + xton(c0); - s += 2; - } else { - *(p++) = *s; - } - len++; - break; - } - default: - *p++ = *s; - break; - } - break; - default: - *(p++) = *s; - len++; - break; - } - } + if (isxdigit((guchar)c1) && isxdigit((guchar)c0)) { + *(p++) = (xton(c1) * 0x10) + xton(c0); + s += 2; + } else { + *(p++) = *s; + } + len++; + break; + } + default: + *p++ = *s; + break; + } + break; + default: + *(p++) = *s; + len++; + break; + } + } - if (len_p) *len_p = len; - return buf; + if (len_p) *len_p = len; + return buf; } char* uat_undquote(const char* si, guint in_len, guint* len_p) { - return uat_unesc(si+1,in_len-2,len_p); + return uat_unesc(si+1,in_len-2,len_p); } char* uat_esc(const char* buf, guint len) { - const guint8* end = ((guint8*)buf)+len; - char* out = ep_alloc0((4*len)+1); - const guint8* b; - char* s = out; + const guint8* end = ((guint8*)buf)+len; + char* out = ep_alloc0((4*len)+1); + const guint8* b; + char* s = out; - for (b = (void*)buf; b < end; b++) { - if (isprint(*b) ) { - *(s++) = (*b); - } else { - g_snprintf(s,5,"\\x%.2x",((guint)*b)); - s+=4; - } - } + for (b = (void*)buf; b < end; b++) { + if (isprint(*b) ) { + *(s++) = (*b); + } else { + g_snprintf(s,5,"\\x%.2x",((guint)*b)); + s+=4; + } + } - return out; + return out; } @@ -676,10 +676,10 @@ CHK_STR_IS_DEF(isxdigit) * * Local Variables: * c-basic-offset: 4 - * tab-width: 4 + * tab-width: 8 * indent-tabs-mode: nil * End: * - * ex: set shiftwidth=4 tabstop=4 expandtab: - * :indentSize=4:tabSize=4:noTabs=true: + * ex: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: */ diff --git a/file.c b/file.c index ef9c24f6d3..27753d45a4 100644 --- a/file.c +++ b/file.c @@ -478,8 +478,8 @@ calc_progbar_val(capture_file *cf, gint64 size, gint64 file_pos, gchar *status_s } g_snprintf(status_str, status_size, - "%" G_GINT64_MODIFIER "dKB of %" G_GINT64_MODIFIER "dKB", - file_pos / 1024, size / 1024); + "%" G_GINT64_MODIFIER "dKB of %" G_GINT64_MODIFIER "dKB", + file_pos / 1024, size / 1024); return progbar_val; } @@ -2758,7 +2758,7 @@ cf_find_string_protocol_tree(capture_file *cf, proto_tree *tree, match_data *md mdata->cf = cf; /* Iterate through all the nodes looking for matching text */ proto_tree_children_foreach(tree, match_subtree_text, mdata); - return mdata->frame_matched ? MR_MATCHED : MR_NOTMATCHED; + return mdata->frame_matched ? MR_MATCHED : MR_NOTMATCHED; } static match_result diff --git a/gtk/filter_dlg.c b/gtk/filter_dlg.c index c0a0781e52..3f6efade9c 100644 --- a/gtk/filter_dlg.c +++ b/gtk/filter_dlg.c @@ -446,7 +446,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, g_signal_connect(new_bt, "clicked", G_CALLBACK(filter_new_bt_clicked_cb), filter_list_type_p); gtk_widget_show(new_bt); gtk_box_pack_start (GTK_BOX (list_bb), new_bt, FALSE, FALSE, 0); - gtk_widget_set_tooltip_text(new_bt, "Create a new filter at the end of the list (with the current properties)"); + gtk_widget_set_tooltip_text(new_bt, "Create a new filter at the end of the list (with the current properties)"); del_bt = gtk_button_new_from_stock(GTK_STOCK_DELETE); gtk_widget_set_sensitive(del_bt, FALSE); @@ -454,7 +454,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, g_object_set_data(G_OBJECT(main_w), E_FILT_DEL_BT_KEY, del_bt); gtk_widget_show(del_bt); gtk_box_pack_start (GTK_BOX (list_bb), del_bt, FALSE, FALSE, 0); - gtk_widget_set_tooltip_text(del_bt, "Delete the selected filter"); + gtk_widget_set_tooltip_text(del_bt, "Delete the selected filter"); filter_fr = gtk_frame_new(list_name); gtk_box_pack_start(GTK_BOX(top_hb), filter_fr, TRUE, TRUE, 0); @@ -547,7 +547,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, g_object_set_data(G_OBJECT(main_w), E_FILT_PARENT_FILTER_TE_KEY, parent_filter_te); if (list_type == DFILTER_EDITED_LIST) { - gtk_widget_set_tooltip_text(filter_te, + gtk_widget_set_tooltip_text(filter_te, "Enter a display filter. " "The background color of this field is changed by a continuous syntax check" " (green is valid, red is invalid, yellow may have unexpected results)."); @@ -558,7 +558,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, g_signal_connect(add_expression_bt, "clicked", G_CALLBACK(filter_add_expr_bt_cb), main_w); gtk_box_pack_start(GTK_BOX(bottom_hb), add_expression_bt, FALSE, FALSE, 0); gtk_widget_show(add_expression_bt); - gtk_widget_set_tooltip_text(add_expression_bt, "Add an expression to the filter string"); + gtk_widget_set_tooltip_text(add_expression_bt, "Add an expression to the filter string"); } @@ -569,7 +569,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); g_signal_connect(ok_bt, "clicked", G_CALLBACK(filter_dlg_ok_cb), filter_list_type_p); - gtk_widget_set_tooltip_text(ok_bt, "Apply the filters and close this dialog"); + gtk_widget_set_tooltip_text(ok_bt, "Apply the filters and close this dialog"); /* Catch the "activate" signal on the filter name and filter expression text entries, so that if the user types Return @@ -583,14 +583,14 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, apply_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_APPLY); g_signal_connect(apply_bt, "clicked", G_CALLBACK(filter_dlg_apply_cb), filter_list_type_p); - gtk_widget_set_tooltip_text(apply_bt, "Apply the filters and keep this dialog open"); + gtk_widget_set_tooltip_text(apply_bt, "Apply the filters and keep this dialog open"); save_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_SAVE); g_signal_connect(save_bt, "clicked", G_CALLBACK(filter_dlg_save_cb), filter_list_type_p); - gtk_widget_set_tooltip_text(save_bt, "Save the filters permanently and keep this dialog open"); + gtk_widget_set_tooltip_text(save_bt, "Save the filters permanently and keep this dialog open"); cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); - gtk_widget_set_tooltip_text(cancel_bt, "Cancel the changes"); + gtk_widget_set_tooltip_text(cancel_bt, "Cancel the changes"); g_signal_connect(cancel_bt, "clicked", G_CALLBACK(filter_dlg_cancel_cb), filter_list_type_p); window_set_cancel_button(main_w, cancel_bt, NULL); @@ -600,7 +600,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, } else { g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_DISPLAY_FILTERS_DIALOG); } - gtk_widget_set_tooltip_text(help_bt, "Show topic specific help"); + gtk_widget_set_tooltip_text(help_bt, "Show topic specific help"); if(ok_bt) { gtk_widget_grab_default(ok_bt); diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c index 6e45bceebc..7f88fbc88c 100644 --- a/gtk/hostlist_table.c +++ b/gtk/hostlist_table.c @@ -400,99 +400,99 @@ hostlist_show_popup_menu_cb(void *widg _U_, GdkEvent *event, hostlist_table *et) static void apply_as_selected_cb(GtkWidget *widget, gpointer user_data) { - hostlist_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_SELECTED, 0)); + hostlist_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_SELECTED, 0)); } static void apply_as_not_selected_cb(GtkWidget *widget, gpointer user_data) { - hostlist_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_NOT_SELECTED, 0)); + hostlist_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_NOT_SELECTED, 0)); } static void apply_as_and_selected_cb(GtkWidget *widget, gpointer user_data) { - hostlist_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_SELECTED, 0)); + hostlist_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_SELECTED, 0)); } static void apply_as_or_selected_cb(GtkWidget *widget, gpointer user_data) { - hostlist_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_SELECTED, 0)); + hostlist_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_SELECTED, 0)); } static void apply_as_and_not_selected_cb(GtkWidget *widget, gpointer user_data) { - hostlist_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, 0)); + hostlist_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, 0)); } static void apply_as_or_not_selected_cb(GtkWidget *widget, gpointer user_data) { - hostlist_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, 0)); + hostlist_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, 0)); } static void prep_as_selected_cb(GtkWidget *widget, gpointer user_data) { - hostlist_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_SELECTED, 0)); + hostlist_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_SELECTED, 0)); } static void prep_as_not_selected_cb(GtkWidget *widget, gpointer user_data) { - hostlist_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, 0)); + hostlist_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, 0)); } static void prep_as_and_selected_cb(GtkWidget *widget, gpointer user_data) { - hostlist_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_SELECTED, 0)); + hostlist_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_SELECTED, 0)); } static void prep_as_or_selected_cb(GtkWidget *widget, gpointer user_data) { - hostlist_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_SELECTED, 0)); + hostlist_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_SELECTED, 0)); } static void prep_as_and_not_selected_cb(GtkWidget *widget, gpointer user_data) { - hostlist_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, 0)); + hostlist_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, 0)); } static void prep_as_or_not_selected_cb(GtkWidget *widget, gpointer user_data) { - hostlist_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, 0)); + hostlist_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, 0)); } static void find_selected_cb(GtkWidget *widget, gpointer user_data) { - hostlist_select_filter_cb( widget , user_data, CALLBACK_FIND_FRAME(ACTYPE_SELECTED, 0)); + hostlist_select_filter_cb( widget , user_data, CALLBACK_FIND_FRAME(ACTYPE_SELECTED, 0)); } static void find_not_selected_cb(GtkWidget *widget, gpointer user_data) { - hostlist_select_filter_cb( widget , user_data, CALLBACK_FIND_FRAME(ACTYPE_NOT_SELECTED, 0)); + hostlist_select_filter_cb( widget , user_data, CALLBACK_FIND_FRAME(ACTYPE_NOT_SELECTED, 0)); } static void find_prev_selected_cb(GtkWidget *widget, gpointer user_data) { - hostlist_select_filter_cb( widget , user_data, CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, 0)); + hostlist_select_filter_cb( widget , user_data, CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, 0)); } static void find_prev_not_selected_cb(GtkWidget *widget, gpointer user_data) { - hostlist_select_filter_cb( widget , user_data, CALLBACK_FIND_PREVIOUS(ACTYPE_NOT_SELECTED, 0)); + hostlist_select_filter_cb( widget , user_data, CALLBACK_FIND_PREVIOUS(ACTYPE_NOT_SELECTED, 0)); } static void find_next_selected_cb(GtkWidget *widget, gpointer user_data) { - hostlist_select_filter_cb( widget , user_data, CALLBACK_FIND_NEXT(ACTYPE_SELECTED, 0)); + hostlist_select_filter_cb( widget , user_data, CALLBACK_FIND_NEXT(ACTYPE_SELECTED, 0)); } static void find_next_not_selected_cb(GtkWidget *widget, gpointer user_data) { - hostlist_select_filter_cb( widget , user_data, CALLBACK_FIND_NEXT(ACTYPE_NOT_SELECTED, 0)); + hostlist_select_filter_cb( widget , user_data, CALLBACK_FIND_NEXT(ACTYPE_NOT_SELECTED, 0)); } static void color_selected_cb(GtkWidget *widget, gpointer user_data) { - hostlist_select_filter_cb( widget , user_data, CALLBACK_COLORIZE(ACTYPE_SELECTED, 0)); + hostlist_select_filter_cb( widget , user_data, CALLBACK_COLORIZE(ACTYPE_SELECTED, 0)); } static const char *ui_desc_hostlist_table_popup = @@ -544,73 +544,73 @@ static const char *ui_desc_hostlist_table_popup = * const gchar *tooltip; * GCallback callback; * } GtkActionEntry; - * const gchar *name; The name of the action. - * const gchar *stock_id; The stock id for the action, or the name of an icon from the icon theme. - * const gchar *label; The label for the action. This field should typically be marked for translation, - * see gtk_action_group_set_translation_domain(). - * If label is NULL, the label of the stock item with id stock_id is used. - * const gchar *accelerator; The accelerator for the action, in the format understood by gtk_accelerator_parse(). - * const gchar *tooltip; The tooltip for the action. This field should typically be marked for translation, + * const gchar *name; The name of the action. + * const gchar *stock_id; The stock id for the action, or the name of an icon from the icon theme. + * const gchar *label; The label for the action. This field should typically be marked for translation, * see gtk_action_group_set_translation_domain(). - * GCallback callback; The function to call when the action is activated. + * If label is NULL, the label of the stock item with id stock_id is used. + * const gchar *accelerator; The accelerator for the action, in the format understood by gtk_accelerator_parse(). + * const gchar *tooltip; The tooltip for the action. This field should typically be marked for translation, + * see gtk_action_group_set_translation_domain(). + * GCallback callback; The function to call when the action is activated. * */ static const GtkActionEntry service_resp_t__popup_entries[] = { - { "/Apply as Filter", NULL, "Apply as Filter", NULL, NULL, NULL }, - { "/Prepare a Filter", NULL, "Prepare a Filter", NULL, NULL, NULL }, - { "/Find Frame", NULL, "Find Frame", NULL, NULL, NULL }, - { "/Find Frame/Find Frame", NULL, "Find Frame", NULL, NULL, NULL }, - { "/Find Frame/Find Next", NULL, "Find Next" , NULL, NULL, NULL }, - { "/Find Frame/Find Previous", NULL, "Find Previous", NULL, NULL, NULL }, - { "/Colorize Procedure", NULL, "Colorize Procedure", NULL, NULL, NULL }, - { "/Apply as Filter/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(apply_as_selected_cb) }, - { "/Apply as Filter/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(apply_as_not_selected_cb) }, - { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", G_CALLBACK(apply_as_and_selected_cb) }, - { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", G_CALLBACK(apply_as_or_selected_cb) }, - { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", G_CALLBACK(apply_as_and_not_selected_cb) }, - { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", G_CALLBACK(apply_as_or_not_selected_cb) }, - { "/Prepare a Filter/Selected", NULL, "Selected", NULL, "selcted", G_CALLBACK(prep_as_selected_cb) }, - { "/Prepare a Filter/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(prep_as_not_selected_cb) }, - { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", G_CALLBACK(prep_as_and_selected_cb) }, - { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", G_CALLBACK(prep_as_or_selected_cb) }, - { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", G_CALLBACK(prep_as_and_not_selected_cb) }, - { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", G_CALLBACK(prep_as_or_not_selected_cb) }, - { "/Find Frame/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_selected_cb) }, - { "/Find Frame/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_not_selected_cb) }, - { "/Find Previous/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_prev_selected_cb) }, - { "/Find Previous/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_prev_not_selected_cb) }, - { "/Find Next/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_next_selected_cb) }, - { "/Find Next/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_next_not_selected_cb) }, - { "/Colorize Procedure/Colorize Host Traffic",NULL, "Colorize Host Traffic", NULL, "Colorize Host Traffic", G_CALLBACK(color_selected_cb) }, + { "/Apply as Filter", NULL, "Apply as Filter", NULL, NULL, NULL }, + { "/Prepare a Filter", NULL, "Prepare a Filter", NULL, NULL, NULL }, + { "/Find Frame", NULL, "Find Frame", NULL, NULL, NULL }, + { "/Find Frame/Find Frame", NULL, "Find Frame", NULL, NULL, NULL }, + { "/Find Frame/Find Next", NULL, "Find Next" , NULL, NULL, NULL }, + { "/Find Frame/Find Previous", NULL, "Find Previous", NULL, NULL, NULL }, + { "/Colorize Procedure", NULL, "Colorize Procedure", NULL, NULL, NULL }, + { "/Apply as Filter/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(apply_as_selected_cb) }, + { "/Apply as Filter/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(apply_as_not_selected_cb) }, + { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", G_CALLBACK(apply_as_and_selected_cb) }, + { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", G_CALLBACK(apply_as_or_selected_cb) }, + { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", G_CALLBACK(apply_as_and_not_selected_cb) }, + { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", G_CALLBACK(apply_as_or_not_selected_cb) }, + { "/Prepare a Filter/Selected", NULL, "Selected", NULL, "selcted", G_CALLBACK(prep_as_selected_cb) }, + { "/Prepare a Filter/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(prep_as_not_selected_cb) }, + { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", G_CALLBACK(prep_as_and_selected_cb) }, + { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", G_CALLBACK(prep_as_or_selected_cb) }, + { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", G_CALLBACK(prep_as_and_not_selected_cb) }, + { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", G_CALLBACK(prep_as_or_not_selected_cb) }, + { "/Find Frame/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_selected_cb) }, + { "/Find Frame/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_not_selected_cb) }, + { "/Find Previous/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_prev_selected_cb) }, + { "/Find Previous/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_prev_not_selected_cb) }, + { "/Find Next/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_next_selected_cb) }, + { "/Find Next/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_next_not_selected_cb) }, + { "/Colorize Procedure/Colorize Host Traffic",NULL, "Colorize Host Traffic", NULL, "Colorize Host Traffic", G_CALLBACK(color_selected_cb) }, }; static void hostlist_create_popup_menu(hostlist_table *hl) { - GtkUIManager *ui_manager; - GtkActionGroup *action_group; - GError *error = NULL; + GtkUIManager *ui_manager; + GtkActionGroup *action_group; + GError *error = NULL; - action_group = gtk_action_group_new ("HostlistTablePopupActionGroup"); - gtk_action_group_add_actions (action_group, /* the action group */ - (gpointer)service_resp_t__popup_entries, /* an array of action descriptions */ - G_N_ELEMENTS(service_resp_t__popup_entries),/* the number of entries */ - hl); /* data to pass to the action callbacks */ + action_group = gtk_action_group_new ("HostlistTablePopupActionGroup"); + gtk_action_group_add_actions (action_group, /* the action group */ + (gpointer)service_resp_t__popup_entries, /* an array of action descriptions */ + G_N_ELEMENTS(service_resp_t__popup_entries),/* the number of entries */ + hl); /* data to pass to the action callbacks */ - ui_manager = gtk_ui_manager_new (); - gtk_ui_manager_insert_action_group (ui_manager, - action_group, - 0); /* the position at which the group will be inserted */ - gtk_ui_manager_add_ui_from_string (ui_manager,ui_desc_hostlist_table_popup, -1, &error); - if (error != NULL) + ui_manager = gtk_ui_manager_new (); + gtk_ui_manager_insert_action_group (ui_manager, + action_group, + 0); /* the position at which the group will be inserted */ + gtk_ui_manager_add_ui_from_string (ui_manager,ui_desc_hostlist_table_popup, -1, &error); + if (error != NULL) { fprintf (stderr, "Warning: building hostlist table filter popup failed: %s\n", error->message); g_error_free (error); error = NULL; } - hl->menu = gtk_ui_manager_get_widget(ui_manager, "/HostlistTableFilterPopup"); - g_signal_connect(hl->table, "button_press_event", G_CALLBACK(hostlist_show_popup_menu_cb), hl); + hl->menu = gtk_ui_manager_get_widget(ui_manager, "/HostlistTableFilterPopup"); + g_signal_connect(hl->table, "button_press_event", G_CALLBACK(hostlist_show_popup_menu_cb), hl); } @@ -1376,7 +1376,7 @@ init_hostlist_table(gboolean hide_ports, const char *table_name, const char *tap window_set_cancel_button(hosttable->win, close_bt, window_cancel_button_cb); copy_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_COPY); - gtk_widget_set_tooltip_text(copy_bt, "Copy all statistical values of this page to the clipboard in CSV (Comma Separated Values) format."); + gtk_widget_set_tooltip_text(copy_bt, "Copy all statistical values of this page to the clipboard in CSV (Comma Separated Values) format."); g_object_set_data(G_OBJECT(copy_bt), HOST_PTR_KEY, hosttable); g_signal_connect(copy_bt, "clicked", G_CALLBACK(copy_as_csv_cb), NULL); @@ -1616,15 +1616,15 @@ init_hostlist_notebook_cb(GtkWidget *w _U_, gpointer d _U_) resolv_cb = gtk_check_button_new_with_mnemonic("Name resolution"); gtk_container_add(GTK_CONTAINER(hbox), resolv_cb); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(resolv_cb), TRUE); - gtk_widget_set_tooltip_text(resolv_cb, - "Show results of name resolutions rather than the \"raw\" values. Please note: The corresponding name resolution must be enabled."); + gtk_widget_set_tooltip_text(resolv_cb, + "Show results of name resolutions rather than the \"raw\" values. Please note: The corresponding name resolution must be enabled."); g_signal_connect(resolv_cb, "toggled", G_CALLBACK(hostlist_resolve_toggle_dest), pages); filter_cb = gtk_check_button_new_with_mnemonic("Limit to display filter"); gtk_container_add(GTK_CONTAINER(hbox), filter_cb); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(filter_cb), FALSE); - gtk_widget_set_tooltip_text(filter_cb, "Limit the list to endpoints matching the current display filter."); + gtk_widget_set_tooltip_text(filter_cb, "Limit the list to endpoints matching the current display filter."); g_signal_connect(filter_cb, "toggled", G_CALLBACK(hostlist_filter_toggle_dest), pages); diff --git a/gtk/main_menubar.c b/gtk/main_menubar.c index ffec7fcdcf..05452c3cc0 100644 --- a/gtk/main_menubar.c +++ b/gtk/main_menubar.c @@ -361,14 +361,14 @@ build_conversation_filter(int action, gboolean show_dialog) static void new_window_cb(GtkWidget *widget) { - new_packet_window(widget, FALSE); + new_packet_window(widget, FALSE); } static void edit_window_cb(GtkWidget *widget _U_) { #ifdef WANT_PACKET_EDITOR - new_packet_window(widget, TRUE); + new_packet_window(widget, TRUE); #endif } @@ -439,37 +439,37 @@ colorize_conversation_cb(GtkAction *action _U_, gpointer data _U_, int action_nu static void goto_conversation_frame(gboolean dir) { - gchar *filter; - dfilter_t *dfcode = NULL; - gboolean found_packet=FALSE; + gchar *filter; + dfilter_t *dfcode = NULL; + gboolean found_packet=FALSE; - filter = build_conversation_filter(CONV_TCP,FALSE); - if( filter == NULL ) - filter = build_conversation_filter(CONV_UDP,FALSE); - if( filter == NULL ) - filter = build_conversation_filter(CONV_IP,FALSE); - if( filter == NULL ) { - statusbar_push_temporary_msg("Unable to build conversation filter."); - g_free(filter); - return; - } - - if (!dfilter_compile(filter, &dfcode)) { - /* The attempt failed; report an error. */ - statusbar_push_temporary_msg("Error compiling filter for this conversation."); - g_free(filter); - return; - } - - found_packet = cf_find_packet_dfilter(&cfile, dfcode, dir); - - if (!found_packet) { - /* We didn't find a packet */ - statusbar_push_temporary_msg("No previous/next packet in conversation."); - } - - dfilter_free(dfcode); + filter = build_conversation_filter(CONV_TCP,FALSE); + if( filter == NULL ) + filter = build_conversation_filter(CONV_UDP,FALSE); + if( filter == NULL ) + filter = build_conversation_filter(CONV_IP,FALSE); + if( filter == NULL ) { + statusbar_push_temporary_msg("Unable to build conversation filter."); g_free(filter); + return; + } + + if (!dfilter_compile(filter, &dfcode)) { + /* The attempt failed; report an error. */ + statusbar_push_temporary_msg("Error compiling filter for this conversation."); + g_free(filter); + return; + } + + found_packet = cf_find_packet_dfilter(&cfile, dfcode, dir); + + if (!found_packet) { + /* We didn't find a packet */ + statusbar_push_temporary_msg("No previous/next packet in conversation."); + } + + dfilter_free(dfcode); + g_free(filter); } static void @@ -490,210 +490,210 @@ goto_previous_frame_conversation_cb(GtkAction *action _U_, gpointer user_data _U static void tree_view_menu_apply_selected_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/Selected"); - match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/Selected"); + match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW); } static void tree_view_menu_apply_not_selected_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/NotSelected"); - match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/NotSelected"); + match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW); } static void tree_view_menu_apply_and_selected_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/AndSelected"); - match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/AndSelected"); + match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW); } static void tree_view_menu_apply_or_selected_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/OrSelected"); - match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/OrSelected"); + match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW); } static void tree_view_menu_apply_and_not_selected_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/AndNotSelected"); - match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/AndNotSelected"); + match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW); } static void tree_view_menu_apply_or_not_selected_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/OrNotSelected"); - match_selected_ptree_cb( widget , user_data,MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/OrNotSelected"); + match_selected_ptree_cb( widget , user_data,MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW); } /* Prepare a filter */ static void tree_view_menu_prepare_selected_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/Selected"); - match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_REPLACE); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/Selected"); + match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_REPLACE); } static void tree_view_menu_prepare_not_selected_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/NotSelected"); - match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_NOT); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/NotSelected"); + match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_NOT); } static void tree_view_menu_prepare_and_selected_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/AndSelected"); - match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_AND); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/AndSelected"); + match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_AND); } static void tree_view_menu_prepare_or_selected_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/OrSelected"); - match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_OR); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/OrSelected"); + match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_OR); } static void tree_view_menu_prepare_and_not_selected_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/AndNotSelected"); - match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_AND_NOT); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/AndNotSelected"); + match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_AND_NOT); } static void tree_view_menu_prepare_or_not_selected_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/OrNotSelected"); - match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_OR_NOT); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/OrNotSelected"); + match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_OR_NOT); } static void copy_description_cb(GtkAction *action _U_, gpointer user_data) { - copy_selected_plist_cb( NULL /* widget _U_ */ , user_data, COPY_SELECTED_DESCRIPTION); + copy_selected_plist_cb( NULL /* widget _U_ */ , user_data, COPY_SELECTED_DESCRIPTION); } static void copy_fieldname_cb(GtkAction *action _U_, gpointer user_data) { - copy_selected_plist_cb( NULL /* widget _U_ */ , user_data, COPY_SELECTED_FIELDNAME); + copy_selected_plist_cb( NULL /* widget _U_ */ , user_data, COPY_SELECTED_FIELDNAME); } static void copy_value_cb(GtkAction *action _U_, gpointer user_data) { - copy_selected_plist_cb( NULL /* widget _U_ */ , user_data, COPY_SELECTED_VALUE); + copy_selected_plist_cb( NULL /* widget _U_ */ , user_data, COPY_SELECTED_VALUE); } static void copy_as_filter_cb(GtkAction *action _U_, gpointer user_data) { - match_selected_ptree_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY); + match_selected_ptree_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY); } static void set_reftime_cb(GtkAction *action _U_, gpointer user_data) { - reftime_frame_cb( NULL /* widget _U_ */ , user_data, REFTIME_TOGGLE); + reftime_frame_cb( NULL /* widget _U_ */ , user_data, REFTIME_TOGGLE); } static void find_next_ref_time_cb(GtkAction *action _U_, gpointer user_data) { - reftime_frame_cb( NULL /* widget _U_ */ , user_data, REFTIME_FIND_NEXT); + reftime_frame_cb( NULL /* widget _U_ */ , user_data, REFTIME_FIND_NEXT); } static void find_previous_ref_time_cb(GtkAction *action _U_, gpointer user_data) { - reftime_frame_cb( NULL /* widget _U_ */ , user_data, REFTIME_FIND_PREV); + reftime_frame_cb( NULL /* widget _U_ */ , user_data, REFTIME_FIND_PREV); } static void menus_prefs_cb(GtkAction *action _U_, gpointer user_data) { - prefs_page_cb( NULL /* widget _U_ */ , user_data, PREFS_PAGE_USER_INTERFACE); + prefs_page_cb( NULL /* widget _U_ */ , user_data, PREFS_PAGE_USER_INTERFACE); } static void main_toolbar_show_hide_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/MainToolbar"); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/MainToolbar"); - if (!widget){ - g_warning("main_toolbar_show_hide_cb: No widget found"); - }else{ - show_hide_cb( widget, user_data, SHOW_HIDE_MAIN_TOOLBAR); - } + if (!widget){ + g_warning("main_toolbar_show_hide_cb: No widget found"); + }else{ + show_hide_cb( widget, user_data, SHOW_HIDE_MAIN_TOOLBAR); + } } static void filter_toolbar_show_hide_cb(GtkAction * action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/FilterToolbar"); - if (!widget){ - g_warning("filter_toolbar_show_hide_cb: No widget found"); - }else{ - show_hide_cb( widget, user_data, SHOW_HIDE_FILTER_TOOLBAR); - } + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/FilterToolbar"); + if (!widget){ + g_warning("filter_toolbar_show_hide_cb: No widget found"); + }else{ + show_hide_cb( widget, user_data, SHOW_HIDE_FILTER_TOOLBAR); + } } static void wireless_toolbar_show_hide_cb(GtkAction *action _U_, gpointer user_data _U_) { #ifdef HAVE_AIRPCAP - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/WirelessToolbar"); - if (!widget){ - g_warning("wireless_toolbar_show_hide_cb: No widget found"); - }else{ - show_hide_cb( widget, user_data, SHOW_HIDE_AIRPCAP_TOOLBAR); - } + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/WirelessToolbar"); + if (!widget){ + g_warning("wireless_toolbar_show_hide_cb: No widget found"); + }else{ + show_hide_cb( widget, user_data, SHOW_HIDE_AIRPCAP_TOOLBAR); + } #endif /* HAVE_AIRPCAP */ } static void status_bar_show_hide_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/Statusbar"); - if (!widget){ - g_warning("status_bar_show_hide_cb: No widget found"); - }else{ - show_hide_cb( widget, user_data, SHOW_HIDE_STATUSBAR); - } + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/Statusbar"); + if (!widget){ + g_warning("status_bar_show_hide_cb: No widget found"); + }else{ + show_hide_cb( widget, user_data, SHOW_HIDE_STATUSBAR); + } } static void packet_list_show_hide_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/PacketList"); - if (!widget){ - g_warning("packet_list_show_hide_cb: No widget found"); - }else{ - show_hide_cb( widget, user_data, SHOW_HIDE_PACKET_LIST); - } + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/PacketList"); + if (!widget){ + g_warning("packet_list_show_hide_cb: No widget found"); + }else{ + show_hide_cb( widget, user_data, SHOW_HIDE_PACKET_LIST); + } } static void packet_details_show_hide_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/PacketDetails"); - if (!widget){ - g_warning("packet_details_show_hide_cb: No widget found"); - }else{ - show_hide_cb( widget, user_data, SHOW_HIDE_TREE_VIEW); - } + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/PacketDetails"); + if (!widget){ + g_warning("packet_details_show_hide_cb: No widget found"); + }else{ + show_hide_cb( widget, user_data, SHOW_HIDE_TREE_VIEW); + } } static void packet_bytes_show_hide_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/PacketBytes"); - if (!widget){ - g_warning("packet_bytes_show_hide_cb: No widget found"); - }else{ - show_hide_cb( widget, user_data, SHOW_HIDE_BYTE_VIEW); - } + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/PacketBytes"); + if (!widget){ + g_warning("packet_bytes_show_hide_cb: No widget found"); + }else{ + show_hide_cb( widget, user_data, SHOW_HIDE_BYTE_VIEW); + } } static void @@ -737,56 +737,56 @@ timestamp_precision_new_cb (GtkRadioAction *action, GtkRadioAction *current _U_, static void view_menu_seconds_time_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/TimeDisplayFormat/DisplaySecondsWithHoursAndMinutes"); - if (!widget){ - g_warning("view_menu_seconds_time_cb: No widget found"); - }else{ - timestamp_seconds_time_cb(widget, user_data, 0); - } + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/TimeDisplayFormat/DisplaySecondsWithHoursAndMinutes"); + if (!widget){ + g_warning("view_menu_seconds_time_cb: No widget found"); + }else{ + timestamp_seconds_time_cb(widget, user_data, 0); + } } static void view_menu_en_for_MAC_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/NameResolution/EnableforMACLayer"); - if (!widget){ - g_warning("view_menu_en_for_MAC_cb: No widget found"); - }else{ - name_resolution_cb( widget , user_data, RESOLV_MAC); - } + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/NameResolution/EnableforMACLayer"); + if (!widget){ + g_warning("view_menu_en_for_MAC_cb: No widget found"); + }else{ + name_resolution_cb( widget , user_data, RESOLV_MAC); + } } static void view_menu_en_for_network_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/NameResolution/EnableforNetworkLayer"); - if (!widget){ - g_warning("view_menu_en_for_network_cb: No widget found"); - }else{ - name_resolution_cb( widget , user_data, RESOLV_NETWORK); - } + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/NameResolution/EnableforNetworkLayer"); + if (!widget){ + g_warning("view_menu_en_for_network_cb: No widget found"); + }else{ + name_resolution_cb( widget , user_data, RESOLV_NETWORK); + } } static void view_menu_en_for_transport_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/NameResolution/EnableforTransportLayer"); - if (!widget){ - g_warning("view_menu_en_for_transport_cb: No widget found"); - }else{ - name_resolution_cb( widget , user_data, RESOLV_TRANSPORT); - } + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/NameResolution/EnableforTransportLayer"); + if (!widget){ + g_warning("view_menu_en_for_transport_cb: No widget found"); + }else{ + name_resolution_cb( widget , user_data, RESOLV_TRANSPORT); + } } static void view_menu_colorize_pkt_lst_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/ColorizePacketList"); - if (!widget){ - g_warning("view_menu_colorize_pkt_lst_cb: No widget found"); - }else{ - colorize_cb( widget , user_data); - } + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/ColorizePacketList"); + if (!widget){ + g_warning("view_menu_colorize_pkt_lst_cb: No widget found"); + }else{ + colorize_cb( widget , user_data); + } } @@ -794,86 +794,86 @@ static void view_menu_auto_scroll_live_cb(GtkAction *action _U_, gpointer user_data _U_) { #ifdef HAVE_LIBPCAP - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/AutoScrollinLiveCapture"); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/AutoScrollinLiveCapture"); - if (!widget){ - g_warning("view_menu_auto_scroll_live_cb: No widget found"); - }else{ - menu_auto_scroll_live_changed(gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))); - } + if (!widget){ + g_warning("view_menu_auto_scroll_live_cb: No widget found"); + }else{ + menu_auto_scroll_live_changed(gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))); + } #endif } static void view_menu_color_conv_color1_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, 1*256); + colorize_conversation_cb(action, user_data, 1*256); } static void view_menu_color_conv_color2_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, 2*256); + colorize_conversation_cb(action, user_data, 2*256); } static void view_menu_color_conv_color3_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, 3*256); + colorize_conversation_cb(action, user_data, 3*256); } static void view_menu_color_conv_color4_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, 4*256); + colorize_conversation_cb(action, user_data, 4*256); } static void view_menu_color_conv_color5_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, 5*256); + colorize_conversation_cb(action, user_data, 5*256); } static void view_menu_color_conv_color6_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, 6*256); + colorize_conversation_cb(action, user_data, 6*256); } static void view_menu_color_conv_color7_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, 7*256); + colorize_conversation_cb(action, user_data, 7*256); } static void view_menu_color_conv_color8_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, 8*256); + colorize_conversation_cb(action, user_data, 8*256); } static void view_menu_color_conv_color9_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, 9*256); + colorize_conversation_cb(action, user_data, 9*256); } static void view_menu_color_conv_color10_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, 10*256); + colorize_conversation_cb(action, user_data, 10*256); } static void view_menu_color_conv_new_rule_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, 0); + colorize_conversation_cb(action, user_data, 0); } static void view_menu_reset_coloring_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, 255*256); + colorize_conversation_cb(action, user_data, 255*256); } /* * TODO Move this menu to capture_if_dlg.c ? @@ -882,122 +882,122 @@ static void capture_cb(GtkAction *action _U_, gpointer user_data _U_) { #ifdef HAVE_LIBPCAP - const gchar *action_name; - gchar *name; + const gchar *action_name; + gchar *name; - action_name = gtk_action_get_name (action); - name = strrchr(action_name,'/'); - if(name){ - name = name+1; - }else{ - name = g_strdup_printf("%s",action_name); - } - if(strcmp(name, "Interfaces") == 0){ - capture_if_cb(NULL /* GtkWidget *w _U_ */, user_data); - return; - }else if(strcmp(name, "Options") == 0){ - capture_prep_cb(NULL /* GtkWidget *w _U_ */, user_data); - return; - }else if(strcmp(name, "Start") == 0){ - capture_start_cb(NULL /* GtkWidget *w _U_ */, user_data); - return; - }else if(strcmp(name, "Stop") == 0){ - capture_stop_cb(NULL /* GtkWidget *w _U_ */, user_data); - return; - }else if(strcmp(name, "Restart") == 0){ - capture_restart_cb(NULL /* GtkWidget *w _U_ */, user_data); - return; - }else if(strcmp(name, "CaptureFilters") == 0){ - cfilter_dialog_cb(NULL /* GtkWidget *w _U_ */); - return; - } + action_name = gtk_action_get_name (action); + name = strrchr(action_name,'/'); + if(name){ + name = name+1; + }else{ + name = g_strdup_printf("%s",action_name); + } + if(strcmp(name, "Interfaces") == 0){ + capture_if_cb(NULL /* GtkWidget *w _U_ */, user_data); + return; + }else if(strcmp(name, "Options") == 0){ + capture_prep_cb(NULL /* GtkWidget *w _U_ */, user_data); + return; + }else if(strcmp(name, "Start") == 0){ + capture_start_cb(NULL /* GtkWidget *w _U_ */, user_data); + return; + }else if(strcmp(name, "Stop") == 0){ + capture_stop_cb(NULL /* GtkWidget *w _U_ */, user_data); + return; + }else if(strcmp(name, "Restart") == 0){ + capture_restart_cb(NULL /* GtkWidget *w _U_ */, user_data); + return; + }else if(strcmp(name, "CaptureFilters") == 0){ + cfilter_dialog_cb(NULL /* GtkWidget *w _U_ */); + return; + } - fprintf (stderr, "Warning capture_cb unknown action: %s/n",action_name); -#endif /* HAVE_LIBPCAP */ + fprintf (stderr, "Warning capture_cb unknown action: %s/n",action_name); +#endif /* HAVE_LIBPCAP */ } static void help_menu_cont_cb(GtkAction *action _U_, gpointer user_data _U_) { - topic_menu_cb(NULL/*widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(HELP_CONTENT)); + topic_menu_cb(NULL/*widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(HELP_CONTENT)); } static void help_menu_faq_cb(GtkAction *action _U_, gpointer user_data _U_) { - topic_menu_cb(NULL/*widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(ONLINEPAGE_FAQ)); + topic_menu_cb(NULL/*widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(ONLINEPAGE_FAQ)); } static void help_menu_wireshark_cb(GtkAction *action _U_, gpointer user_data _U_) { - topic_menu_cb(NULL/*widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(LOCALPAGE_MAN_WIRESHARK)); + topic_menu_cb(NULL/*widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(LOCALPAGE_MAN_WIRESHARK)); } static void help_menu_wireshark_flt_cb(GtkAction *action _U_, gpointer user_data _U_) { - topic_menu_cb(NULL/*widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(LOCALPAGE_MAN_WIRESHARK_FILTER)); + topic_menu_cb(NULL/*widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(LOCALPAGE_MAN_WIRESHARK_FILTER)); } static void help_menu_Tshark_cb(GtkAction *action _U_, gpointer user_data _U_) { - topic_menu_cb(NULL/*widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(LOCALPAGE_MAN_TSHARK)); + topic_menu_cb(NULL/*widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(LOCALPAGE_MAN_TSHARK)); } static void help_menu_RawShark_cb(GtkAction *action _U_, gpointer user_data _U_) { - topic_menu_cb(NULL/*widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(LOCALPAGE_MAN_RAWSHARK)); + topic_menu_cb(NULL/*widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(LOCALPAGE_MAN_RAWSHARK)); } static void help_menu_Dumpcap_cb(GtkAction *action _U_, gpointer user_data _U_) { - topic_menu_cb(NULL/*widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(LOCALPAGE_MAN_DUMPCAP)); + topic_menu_cb(NULL/*widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(LOCALPAGE_MAN_DUMPCAP)); } static void help_menu_Mergecap_cb(GtkAction *action _U_, gpointer user_data _U_) { - topic_menu_cb(NULL/*widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(LOCALPAGE_MAN_MERGECAP)); + topic_menu_cb(NULL/*widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(LOCALPAGE_MAN_MERGECAP)); } static void help_menu_Editcap_cb(GtkAction *action _U_, gpointer user_data _U_) { - topic_menu_cb(NULL/* widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(LOCALPAGE_MAN_EDITCAP)); + topic_menu_cb(NULL/* widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(LOCALPAGE_MAN_EDITCAP)); } static void help_menu_Text2pcap_cb(GtkAction *action _U_, gpointer user_data _U_) { - topic_menu_cb(NULL/* widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(LOCALPAGE_MAN_TEXT2PCAP)); + topic_menu_cb(NULL/* widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(LOCALPAGE_MAN_TEXT2PCAP)); } static void help_menu_Website_cb(GtkAction *action _U_, gpointer user_data _U_) { - topic_menu_cb(NULL/* widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(ONLINEPAGE_HOME)); + topic_menu_cb(NULL/* widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(ONLINEPAGE_HOME)); } static void help_menu_Wiki_cb(GtkAction *action _U_, gpointer user_data _U_) { - topic_menu_cb(NULL/* widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(ONLINEPAGE_WIKI)); + topic_menu_cb(NULL/* widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(ONLINEPAGE_WIKI)); } static void help_menu_Downloads_cb(GtkAction *action _U_, gpointer user_data _U_) { - topic_menu_cb(NULL/* widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(ONLINEPAGE_DOWNLOAD)); + topic_menu_cb(NULL/* widget _U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(ONLINEPAGE_DOWNLOAD)); } static void help_menu_SampleCaptures_cb(GtkAction *action _U_, gpointer user_data _U_) { - topic_menu_cb( NULL/* widget_U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(ONLINEPAGE_SAMPLE_FILES)); + topic_menu_cb( NULL/* widget_U_ */, NULL /*GdkEventButton *event _U_*/, GINT_TO_POINTER(ONLINEPAGE_SAMPLE_FILES)); } #ifndef NEW_MENU_CODE @@ -1341,9 +1341,9 @@ static const char *ui_desc_menubar = " \n" " \n" " \n" -" \n" -" \n" -" \n" +" \n" +" \n" +" \n" " \n" " \n" " \n" @@ -1392,27 +1392,27 @@ static const char *ui_desc_menubar = * various desktop environments: * * Windows: - * http://support.microsoft.com/kb/126449 + * http://support.microsoft.com/kb/126449 * * GNOME: - * http://library.gnome.org/users/user-guide/nightly/keyboard-skills.html.en + * http://library.gnome.org/users/user-guide/nightly/keyboard-skills.html.en * * KDE: - * http://developer.kde.org/documentation/standards/kde/style/keys/shortcuts.html + * http://developer.kde.org/documentation/standards/kde/style/keys/shortcuts.html * * In particular, do not use the following sequences for anything * other than their standard purposes: * - * O File->Open - * S File->Save - * P File->Print - * W File->Close - * Q File->Quit - * Z Edit->Undo (which we don't currently have) - * X Edit->Cut (which we don't currently have) - * C Edit->Copy (which we don't currently have) - * V Edit->Paste (which we don't currently have) - * A Edit->Select All (which we don't currently have) + * O File->Open + * S File->Save + * P File->Print + * W File->Close + * Q File->Quit + * Z Edit->Undo (which we don't currently have) + * X Edit->Cut (which we don't currently have) + * C Edit->Copy (which we don't currently have) + * V Edit->Paste (which we don't currently have) + * A Edit->Select All (which we don't currently have) * * Note that some if not all of the Edit keys above already perform those * functions in text boxes, such as the Filter box. Do no, under any @@ -1429,74 +1429,74 @@ static const char *ui_desc_menubar = * const gchar *tooltip; * GCallback callback; * } GtkActionEntry; - * const gchar *name; The name of the action. - * const gchar *stock_id; The stock id for the action, or the name of an icon from the icon theme. - * const gchar *label; The label for the action. This field should typically be marked for translation, - * see gtk_action_group_set_translation_domain(). - * If label is NULL, the label of the stock item with id stock_id is used. - * const gchar *accelerator; The accelerator for the action, in the format understood by gtk_accelerator_parse(). - * const gchar *tooltip; The tooltip for the action. This field should typically be marked for translation, + * const gchar *name; The name of the action. + * const gchar *stock_id; The stock id for the action, or the name of an icon from the icon theme. + * const gchar *label; The label for the action. This field should typically be marked for translation, * see gtk_action_group_set_translation_domain(). - * GCallback callback; The function to call when the action is activated. + * If label is NULL, the label of the stock item with id stock_id is used. + * const gchar *accelerator; The accelerator for the action, in the format understood by gtk_accelerator_parse(). + * const gchar *tooltip; The tooltip for the action. This field should typically be marked for translation, + * see gtk_action_group_set_translation_domain(). + * GCallback callback; The function to call when the action is activated. * */ static const GtkActionEntry main_menu_bar_entries[] = { /* Top level */ - { "/File", NULL, "_File", NULL, NULL, NULL }, - { "/Edit", NULL, "_Edit", NULL, NULL, NULL }, - { "/View", NULL, "_View", NULL, NULL, NULL }, - { "/Go", NULL, "_Go", NULL, NULL, NULL }, - { "/Capture", NULL, "_Capture", NULL, NULL, NULL }, - { "/Analyze", NULL, "_Analyze", NULL, NULL, NULL }, - { "/Statistics", NULL, "_Statistics", NULL, NULL, NULL }, - { "/Telephony", NULL, "Telephon_y", NULL, NULL, NULL }, - { "/Tools", NULL, "_Tools", NULL, NULL, NULL }, - { "/Internals", NULL, "_Internals", NULL, NULL, NULL }, - { "/Help", NULL, "_Help", NULL, NULL, NULL }, + { "/File", NULL, "_File", NULL, NULL, NULL }, + { "/Edit", NULL, "_Edit", NULL, NULL, NULL }, + { "/View", NULL, "_View", NULL, NULL, NULL }, + { "/Go", NULL, "_Go", NULL, NULL, NULL }, + { "/Capture", NULL, "_Capture", NULL, NULL, NULL }, + { "/Analyze", NULL, "_Analyze", NULL, NULL, NULL }, + { "/Statistics", NULL, "_Statistics", NULL, NULL, NULL }, + { "/Telephony", NULL, "Telephon_y", NULL, NULL, NULL }, + { "/Tools", NULL, "_Tools", NULL, NULL, NULL }, + { "/Internals", NULL, "_Internals", NULL, NULL, NULL }, + { "/Help", NULL, "_Help", NULL, NULL, NULL }, - { "/File/Open", GTK_STOCK_OPEN, "_Open...", "O", "Open a file", G_CALLBACK(file_open_cmd_cb) }, - { "/File/OpenRecent", NULL, "Open _Recent", NULL, NULL, NULL }, - { "/File/Merge", NULL, "_Merge...", NULL, NULL, G_CALLBACK(file_merge_cmd_cb) }, - { "/File/Import", NULL, "_Import...", NULL, NULL, G_CALLBACK(file_import_cmd_cb) }, - { "/File/Close", GTK_STOCK_CLOSE, "_Close", "W", NULL, G_CALLBACK(file_close_cmd_cb) }, + { "/File/Open", GTK_STOCK_OPEN, "_Open...", "O", "Open a file", G_CALLBACK(file_open_cmd_cb) }, + { "/File/OpenRecent", NULL, "Open _Recent", NULL, NULL, NULL }, + { "/File/Merge", NULL, "_Merge...", NULL, NULL, G_CALLBACK(file_merge_cmd_cb) }, + { "/File/Import", NULL, "_Import...", NULL, NULL, G_CALLBACK(file_import_cmd_cb) }, + { "/File/Close", GTK_STOCK_CLOSE, "_Close", "W", NULL, G_CALLBACK(file_close_cmd_cb) }, - { "/File/Save", GTK_STOCK_SAVE, "_Save", "S", NULL, G_CALLBACK(file_save_cmd_cb) }, - { "/File/SaveAs", GTK_STOCK_SAVE_AS, "Save _As...", "S", NULL, G_CALLBACK(file_save_as_cmd_cb) }, + { "/File/Save", GTK_STOCK_SAVE, "_Save", "S", NULL, G_CALLBACK(file_save_cmd_cb) }, + { "/File/SaveAs", GTK_STOCK_SAVE_AS, "Save _As...", "S", NULL, G_CALLBACK(file_save_as_cmd_cb) }, - { "/File/Set", NULL, "File Set", NULL, NULL, NULL }, - { "/File/Export", NULL, "Export", NULL, NULL, NULL }, - { "/File/Print", GTK_STOCK_PRINT, "_Print...", "P", NULL, G_CALLBACK(file_print_cmd_cb) }, - { "/File/Quit", GTK_STOCK_QUIT, "_Quit", "Q", NULL, G_CALLBACK(file_quit_cmd_cb) }, + { "/File/Set", NULL, "File Set", NULL, NULL, NULL }, + { "/File/Export", NULL, "Export", NULL, NULL, NULL }, + { "/File/Print", GTK_STOCK_PRINT, "_Print...", "P", NULL, G_CALLBACK(file_print_cmd_cb) }, + { "/File/Quit", GTK_STOCK_QUIT, "_Quit", "Q", NULL, G_CALLBACK(file_quit_cmd_cb) }, - { "/File/Set/ListFiles", WIRESHARK_STOCK_FILE_SET_LIST, "List Files", NULL, NULL, G_CALLBACK(fileset_cb) }, - { "/File/Set/NextFile", WIRESHARK_STOCK_FILE_SET_NEXT, "Next File", NULL, NULL, G_CALLBACK(fileset_next_cb) }, - { "/File/Set/PreviousFile",WIRESHARK_STOCK_FILE_SET_PREVIOUS, "Previous File", NULL, NULL, G_CALLBACK(fileset_previous_cb) }, + { "/File/Set/ListFiles", WIRESHARK_STOCK_FILE_SET_LIST, "List Files", NULL, NULL, G_CALLBACK(fileset_cb) }, + { "/File/Set/NextFile", WIRESHARK_STOCK_FILE_SET_NEXT, "Next File", NULL, NULL, G_CALLBACK(fileset_next_cb) }, + { "/File/Set/PreviousFile",WIRESHARK_STOCK_FILE_SET_PREVIOUS, "Previous File", NULL, NULL, G_CALLBACK(fileset_previous_cb) }, - { "/File/Export/File", NULL, "File", NULL, NULL, NULL }, - { "/File/Export/File/Text", NULL, "as \"Plain _Text\" file...", NULL, NULL, G_CALLBACK(export_text_cmd_cb) }, - { "/File/Export/File/PostScript", NULL, "as \"_PostScript\" file...", NULL, NULL, G_CALLBACK(export_ps_cmd_cb) }, - { "/File/Export/File/CSV", NULL, "as \"_CSV\" (Comma Separated Values packet summary) file...", - NULL, NULL, G_CALLBACK(export_csv_cmd_cb) }, - { "/File/Export/File/CArrays", NULL, "as \"C _Arrays\" (packet bytes) file...", - NULL, NULL, G_CALLBACK(export_carrays_cmd_cb) }, - { "/File/Export/File/PSML", NULL, "as XML - \"P_SML\" (packet summary) file...", - NULL, NULL, G_CALLBACK(export_psml_cmd_cb) }, - { "/File/Export/File/PDML", NULL, "as XML - \"P_DML\" (packet details) file...", - NULL, NULL, G_CALLBACK(export_pdml_cmd_cb) }, - { "/File/Export/SelectedPacketBytes", NULL, "Selected Packet _Bytes...", "H", NULL, G_CALLBACK(savehex_cb) }, - { "/File/Export/SslSessionKeys", NULL, "SSL Session Keys...", NULL, NULL, G_CALLBACK(savesslkeys_cb) }, - { "/File/Export/Objects", NULL, "Objects", NULL, NULL, NULL }, - { "/File/Export/Objects/HTTP", NULL, "_HTTP", NULL, NULL, G_CALLBACK(eo_http_cb) }, - { "/File/Export/Objects/DICOM", NULL, "_DICOM", NULL, NULL, G_CALLBACK(eo_dicom_cb) }, - { "/File/Export/Objects/SMB", NULL, "_SMB", NULL, NULL, G_CALLBACK(eo_smb_cb) }, + { "/File/Export/File", NULL, "File", NULL, NULL, NULL }, + { "/File/Export/File/Text", NULL, "as \"Plain _Text\" file...", NULL, NULL, G_CALLBACK(export_text_cmd_cb) }, + { "/File/Export/File/PostScript", NULL, "as \"_PostScript\" file...", NULL, NULL, G_CALLBACK(export_ps_cmd_cb) }, + { "/File/Export/File/CSV", NULL, "as \"_CSV\" (Comma Separated Values packet summary) file...", + NULL, NULL, G_CALLBACK(export_csv_cmd_cb) }, + { "/File/Export/File/CArrays", NULL, "as \"C _Arrays\" (packet bytes) file...", + NULL, NULL, G_CALLBACK(export_carrays_cmd_cb) }, + { "/File/Export/File/PSML", NULL, "as XML - \"P_SML\" (packet summary) file...", + NULL, NULL, G_CALLBACK(export_psml_cmd_cb) }, + { "/File/Export/File/PDML", NULL, "as XML - \"P_DML\" (packet details) file...", + NULL, NULL, G_CALLBACK(export_pdml_cmd_cb) }, + { "/File/Export/SelectedPacketBytes", NULL, "Selected Packet _Bytes...", "H", NULL, G_CALLBACK(savehex_cb) }, + { "/File/Export/SslSessionKeys", NULL, "SSL Session Keys...", NULL, NULL, G_CALLBACK(savesslkeys_cb) }, + { "/File/Export/Objects", NULL, "Objects", NULL, NULL, NULL }, + { "/File/Export/Objects/HTTP", NULL, "_HTTP", NULL, NULL, G_CALLBACK(eo_http_cb) }, + { "/File/Export/Objects/DICOM", NULL, "_DICOM", NULL, NULL, G_CALLBACK(eo_dicom_cb) }, + { "/File/Export/Objects/SMB", NULL, "_SMB", NULL, NULL, G_CALLBACK(eo_smb_cb) }, - { "/Edit/Copy", NULL, "Copy", NULL, NULL, NULL }, + { "/Edit/Copy", NULL, "Copy", NULL, NULL, NULL }, - { "/Edit/Copy/Description", NULL, "Description", "D", NULL, G_CALLBACK(copy_description_cb) }, - { "/Edit/Copy/Fieldname", NULL, "Fieldname", "F", NULL, G_CALLBACK(copy_fieldname_cb) }, - { "/Edit/Copy/Value", NULL, "Value", "V", NULL, G_CALLBACK(copy_value_cb) }, - { "/Edit/Copy/AsFilter", NULL, "As Filter", "C", NULL, G_CALLBACK(copy_as_filter_cb) }, + { "/Edit/Copy/Description", NULL, "Description", "D", NULL, G_CALLBACK(copy_description_cb) }, + { "/Edit/Copy/Fieldname", NULL, "Fieldname", "F", NULL, G_CALLBACK(copy_fieldname_cb) }, + { "/Edit/Copy/Value", NULL, "Value", "V", NULL, G_CALLBACK(copy_value_cb) }, + { "/Edit/Copy/AsFilter", NULL, "As Filter", "C", NULL, G_CALLBACK(copy_as_filter_cb) }, #if 0 /* @@ -1553,542 +1553,542 @@ static const GtkActionEntry main_menu_bar_entries[] = { {"/Edit/Select _All", "A", NULL, 0, "", GTK_STOCK_SELECT_ALL,}, #endif /* 0 */ - { "/Edit/FindPacket", GTK_STOCK_FIND, "_Find Packet...", "F", NULL, G_CALLBACK(find_frame_cb) }, - { "/Edit/FindNext", NULL, "Find Ne_xt", "N", NULL, G_CALLBACK(find_next_cb) }, - { "/Edit/FindPrevious", NULL, "Find Pre_vious", "B", NULL, G_CALLBACK(find_previous_cb) }, + { "/Edit/FindPacket", GTK_STOCK_FIND, "_Find Packet...", "F", NULL, G_CALLBACK(find_frame_cb) }, + { "/Edit/FindNext", NULL, "Find Ne_xt", "N", NULL, G_CALLBACK(find_next_cb) }, + { "/Edit/FindPrevious", NULL, "Find Pre_vious", "B", NULL, G_CALLBACK(find_previous_cb) }, - { "/Edit/MarkPacket", NULL, "_Mark Packet (toggle)", "M", NULL, G_CALLBACK(new_packet_list_mark_frame_cb) }, - { "/Edit/ToggleMarkingOfAllDisplayedPackets", NULL, "Toggle Marking Of All Displayed Packets", "M", NULL, G_CALLBACK(new_packet_list_toggle_mark_all_displayed_frames_cb) }, - { "/Edit/MarkAllDisplayedPackets", NULL, "Mark All Displayed Packets", "M", NULL, G_CALLBACK(new_packet_list_mark_all_displayed_frames_cb) }, - { "/Edit/UnmarkAllDisplayedPackets", NULL, "_Unmark All Displayed Packets", "M", NULL, G_CALLBACK(new_packet_list_unmark_all_displayed_frames_cb) }, - { "/Edit/FindNextMark", NULL, "Find Next Mark", "N", NULL, G_CALLBACK(find_next_mark_cb) }, - { "/Edit/FindPreviousMark", NULL, "Find Next Mark", "B", NULL, G_CALLBACK(find_prev_mark_cb) }, + { "/Edit/MarkPacket", NULL, "_Mark Packet (toggle)", "M", NULL, G_CALLBACK(new_packet_list_mark_frame_cb) }, + { "/Edit/ToggleMarkingOfAllDisplayedPackets", NULL, "Toggle Marking Of All Displayed Packets", "M", NULL, G_CALLBACK(new_packet_list_toggle_mark_all_displayed_frames_cb) }, + { "/Edit/MarkAllDisplayedPackets", NULL, "Mark All Displayed Packets", "M", NULL, G_CALLBACK(new_packet_list_mark_all_displayed_frames_cb) }, + { "/Edit/UnmarkAllDisplayedPackets", NULL, "_Unmark All Displayed Packets", "M", NULL, G_CALLBACK(new_packet_list_unmark_all_displayed_frames_cb) }, + { "/Edit/FindNextMark", NULL, "Find Next Mark", "N", NULL, G_CALLBACK(find_next_mark_cb) }, + { "/Edit/FindPreviousMark", NULL, "Find Next Mark", "B", NULL, G_CALLBACK(find_prev_mark_cb) }, - { "/Edit/IgnorePacket", NULL, "_Ignore Packet (toggle)", "X", NULL, G_CALLBACK(new_packet_list_ignore_frame_cb) }, + { "/Edit/IgnorePacket", NULL, "_Ignore Packet (toggle)", "X", NULL, G_CALLBACK(new_packet_list_ignore_frame_cb) }, /* * XXX - this next one overrides /Edit/Copy/Description */ - { "/Edit/IgnoreAllDisplayedPackets", NULL, "_Ignore All Displayed Packets (toggle)","X", NULL, G_CALLBACK(new_packet_list_ignore_all_displayed_frames_cb) }, - { "/Edit/Un-IgnoreAllPackets", NULL, "U_n-Ignore All Packets", "X", NULL, G_CALLBACK(new_packet_list_unignore_all_frames_cb) }, - { "/Edit/SetTimeReference", WIRESHARK_STOCK_TIME, "Set Time Reference (toggle)", "T", NULL, G_CALLBACK(set_reftime_cb) }, - { "/Edit/Un-TimeReferenceAllPackets",NULL, "Un-Time Reference All Packets", "T", NULL, G_CALLBACK(new_packet_list_untime_reference_all_frames_cb) }, - { "/Edit/FindNextTimeReference", NULL, "Find Next Time Reference", "N", NULL, G_CALLBACK(find_next_ref_time_cb) }, - { "/Edit/FindPreviousTimeReference", NULL, "Find Previous Time Reference", "B", NULL, G_CALLBACK(find_previous_ref_time_cb) }, - { "/Edit/TimeShift", WIRESHARK_STOCK_TIME, "Time Shift...", "T", NULL, G_CALLBACK(time_shift_cb) }, + { "/Edit/IgnoreAllDisplayedPackets", NULL, "_Ignore All Displayed Packets (toggle)","X", NULL, G_CALLBACK(new_packet_list_ignore_all_displayed_frames_cb) }, + { "/Edit/Un-IgnoreAllPackets", NULL, "U_n-Ignore All Packets", "X", NULL, G_CALLBACK(new_packet_list_unignore_all_frames_cb) }, + { "/Edit/SetTimeReference", WIRESHARK_STOCK_TIME, "Set Time Reference (toggle)", "T", NULL, G_CALLBACK(set_reftime_cb) }, + { "/Edit/Un-TimeReferenceAllPackets",NULL, "Un-Time Reference All Packets", "T", NULL, G_CALLBACK(new_packet_list_untime_reference_all_frames_cb) }, + { "/Edit/FindNextTimeReference", NULL, "Find Next Time Reference", "N", NULL, G_CALLBACK(find_next_ref_time_cb) }, + { "/Edit/FindPreviousTimeReference", NULL, "Find Previous Time Reference", "B", NULL, G_CALLBACK(find_previous_ref_time_cb) }, + { "/Edit/TimeShift", WIRESHARK_STOCK_TIME, "Time Shift...", "T", NULL, G_CALLBACK(time_shift_cb) }, - { "/Edit/ConfigurationProfiles", NULL, "_Configuration Profiles...", "A", NULL, G_CALLBACK(profile_dialog_cb) }, - { "/Edit/Preferences", GTK_STOCK_PREFERENCES, "_Preferences...", "P", NULL, G_CALLBACK(menus_prefs_cb) }, - { "/Edit/EditPacket", NULL, "_Edit Packet", NULL, NULL, G_CALLBACK(edit_window_cb) }, + { "/Edit/ConfigurationProfiles", NULL, "_Configuration Profiles...", "A", NULL, G_CALLBACK(profile_dialog_cb) }, + { "/Edit/Preferences", GTK_STOCK_PREFERENCES, "_Preferences...", "P", NULL, G_CALLBACK(menus_prefs_cb) }, + { "/Edit/EditPacket", NULL, "_Edit Packet", NULL, NULL, G_CALLBACK(edit_window_cb) }, - { "/View/TimeDisplayFormat", NULL, "_Time Display Format", NULL, NULL, NULL }, + { "/View/TimeDisplayFormat", NULL, "_Time Display Format", NULL, NULL, NULL }, - { "/View/NameResolution", NULL, "Name Resol_ution", NULL, NULL, NULL }, - { "/View/ZoomIn", GTK_STOCK_ZOOM_IN, "_Zoom In", "plus", NULL, G_CALLBACK(view_zoom_in_cb) }, - { "/View/ZoomOut", GTK_STOCK_ZOOM_OUT, "Zoom _Out", "minus", NULL, G_CALLBACK(view_zoom_out_cb) }, - { "/View/NormalSize", GTK_STOCK_ZOOM_100, "_Normal Size", "equal", NULL, G_CALLBACK(view_zoom_100_cb) }, - { "/View/ResizeAllColumns", WIRESHARK_STOCK_RESIZE_COLUMNS, "Resize All Columns", "R", NULL, G_CALLBACK(new_packet_list_resize_columns_cb) }, - { "/View/DisplayedColumns", NULL, "Displayed Columns", NULL, NULL, NULL }, - { "/View/ExpandSubtrees", NULL, "Expand Subtrees", NULL, NULL, G_CALLBACK(expand_tree_cb) }, - { "/View/ExpandAll", NULL, "Expand All", NULL, NULL, G_CALLBACK(expand_all_cb) }, - { "/View/CollapseAll", NULL, "Collapse All", NULL, NULL, G_CALLBACK(collapse_all_cb) }, - { "/View/ColorizeConversation", NULL, "Colorize Conversation",NULL, NULL, NULL }, + { "/View/NameResolution", NULL, "Name Resol_ution", NULL, NULL, NULL }, + { "/View/ZoomIn", GTK_STOCK_ZOOM_IN, "_Zoom In", "plus", NULL, G_CALLBACK(view_zoom_in_cb) }, + { "/View/ZoomOut", GTK_STOCK_ZOOM_OUT, "Zoom _Out", "minus", NULL, G_CALLBACK(view_zoom_out_cb) }, + { "/View/NormalSize", GTK_STOCK_ZOOM_100, "_Normal Size", "equal", NULL, G_CALLBACK(view_zoom_100_cb) }, + { "/View/ResizeAllColumns", WIRESHARK_STOCK_RESIZE_COLUMNS, "Resize All Columns", "R", NULL, G_CALLBACK(new_packet_list_resize_columns_cb) }, + { "/View/DisplayedColumns", NULL, "Displayed Columns", NULL, NULL, NULL }, + { "/View/ExpandSubtrees", NULL, "Expand Subtrees", NULL, NULL, G_CALLBACK(expand_tree_cb) }, + { "/View/ExpandAll", NULL, "Expand All", NULL, NULL, G_CALLBACK(expand_all_cb) }, + { "/View/CollapseAll", NULL, "Collapse All", NULL, NULL, G_CALLBACK(collapse_all_cb) }, + { "/View/ColorizeConversation", NULL, "Colorize Conversation",NULL, NULL, NULL }, - { "/View/ColorizeConversation/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(view_menu_color_conv_color1_cb) }, - { "/View/ColorizeConversation/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(view_menu_color_conv_color2_cb) }, - { "/View/ColorizeConversation/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(view_menu_color_conv_color3_cb) }, - { "/View/ColorizeConversation/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(view_menu_color_conv_color4_cb) }, - { "/View/ColorizeConversation/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(view_menu_color_conv_color5_cb) }, - { "/View/ColorizeConversation/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(view_menu_color_conv_color6_cb) }, - { "/View/ColorizeConversation/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(view_menu_color_conv_color7_cb) }, - { "/View/ColorizeConversation/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(view_menu_color_conv_color8_cb) }, - { "/View/ColorizeConversation/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(view_menu_color_conv_color9_cb) }, - { "/View/ColorizeConversation/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(view_menu_color_conv_color10_cb) }, - { "/View/ColorizeConversation/NewColoringRule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(view_menu_color_conv_new_rule_cb) }, + { "/View/ColorizeConversation/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(view_menu_color_conv_color1_cb) }, + { "/View/ColorizeConversation/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(view_menu_color_conv_color2_cb) }, + { "/View/ColorizeConversation/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(view_menu_color_conv_color3_cb) }, + { "/View/ColorizeConversation/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(view_menu_color_conv_color4_cb) }, + { "/View/ColorizeConversation/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(view_menu_color_conv_color5_cb) }, + { "/View/ColorizeConversation/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(view_menu_color_conv_color6_cb) }, + { "/View/ColorizeConversation/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(view_menu_color_conv_color7_cb) }, + { "/View/ColorizeConversation/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(view_menu_color_conv_color8_cb) }, + { "/View/ColorizeConversation/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(view_menu_color_conv_color9_cb) }, + { "/View/ColorizeConversation/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(view_menu_color_conv_color10_cb) }, + { "/View/ColorizeConversation/NewColoringRule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(view_menu_color_conv_new_rule_cb) }, - { "/View/ResetColoring1-10", NULL, "Reset Coloring 1-10", "space", NULL, G_CALLBACK(view_menu_reset_coloring_cb) }, - { "/View/ColoringRules", GTK_STOCK_SELECT_COLOR, "_Coloring Rules...", NULL, NULL, G_CALLBACK(color_display_cb) }, - { "/View/ShowPacketinNewWindow", NULL, "Show Packet in New _Window", NULL, NULL, G_CALLBACK(new_window_cb) }, - { "/View/Reload", GTK_STOCK_REFRESH, "_Reload", "R", NULL, G_CALLBACK(file_reload_cmd_cb) }, + { "/View/ResetColoring1-10", NULL, "Reset Coloring 1-10", "space", NULL, G_CALLBACK(view_menu_reset_coloring_cb) }, + { "/View/ColoringRules", GTK_STOCK_SELECT_COLOR, "_Coloring Rules...", NULL, NULL, G_CALLBACK(color_display_cb) }, + { "/View/ShowPacketinNewWindow", NULL, "Show Packet in New _Window", NULL, NULL, G_CALLBACK(new_window_cb) }, + { "/View/Reload", GTK_STOCK_REFRESH, "_Reload", "R", NULL, G_CALLBACK(file_reload_cmd_cb) }, - { "/Go/Back", GTK_STOCK_GO_BACK, "_Back", "Left", NULL, G_CALLBACK(history_back_cb) }, - { "/Go/Forward", GTK_STOCK_GO_FORWARD, "_Forward", "Right", NULL, G_CALLBACK(history_forward_cb) }, - { "/Go/Goto", GTK_STOCK_JUMP_TO, "_Go to Packet...", "G", NULL, G_CALLBACK(goto_frame_cb) }, - { "/Go/GotoCorrespondingPacket", NULL, "Go to _Corresponding Packet", NULL, NULL, G_CALLBACK(goto_framenum_cb) }, - { "/Go/PreviousPacket", GTK_STOCK_GO_UP, "Previous Packet", "Up", NULL, G_CALLBACK(goto_previous_frame_cb) }, - { "/Go/NextPacket", GTK_STOCK_GO_DOWN, "Next Packet", "Down", NULL, G_CALLBACK(goto_next_frame_cb) }, - { "/Go/FirstPacket", GTK_STOCK_GOTO_TOP, "F_irst Packet", "Home", NULL, G_CALLBACK(goto_top_frame_cb) }, - { "/Go/LastPacket", GTK_STOCK_GOTO_BOTTOM, "_Last Packet", "End", NULL, G_CALLBACK(goto_bottom_frame_cb) }, - { "/Go/PreviousPacketInConversation", GTK_STOCK_GO_UP, "Previous Packet In Conversation", "comma", NULL, G_CALLBACK(goto_previous_frame_conversation_cb) }, - { "/Go/NextPacketInConversation", GTK_STOCK_GO_DOWN, "Next Packet In Conversation", "period", NULL, G_CALLBACK(goto_next_frame_conversation_cb) }, + { "/Go/Back", GTK_STOCK_GO_BACK, "_Back", "Left", NULL, G_CALLBACK(history_back_cb) }, + { "/Go/Forward", GTK_STOCK_GO_FORWARD, "_Forward", "Right", NULL, G_CALLBACK(history_forward_cb) }, + { "/Go/Goto", GTK_STOCK_JUMP_TO, "_Go to Packet...", "G", NULL, G_CALLBACK(goto_frame_cb) }, + { "/Go/GotoCorrespondingPacket", NULL, "Go to _Corresponding Packet", NULL, NULL, G_CALLBACK(goto_framenum_cb) }, + { "/Go/PreviousPacket", GTK_STOCK_GO_UP, "Previous Packet", "Up", NULL, G_CALLBACK(goto_previous_frame_cb) }, + { "/Go/NextPacket", GTK_STOCK_GO_DOWN, "Next Packet", "Down", NULL, G_CALLBACK(goto_next_frame_cb) }, + { "/Go/FirstPacket", GTK_STOCK_GOTO_TOP, "F_irst Packet", "Home", NULL, G_CALLBACK(goto_top_frame_cb) }, + { "/Go/LastPacket", GTK_STOCK_GOTO_BOTTOM, "_Last Packet", "End", NULL, G_CALLBACK(goto_bottom_frame_cb) }, + { "/Go/PreviousPacketInConversation", GTK_STOCK_GO_UP, "Previous Packet In Conversation", "comma", NULL, G_CALLBACK(goto_previous_frame_conversation_cb) }, + { "/Go/NextPacketInConversation", GTK_STOCK_GO_DOWN, "Next Packet In Conversation", "period", NULL, G_CALLBACK(goto_next_frame_conversation_cb) }, /* - * TODO Move this menu to capture_if_dlg.c + * TODO Move this menu to capture_if_dlg.c * eg put a "place holder" in the UI description and * make a call from main_menubar.c i.e build_capture_menu() * ad do the UI stuff there. */ - { "/Capture/Interfaces", WIRESHARK_STOCK_CAPTURE_INTERFACES, "_Interfaces...", "I", NULL, G_CALLBACK(capture_cb) }, - { "/Capture/Options", WIRESHARK_STOCK_CAPTURE_OPTIONS, "_Options...", "K", NULL, G_CALLBACK(capture_cb) }, - { "/Capture/Start", WIRESHARK_STOCK_CAPTURE_START, "_Start", "E", NULL, G_CALLBACK(capture_cb) }, - { "/Capture/Stop", WIRESHARK_STOCK_CAPTURE_STOP, "S_top", "E", NULL, G_CALLBACK(capture_cb) }, - { "/Capture/Restart", WIRESHARK_STOCK_CAPTURE_RESTART, "_Restart", "R", NULL, G_CALLBACK(capture_cb) }, - { "/Capture/CaptureFilters", WIRESHARK_STOCK_CAPTURE_FILTER, "Capture _Filters...", NULL, NULL, G_CALLBACK(capture_cb) }, + { "/Capture/Interfaces", WIRESHARK_STOCK_CAPTURE_INTERFACES, "_Interfaces...", "I", NULL, G_CALLBACK(capture_cb) }, + { "/Capture/Options", WIRESHARK_STOCK_CAPTURE_OPTIONS, "_Options...", "K", NULL, G_CALLBACK(capture_cb) }, + { "/Capture/Start", WIRESHARK_STOCK_CAPTURE_START, "_Start", "E", NULL, G_CALLBACK(capture_cb) }, + { "/Capture/Stop", WIRESHARK_STOCK_CAPTURE_STOP, "S_top", "E", NULL, G_CALLBACK(capture_cb) }, + { "/Capture/Restart", WIRESHARK_STOCK_CAPTURE_RESTART, "_Restart", "R", NULL, G_CALLBACK(capture_cb) }, + { "/Capture/CaptureFilters", WIRESHARK_STOCK_CAPTURE_FILTER, "Capture _Filters...", NULL, NULL, G_CALLBACK(capture_cb) }, - { "/Analyze/DisplayFilters", WIRESHARK_STOCK_DISPLAY_FILTER, "_Display Filters...", NULL, NULL, G_CALLBACK(dfilter_dialog_cb) }, + { "/Analyze/DisplayFilters", WIRESHARK_STOCK_DISPLAY_FILTER, "_Display Filters...", NULL, NULL, G_CALLBACK(dfilter_dialog_cb) }, - { "/Analyze/DisplayFilterMacros", NULL, "Display Filter _Macros...", NULL, NULL, G_CALLBACK(macros_dialog_cb) }, - { "/Analyze/ApplyasColumn", NULL, "Apply as Column", NULL, NULL, G_CALLBACK(apply_as_custom_column_cb) }, - { "/Analyze/ApplyasFilter", NULL, "Apply as Filter", NULL, NULL, NULL }, + { "/Analyze/DisplayFilterMacros", NULL, "Display Filter _Macros...", NULL, NULL, G_CALLBACK(macros_dialog_cb) }, + { "/Analyze/ApplyasColumn", NULL, "Apply as Column", NULL, NULL, G_CALLBACK(apply_as_custom_column_cb) }, + { "/Analyze/ApplyasFilter", NULL, "Apply as Filter", NULL, NULL, NULL }, - { "/Analyze/ApplyasFilter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(tree_view_menu_apply_selected_cb) }, - { "/Analyze/ApplyasFilter/NotSelected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_not_selected_cb) }, - { "/Analyze/ApplyasFilter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_and_selected_cb) }, - { "/Analyze/ApplyasFilter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_or_selected_cb) }, - { "/Analyze/ApplyasFilter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_and_not_selected_cb) }, - { "/Analyze/ApplyasFilter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_or_not_selected_cb) }, + { "/Analyze/ApplyasFilter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(tree_view_menu_apply_selected_cb) }, + { "/Analyze/ApplyasFilter/NotSelected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_not_selected_cb) }, + { "/Analyze/ApplyasFilter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_and_selected_cb) }, + { "/Analyze/ApplyasFilter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_or_selected_cb) }, + { "/Analyze/ApplyasFilter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_and_not_selected_cb) }, + { "/Analyze/ApplyasFilter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_or_not_selected_cb) }, - { "/Analyze/PrepareaFilter", NULL, "Prepare a Filter", NULL, NULL, NULL }, - { "/Analyze/PrepareaFilter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(tree_view_menu_prepare_selected_cb) }, - { "/Analyze/PrepareaFilter/NotSelected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_not_selected_cb) }, - { "/Analyze/PrepareaFilter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_and_selected_cb) }, - { "/Analyze/PrepareaFilter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_or_selected_cb) }, - { "/Analyze/PrepareaFilter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_and_not_selected_cb) }, - { "/Analyze/PrepareaFilter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_or_not_selected_cb) }, + { "/Analyze/PrepareaFilter", NULL, "Prepare a Filter", NULL, NULL, NULL }, + { "/Analyze/PrepareaFilter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(tree_view_menu_prepare_selected_cb) }, + { "/Analyze/PrepareaFilter/NotSelected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_not_selected_cb) }, + { "/Analyze/PrepareaFilter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_and_selected_cb) }, + { "/Analyze/PrepareaFilter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_or_selected_cb) }, + { "/Analyze/PrepareaFilter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_and_not_selected_cb) }, + { "/Analyze/PrepareaFilter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_or_not_selected_cb) }, - { "/Analyze/EnabledProtocols", WIRESHARK_STOCK_CHECKBOX, "_Enabled Protocols...", "E", NULL, G_CALLBACK(proto_cb) }, - { "/Analyze/DecodeAs", WIRESHARK_STOCK_DECODE_AS, "Decode _As...", NULL, NULL, G_CALLBACK(decode_as_cb) }, - { "/Analyze/UserSpecifiedDecodes", WIRESHARK_STOCK_DECODE_AS, "_User Specified Decodes...", NULL, NULL, G_CALLBACK(decode_show_cb) }, + { "/Analyze/EnabledProtocols", WIRESHARK_STOCK_CHECKBOX, "_Enabled Protocols...", "E", NULL, G_CALLBACK(proto_cb) }, + { "/Analyze/DecodeAs", WIRESHARK_STOCK_DECODE_AS, "Decode _As...", NULL, NULL, G_CALLBACK(decode_as_cb) }, + { "/Analyze/UserSpecifiedDecodes", WIRESHARK_STOCK_DECODE_AS, "_User Specified Decodes...", NULL, NULL, G_CALLBACK(decode_show_cb) }, - { "/Analyze/FollowTCPStream", NULL, "Follow TCP Stream", NULL, NULL, G_CALLBACK(follow_tcp_stream_cb) }, - { "/Analyze/FollowUDPStream", NULL, "Follow UDP Stream", NULL, NULL, G_CALLBACK(follow_udp_stream_cb) }, - { "/Analyze/FollowSSLStream", NULL, "Follow SSL Stream", NULL, NULL, G_CALLBACK(follow_ssl_stream_cb) }, + { "/Analyze/FollowTCPStream", NULL, "Follow TCP Stream", NULL, NULL, G_CALLBACK(follow_tcp_stream_cb) }, + { "/Analyze/FollowUDPStream", NULL, "Follow UDP Stream", NULL, NULL, G_CALLBACK(follow_udp_stream_cb) }, + { "/Analyze/FollowSSLStream", NULL, "Follow SSL Stream", NULL, NULL, G_CALLBACK(follow_ssl_stream_cb) }, - { "/Analyze/ExpertInfoComposite",WIRESHARK_STOCK_EXPERT_INFO, "Expert Info _Composite", NULL, NULL, G_CALLBACK(expert_comp_dlg_launch) }, + { "/Analyze/ExpertInfoComposite",WIRESHARK_STOCK_EXPERT_INFO, "Expert Info _Composite", NULL, NULL, G_CALLBACK(expert_comp_dlg_launch) }, - { "/Analyze/ConversationFilter", NULL, "Conversation Filter", NULL, NULL, NULL }, + { "/Analyze/ConversationFilter", NULL, "Conversation Filter", NULL, NULL, NULL }, - { "/Stataistics/ConversationList", NULL, "_Conversation List", NULL, NULL, NULL }, - { "/Stataistics/ConversationList/Ethernet", WIRESHARK_STOCK_CONVERSATIONS, "Ethernet", NULL, NULL, G_CALLBACK(eth_endpoints_cb) }, - { "/Stataistics/ConversationList/FibreChannel", WIRESHARK_STOCK_CONVERSATIONS, "Fibre Channel", NULL, NULL, G_CALLBACK(fc_endpoints_cb) }, - { "/Stataistics/ConversationList/FDDI", WIRESHARK_STOCK_CONVERSATIONS, "FDDI", NULL, NULL, G_CALLBACK(fddi_endpoints_cb) }, - { "/Stataistics/ConversationList/IP", WIRESHARK_STOCK_CONVERSATIONS, "IPv4", NULL, NULL, G_CALLBACK(ip_endpoints_cb) }, - { "/Stataistics/ConversationList/IPv6", WIRESHARK_STOCK_CONVERSATIONS, "IPv6", NULL, NULL, G_CALLBACK(ipv6_endpoints_cb) }, - { "/Stataistics/ConversationList/IPX", WIRESHARK_STOCK_CONVERSATIONS, "IPX", NULL, NULL, G_CALLBACK(ipx_endpoints_cb) }, - { "/Stataistics/ConversationList/JXTA", WIRESHARK_STOCK_CONVERSATIONS, "JXTA", NULL, NULL, G_CALLBACK(jxta_conversation_cb) }, - { "/Stataistics/ConversationList/NCP", WIRESHARK_STOCK_CONVERSATIONS, "NCP", NULL, NULL, G_CALLBACK(ncp_endpoints_cb) }, - { "/Stataistics/ConversationList/RSVP", WIRESHARK_STOCK_CONVERSATIONS, "RSVP", NULL, NULL, G_CALLBACK(rsvp_endpoints_cb) }, - { "/Stataistics/ConversationList/SCTP", WIRESHARK_STOCK_CONVERSATIONS, "SCTP", NULL, NULL, G_CALLBACK(sctp_conversation_cb) }, - { "/Stataistics/ConversationList/TCPIP", WIRESHARK_STOCK_CONVERSATIONS, "TCP (IPv4 & IPv6)", NULL, NULL, G_CALLBACK(tcpip_conversation_cb) }, - { "/Stataistics/ConversationList/TR", WIRESHARK_STOCK_CONVERSATIONS, "Token Ring", NULL, NULL, G_CALLBACK(tr_conversation_cb) }, - { "/Stataistics/ConversationList/UDPIP", WIRESHARK_STOCK_CONVERSATIONS, "UDP (IPv4 & IPv6)", NULL, NULL, G_CALLBACK(udpip_conversation_cb) }, - { "/Stataistics/ConversationList/USB", WIRESHARK_STOCK_CONVERSATIONS, "USB", NULL, NULL, G_CALLBACK(usb_endpoints_cb) }, - { "/Stataistics/ConversationList/WLAN", WIRESHARK_STOCK_CONVERSATIONS, "WLAN", NULL, NULL, G_CALLBACK(wlan_endpoints_cb) }, + { "/Stataistics/ConversationList", NULL, "_Conversation List", NULL, NULL, NULL }, + { "/Stataistics/ConversationList/Ethernet", WIRESHARK_STOCK_CONVERSATIONS, "Ethernet", NULL, NULL, G_CALLBACK(eth_endpoints_cb) }, + { "/Stataistics/ConversationList/FibreChannel", WIRESHARK_STOCK_CONVERSATIONS, "Fibre Channel", NULL, NULL, G_CALLBACK(fc_endpoints_cb) }, + { "/Stataistics/ConversationList/FDDI", WIRESHARK_STOCK_CONVERSATIONS, "FDDI", NULL, NULL, G_CALLBACK(fddi_endpoints_cb) }, + { "/Stataistics/ConversationList/IP", WIRESHARK_STOCK_CONVERSATIONS, "IPv4", NULL, NULL, G_CALLBACK(ip_endpoints_cb) }, + { "/Stataistics/ConversationList/IPv6", WIRESHARK_STOCK_CONVERSATIONS, "IPv6", NULL, NULL, G_CALLBACK(ipv6_endpoints_cb) }, + { "/Stataistics/ConversationList/IPX", WIRESHARK_STOCK_CONVERSATIONS, "IPX", NULL, NULL, G_CALLBACK(ipx_endpoints_cb) }, + { "/Stataistics/ConversationList/JXTA", WIRESHARK_STOCK_CONVERSATIONS, "JXTA", NULL, NULL, G_CALLBACK(jxta_conversation_cb) }, + { "/Stataistics/ConversationList/NCP", WIRESHARK_STOCK_CONVERSATIONS, "NCP", NULL, NULL, G_CALLBACK(ncp_endpoints_cb) }, + { "/Stataistics/ConversationList/RSVP", WIRESHARK_STOCK_CONVERSATIONS, "RSVP", NULL, NULL, G_CALLBACK(rsvp_endpoints_cb) }, + { "/Stataistics/ConversationList/SCTP", WIRESHARK_STOCK_CONVERSATIONS, "SCTP", NULL, NULL, G_CALLBACK(sctp_conversation_cb) }, + { "/Stataistics/ConversationList/TCPIP", WIRESHARK_STOCK_CONVERSATIONS, "TCP (IPv4 & IPv6)", NULL, NULL, G_CALLBACK(tcpip_conversation_cb) }, + { "/Stataistics/ConversationList/TR", WIRESHARK_STOCK_CONVERSATIONS, "Token Ring", NULL, NULL, G_CALLBACK(tr_conversation_cb) }, + { "/Stataistics/ConversationList/UDPIP", WIRESHARK_STOCK_CONVERSATIONS, "UDP (IPv4 & IPv6)", NULL, NULL, G_CALLBACK(udpip_conversation_cb) }, + { "/Stataistics/ConversationList/USB", WIRESHARK_STOCK_CONVERSATIONS, "USB", NULL, NULL, G_CALLBACK(usb_endpoints_cb) }, + { "/Stataistics/ConversationList/WLAN", WIRESHARK_STOCK_CONVERSATIONS, "WLAN", NULL, NULL, G_CALLBACK(wlan_endpoints_cb) }, - { "/Statistics/EndpointList", NULL, "_Endpoint List", NULL, NULL, NULL }, - { "/Statistics/EndpointList/Ethernet", WIRESHARK_STOCK_ENDPOINTS, "Ethernet", NULL, NULL, G_CALLBACK(gtk_eth_hostlist_cb) }, - { "/Statistics/EndpointList/FibreChannel", WIRESHARK_STOCK_ENDPOINTS, "Fibre Channel", NULL, NULL, G_CALLBACK(gtk_fc_hostlist_cb) }, - { "/Statistics/EndpointList/FDDI", WIRESHARK_STOCK_ENDPOINTS, "FDDI", NULL, NULL, G_CALLBACK(gtk_fddi_hostlist_cb) }, - { "/Statistics/EndpointList/IP", WIRESHARK_STOCK_ENDPOINTS, "IPv4", NULL, NULL, G_CALLBACK(gtk_ip_hostlist_cb) }, - { "/Statistics/EndpointList/IPv6", WIRESHARK_STOCK_ENDPOINTS, "IPv6", NULL, NULL, G_CALLBACK(gtk_ipv6_hostlist_cb) }, - { "/Statistics/EndpointList/IPX", WIRESHARK_STOCK_ENDPOINTS, "IPX", NULL, NULL, G_CALLBACK(gtk_ipx_hostlist_cb) }, - { "/Statistics/EndpointList/JXTA", WIRESHARK_STOCK_ENDPOINTS, "JXTA", NULL, NULL, G_CALLBACK(gtk_jxta_hostlist_cb) }, - { "/Statistics/EndpointList/NCP", WIRESHARK_STOCK_ENDPOINTS, "NCP", NULL, NULL, G_CALLBACK(gtk_ncp_hostlist_cb) }, - { "/Statistics/EndpointList/RSVP", WIRESHARK_STOCK_ENDPOINTS, "RSVP", NULL, NULL, G_CALLBACK(gtk_rsvp_hostlist_cb) }, - { "/Statistics/EndpointList/SCTP", WIRESHARK_STOCK_ENDPOINTS, "SCTP", NULL, NULL, G_CALLBACK(gtk_sctp_hostlist_cb) }, - { "/Statistics/EndpointList/TCPIP", WIRESHARK_STOCK_ENDPOINTS, "TCP (IPv4 & IPv6)", NULL, NULL, G_CALLBACK(gtk_tcpip_hostlist_cb) }, - { "/Statistics/EndpointList/TR", WIRESHARK_STOCK_ENDPOINTS, "Token Ring", NULL, NULL, G_CALLBACK(gtk_tr_hostlist_cb) }, - { "/Statistics/EndpointList/UDPIP", WIRESHARK_STOCK_ENDPOINTS, "UDP (IPv4 & IPv6)", NULL, NULL, G_CALLBACK(gtk_udpip_hostlist_cb) }, - { "/Statistics/EndpointList/USB", WIRESHARK_STOCK_ENDPOINTS, "USB", NULL, NULL, G_CALLBACK(gtk_usb_hostlist_cb) }, - { "/Statistics/EndpointList/WLAN", WIRESHARK_STOCK_ENDPOINTS, "WLAN", NULL, NULL, G_CALLBACK(gtk_wlan_hostlist_cb) }, + { "/Statistics/EndpointList", NULL, "_Endpoint List", NULL, NULL, NULL }, + { "/Statistics/EndpointList/Ethernet", WIRESHARK_STOCK_ENDPOINTS, "Ethernet", NULL, NULL, G_CALLBACK(gtk_eth_hostlist_cb) }, + { "/Statistics/EndpointList/FibreChannel", WIRESHARK_STOCK_ENDPOINTS, "Fibre Channel", NULL, NULL, G_CALLBACK(gtk_fc_hostlist_cb) }, + { "/Statistics/EndpointList/FDDI", WIRESHARK_STOCK_ENDPOINTS, "FDDI", NULL, NULL, G_CALLBACK(gtk_fddi_hostlist_cb) }, + { "/Statistics/EndpointList/IP", WIRESHARK_STOCK_ENDPOINTS, "IPv4", NULL, NULL, G_CALLBACK(gtk_ip_hostlist_cb) }, + { "/Statistics/EndpointList/IPv6", WIRESHARK_STOCK_ENDPOINTS, "IPv6", NULL, NULL, G_CALLBACK(gtk_ipv6_hostlist_cb) }, + { "/Statistics/EndpointList/IPX", WIRESHARK_STOCK_ENDPOINTS, "IPX", NULL, NULL, G_CALLBACK(gtk_ipx_hostlist_cb) }, + { "/Statistics/EndpointList/JXTA", WIRESHARK_STOCK_ENDPOINTS, "JXTA", NULL, NULL, G_CALLBACK(gtk_jxta_hostlist_cb) }, + { "/Statistics/EndpointList/NCP", WIRESHARK_STOCK_ENDPOINTS, "NCP", NULL, NULL, G_CALLBACK(gtk_ncp_hostlist_cb) }, + { "/Statistics/EndpointList/RSVP", WIRESHARK_STOCK_ENDPOINTS, "RSVP", NULL, NULL, G_CALLBACK(gtk_rsvp_hostlist_cb) }, + { "/Statistics/EndpointList/SCTP", WIRESHARK_STOCK_ENDPOINTS, "SCTP", NULL, NULL, G_CALLBACK(gtk_sctp_hostlist_cb) }, + { "/Statistics/EndpointList/TCPIP", WIRESHARK_STOCK_ENDPOINTS, "TCP (IPv4 & IPv6)", NULL, NULL, G_CALLBACK(gtk_tcpip_hostlist_cb) }, + { "/Statistics/EndpointList/TR", WIRESHARK_STOCK_ENDPOINTS, "Token Ring", NULL, NULL, G_CALLBACK(gtk_tr_hostlist_cb) }, + { "/Statistics/EndpointList/UDPIP", WIRESHARK_STOCK_ENDPOINTS, "UDP (IPv4 & IPv6)", NULL, NULL, G_CALLBACK(gtk_udpip_hostlist_cb) }, + { "/Statistics/EndpointList/USB", WIRESHARK_STOCK_ENDPOINTS, "USB", NULL, NULL, G_CALLBACK(gtk_usb_hostlist_cb) }, + { "/Statistics/EndpointList/WLAN", WIRESHARK_STOCK_ENDPOINTS, "WLAN", NULL, NULL, G_CALLBACK(gtk_wlan_hostlist_cb) }, - { "/Statistics/ServiceResponseTime", NULL, "Service _Response Time", NULL, NULL, NULL }, - { "/Statistics/ServiceResponseTime/ONC-RPC", WIRESHARK_STOCK_TIME, "ONC-RPC...", NULL, NULL, G_CALLBACK(gtk_rpcstat_cb) }, - { "/Statistics/ServiceResponseTime/AFP", WIRESHARK_STOCK_TIME, "AFP...", NULL, NULL, G_CALLBACK(afp_srt_stat_cb) }, - { "/Statistics/ServiceResponseTime/Camel", WIRESHARK_STOCK_TIME, "Camel...", NULL, NULL, G_CALLBACK(camel_srt_cb) }, - { "/Statistics/ServiceResponseTime/DCE-RPC", WIRESHARK_STOCK_TIME, "DCE-RPC...", NULL, NULL, G_CALLBACK(gtk_dcerpcstat_cb) }, - { "/Statistics/ServiceResponseTime/Diameter", WIRESHARK_STOCK_TIME, "Diameter...", NULL, NULL, G_CALLBACK(diameter_srt_cb) }, - { "/Statistics/ServiceResponseTime/FibreChannel", WIRESHARK_STOCK_TIME, "Fibre Channel...", NULL, NULL, G_CALLBACK(fc_srt_cb) }, - { "/Statistics/ServiceResponseTime/GTP", WIRESHARK_STOCK_TIME, "GTP...", NULL, NULL, G_CALLBACK(gtp_srt_cb) }, - { "/Statistics/ServiceResponseTime/H225", WIRESHARK_STOCK_TIME, "H225...", NULL, NULL, G_CALLBACK(h225_srt_cb) }, - { "/Statistics/ServiceResponseTime/LDAP", WIRESHARK_STOCK_TIME, "LDAP...", NULL, NULL, G_CALLBACK(ldap_srt_cb) }, - { "/Statistics/ServiceResponseTime/MEGACO", WIRESHARK_STOCK_TIME, "MEGACO...", NULL, NULL, G_CALLBACK(megaco_srt_cb) }, - { "/Statistics/ServiceResponseTime/MGCP", WIRESHARK_STOCK_TIME, "MGCP...", NULL, NULL, G_CALLBACK(mgcp_srt_cb) }, - { "/Statistics/ServiceResponseTime/NCP", WIRESHARK_STOCK_TIME, "NCP...", NULL, NULL, G_CALLBACK(ncp_srt_cb) }, - { "/Statistics/ServiceResponseTime/RADIUS", WIRESHARK_STOCK_TIME, "RADIUS...", NULL, NULL, G_CALLBACK(radius_srt_cb) }, - { "/Statistics/ServiceResponseTime/SCSI", WIRESHARK_STOCK_TIME, "SCSI...", NULL, NULL, G_CALLBACK(scsi_srt_cb) }, - { "/Statistics/ServiceResponseTime/SMB", WIRESHARK_STOCK_TIME, "SMB...", NULL, NULL, G_CALLBACK(smb_srt_cb) }, - { "/Statistics/ServiceResponseTime/SMB2", WIRESHARK_STOCK_TIME, "SMB2...", NULL, NULL, G_CALLBACK(smb2_srt_cb) }, + { "/Statistics/ServiceResponseTime", NULL, "Service _Response Time", NULL, NULL, NULL }, + { "/Statistics/ServiceResponseTime/ONC-RPC", WIRESHARK_STOCK_TIME, "ONC-RPC...", NULL, NULL, G_CALLBACK(gtk_rpcstat_cb) }, + { "/Statistics/ServiceResponseTime/AFP", WIRESHARK_STOCK_TIME, "AFP...", NULL, NULL, G_CALLBACK(afp_srt_stat_cb) }, + { "/Statistics/ServiceResponseTime/Camel", WIRESHARK_STOCK_TIME, "Camel...", NULL, NULL, G_CALLBACK(camel_srt_cb) }, + { "/Statistics/ServiceResponseTime/DCE-RPC", WIRESHARK_STOCK_TIME, "DCE-RPC...", NULL, NULL, G_CALLBACK(gtk_dcerpcstat_cb) }, + { "/Statistics/ServiceResponseTime/Diameter", WIRESHARK_STOCK_TIME, "Diameter...", NULL, NULL, G_CALLBACK(diameter_srt_cb) }, + { "/Statistics/ServiceResponseTime/FibreChannel", WIRESHARK_STOCK_TIME, "Fibre Channel...", NULL, NULL, G_CALLBACK(fc_srt_cb) }, + { "/Statistics/ServiceResponseTime/GTP", WIRESHARK_STOCK_TIME, "GTP...", NULL, NULL, G_CALLBACK(gtp_srt_cb) }, + { "/Statistics/ServiceResponseTime/H225", WIRESHARK_STOCK_TIME, "H225...", NULL, NULL, G_CALLBACK(h225_srt_cb) }, + { "/Statistics/ServiceResponseTime/LDAP", WIRESHARK_STOCK_TIME, "LDAP...", NULL, NULL, G_CALLBACK(ldap_srt_cb) }, + { "/Statistics/ServiceResponseTime/MEGACO", WIRESHARK_STOCK_TIME, "MEGACO...", NULL, NULL, G_CALLBACK(megaco_srt_cb) }, + { "/Statistics/ServiceResponseTime/MGCP", WIRESHARK_STOCK_TIME, "MGCP...", NULL, NULL, G_CALLBACK(mgcp_srt_cb) }, + { "/Statistics/ServiceResponseTime/NCP", WIRESHARK_STOCK_TIME, "NCP...", NULL, NULL, G_CALLBACK(ncp_srt_cb) }, + { "/Statistics/ServiceResponseTime/RADIUS", WIRESHARK_STOCK_TIME, "RADIUS...", NULL, NULL, G_CALLBACK(radius_srt_cb) }, + { "/Statistics/ServiceResponseTime/SCSI", WIRESHARK_STOCK_TIME, "SCSI...", NULL, NULL, G_CALLBACK(scsi_srt_cb) }, + { "/Statistics/ServiceResponseTime/SMB", WIRESHARK_STOCK_TIME, "SMB...", NULL, NULL, G_CALLBACK(smb_srt_cb) }, + { "/Statistics/ServiceResponseTime/SMB2", WIRESHARK_STOCK_TIME, "SMB2...", NULL, NULL, G_CALLBACK(smb2_srt_cb) }, - { "/StatisticsMenu/ancp", NULL, "ANCP", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, - { "/StatisticsMenu/BACnet", NULL, "BACnet", NULL, NULL, NULL }, - { "/StatisticsMenu/BACnet/bacapp_instanceid", NULL, "Packets sorted by Instance ID", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, - { "/StatisticsMenu/BACnet/bacapp_ip", NULL, "Packets sorted by IP", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, - { "/StatisticsMenu/BACnet/bacapp_objectid", NULL, "Packets sorted by Object Type", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, - { "/StatisticsMenu/BACnet/bacapp_service", NULL, "Packets sorted by Service", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, - { "/StatisticsMenu/BOOTP-DHCP", NULL, "BOOTP-DHCP...", NULL, NULL, G_CALLBACK(bootp_dhcp_stat_cb) }, + { "/StatisticsMenu/ancp", NULL, "ANCP", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, + { "/StatisticsMenu/BACnet", NULL, "BACnet", NULL, NULL, NULL }, + { "/StatisticsMenu/BACnet/bacapp_instanceid", NULL, "Packets sorted by Instance ID", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, + { "/StatisticsMenu/BACnet/bacapp_ip", NULL, "Packets sorted by IP", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, + { "/StatisticsMenu/BACnet/bacapp_objectid", NULL, "Packets sorted by Object Type", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, + { "/StatisticsMenu/BACnet/bacapp_service", NULL, "Packets sorted by Service", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, + { "/StatisticsMenu/BOOTP-DHCP", NULL, "BOOTP-DHCP...", NULL, NULL, G_CALLBACK(bootp_dhcp_stat_cb) }, - { "/StatisticsMenu/collectd", NULL, "Collectd...", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, - { "/StatisticsMenu/compare", NULL, "Compare...", NULL, NULL, G_CALLBACK(gtk_comparestat_cb) }, - { "/StatisticsMenu/FlowGraph", WIRESHARK_STOCK_FLOW_GRAPH, "Flo_w Graph...", NULL, NULL, G_CALLBACK(flow_graph_launch) }, - { "/StatisticsMenu/HTTP", NULL, "HTTP", NULL, NULL, NULL }, - { "/StatisticsMenu/HTTP/http", NULL, "Packet Counter", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, - { "/StatisticsMenu/HTTP/http_req", NULL, "Requests", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, - { "/StatisticsMenu/HTTP/http_srv", NULL, "Load Distribution", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, - - { "/StatisticsMenu/ip_hosts", NULL, "IP Addresses...", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, - { "/StatisticsMenu/dests", NULL, "IP Destinations...", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, - { "/StatisticsMenu/ptype", NULL, "IP Protocol Types..", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, - { "/StatisticsMenu/ONC-RPC-Programs", NULL, "ONC-RPC Programs", NULL, NULL, G_CALLBACK(gtk_rpcprogs_cb) }, - { "/StatisticsMenu/Sametime", NULL, "Sametime", NULL, NULL, NULL }, - { "/StatisticsMenu/Sametime/sametime", NULL, "Messages", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, - { "/StatisticsMenu/TCPStreamGraphMenu", NULL, "TCP StreamGraph", NULL, NULL, NULL }, - { "/StatisticsMenu/TCPStreamGraphMenu/Time-Sequence-Graph-Stevens", NULL, "Time-Sequence Graph (Stevens)", NULL, NULL, G_CALLBACK(tcp_graph_cb) }, - { "/StatisticsMenu/TCPStreamGraphMenu/Time-Sequence-Graph-tcptrace", NULL, "Time-Sequence Graph (tcptrace)", NULL, NULL, G_CALLBACK(tcp_graph_cb) }, - { "/StatisticsMenu/TCPStreamGraphMenu/Throughput-Graph", NULL, "Throughput Graph", NULL, NULL, G_CALLBACK(tcp_graph_cb) }, - { "/StatisticsMenu/TCPStreamGraphMenu/RTT-Graph", NULL, "Round Trip Time Graph", NULL, NULL, G_CALLBACK(tcp_graph_cb) }, - { "/StatisticsMenu/TCPStreamGraphMenu/Window-Scaling-Graph", NULL, "Window Scaling Graph", NULL, NULL, G_CALLBACK(tcp_graph_cb) }, + { "/StatisticsMenu/collectd", NULL, "Collectd...", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, + { "/StatisticsMenu/compare", NULL, "Compare...", NULL, NULL, G_CALLBACK(gtk_comparestat_cb) }, + { "/StatisticsMenu/FlowGraph", WIRESHARK_STOCK_FLOW_GRAPH, "Flo_w Graph...", NULL, NULL, G_CALLBACK(flow_graph_launch) }, + { "/StatisticsMenu/HTTP", NULL, "HTTP", NULL, NULL, NULL }, + { "/StatisticsMenu/HTTP/http", NULL, "Packet Counter", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, + { "/StatisticsMenu/HTTP/http_req", NULL, "Requests", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, + { "/StatisticsMenu/HTTP/http_srv", NULL, "Load Distribution", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, - { "/StatisticsMenu/UDPMulticastStreams", NULL, "UDP Multicast Streams", NULL, NULL, G_CALLBACK(mcaststream_launch) }, - { "/StatisticsMenu/WLANTraffic", NULL, "WLAN Traffic", NULL, NULL, G_CALLBACK(wlanstat_launch) }, + { "/StatisticsMenu/ip_hosts", NULL, "IP Addresses...", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, + { "/StatisticsMenu/dests", NULL, "IP Destinations...", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, + { "/StatisticsMenu/ptype", NULL, "IP Protocol Types..", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, + { "/StatisticsMenu/ONC-RPC-Programs", NULL, "ONC-RPC Programs", NULL, NULL, G_CALLBACK(gtk_rpcprogs_cb) }, + { "/StatisticsMenu/Sametime", NULL, "Sametime", NULL, NULL, NULL }, + { "/StatisticsMenu/Sametime/sametime", NULL, "Messages", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, + { "/StatisticsMenu/TCPStreamGraphMenu", NULL, "TCP StreamGraph", NULL, NULL, NULL }, + { "/StatisticsMenu/TCPStreamGraphMenu/Time-Sequence-Graph-Stevens", NULL, "Time-Sequence Graph (Stevens)", NULL, NULL, G_CALLBACK(tcp_graph_cb) }, + { "/StatisticsMenu/TCPStreamGraphMenu/Time-Sequence-Graph-tcptrace", NULL, "Time-Sequence Graph (tcptrace)", NULL, NULL, G_CALLBACK(tcp_graph_cb) }, + { "/StatisticsMenu/TCPStreamGraphMenu/Throughput-Graph", NULL, "Throughput Graph", NULL, NULL, G_CALLBACK(tcp_graph_cb) }, + { "/StatisticsMenu/TCPStreamGraphMenu/RTT-Graph", NULL, "Round Trip Time Graph", NULL, NULL, G_CALLBACK(tcp_graph_cb) }, + { "/StatisticsMenu/TCPStreamGraphMenu/Window-Scaling-Graph", NULL, "Window Scaling Graph", NULL, NULL, G_CALLBACK(tcp_graph_cb) }, - { "/Statistics/Summary", GTK_STOCK_PROPERTIES, "_Summary", NULL, NULL, G_CALLBACK(summary_open_cb) }, - { "/Statistics/ProtocolHierarchy", NULL, "_Protocol Hierarchy", NULL, NULL, G_CALLBACK(proto_hier_stats_cb) }, - { "/Statistics/Conversations", WIRESHARK_STOCK_CONVERSATIONS, "Conversations", NULL, NULL, G_CALLBACK(init_conversation_notebook_cb) }, - { "/Statistics/Endpoints", WIRESHARK_STOCK_ENDPOINTS, "Endpoints", NULL, NULL, G_CALLBACK(init_hostlist_notebook_cb) }, - { "/Statistics/IOGraphs", WIRESHARK_STOCK_GRAPHS, "_IO Graph", NULL, NULL, G_CALLBACK(gui_iostat_cb) }, - { "/Statistics/plen", NULL, "Packet Lengths...", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, + { "/StatisticsMenu/UDPMulticastStreams", NULL, "UDP Multicast Streams", NULL, NULL, G_CALLBACK(mcaststream_launch) }, + { "/StatisticsMenu/WLANTraffic", NULL, "WLAN Traffic", NULL, NULL, G_CALLBACK(wlanstat_launch) }, - { "/Telephony/ANSI", NULL, "_ANSI", NULL, NULL, NULL }, - { "/Telephony/ANSI/BSMAP", NULL, "A-Interface BSMAP", NULL, NULL, G_CALLBACK(ansi_a_stat_gtk_bsmap_cb) }, - { "/Telephony/ANSI/DTAP", NULL, "A-Interface DTAP", NULL, NULL, G_CALLBACK(ansi_a_stat_gtk_dtap_cb) }, - { "/Telephony/ANSI/MAP-OP", NULL, "MAP Operation", NULL, NULL, G_CALLBACK(ansi_map_stat_gtk_cb) }, + { "/Statistics/Summary", GTK_STOCK_PROPERTIES, "_Summary", NULL, NULL, G_CALLBACK(summary_open_cb) }, + { "/Statistics/ProtocolHierarchy", NULL, "_Protocol Hierarchy", NULL, NULL, G_CALLBACK(proto_hier_stats_cb) }, + { "/Statistics/Conversations", WIRESHARK_STOCK_CONVERSATIONS, "Conversations", NULL, NULL, G_CALLBACK(init_conversation_notebook_cb) }, + { "/Statistics/Endpoints", WIRESHARK_STOCK_ENDPOINTS, "Endpoints", NULL, NULL, G_CALLBACK(init_hostlist_notebook_cb) }, + { "/Statistics/IOGraphs", WIRESHARK_STOCK_GRAPHS, "_IO Graph", NULL, NULL, G_CALLBACK(gui_iostat_cb) }, + { "/Statistics/plen", NULL, "Packet Lengths...", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, - { "/Telephony/GSM", NULL, "_GSM", NULL, NULL, NULL }, - { "/Telephony/GSM/CAMEL", NULL, "CAMEL Messages and Response Status", NULL, NULL, G_CALLBACK(camel_counter_cb) }, - { "/Telephony/GSM/BSSMAP", NULL, "_GSM/A-Interface BSSMAP", NULL, NULL, G_CALLBACK(gsm_a_stat_gtk_bssmap_cb) }, + { "/Telephony/ANSI", NULL, "_ANSI", NULL, NULL, NULL }, + { "/Telephony/ANSI/BSMAP", NULL, "A-Interface BSMAP", NULL, NULL, G_CALLBACK(ansi_a_stat_gtk_bsmap_cb) }, + { "/Telephony/ANSI/DTAP", NULL, "A-Interface DTAP", NULL, NULL, G_CALLBACK(ansi_a_stat_gtk_dtap_cb) }, + { "/Telephony/ANSI/MAP-OP", NULL, "MAP Operation", NULL, NULL, G_CALLBACK(ansi_map_stat_gtk_cb) }, - { "/Telephony/GSM/DTAP", NULL, "_GSM/A-Interface DTAP", NULL, NULL, NULL }, - { "/Telephony/GSM/DTAP/CC", NULL, "Call Control", NULL, NULL, G_CALLBACK(gsm_a_stat_gtk_dtap_cc_cb) }, - { "/Telephony/GSM/DTAP/GMM", NULL, "GPRS Mobility Management", NULL, NULL, G_CALLBACK(gsm_a_stat_gtk_dtap_gmm_cb) }, - { "/Telephony/GSM/DTAP/SM", NULL, "GPRS Session Management", NULL, NULL, G_CALLBACK(gsm_a_stat_gtk_dtap_sm_cb) }, - { "/Telephony/GSM/DTAP/MM", NULL, "Mobility Management", NULL, NULL, G_CALLBACK(gsm_a_stat_gtk_dtap_mm_cb) }, - { "/Telephony/GSM/DTAP/RR", NULL, "Radio Resource Management",NULL, NULL, G_CALLBACK(gsm_a_stat_gtk_dtap_rr_cb) }, - { "/Telephony/GSM/DTAP/SMS", NULL, "Short Message Service", NULL, NULL, G_CALLBACK(gsm_a_stat_gtk_dtap_sms_cb) }, - { "/Telephony/GSM/DTAP/TP", NULL, "Special Conformance Testing Functions", NULL, NULL, G_CALLBACK(gsm_a_stat_gtk_dtap_tp_cb) }, - { "/Telephony/GSM/DTAP/SS", NULL, "Supplementary Services", NULL, NULL, G_CALLBACK(gsm_a_stat_gtk_dtap_ss_cb) }, + { "/Telephony/GSM", NULL, "_GSM", NULL, NULL, NULL }, + { "/Telephony/GSM/CAMEL", NULL, "CAMEL Messages and Response Status", NULL, NULL, G_CALLBACK(camel_counter_cb) }, + { "/Telephony/GSM/BSSMAP", NULL, "_GSM/A-Interface BSSMAP", NULL, NULL, G_CALLBACK(gsm_a_stat_gtk_bssmap_cb) }, - { "/Telephony/GSM/SACCH", NULL, "_GSM/A-Interface SACCH", NULL, NULL, G_CALLBACK(gsm_a_stat_gtk_sacch_rr_cb) }, - { "/Telephony/GSM/MAP-OP", NULL, "_GSM/MAP Operation", NULL, NULL, G_CALLBACK(gsm_map_stat_gtk_cb) }, - { "/Telephony/GSM/MAPSummary", NULL, "MAP Summary", NULL, NULL, G_CALLBACK(gsm_map_stat_gtk_sum_cb) }, + { "/Telephony/GSM/DTAP", NULL, "_GSM/A-Interface DTAP", NULL, NULL, NULL }, + { "/Telephony/GSM/DTAP/CC", NULL, "Call Control", NULL, NULL, G_CALLBACK(gsm_a_stat_gtk_dtap_cc_cb) }, + { "/Telephony/GSM/DTAP/GMM", NULL, "GPRS Mobility Management", NULL, NULL, G_CALLBACK(gsm_a_stat_gtk_dtap_gmm_cb) }, + { "/Telephony/GSM/DTAP/SM", NULL, "GPRS Session Management", NULL, NULL, G_CALLBACK(gsm_a_stat_gtk_dtap_sm_cb) }, + { "/Telephony/GSM/DTAP/MM", NULL, "Mobility Management", NULL, NULL, G_CALLBACK(gsm_a_stat_gtk_dtap_mm_cb) }, + { "/Telephony/GSM/DTAP/RR", NULL, "Radio Resource Management",NULL, NULL, G_CALLBACK(gsm_a_stat_gtk_dtap_rr_cb) }, + { "/Telephony/GSM/DTAP/SMS", NULL, "Short Message Service", NULL, NULL, G_CALLBACK(gsm_a_stat_gtk_dtap_sms_cb) }, + { "/Telephony/GSM/DTAP/TP", NULL, "Special Conformance Testing Functions", NULL, NULL, G_CALLBACK(gsm_a_stat_gtk_dtap_tp_cb) }, + { "/Telephony/GSM/DTAP/SS", NULL, "Supplementary Services", NULL, NULL, G_CALLBACK(gsm_a_stat_gtk_dtap_ss_cb) }, - { "/Telephony/H225", NULL, "_H.225...", NULL, NULL, G_CALLBACK(h225_counter_cb) }, + { "/Telephony/GSM/SACCH", NULL, "_GSM/A-Interface SACCH", NULL, NULL, G_CALLBACK(gsm_a_stat_gtk_sacch_rr_cb) }, + { "/Telephony/GSM/MAP-OP", NULL, "_GSM/MAP Operation", NULL, NULL, G_CALLBACK(gsm_map_stat_gtk_cb) }, + { "/Telephony/GSM/MAPSummary", NULL, "MAP Summary", NULL, NULL, G_CALLBACK(gsm_map_stat_gtk_sum_cb) }, - { "/Telephony/IAX2", NULL, "IA_X2", NULL, NULL, NULL }, - { "/Telephony/IAX2/StreamAnalysis", NULL, "Stream Analysis...", NULL, NULL, G_CALLBACK(iax2_analysis_cb) }, + { "/Telephony/H225", NULL, "_H.225...", NULL, NULL, G_CALLBACK(h225_counter_cb) }, - { "/Telephony/isup_msg", NULL, "_ISUP Messages", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, + { "/Telephony/IAX2", NULL, "IA_X2", NULL, NULL, NULL }, + { "/Telephony/IAX2/StreamAnalysis", NULL, "Stream Analysis...", NULL, NULL, G_CALLBACK(iax2_analysis_cb) }, - { "/Telephony/LTE", NULL, "_LTE", NULL, NULL, NULL }, - { "/Telephony/LTE/MAC", NULL, "_MAC...", NULL, NULL, G_CALLBACK(mac_lte_stat_cb) }, - { "/Telephony/LTE/RLC", NULL, "_RLC...", NULL, NULL, G_CALLBACK(rlc_lte_stat_cb) }, - { "/Telephony/MTP3", NULL, "_MTP3", NULL, NULL, NULL }, - { "/Telephony/MTP3/MSUs", NULL, "MSUs", NULL, NULL, G_CALLBACK(mtp3_stat_gtk_cb) }, - { "/Telephony/MTP3/MSUSummary", NULL, "MSU Summary", NULL, NULL, G_CALLBACK(mtp3_sum_gtk_sum_cb) }, - { "/Telephony/RTP", NULL, "_RTP", NULL, NULL, NULL }, - { "/Telephony/RTP/StreamAnalysis", NULL, "Stream Analysis...", NULL, NULL, G_CALLBACK(rtp_analysis_cb) }, - { "/Telephony/RTP/ShowAllStreams", NULL, "Show All Streams", NULL, NULL, G_CALLBACK(rtpstream_launch) }, - { "/Telephony/RTSP", NULL, "RTSP", NULL, NULL, NULL }, - { "/Telephony/RTSP/rtsp", NULL, "Packet Counter", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, - { "/Telephony/SCTP", NULL, "S_CTP", NULL, NULL, NULL }, - { "/Telephony/SCTP/AnalysethisAssociation", NULL, "Analyse this Association", NULL, NULL, G_CALLBACK(sctp_analyse_start) }, - { "/Telephony/SCTP/ShowAllAssociations", NULL, "Show All Associations...", NULL, NULL, G_CALLBACK(sctp_stat_start) }, - { "/Telephony/SCTP/ChunkCounter", NULL, "Chunk Counter", NULL, NULL, G_CALLBACK(sctp_chunk_counter_cb) }, - { "/Telephony/SIP", NULL, "_SIP...", NULL, NULL, G_CALLBACK(sipstat_cb) }, - { "/Telephony/smpp_commands", NULL, "SM_PPOperations", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, - { "/Telephony/ucp_messages", NULL, "_UCP Messages", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, - { "/Telephony/VoIPCalls", WIRESHARK_STOCK_TELEPHONE, "_VoIP Calls", NULL, NULL, G_CALLBACK(voip_calls_launch) }, - { "/Telephony/WSP", NULL, "_WAP-WSP...", NULL, NULL, G_CALLBACK(wsp_stat_cb) }, + { "/Telephony/isup_msg", NULL, "_ISUP Messages", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, - { "/Tools/FirewallACLRules", NULL, "Firewall ACL Rules", NULL, NULL, G_CALLBACK(firewall_rule_cb) }, - { "/Tools/LUA", NULL, "LUA", NULL, NULL, NULL }, + { "/Telephony/LTE", NULL, "_LTE", NULL, NULL, NULL }, + { "/Telephony/LTE/MAC", NULL, "_MAC...", NULL, NULL, G_CALLBACK(mac_lte_stat_cb) }, + { "/Telephony/LTE/RLC", NULL, "_RLC...", NULL, NULL, G_CALLBACK(rlc_lte_stat_cb) }, + { "/Telephony/MTP3", NULL, "_MTP3", NULL, NULL, NULL }, + { "/Telephony/MTP3/MSUs", NULL, "MSUs", NULL, NULL, G_CALLBACK(mtp3_stat_gtk_cb) }, + { "/Telephony/MTP3/MSUSummary", NULL, "MSU Summary", NULL, NULL, G_CALLBACK(mtp3_sum_gtk_sum_cb) }, + { "/Telephony/RTP", NULL, "_RTP", NULL, NULL, NULL }, + { "/Telephony/RTP/StreamAnalysis", NULL, "Stream Analysis...", NULL, NULL, G_CALLBACK(rtp_analysis_cb) }, + { "/Telephony/RTP/ShowAllStreams", NULL, "Show All Streams", NULL, NULL, G_CALLBACK(rtpstream_launch) }, + { "/Telephony/RTSP", NULL, "RTSP", NULL, NULL, NULL }, + { "/Telephony/RTSP/rtsp", NULL, "Packet Counter", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, + { "/Telephony/SCTP", NULL, "S_CTP", NULL, NULL, NULL }, + { "/Telephony/SCTP/AnalysethisAssociation", NULL, "Analyse this Association", NULL, NULL, G_CALLBACK(sctp_analyse_start) }, + { "/Telephony/SCTP/ShowAllAssociations", NULL, "Show All Associations...", NULL, NULL, G_CALLBACK(sctp_stat_start) }, + { "/Telephony/SCTP/ChunkCounter", NULL, "Chunk Counter", NULL, NULL, G_CALLBACK(sctp_chunk_counter_cb) }, + { "/Telephony/SIP", NULL, "_SIP...", NULL, NULL, G_CALLBACK(sipstat_cb) }, + { "/Telephony/smpp_commands", NULL, "SM_PPOperations", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, + { "/Telephony/ucp_messages", NULL, "_UCP Messages", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, + { "/Telephony/VoIPCalls", WIRESHARK_STOCK_TELEPHONE, "_VoIP Calls", NULL, NULL, G_CALLBACK(voip_calls_launch) }, + { "/Telephony/WSP", NULL, "_WAP-WSP...", NULL, NULL, G_CALLBACK(wsp_stat_cb) }, - { "/Internals/Dissectortables", NULL, "_Dissector tables", NULL, NULL, G_CALLBACK(dissector_tables_dlg_cb) }, - { "/Internals/SupportedProtocols", NULL, "_Supported Protocols (slow!)", NULL, NULL, G_CALLBACK(supported_cb) }, + { "/Tools/FirewallACLRules", NULL, "Firewall ACL Rules", NULL, NULL, G_CALLBACK(firewall_rule_cb) }, + { "/Tools/LUA", NULL, "LUA", NULL, NULL, NULL }, - { "/Help/Contents", GTK_STOCK_HELP, "_Contents", "F1", NULL, G_CALLBACK(help_menu_cont_cb) }, - { "/Help/ManualPages", NULL, "ManualPages", NULL, NULL, NULL }, - { "/Help/ManualPages/Wireshark", NULL, "Wireshark", NULL, NULL, G_CALLBACK(help_menu_wireshark_cb) }, - { "/Help/ManualPages/WiresharkFilter", NULL, "Wireshark Filter", NULL, NULL, G_CALLBACK(help_menu_wireshark_flt_cb) }, - { "/Help/ManualPages/TShark", NULL, "Wireshark", NULL, NULL, G_CALLBACK(help_menu_Tshark_cb) }, - { "/Help/ManualPages/RawShark", NULL, "RawShark", NULL, NULL, G_CALLBACK(help_menu_RawShark_cb) }, - { "/Help/ManualPages/Dumpcap", NULL, "Dumpcap", NULL, NULL, G_CALLBACK(help_menu_Dumpcap_cb) }, - { "/Help/ManualPages/Mergecap", NULL, "Mergecap", NULL, NULL, G_CALLBACK(help_menu_Mergecap_cb) }, - { "/Help/ManualPages/Editcap", NULL, "Editcap", NULL, NULL, G_CALLBACK(help_menu_Editcap_cb) }, - { "/Help/ManualPages/Text2pcap", NULL, "Text2pcap", NULL, NULL, G_CALLBACK(help_menu_Text2pcap_cb) }, + { "/Internals/Dissectortables", NULL, "_Dissector tables", NULL, NULL, G_CALLBACK(dissector_tables_dlg_cb) }, + { "/Internals/SupportedProtocols", NULL, "_Supported Protocols (slow!)", NULL, NULL, G_CALLBACK(supported_cb) }, - { "/Help/Website", GTK_STOCK_HOME, "Website", NULL, NULL, G_CALLBACK(help_menu_Website_cb) }, - { "/Help/FAQs", NULL, "FAQ's", NULL, NULL, G_CALLBACK(help_menu_faq_cb) }, - { "/Help/Downloads", NULL, "Downloads", NULL, NULL, G_CALLBACK(help_menu_Downloads_cb) }, - { "/Help/Wiki", WIRESHARK_STOCK_WIKI, "Wiki", NULL, NULL, G_CALLBACK(help_menu_Wiki_cb) }, - { "/Help/SampleCaptures", NULL, "Sample Captures", NULL, NULL, G_CALLBACK(help_menu_SampleCaptures_cb) }, - { "/Help/AboutWireshark", WIRESHARK_STOCK_ABOUT, "_About Wireshark", NULL, NULL, G_CALLBACK(about_wireshark_cb) }, + { "/Help/Contents", GTK_STOCK_HELP, "_Contents", "F1", NULL, G_CALLBACK(help_menu_cont_cb) }, + { "/Help/ManualPages", NULL, "ManualPages", NULL, NULL, NULL }, + { "/Help/ManualPages/Wireshark", NULL, "Wireshark", NULL, NULL, G_CALLBACK(help_menu_wireshark_cb) }, + { "/Help/ManualPages/WiresharkFilter", NULL, "Wireshark Filter", NULL, NULL, G_CALLBACK(help_menu_wireshark_flt_cb) }, + { "/Help/ManualPages/TShark", NULL, "Wireshark", NULL, NULL, G_CALLBACK(help_menu_Tshark_cb) }, + { "/Help/ManualPages/RawShark", NULL, "RawShark", NULL, NULL, G_CALLBACK(help_menu_RawShark_cb) }, + { "/Help/ManualPages/Dumpcap", NULL, "Dumpcap", NULL, NULL, G_CALLBACK(help_menu_Dumpcap_cb) }, + { "/Help/ManualPages/Mergecap", NULL, "Mergecap", NULL, NULL, G_CALLBACK(help_menu_Mergecap_cb) }, + { "/Help/ManualPages/Editcap", NULL, "Editcap", NULL, NULL, G_CALLBACK(help_menu_Editcap_cb) }, + { "/Help/ManualPages/Text2pcap", NULL, "Text2pcap", NULL, NULL, G_CALLBACK(help_menu_Text2pcap_cb) }, + + { "/Help/Website", GTK_STOCK_HOME, "Website", NULL, NULL, G_CALLBACK(help_menu_Website_cb) }, + { "/Help/FAQs", NULL, "FAQ's", NULL, NULL, G_CALLBACK(help_menu_faq_cb) }, + { "/Help/Downloads", NULL, "Downloads", NULL, NULL, G_CALLBACK(help_menu_Downloads_cb) }, + { "/Help/Wiki", WIRESHARK_STOCK_WIKI, "Wiki", NULL, NULL, G_CALLBACK(help_menu_Wiki_cb) }, + { "/Help/SampleCaptures", NULL, "Sample Captures", NULL, NULL, G_CALLBACK(help_menu_SampleCaptures_cb) }, + { "/Help/AboutWireshark", WIRESHARK_STOCK_ABOUT, "_About Wireshark", NULL, NULL, G_CALLBACK(about_wireshark_cb) }, }; static const GtkToggleActionEntry main_menu_bar_toggle_action_entries[] = { - /* name, stock id, label, accel, tooltip, callback, is_active */ - {"/View/MainToolbar", NULL, "_Main Toolbar", NULL, NULL, G_CALLBACK(main_toolbar_show_hide_cb), TRUE}, - {"/View/FilterToolbar", NULL, "_FilterToolbar", NULL, NULL, G_CALLBACK(filter_toolbar_show_hide_cb), TRUE}, - {"/View/WirelessToolbar", NULL, "_WirelessToolbar", NULL, NULL, G_CALLBACK(wireless_toolbar_show_hide_cb), FALSE}, - {"/View/Statusbar", NULL, "_Statusbar", NULL, NULL, G_CALLBACK(status_bar_show_hide_cb), TRUE}, - {"/View/PacketList", NULL, "Packet _List", NULL, NULL, G_CALLBACK(packet_list_show_hide_cb), TRUE}, - {"/View/PacketDetails", NULL, "Packet _Details", NULL, NULL, G_CALLBACK(packet_details_show_hide_cb), TRUE}, - {"/View/PacketBytes", NULL, "Packet _Bytes", NULL, NULL, G_CALLBACK(packet_bytes_show_hide_cb), TRUE}, - {"/View/TimeDisplayFormat/DisplaySecondsWithHoursAndMinutes", NULL, "Display Seconds with hours and minutes", NULL, NULL, G_CALLBACK(view_menu_seconds_time_cb), FALSE}, - {"/View/NameResolution/ResolveName", NULL, "_Resolve Name", NULL, NULL, G_CALLBACK(resolve_name_cb), FALSE}, - {"/View/NameResolution/EnableforMACLayer", NULL, "Enable for _MAC Layer", NULL, NULL, G_CALLBACK(view_menu_en_for_MAC_cb), TRUE}, - {"/View/NameResolution/EnableforNetworkLayer", NULL, "Enable for _Network Layer", NULL, NULL, G_CALLBACK(view_menu_en_for_network_cb), TRUE }, - {"/View/NameResolution/EnableforTransportLayer", NULL, "Enable for _Transport Layer", NULL, NULL, G_CALLBACK(view_menu_en_for_transport_cb), TRUE }, - {"/View/ColorizePacketList", NULL, "Colorize Packet List", NULL, NULL, G_CALLBACK(view_menu_colorize_pkt_lst_cb), TRUE }, - {"/View/AutoScrollinLiveCapture", NULL, "Auto Scroll in Li_ve Capture", NULL, NULL, G_CALLBACK(view_menu_auto_scroll_live_cb), TRUE }, + /* name, stock id, label, accel, tooltip, callback, is_active */ + {"/View/MainToolbar", NULL, "_Main Toolbar", NULL, NULL, G_CALLBACK(main_toolbar_show_hide_cb), TRUE}, + {"/View/FilterToolbar", NULL, "_FilterToolbar", NULL, NULL, G_CALLBACK(filter_toolbar_show_hide_cb), TRUE}, + {"/View/WirelessToolbar", NULL, "_WirelessToolbar", NULL, NULL, G_CALLBACK(wireless_toolbar_show_hide_cb), FALSE}, + {"/View/Statusbar", NULL, "_Statusbar", NULL, NULL, G_CALLBACK(status_bar_show_hide_cb), TRUE}, + {"/View/PacketList", NULL, "Packet _List", NULL, NULL, G_CALLBACK(packet_list_show_hide_cb), TRUE}, + {"/View/PacketDetails", NULL, "Packet _Details", NULL, NULL, G_CALLBACK(packet_details_show_hide_cb), TRUE}, + {"/View/PacketBytes", NULL, "Packet _Bytes", NULL, NULL, G_CALLBACK(packet_bytes_show_hide_cb), TRUE}, + {"/View/TimeDisplayFormat/DisplaySecondsWithHoursAndMinutes", NULL, "Display Seconds with hours and minutes", NULL, NULL, G_CALLBACK(view_menu_seconds_time_cb), FALSE}, + {"/View/NameResolution/ResolveName", NULL, "_Resolve Name", NULL, NULL, G_CALLBACK(resolve_name_cb), FALSE}, + {"/View/NameResolution/EnableforMACLayer", NULL, "Enable for _MAC Layer", NULL, NULL, G_CALLBACK(view_menu_en_for_MAC_cb), TRUE}, + {"/View/NameResolution/EnableforNetworkLayer", NULL, "Enable for _Network Layer", NULL, NULL, G_CALLBACK(view_menu_en_for_network_cb), TRUE }, + {"/View/NameResolution/EnableforTransportLayer", NULL, "Enable for _Transport Layer", NULL, NULL, G_CALLBACK(view_menu_en_for_transport_cb), TRUE }, + {"/View/ColorizePacketList", NULL, "Colorize Packet List", NULL, NULL, G_CALLBACK(view_menu_colorize_pkt_lst_cb), TRUE }, + {"/View/AutoScrollinLiveCapture", NULL, "Auto Scroll in Li_ve Capture", NULL, NULL, G_CALLBACK(view_menu_auto_scroll_live_cb), TRUE }, }; static const GtkRadioActionEntry main_menu_bar_radio_view_time_entries [] = { - /* name, stock id, label, accel, tooltip, value */ - { "/View/TimeDisplayFormat/DateandTimeofDay", NULL, "Date and Time of Day: 1970-01-01 01:02:03.123456", "1", NULL, TS_ABSOLUTE_WITH_DATE }, - { "/View/TimeDisplayFormat/TimeofDay", NULL, "Time of Day: 01:02:03.123456", "2", NULL, TS_ABSOLUTE }, - { "/View/TimeDisplayFormat/SecondsSinceEpoch", NULL, "Seconds Since Epoch (1970-01-01): 1234567890.123456", "3", NULL, TS_EPOCH }, - { "/View/TimeDisplayFormat/SecondsSinceBeginningofCapture", NULL, "Seconds Since Beginning of Capture: 123.123456", "4", NULL, TS_RELATIVE }, - { "/View/TimeDisplayFormat/SecondsSincePreviousCapturedPacket", NULL, "Seconds Since Previous Captured Packet: 1.123456", "5", NULL, TS_DELTA }, - { "/View/TimeDisplayFormat/SecondsSincePreviousDisplayedPacket",NULL, "Seconds Since Previous Displayed Packet: 1.123456", "6", NULL, TS_DELTA_DIS }, - { "/View/TimeDisplayFormat/UTCDateandTimeofDay", NULL, "UTC Date and Time of Day: 1970-01-01 01:02:03.123456", "7", NULL, TS_UTC_WITH_DATE }, - { "/View/TimeDisplayFormat/UTCTimeofDay", NULL, "UTC Time of Day: 01:02:03.123456", "7", NULL, TS_UTC }, + /* name, stock id, label, accel, tooltip, value */ + { "/View/TimeDisplayFormat/DateandTimeofDay", NULL, "Date and Time of Day: 1970-01-01 01:02:03.123456", "1", NULL, TS_ABSOLUTE_WITH_DATE }, + { "/View/TimeDisplayFormat/TimeofDay", NULL, "Time of Day: 01:02:03.123456", "2", NULL, TS_ABSOLUTE }, + { "/View/TimeDisplayFormat/SecondsSinceEpoch", NULL, "Seconds Since Epoch (1970-01-01): 1234567890.123456", "3", NULL, TS_EPOCH }, + { "/View/TimeDisplayFormat/SecondsSinceBeginningofCapture", NULL, "Seconds Since Beginning of Capture: 123.123456", "4", NULL, TS_RELATIVE }, + { "/View/TimeDisplayFormat/SecondsSincePreviousCapturedPacket", NULL, "Seconds Since Previous Captured Packet: 1.123456", "5", NULL, TS_DELTA }, + { "/View/TimeDisplayFormat/SecondsSincePreviousDisplayedPacket",NULL, "Seconds Since Previous Displayed Packet: 1.123456", "6", NULL, TS_DELTA_DIS }, + { "/View/TimeDisplayFormat/UTCDateandTimeofDay", NULL, "UTC Date and Time of Day: 1970-01-01 01:02:03.123456", "7", NULL, TS_UTC_WITH_DATE }, + { "/View/TimeDisplayFormat/UTCTimeofDay", NULL, "UTC Time of Day: 01:02:03.123456", "7", NULL, TS_UTC }, }; static const GtkRadioActionEntry main_menu_bar_radio_view_time_fileformat_prec_entries [] = { - /* name, stock id, label, accel, tooltip, value */ - { "/View/TimeDisplayFormat/FileFormatPrecision-Automatic", NULL, "Automatic (File Format Precision)", NULL, NULL, TS_PREC_AUTO }, - { "/View/TimeDisplayFormat/FileFormatPrecision-Seconds", NULL, "Seconds: 0", NULL, NULL, TS_PREC_FIXED_SEC }, - { "/View/TimeDisplayFormat/FileFormatPrecision-Deciseconds", NULL, "Deciseconds: 0.1", NULL, NULL, TS_PREC_FIXED_DSEC }, - { "/View/TimeDisplayFormat/FileFormatPrecision-Centiseconds", NULL, "Centiseconds: 0.12", NULL, NULL, TS_PREC_FIXED_CSEC }, - { "/View/TimeDisplayFormat/FileFormatPrecision-Milliseconds", NULL, "Milliseconds: 0.123", NULL, NULL, TS_PREC_FIXED_MSEC }, - { "/View/TimeDisplayFormat/FileFormatPrecision-Microseconds", NULL, "Microseconds: 0.123456", NULL, NULL, TS_PREC_FIXED_USEC }, - { "/View/TimeDisplayFormat/FileFormatPrecision-Nanoseconds", NULL, "Nanoseconds: 0.123456789", NULL, NULL, TS_PREC_FIXED_NSEC }, + /* name, stock id, label, accel, tooltip, value */ + { "/View/TimeDisplayFormat/FileFormatPrecision-Automatic", NULL, "Automatic (File Format Precision)", NULL, NULL, TS_PREC_AUTO }, + { "/View/TimeDisplayFormat/FileFormatPrecision-Seconds", NULL, "Seconds: 0", NULL, NULL, TS_PREC_FIXED_SEC }, + { "/View/TimeDisplayFormat/FileFormatPrecision-Deciseconds", NULL, "Deciseconds: 0.1", NULL, NULL, TS_PREC_FIXED_DSEC }, + { "/View/TimeDisplayFormat/FileFormatPrecision-Centiseconds", NULL, "Centiseconds: 0.12", NULL, NULL, TS_PREC_FIXED_CSEC }, + { "/View/TimeDisplayFormat/FileFormatPrecision-Milliseconds", NULL, "Milliseconds: 0.123", NULL, NULL, TS_PREC_FIXED_MSEC }, + { "/View/TimeDisplayFormat/FileFormatPrecision-Microseconds", NULL, "Microseconds: 0.123456", NULL, NULL, TS_PREC_FIXED_USEC }, + { "/View/TimeDisplayFormat/FileFormatPrecision-Nanoseconds", NULL, "Nanoseconds: 0.123456789", NULL, NULL, TS_PREC_FIXED_NSEC }, }; static void select_bytes_view_cb (GtkRadioAction *action, GtkRadioAction *current _U_, gpointer user_data _U_) { - gint value; + gint value; - value = gtk_radio_action_get_current_value (action); - /* Fix me */ - select_bytes_view( NULL, NULL, value); + value = gtk_radio_action_get_current_value (action); + /* Fix me */ + select_bytes_view( NULL, NULL, value); } static void sort_ascending_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/SortAscending"); - new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_SORT_ASCENDING); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/SortAscending"); + new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_SORT_ASCENDING); } static void sort_descending_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/SortDescending"); - new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_SORT_DESCENDING); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/SortDescending"); + new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_SORT_DESCENDING); } static void no_sorting_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/NoSorting"); - new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_SORT_NONE); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/NoSorting"); + new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_SORT_NONE); } static void packet_list_heading_show_resolved_cb(GtkAction *action _U_, gpointer user_data _U_) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/ShowResolved"); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/ShowResolved"); - new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_TOGGLE_RESOLVED); + new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_TOGGLE_RESOLVED); } static void packet_list_heading_align_left_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/AlignLeft"); - new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_ALIGN_LEFT); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/AlignLeft"); + new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_ALIGN_LEFT); } static void packet_list_heading_align_center_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/AlignCenter"); - new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_ALIGN_CENTER); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/AlignCenter"); + new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_ALIGN_CENTER); } static void packet_list_heading_align_right_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/AlignRight"); - new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_ALIGN_RIGHT); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/AlignRight"); + new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_ALIGN_RIGHT); } static void packet_list_heading_col_pref_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/ColumnPreferences"); - prefs_page_cb( widget , user_data, PREFS_PAGE_COLUMNS); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/ColumnPreferences"); + prefs_page_cb( widget , user_data, PREFS_PAGE_COLUMNS); } static void packet_list_heading_resize_col_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/ResizeColumn"); - new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_RESIZE); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/ResizeColumn"); + new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_RESIZE); } static void packet_list_heading_change_col_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/EditColumnDetails"); - new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_CHANGE); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/EditColumnDetails"); + new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_CHANGE); } static void packet_list_heading_activate_all_columns_cb(GtkAction *action _U_, gpointer user_data _U_) { - new_packet_list_set_all_columns_visible (); + new_packet_list_set_all_columns_visible (); } static void packet_list_heading_hide_col_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/HideColumn"); - new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_HIDE); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/HideColumn"); + new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_HIDE); } static void packet_list_heading_remove_col_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/RemoveColumn"); - new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_REMOVE); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/RemoveColumn"); + new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_REMOVE); } static void packet_list_menu_set_ref_time_cb(GtkAction *action _U_, gpointer user_data) { - reftime_frame_cb( NULL /* widget _U_ */ , user_data, REFTIME_TOGGLE); + reftime_frame_cb( NULL /* widget _U_ */ , user_data, REFTIME_TOGGLE); } static void packet_list_menu_apply_selected_cb(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb( NULL /* widget _U_ */, user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW); + match_selected_plist_cb( NULL /* widget _U_ */, user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW); } static void packet_list_menu_apply_not_selected_cb(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW); + match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW); } static void packet_list_menu_apply_and_selected_cb(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW); + match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW); } static void packet_list_menu_apply_or_selected_cb(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW); + match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW); } static void packet_list_menu_apply_and_not_selected_cb(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW); + match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW); } static void packet_list_menu_apply_or_not_selected_cb(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb( NULL /* widget _U_ */ , user_data,MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW); + match_selected_plist_cb( NULL /* widget _U_ */ , user_data,MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW); } /* Prepare a filter */ static void packet_list_menu_prepare_selected_cb(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_REPLACE); + match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_REPLACE); } static void packet_list_menu_prepare_not_selected_cb(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_NOT); + match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_NOT); } static void packet_list_menu_prepare_and_selected_cb(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_AND); + match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_AND); } static void packet_list_menu_prepare_or_selected_cb(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_OR); + match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_OR); } static void packet_list_menu_prepare_and_not_selected_cb(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_AND_NOT); + match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_AND_NOT); } static void packet_list_menu_prepare_or_not_selected_cb(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_OR_NOT); + match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_OR_NOT); } static void packet_list_menu_conversation_ethernet_cb(GtkAction *action, gpointer user_data) { - conversation_cb( action, user_data, CONV_ETHER); + conversation_cb( action, user_data, CONV_ETHER); } static void packet_list_menu_conversation_ip_cb(GtkAction *action _U_, gpointer user_data) { - conversation_cb( action, user_data, CONV_IP); + conversation_cb( action, user_data, CONV_IP); } static void packet_list_menu_conversation_tcp_cb(GtkAction *action _U_, gpointer user_data) { - conversation_cb( action, user_data, CONV_TCP); + conversation_cb( action, user_data, CONV_TCP); } static void packet_list_menu_conversation_udp_cb(GtkAction *action _U_, gpointer user_data) { - conversation_cb( action, user_data, CONV_UDP); + conversation_cb( action, user_data, CONV_UDP); } static void packet_list_menu_conversation_pn_cba_cb(GtkAction *action _U_, gpointer user_data) { - conversation_cb( action, user_data, CONV_CBA); + conversation_cb( action, user_data, CONV_CBA); } /* Ethernet */ @@ -2096,67 +2096,67 @@ packet_list_menu_conversation_pn_cba_cb(GtkAction *action _U_, gpointer user_dat static void packet_list_menu_color_conv_ethernet_color1_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_ETHER+1*256); + colorize_conversation_cb(action, user_data, CONV_ETHER+1*256); } static void packet_list_menu_color_conv_ethernet_color2_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_ETHER+2*256); + colorize_conversation_cb(action, user_data, CONV_ETHER+2*256); } static void packet_list_menu_color_conv_ethernet_color3_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_ETHER+3*256); + colorize_conversation_cb(action, user_data, CONV_ETHER+3*256); } static void packet_list_menu_color_conv_ethernet_color4_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_ETHER+4*256); + colorize_conversation_cb(action, user_data, CONV_ETHER+4*256); } static void packet_list_menu_color_conv_ethernet_color5_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_ETHER+5*256); + colorize_conversation_cb(action, user_data, CONV_ETHER+5*256); } static void packet_list_menu_color_conv_ethernet_color6_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_ETHER+6*256); + colorize_conversation_cb(action, user_data, CONV_ETHER+6*256); } static void packet_list_menu_color_conv_ethernet_color7_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_ETHER+7*256); + colorize_conversation_cb(action, user_data, CONV_ETHER+7*256); } static void packet_list_menu_color_conv_ethernet_color8_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_ETHER+8*256); + colorize_conversation_cb(action, user_data, CONV_ETHER+8*256); } static void packet_list_menu_color_conv_ethernet_color9_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_ETHER+9*256); + colorize_conversation_cb(action, user_data, CONV_ETHER+9*256); } static void packet_list_menu_color_conv_ethernet_color10_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_ETHER+10*256); + colorize_conversation_cb(action, user_data, CONV_ETHER+10*256); } static void packet_list_menu_color_conv_ethernet_new_rule_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_ETHER); + colorize_conversation_cb(action, user_data, CONV_ETHER); } /* IP */ @@ -2164,67 +2164,67 @@ packet_list_menu_color_conv_ethernet_new_rule_cb(GtkAction *action, gpointer use static void packet_list_menu_color_conv_ip_color1_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_IP+1*256); + colorize_conversation_cb(action, user_data, CONV_IP+1*256); } static void packet_list_menu_color_conv_ip_color2_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_IP+2*256); + colorize_conversation_cb(action, user_data, CONV_IP+2*256); } static void packet_list_menu_color_conv_ip_color3_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_IP+3*256); + colorize_conversation_cb(action, user_data, CONV_IP+3*256); } static void packet_list_menu_color_conv_ip_color4_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_IP+4*256); + colorize_conversation_cb(action, user_data, CONV_IP+4*256); } static void packet_list_menu_color_conv_ip_color5_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_IP+5*256); + colorize_conversation_cb(action, user_data, CONV_IP+5*256); } static void packet_list_menu_color_conv_ip_color6_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_IP+6*256); + colorize_conversation_cb(action, user_data, CONV_IP+6*256); } static void packet_list_menu_color_conv_ip_color7_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_IP+7*256); + colorize_conversation_cb(action, user_data, CONV_IP+7*256); } static void packet_list_menu_color_conv_ip_color8_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_IP+8*256); + colorize_conversation_cb(action, user_data, CONV_IP+8*256); } static void packet_list_menu_color_conv_ip_color9_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_IP+9*256); + colorize_conversation_cb(action, user_data, CONV_IP+9*256); } static void packet_list_menu_color_conv_ip_color10_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_IP+10*256); + colorize_conversation_cb(action, user_data, CONV_IP+10*256); } static void packet_list_menu_color_conv_ip_new_rule_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_TCP); + colorize_conversation_cb(action, user_data, CONV_TCP); } /* TCP */ @@ -2232,67 +2232,67 @@ packet_list_menu_color_conv_ip_new_rule_cb(GtkAction *action, gpointer user_data static void packet_list_menu_color_conv_tcp_color1_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_TCP+1*256); + colorize_conversation_cb(action, user_data, CONV_TCP+1*256); } static void packet_list_menu_color_conv_tcp_color2_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_TCP+2*256); + colorize_conversation_cb(action, user_data, CONV_TCP+2*256); } static void packet_list_menu_color_conv_tcp_color3_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_TCP+3*256); + colorize_conversation_cb(action, user_data, CONV_TCP+3*256); } static void packet_list_menu_color_conv_tcp_color4_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_TCP+4*256); + colorize_conversation_cb(action, user_data, CONV_TCP+4*256); } static void packet_list_menu_color_conv_tcp_color5_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_TCP+5*256); + colorize_conversation_cb(action, user_data, CONV_TCP+5*256); } static void packet_list_menu_color_conv_tcp_color6_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_TCP+6*256); + colorize_conversation_cb(action, user_data, CONV_TCP+6*256); } static void packet_list_menu_color_conv_tcp_color7_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_TCP+7*256); + colorize_conversation_cb(action, user_data, CONV_TCP+7*256); } static void packet_list_menu_color_conv_tcp_color8_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_TCP+8*256); + colorize_conversation_cb(action, user_data, CONV_TCP+8*256); } static void packet_list_menu_color_conv_tcp_color9_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_TCP+9*256); + colorize_conversation_cb(action, user_data, CONV_TCP+9*256); } static void packet_list_menu_color_conv_tcp_color10_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_TCP+10*256); + colorize_conversation_cb(action, user_data, CONV_TCP+10*256); } static void packet_list_menu_color_conv_tcp_new_rule_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_TCP); + colorize_conversation_cb(action, user_data, CONV_TCP); } /* UDP */ @@ -2300,67 +2300,67 @@ packet_list_menu_color_conv_tcp_new_rule_cb(GtkAction *action, gpointer user_dat static void packet_list_menu_color_conv_udp_color1_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_UDP+1*256); + colorize_conversation_cb(action, user_data, CONV_UDP+1*256); } static void packet_list_menu_color_conv_udp_color2_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_UDP+2*256); + colorize_conversation_cb(action, user_data, CONV_UDP+2*256); } static void packet_list_menu_color_conv_udp_color3_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_UDP+3*256); + colorize_conversation_cb(action, user_data, CONV_UDP+3*256); } static void packet_list_menu_color_conv_udp_color4_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_UDP+4*256); + colorize_conversation_cb(action, user_data, CONV_UDP+4*256); } static void packet_list_menu_color_conv_udp_color5_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_UDP+5*256); + colorize_conversation_cb(action, user_data, CONV_UDP+5*256); } static void packet_list_menu_color_conv_udp_color6_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_UDP+6*256); + colorize_conversation_cb(action, user_data, CONV_UDP+6*256); } static void packet_list_menu_color_conv_udp_color7_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_UDP+7*256); + colorize_conversation_cb(action, user_data, CONV_UDP+7*256); } static void packet_list_menu_color_conv_udp_color8_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_UDP+8*256); + colorize_conversation_cb(action, user_data, CONV_UDP+8*256); } static void packet_list_menu_color_conv_udp_color9_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_UDP+9*256); + colorize_conversation_cb(action, user_data, CONV_UDP+9*256); } static void packet_list_menu_color_conv_udp_color10_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_UDP+10*256); + colorize_conversation_cb(action, user_data, CONV_UDP+10*256); } static void packet_list_menu_color_conv_udp_new_rule_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_UDP); + colorize_conversation_cb(action, user_data, CONV_UDP); } /* CONV_CBA */ @@ -2368,115 +2368,115 @@ packet_list_menu_color_conv_udp_new_rule_cb(GtkAction *action, gpointer user_dat static void packet_list_menu_color_conv_cba_color1_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_CBA+1*256); + colorize_conversation_cb(action, user_data, CONV_CBA+1*256); } static void packet_list_menu_color_conv_cba_color2_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_CBA+2*256); + colorize_conversation_cb(action, user_data, CONV_CBA+2*256); } static void packet_list_menu_color_conv_cba_color3_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_CBA+3*256); + colorize_conversation_cb(action, user_data, CONV_CBA+3*256); } static void packet_list_menu_color_conv_cba_color4_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_CBA+4*256); + colorize_conversation_cb(action, user_data, CONV_CBA+4*256); } static void packet_list_menu_color_conv_cba_color5_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_CBA+5*256); + colorize_conversation_cb(action, user_data, CONV_CBA+5*256); } static void packet_list_menu_color_conv_cba_color6_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_CBA+6*256); + colorize_conversation_cb(action, user_data, CONV_CBA+6*256); } static void packet_list_menu_color_conv_cba_color7_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_CBA+7*256); + colorize_conversation_cb(action, user_data, CONV_CBA+7*256); } static void packet_list_menu_color_conv_cba_color8_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_CBA+8*256); + colorize_conversation_cb(action, user_data, CONV_CBA+8*256); } static void packet_list_menu_color_conv_cba_color9_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_CBA+9*256); + colorize_conversation_cb(action, user_data, CONV_CBA+9*256); } static void packet_list_menu_color_conv_cba_color10_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_CBA+10*256); + colorize_conversation_cb(action, user_data, CONV_CBA+10*256); } static void packet_list_menu_color_conv_cba_new_rule_cb(GtkAction *action, gpointer user_data) { - colorize_conversation_cb(action, user_data, CONV_CBA); + colorize_conversation_cb(action, user_data, CONV_CBA); } static void packet_list_menu_copy_sum_txt(GtkAction *action _U_, gpointer user_data) { - new_packet_list_copy_summary_cb(user_data, CS_TEXT); + new_packet_list_copy_summary_cb(user_data, CS_TEXT); } static void packet_list_menu_copy_sum_csv(GtkAction *action _U_, gpointer user_data) { - new_packet_list_copy_summary_cb(user_data, CS_CSV); + new_packet_list_copy_summary_cb(user_data, CS_CSV); } static void packet_list_menu_copy_as_flt(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY); + match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY); } static void packet_list_menu_copy_bytes_oht_cb(GtkAction *action _U_, gpointer user_data) { - copy_hex_cb( NULL /* widget _U_ */ , user_data, CD_ALLINFO | CD_FLAGS_SELECTEDONLY); + copy_hex_cb( NULL /* widget _U_ */ , user_data, CD_ALLINFO | CD_FLAGS_SELECTEDONLY); } static void packet_list_menu_copy_bytes_oh_cb(GtkAction *action _U_, gpointer user_data) { - copy_hex_cb( NULL /* widget _U_ */ , user_data, CD_HEXCOLUMNS | CD_FLAGS_SELECTEDONLY); + copy_hex_cb( NULL /* widget _U_ */ , user_data, CD_HEXCOLUMNS | CD_FLAGS_SELECTEDONLY); } static void packet_list_menu_copy_bytes_text_cb(GtkAction *action _U_, gpointer user_data) { - copy_hex_cb( NULL /* widget _U_ */ , user_data, CD_TEXTONLY | CD_FLAGS_SELECTEDONLY); + copy_hex_cb( NULL /* widget _U_ */ , user_data, CD_TEXTONLY | CD_FLAGS_SELECTEDONLY); } static void packet_list_menu_copy_bytes_hex_strm_cb(GtkAction *action _U_, gpointer user_data) { - copy_hex_cb( NULL /* widget _U_ */ , user_data, CD_HEX | CD_FLAGS_SELECTEDONLY); + copy_hex_cb( NULL /* widget _U_ */ , user_data, CD_HEX | CD_FLAGS_SELECTEDONLY); } static void packet_list_menu_copy_bytes_bin_strm_cb(GtkAction *action _U_, gpointer user_data) { - copy_hex_cb( NULL /* widget _U_ */ , user_data, CD_BINARY | CD_FLAGS_SELECTEDONLY); + copy_hex_cb( NULL /* widget _U_ */ , user_data, CD_BINARY | CD_FLAGS_SELECTEDONLY); } /* tree */ @@ -2484,93 +2484,93 @@ packet_list_menu_copy_bytes_bin_strm_cb(GtkAction *action _U_, gpointer user_dat static void tree_view_menu_color_with_flt_color1_cb(GtkAction *action _U_, gpointer user_data) { - colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 1); + colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 1); } static void tree_view_menu_color_with_flt_color2_cb(GtkAction *action _U_, gpointer user_data) { - colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 2); + colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 2); } static void tree_view_menu_color_with_flt_color3_cb(GtkAction *action _U_, gpointer user_data) { - colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 3); + colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 3); } static void tree_view_menu_color_with_flt_color4_cb(GtkAction *action _U_, gpointer user_data) { - colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 4); + colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 4); } static void tree_view_menu_color_with_flt_color5_cb(GtkAction *action _U_, gpointer user_data) { - colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 5); + colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 5); } static void tree_view_menu_color_with_flt_color6_cb(GtkAction *action _U_, gpointer user_data) { - colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 6); + colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 6); } static void tree_view_menu_color_with_flt_color7_cb(GtkAction *action _U_, gpointer user_data) { - colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 7); + colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 7); } static void tree_view_menu_color_with_flt_color8_cb(GtkAction *action _U_, gpointer user_data) { - colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 8); + colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 8); } static void tree_view_menu_color_with_flt_color9_cb(GtkAction *action _U_, gpointer user_data) { - colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 9); + colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 9); } static void tree_view_menu_color_with_flt_color10_cb(GtkAction *action _U_, gpointer user_data) { - colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 10); + colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 10); } static void tree_view_menu_color_with_flt_new_rule_cb(GtkAction *action _U_, gpointer user_data) { - colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 0); + colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 0); } static void tree_view_menu_copy_desc(GtkAction *action _U_, gpointer user_data) { - copy_selected_plist_cb( NULL /* widget _U_ */ , user_data, COPY_SELECTED_DESCRIPTION); + copy_selected_plist_cb( NULL /* widget _U_ */ , user_data, COPY_SELECTED_DESCRIPTION); } static void tree_view_menu_copy_field(GtkAction *action _U_, gpointer user_data) { - copy_selected_plist_cb( NULL /* widget _U_ */ , user_data, COPY_SELECTED_FIELDNAME); + copy_selected_plist_cb( NULL /* widget _U_ */ , user_data, COPY_SELECTED_FIELDNAME); } static void tree_view_menu_copy_value(GtkAction *action _U_, gpointer user_data) { - copy_selected_plist_cb( NULL /* widget _U_ */ , user_data, COPY_SELECTED_VALUE); + copy_selected_plist_cb( NULL /* widget _U_ */ , user_data, COPY_SELECTED_VALUE); } static void tree_view_menu_copy_as_flt(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/Copy/AsFilter"); - match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/Copy/AsFilter"); + match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY); } static const char *ui_desc_packet_list_heading_menu_popup = @@ -2599,25 +2599,25 @@ static const char *ui_desc_packet_list_heading_menu_popup = "\n"; static const GtkActionEntry packet_list_heading_menu_popup_action_entries[] = { - { "/Sort Ascending", GTK_STOCK_SORT_ASCENDING, "Sort Ascending", NULL, NULL, G_CALLBACK(sort_ascending_cb) }, - { "/Sort Descending", GTK_STOCK_SORT_DESCENDING, "Sort Descending", NULL, NULL, G_CALLBACK(sort_descending_cb) }, - { "/No Sorting", NULL, "No Sorting", NULL, NULL, G_CALLBACK(no_sorting_cb) }, - { "/Align Left", GTK_STOCK_JUSTIFY_LEFT, "Align Left", NULL, NULL, G_CALLBACK(packet_list_heading_align_left_cb) }, - { "/Align Center", GTK_STOCK_JUSTIFY_CENTER, "Align Center", NULL, NULL, G_CALLBACK(packet_list_heading_align_center_cb) }, - { "/Align Right", GTK_STOCK_JUSTIFY_RIGHT, "Align Right", NULL, NULL, G_CALLBACK(packet_list_heading_align_right_cb) }, - { "/Column Preferences", GTK_STOCK_PREFERENCES, "Column Preferences...", NULL, NULL, G_CALLBACK(packet_list_heading_col_pref_cb) }, - { "/Edit Column Details", WIRESHARK_STOCK_EDIT, "Edit Column Details...", NULL, NULL, G_CALLBACK(packet_list_heading_change_col_cb) }, - { "/Resize Column", WIRESHARK_STOCK_RESIZE_COLUMNS, "Resize Column", NULL, NULL, G_CALLBACK(packet_list_heading_resize_col_cb) }, - { "/Displayed Columns", NULL, "Displayed Columns", NULL, NULL, NULL }, - { "/Displayed Columns/Display All", NULL, "Display All", NULL, NULL, G_CALLBACK(packet_list_heading_activate_all_columns_cb) }, - { "/Hide Column", NULL, "Hide Column", NULL, NULL, G_CALLBACK(packet_list_heading_hide_col_cb) }, - { "/Remove Column", GTK_STOCK_DELETE, "Remove Column", NULL, NULL, G_CALLBACK(packet_list_heading_remove_col_cb) }, + { "/Sort Ascending", GTK_STOCK_SORT_ASCENDING, "Sort Ascending", NULL, NULL, G_CALLBACK(sort_ascending_cb) }, + { "/Sort Descending", GTK_STOCK_SORT_DESCENDING, "Sort Descending", NULL, NULL, G_CALLBACK(sort_descending_cb) }, + { "/No Sorting", NULL, "No Sorting", NULL, NULL, G_CALLBACK(no_sorting_cb) }, + { "/Align Left", GTK_STOCK_JUSTIFY_LEFT, "Align Left", NULL, NULL, G_CALLBACK(packet_list_heading_align_left_cb) }, + { "/Align Center", GTK_STOCK_JUSTIFY_CENTER, "Align Center", NULL, NULL, G_CALLBACK(packet_list_heading_align_center_cb) }, + { "/Align Right", GTK_STOCK_JUSTIFY_RIGHT, "Align Right", NULL, NULL, G_CALLBACK(packet_list_heading_align_right_cb) }, + { "/Column Preferences", GTK_STOCK_PREFERENCES, "Column Preferences...", NULL, NULL, G_CALLBACK(packet_list_heading_col_pref_cb) }, + { "/Edit Column Details", WIRESHARK_STOCK_EDIT, "Edit Column Details...", NULL, NULL, G_CALLBACK(packet_list_heading_change_col_cb) }, + { "/Resize Column", WIRESHARK_STOCK_RESIZE_COLUMNS, "Resize Column", NULL, NULL, G_CALLBACK(packet_list_heading_resize_col_cb) }, + { "/Displayed Columns", NULL, "Displayed Columns", NULL, NULL, NULL }, + { "/Displayed Columns/Display All", NULL, "Display All", NULL, NULL, G_CALLBACK(packet_list_heading_activate_all_columns_cb) }, + { "/Hide Column", NULL, "Hide Column", NULL, NULL, G_CALLBACK(packet_list_heading_hide_col_cb) }, + { "/Remove Column", GTK_STOCK_DELETE, "Remove Column", NULL, NULL, G_CALLBACK(packet_list_heading_remove_col_cb) }, }; static const GtkToggleActionEntry packet_list_heading_menu_toggle_action_entries[] = { - /* name, stock id, label, accel, tooltip, callback, is_active */ - {"/Show Resolved", NULL, "Show Resolved", NULL, NULL, G_CALLBACK(packet_list_heading_show_resolved_cb), FALSE}, + /* name, stock id, label, accel, tooltip, callback, is_active */ + {"/Show Resolved", NULL, "Show Resolved", NULL, NULL, G_CALLBACK(packet_list_heading_show_resolved_cb), FALSE}, }; static const char *ui_desc_packet_list_menu_popup = @@ -2750,133 +2750,133 @@ static const char *ui_desc_packet_list_menu_popup = "\n"; static const GtkActionEntry packet_list_menu_popup_action_entries[] = { - { "/MarkPacket", NULL, "Mark Packet (toggle)", NULL, NULL, G_CALLBACK(new_packet_list_mark_frame_cb) }, - { "/IgnorePacket", NULL, "Ignore Packet (toggle)", NULL, NULL, G_CALLBACK(new_packet_list_ignore_frame_cb) }, - { "/Set Time Reference", WIRESHARK_STOCK_TIME, "Set Time Reference (toggle)", NULL, NULL, G_CALLBACK(packet_list_menu_set_ref_time_cb) }, - { "/TimeShift", WIRESHARK_STOCK_TIME, "Time Shift...", NULL, NULL, G_CALLBACK(time_shift_cb) }, - { "/ManuallyResolveAddress", NULL, "Manually Resolve Address", NULL, NULL, G_CALLBACK(manual_addr_resolv_dlg) }, - { "/Apply as Filter", NULL, "Apply as Filter", NULL, NULL, NULL }, + { "/MarkPacket", NULL, "Mark Packet (toggle)", NULL, NULL, G_CALLBACK(new_packet_list_mark_frame_cb) }, + { "/IgnorePacket", NULL, "Ignore Packet (toggle)", NULL, NULL, G_CALLBACK(new_packet_list_ignore_frame_cb) }, + { "/Set Time Reference", WIRESHARK_STOCK_TIME, "Set Time Reference (toggle)", NULL, NULL, G_CALLBACK(packet_list_menu_set_ref_time_cb) }, + { "/TimeShift", WIRESHARK_STOCK_TIME, "Time Shift...", NULL, NULL, G_CALLBACK(time_shift_cb) }, + { "/ManuallyResolveAddress", NULL, "Manually Resolve Address", NULL, NULL, G_CALLBACK(manual_addr_resolv_dlg) }, + { "/Apply as Filter", NULL, "Apply as Filter", NULL, NULL, NULL }, - { "/Apply as Filter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(packet_list_menu_apply_selected_cb) }, - { "/Apply as Filter/Not Selected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_apply_not_selected_cb) }, - { "/Apply as Filter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(packet_list_menu_apply_and_selected_cb) }, - { "/Apply as Filter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(packet_list_menu_apply_or_selected_cb) }, - { "/Apply as Filter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_apply_and_not_selected_cb) }, - { "/Apply as Filter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_apply_or_not_selected_cb) }, + { "/Apply as Filter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(packet_list_menu_apply_selected_cb) }, + { "/Apply as Filter/Not Selected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_apply_not_selected_cb) }, + { "/Apply as Filter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(packet_list_menu_apply_and_selected_cb) }, + { "/Apply as Filter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(packet_list_menu_apply_or_selected_cb) }, + { "/Apply as Filter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_apply_and_not_selected_cb) }, + { "/Apply as Filter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_apply_or_not_selected_cb) }, - { "/Prepare a Filter", NULL, "Prepare a Filter", NULL, NULL, NULL }, - { "/Prepare a Filter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(packet_list_menu_prepare_selected_cb) }, - { "/Prepare a Filter/Not Selected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_prepare_not_selected_cb) }, - { "/Prepare a Filter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(packet_list_menu_prepare_and_selected_cb) }, - { "/Prepare a Filter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(packet_list_menu_prepare_or_selected_cb) }, - { "/Prepare a Filter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_prepare_and_not_selected_cb) }, - { "/Prepare a Filter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_prepare_or_not_selected_cb) }, + { "/Prepare a Filter", NULL, "Prepare a Filter", NULL, NULL, NULL }, + { "/Prepare a Filter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(packet_list_menu_prepare_selected_cb) }, + { "/Prepare a Filter/Not Selected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_prepare_not_selected_cb) }, + { "/Prepare a Filter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(packet_list_menu_prepare_and_selected_cb) }, + { "/Prepare a Filter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(packet_list_menu_prepare_or_selected_cb) }, + { "/Prepare a Filter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_prepare_and_not_selected_cb) }, + { "/Prepare a Filter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_prepare_or_not_selected_cb) }, - { "/Conversation Filter", NULL, "Conversation Filter", NULL, NULL, NULL }, - { "/Conversation Filter/Ethernet", NULL, "Ethernet", NULL, NULL, G_CALLBACK(packet_list_menu_conversation_ethernet_cb) }, - { "/Conversation Filter/IP", NULL, "IP", NULL, NULL, G_CALLBACK(packet_list_menu_conversation_ip_cb) }, - { "/Conversation Filter/TCP", NULL, "TCP", NULL, NULL, G_CALLBACK(packet_list_menu_conversation_tcp_cb) }, - { "/Conversation Filter/UDP", NULL, "UDP", NULL, NULL, G_CALLBACK(packet_list_menu_conversation_udp_cb) }, - { "/Conversation Filter/PN-CBA", NULL, "PN-CBA", NULL, NULL, G_CALLBACK(packet_list_menu_conversation_pn_cba_cb) }, + { "/Conversation Filter", NULL, "Conversation Filter", NULL, NULL, NULL }, + { "/Conversation Filter/Ethernet", NULL, "Ethernet", NULL, NULL, G_CALLBACK(packet_list_menu_conversation_ethernet_cb) }, + { "/Conversation Filter/IP", NULL, "IP", NULL, NULL, G_CALLBACK(packet_list_menu_conversation_ip_cb) }, + { "/Conversation Filter/TCP", NULL, "TCP", NULL, NULL, G_CALLBACK(packet_list_menu_conversation_tcp_cb) }, + { "/Conversation Filter/UDP", NULL, "UDP", NULL, NULL, G_CALLBACK(packet_list_menu_conversation_udp_cb) }, + { "/Conversation Filter/PN-CBA", NULL, "PN-CBA", NULL, NULL, G_CALLBACK(packet_list_menu_conversation_pn_cba_cb) }, - { "/Colorize Conversation", NULL, "Colorize Conversation", NULL, NULL, NULL }, + { "/Colorize Conversation", NULL, "Colorize Conversation", NULL, NULL, NULL }, - { "/Colorize Conversation/Ethernet", NULL, "Ethernet", NULL, NULL, NULL }, + { "/Colorize Conversation/Ethernet", NULL, "Ethernet", NULL, NULL, NULL }, - { "/Colorize Conversation/Ethernet/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color1_cb) }, - { "/Colorize Conversation/Ethernet/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color2_cb) }, - { "/Colorize Conversation/Ethernet/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color3_cb) }, - { "/Colorize Conversation/Ethernet/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color4_cb) }, - { "/Colorize Conversation/Ethernet/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color5_cb) }, - { "/Colorize Conversation/Ethernet/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color6_cb) }, - { "/Colorize Conversation/Ethernet/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color7_cb) }, - { "/Colorize Conversation/Ethernet/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color8_cb) }, - { "/Colorize Conversation/Ethernet/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color9_cb) }, - { "/Colorize Conversation/Ethernet/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color10_cb) }, - { "/Colorize Conversation/Ethernet/New Coloring Rule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_new_rule_cb) }, + { "/Colorize Conversation/Ethernet/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color1_cb) }, + { "/Colorize Conversation/Ethernet/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color2_cb) }, + { "/Colorize Conversation/Ethernet/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color3_cb) }, + { "/Colorize Conversation/Ethernet/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color4_cb) }, + { "/Colorize Conversation/Ethernet/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color5_cb) }, + { "/Colorize Conversation/Ethernet/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color6_cb) }, + { "/Colorize Conversation/Ethernet/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color7_cb) }, + { "/Colorize Conversation/Ethernet/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color8_cb) }, + { "/Colorize Conversation/Ethernet/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color9_cb) }, + { "/Colorize Conversation/Ethernet/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color10_cb) }, + { "/Colorize Conversation/Ethernet/New Coloring Rule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_new_rule_cb) }, - { "/Colorize Conversation/IP", NULL, "IP", NULL, NULL, NULL }, + { "/Colorize Conversation/IP", NULL, "IP", NULL, NULL, NULL }, - { "/Colorize Conversation/IP/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color1_cb) }, - { "/Colorize Conversation/IP/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color2_cb) }, - { "/Colorize Conversation/IP/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color3_cb) }, - { "/Colorize Conversation/IP/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color4_cb) }, - { "/Colorize Conversation/IP/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color5_cb) }, - { "/Colorize Conversation/IP/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color6_cb) }, - { "/Colorize Conversation/IP/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color7_cb) }, - { "/Colorize Conversation/IP/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color8_cb) }, - { "/Colorize Conversation/IP/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color9_cb) }, - { "/Colorize Conversation/IP/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color10_cb) }, - { "/Colorize Conversation/IP/New Coloring Rule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_new_rule_cb) }, + { "/Colorize Conversation/IP/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color1_cb) }, + { "/Colorize Conversation/IP/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color2_cb) }, + { "/Colorize Conversation/IP/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color3_cb) }, + { "/Colorize Conversation/IP/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color4_cb) }, + { "/Colorize Conversation/IP/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color5_cb) }, + { "/Colorize Conversation/IP/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color6_cb) }, + { "/Colorize Conversation/IP/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color7_cb) }, + { "/Colorize Conversation/IP/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color8_cb) }, + { "/Colorize Conversation/IP/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color9_cb) }, + { "/Colorize Conversation/IP/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color10_cb) }, + { "/Colorize Conversation/IP/New Coloring Rule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_new_rule_cb) }, - { "/Colorize Conversation/TCP", NULL, "TCP", NULL, NULL, NULL }, + { "/Colorize Conversation/TCP", NULL, "TCP", NULL, NULL, NULL }, - { "/Colorize Conversation/TCP/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color1_cb) }, - { "/Colorize Conversation/TCP/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color2_cb) }, - { "/Colorize Conversation/TCP/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color3_cb) }, - { "/Colorize Conversation/TCP/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color4_cb) }, - { "/Colorize Conversation/TCP/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color5_cb) }, - { "/Colorize Conversation/TCP/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color6_cb) }, - { "/Colorize Conversation/TCP/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color7_cb) }, - { "/Colorize Conversation/TCP/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color8_cb) }, - { "/Colorize Conversation/TCP/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color9_cb) }, - { "/Colorize Conversation/TCP/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color10_cb) }, - { "/Colorize Conversation/TCP/New Coloring Rule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_new_rule_cb) }, + { "/Colorize Conversation/TCP/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color1_cb) }, + { "/Colorize Conversation/TCP/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color2_cb) }, + { "/Colorize Conversation/TCP/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color3_cb) }, + { "/Colorize Conversation/TCP/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color4_cb) }, + { "/Colorize Conversation/TCP/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color5_cb) }, + { "/Colorize Conversation/TCP/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color6_cb) }, + { "/Colorize Conversation/TCP/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color7_cb) }, + { "/Colorize Conversation/TCP/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color8_cb) }, + { "/Colorize Conversation/TCP/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color9_cb) }, + { "/Colorize Conversation/TCP/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color10_cb) }, + { "/Colorize Conversation/TCP/New Coloring Rule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_new_rule_cb) }, - { "/Colorize Conversation/UDP", NULL, "UDP", NULL, NULL, NULL }, + { "/Colorize Conversation/UDP", NULL, "UDP", NULL, NULL, NULL }, - { "/Colorize Conversation/UDP/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color1_cb) }, - { "/Colorize Conversation/UDP/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color2_cb) }, - { "/Colorize Conversation/UDP/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color3_cb) }, - { "/Colorize Conversation/UDP/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color4_cb) }, - { "/Colorize Conversation/UDP/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color5_cb) }, - { "/Colorize Conversation/UDP/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color6_cb) }, - { "/Colorize Conversation/UDP/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color7_cb) }, - { "/Colorize Conversation/UDP/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color8_cb) }, - { "/Colorize Conversation/UDP/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color9_cb) }, - { "/Colorize Conversation/UDP/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color10_cb) }, - { "/Colorize Conversation/UDP/New Coloring Rule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_new_rule_cb) }, + { "/Colorize Conversation/UDP/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color1_cb) }, + { "/Colorize Conversation/UDP/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color2_cb) }, + { "/Colorize Conversation/UDP/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color3_cb) }, + { "/Colorize Conversation/UDP/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color4_cb) }, + { "/Colorize Conversation/UDP/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color5_cb) }, + { "/Colorize Conversation/UDP/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color6_cb) }, + { "/Colorize Conversation/UDP/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color7_cb) }, + { "/Colorize Conversation/UDP/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color8_cb) }, + { "/Colorize Conversation/UDP/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color9_cb) }, + { "/Colorize Conversation/UDP/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color10_cb) }, + { "/Colorize Conversation/UDP/New Coloring Rule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_new_rule_cb) }, - { "/Colorize Conversation/PN-CBA", NULL, "PN-CBA Server", NULL, NULL, NULL }, + { "/Colorize Conversation/PN-CBA", NULL, "PN-CBA Server", NULL, NULL, NULL }, - { "/Colorize Conversation/PN-CBA/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color1_cb) }, - { "/Colorize Conversation/PN-CBA/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color2_cb) }, - { "/Colorize Conversation/PN-CBA/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color3_cb) }, - { "/Colorize Conversation/PN-CBA/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color4_cb) }, - { "/Colorize Conversation/PN-CBA/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color5_cb) }, - { "/Colorize Conversation/PN-CBA/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color6_cb) }, - { "/Colorize Conversation/PN-CBA/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color7_cb) }, - { "/Colorize Conversation/PN-CBA/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color8_cb) }, - { "/Colorize Conversation/PN-CBA/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color9_cb) }, - { "/Colorize Conversation/PN-CBA/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color10_cb) }, - { "/Colorize Conversation/PN-CBA/New Coloring Rule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_new_rule_cb) }, + { "/Colorize Conversation/PN-CBA/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color1_cb) }, + { "/Colorize Conversation/PN-CBA/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color2_cb) }, + { "/Colorize Conversation/PN-CBA/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color3_cb) }, + { "/Colorize Conversation/PN-CBA/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color4_cb) }, + { "/Colorize Conversation/PN-CBA/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color5_cb) }, + { "/Colorize Conversation/PN-CBA/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color6_cb) }, + { "/Colorize Conversation/PN-CBA/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color7_cb) }, + { "/Colorize Conversation/PN-CBA/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color8_cb) }, + { "/Colorize Conversation/PN-CBA/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color9_cb) }, + { "/Colorize Conversation/PN-CBA/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color10_cb) }, + { "/Colorize Conversation/PN-CBA/New Coloring Rule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_new_rule_cb) }, - { "/SCTP", NULL, "SCTP", NULL, NULL, NULL }, - { "/SCTP/Analyse this Association", NULL, "Analyse this Association", NULL, NULL, G_CALLBACK(sctp_analyse_start) }, - { "/SCTP/Prepare Filter for this Association", NULL, "Prepare Filter for this Association", NULL, NULL, G_CALLBACK(sctp_set_assoc_filter) }, + { "/SCTP", NULL, "SCTP", NULL, NULL, NULL }, + { "/SCTP/Analyse this Association", NULL, "Analyse this Association", NULL, NULL, G_CALLBACK(sctp_analyse_start) }, + { "/SCTP/Prepare Filter for this Association", NULL, "Prepare Filter for this Association", NULL, NULL, G_CALLBACK(sctp_set_assoc_filter) }, - { "/Follow TCP Stream", NULL, "Follow TCP Stream", NULL, NULL, G_CALLBACK(follow_tcp_stream_cb) }, - { "/Follow UDP Stream", NULL, "Follow UDP Stream", NULL, NULL, G_CALLBACK(follow_udp_stream_cb) }, - { "/Follow SSL Stream", NULL, "Follow SSL Stream", NULL, NULL, G_CALLBACK(follow_ssl_stream_cb) }, + { "/Follow TCP Stream", NULL, "Follow TCP Stream", NULL, NULL, G_CALLBACK(follow_tcp_stream_cb) }, + { "/Follow UDP Stream", NULL, "Follow UDP Stream", NULL, NULL, G_CALLBACK(follow_udp_stream_cb) }, + { "/Follow SSL Stream", NULL, "Follow SSL Stream", NULL, NULL, G_CALLBACK(follow_ssl_stream_cb) }, - { "/Copy", NULL, "Copy", NULL, NULL, NULL }, - { "/Copy/SummaryTxt", NULL, "Summary (Text)", NULL, NULL, G_CALLBACK(packet_list_menu_copy_sum_txt) }, - { "/Copy/SummaryCSV", NULL, "Summary (CSV)", NULL, NULL, G_CALLBACK(packet_list_menu_copy_sum_csv) }, - { "/Copy/AsFilter", NULL, "As Filter", NULL, NULL, G_CALLBACK(packet_list_menu_copy_as_flt) }, + { "/Copy", NULL, "Copy", NULL, NULL, NULL }, + { "/Copy/SummaryTxt", NULL, "Summary (Text)", NULL, NULL, G_CALLBACK(packet_list_menu_copy_sum_txt) }, + { "/Copy/SummaryCSV", NULL, "Summary (CSV)", NULL, NULL, G_CALLBACK(packet_list_menu_copy_sum_csv) }, + { "/Copy/AsFilter", NULL, "As Filter", NULL, NULL, G_CALLBACK(packet_list_menu_copy_as_flt) }, - { "/Copy/Bytes", NULL, "Bytes", NULL, NULL, NULL }, - { "/Copy/Bytes/OffsetHexText", NULL, "Offset Hex Text", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_oht_cb) }, - { "/Copy/Bytes/OffsetHex", NULL, "Offset Hex", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_oh_cb) }, - { "/Copy/Bytes/PrintableTextOnly", NULL, "Printable Text Only", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_text_cb) }, + { "/Copy/Bytes", NULL, "Bytes", NULL, NULL, NULL }, + { "/Copy/Bytes/OffsetHexText", NULL, "Offset Hex Text", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_oht_cb) }, + { "/Copy/Bytes/OffsetHex", NULL, "Offset Hex", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_oh_cb) }, + { "/Copy/Bytes/PrintableTextOnly", NULL, "Printable Text Only", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_text_cb) }, - { "/Copy/Bytes/HexStream", NULL, "Hex Stream", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_hex_strm_cb) }, - { "/Copy/Bytes/BinaryStream", NULL, "Binary Stream", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_bin_strm_cb) }, + { "/Copy/Bytes/HexStream", NULL, "Hex Stream", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_hex_strm_cb) }, + { "/Copy/Bytes/BinaryStream", NULL, "Binary Stream", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_bin_strm_cb) }, - { "/DecodeAs", WIRESHARK_STOCK_DECODE_AS, "Decode As...", NULL, NULL, G_CALLBACK(decode_as_cb) }, - { "/Print", GTK_STOCK_PRINT, "Print...", NULL, NULL, G_CALLBACK(file_print_selected_cmd_cb) }, - { "/ShowPacketinNewWindow", NULL, "Show Packet in New Window", NULL, NULL, G_CALLBACK(new_window_cb) }, + { "/DecodeAs", WIRESHARK_STOCK_DECODE_AS, "Decode As...", NULL, NULL, G_CALLBACK(decode_as_cb) }, + { "/Print", GTK_STOCK_PRINT, "Print...", NULL, NULL, G_CALLBACK(file_print_selected_cmd_cb) }, + { "/ShowPacketinNewWindow", NULL, "Show Packet in New Window", NULL, NULL, G_CALLBACK(new_window_cb) }, }; @@ -2953,69 +2953,69 @@ static const char *ui_desc_tree_view_menu_popup = "\n"; static const GtkActionEntry tree_view_menu_popup_action_entries[] = { - { "/ExpandSubtrees", NULL, "Expand Subtrees", NULL, NULL, G_CALLBACK(expand_tree_cb) }, - { "/ExpandAll", NULL, "Expand All", NULL, NULL, G_CALLBACK(expand_all_cb) }, - { "/CollapseAll", NULL, "Collapse All", NULL, NULL, G_CALLBACK(collapse_all_cb) }, - { "/Apply as Column", NULL, "Apply as Column", NULL, NULL, G_CALLBACK(apply_as_custom_column_cb) }, - { "/Apply as Filter", NULL, "Apply as Filter", NULL, NULL, NULL }, + { "/ExpandSubtrees", NULL, "Expand Subtrees", NULL, NULL, G_CALLBACK(expand_tree_cb) }, + { "/ExpandAll", NULL, "Expand All", NULL, NULL, G_CALLBACK(expand_all_cb) }, + { "/CollapseAll", NULL, "Collapse All", NULL, NULL, G_CALLBACK(collapse_all_cb) }, + { "/Apply as Column", NULL, "Apply as Column", NULL, NULL, G_CALLBACK(apply_as_custom_column_cb) }, + { "/Apply as Filter", NULL, "Apply as Filter", NULL, NULL, NULL }, - { "/Apply as Filter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(tree_view_menu_apply_selected_cb) }, - { "/Apply as Filter/Not Selected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_not_selected_cb) }, - { "/Apply as Filter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_and_selected_cb) }, - { "/Apply as Filter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_or_selected_cb) }, - { "/Apply as Filter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_and_not_selected_cb) }, - { "/Apply as Filter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_or_not_selected_cb) }, + { "/Apply as Filter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(tree_view_menu_apply_selected_cb) }, + { "/Apply as Filter/Not Selected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_not_selected_cb) }, + { "/Apply as Filter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_and_selected_cb) }, + { "/Apply as Filter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_or_selected_cb) }, + { "/Apply as Filter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_and_not_selected_cb) }, + { "/Apply as Filter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_or_not_selected_cb) }, - { "/Prepare a Filter", NULL, "Prepare a Filter", NULL, NULL, NULL }, - { "/Prepare a Filter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(tree_view_menu_prepare_selected_cb) }, - { "/Prepare a Filter/Not Selected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_not_selected_cb) }, - { "/Prepare a Filter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_and_selected_cb) }, - { "/Prepare a Filter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_or_selected_cb) }, - { "/Prepare a Filter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_and_not_selected_cb) }, - { "/Prepare a Filter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_or_not_selected_cb) }, + { "/Prepare a Filter", NULL, "Prepare a Filter", NULL, NULL, NULL }, + { "/Prepare a Filter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(tree_view_menu_prepare_selected_cb) }, + { "/Prepare a Filter/Not Selected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_not_selected_cb) }, + { "/Prepare a Filter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_and_selected_cb) }, + { "/Prepare a Filter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_or_selected_cb) }, + { "/Prepare a Filter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_and_not_selected_cb) }, + { "/Prepare a Filter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_or_not_selected_cb) }, - { "/Colorize with Filter", NULL, "Colorize with Filter", NULL, NULL, NULL }, - { "/Colorize with Filter/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color1_cb) }, - { "/Colorize with Filter/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color2_cb) }, - { "/Colorize with Filter/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color3_cb) }, - { "/Colorize with Filter/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color4_cb) }, - { "/Colorize with Filter/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color5_cb) }, - { "/Colorize with Filter/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color6_cb) }, - { "/Colorize with Filter/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color7_cb) }, - { "/Colorize with Filter/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color8_cb) }, - { "/Colorize with Filter/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color9_cb) }, - { "/Colorize with Filter/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color10_cb) }, - { "/Colorize with Filter/New Coloring Rule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_new_rule_cb) }, + { "/Colorize with Filter", NULL, "Colorize with Filter", NULL, NULL, NULL }, + { "/Colorize with Filter/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color1_cb) }, + { "/Colorize with Filter/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color2_cb) }, + { "/Colorize with Filter/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color3_cb) }, + { "/Colorize with Filter/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color4_cb) }, + { "/Colorize with Filter/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color5_cb) }, + { "/Colorize with Filter/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color6_cb) }, + { "/Colorize with Filter/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color7_cb) }, + { "/Colorize with Filter/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color8_cb) }, + { "/Colorize with Filter/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color9_cb) }, + { "/Colorize with Filter/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color10_cb) }, + { "/Colorize with Filter/New Coloring Rule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_new_rule_cb) }, - { "/Follow TCP Stream", NULL, "Follow TCP Stream", NULL, NULL, G_CALLBACK(follow_tcp_stream_cb) }, - { "/Follow UDP Stream", NULL, "Follow UDP Stream", NULL, NULL, G_CALLBACK(follow_udp_stream_cb) }, - { "/Follow SSL Stream", NULL, "Follow SSL Stream", NULL, NULL, G_CALLBACK(follow_ssl_stream_cb) }, + { "/Follow TCP Stream", NULL, "Follow TCP Stream", NULL, NULL, G_CALLBACK(follow_tcp_stream_cb) }, + { "/Follow UDP Stream", NULL, "Follow UDP Stream", NULL, NULL, G_CALLBACK(follow_udp_stream_cb) }, + { "/Follow SSL Stream", NULL, "Follow SSL Stream", NULL, NULL, G_CALLBACK(follow_ssl_stream_cb) }, - { "/Copy", NULL, "Copy", NULL, NULL, NULL }, - { "/Copy/Description", NULL, "Description", NULL, NULL, G_CALLBACK(tree_view_menu_copy_desc) }, - { "/Copy/Fieldname", NULL, "Fieldname", NULL, NULL, G_CALLBACK(tree_view_menu_copy_field) }, - { "/Copy/Value", NULL, "Value", NULL, NULL, G_CALLBACK(tree_view_menu_copy_value) }, + { "/Copy", NULL, "Copy", NULL, NULL, NULL }, + { "/Copy/Description", NULL, "Description", NULL, NULL, G_CALLBACK(tree_view_menu_copy_desc) }, + { "/Copy/Fieldname", NULL, "Fieldname", NULL, NULL, G_CALLBACK(tree_view_menu_copy_field) }, + { "/Copy/Value", NULL, "Value", NULL, NULL, G_CALLBACK(tree_view_menu_copy_value) }, - { "/Copy/AsFilter", NULL, "As Filter", NULL, NULL, G_CALLBACK(tree_view_menu_copy_as_flt) }, + { "/Copy/AsFilter", NULL, "As Filter", NULL, NULL, G_CALLBACK(tree_view_menu_copy_as_flt) }, - { "/Copy/Bytes", NULL, "Bytes", NULL, NULL, NULL }, - { "/Copy/Bytes/OffsetHexText", NULL, "Offset Hex Text", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_oht_cb) }, - { "/Copy/Bytes/OffsetHex", NULL, "Offset Hex", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_oh_cb) }, - { "/Copy/Bytes/PrintableTextOnly", NULL, "Printable Text Only", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_text_cb) }, + { "/Copy/Bytes", NULL, "Bytes", NULL, NULL, NULL }, + { "/Copy/Bytes/OffsetHexText", NULL, "Offset Hex Text", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_oht_cb) }, + { "/Copy/Bytes/OffsetHex", NULL, "Offset Hex", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_oh_cb) }, + { "/Copy/Bytes/PrintableTextOnly", NULL, "Printable Text Only", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_text_cb) }, - { "/Copy/Bytes/HexStream", NULL, "Hex Stream", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_hex_strm_cb) }, - { "/Copy/Bytes/BinaryStream", NULL, "Binary Stream", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_bin_strm_cb) }, + { "/Copy/Bytes/HexStream", NULL, "Hex Stream", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_hex_strm_cb) }, + { "/Copy/Bytes/BinaryStream", NULL, "Binary Stream", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_bin_strm_cb) }, - { "/ExportSelectedPacketBytes", NULL, "Export Selected Packet Bytes...", NULL, NULL, G_CALLBACK(savehex_cb) }, + { "/ExportSelectedPacketBytes", NULL, "Export Selected Packet Bytes...", NULL, NULL, G_CALLBACK(savehex_cb) }, - { "/WikiProtocolPage", WIRESHARK_STOCK_WIKI, "Wiki Protocol Page", NULL, NULL, G_CALLBACK(selected_ptree_info_cb) }, - { "/FilterFieldReference", WIRESHARK_STOCK_INTERNET, "Filter Field Reference", NULL, NULL, G_CALLBACK(selected_ptree_ref_cb) }, - { "/ProtocolHelp", NULL, "Protocol Help", NULL, NULL, NULL }, - { "/ProtocolPreferences", NULL, "Protocol Preferences", NULL, NULL, NULL }, - { "/DecodeAs", WIRESHARK_STOCK_DECODE_AS, "Decode As...", NULL, NULL, G_CALLBACK(decode_as_cb) }, - { "/DisableProtocol", WIRESHARK_STOCK_CHECKBOX, "Disable Protocol...", NULL, NULL, G_CALLBACK(proto_disable_cb) }, - { "/ResolveName", NULL, "_Resolve Name", NULL, NULL, G_CALLBACK(resolve_name_cb) }, - { "/GotoCorrespondingPacket", NULL, "_Go to Corresponding Packet", NULL, NULL, G_CALLBACK(goto_framenum_cb) }, + { "/WikiProtocolPage", WIRESHARK_STOCK_WIKI, "Wiki Protocol Page", NULL, NULL, G_CALLBACK(selected_ptree_info_cb) }, + { "/FilterFieldReference", WIRESHARK_STOCK_INTERNET, "Filter Field Reference", NULL, NULL, G_CALLBACK(selected_ptree_ref_cb) }, + { "/ProtocolHelp", NULL, "Protocol Help", NULL, NULL, NULL }, + { "/ProtocolPreferences", NULL, "Protocol Preferences", NULL, NULL, NULL }, + { "/DecodeAs", WIRESHARK_STOCK_DECODE_AS, "Decode As...", NULL, NULL, G_CALLBACK(decode_as_cb) }, + { "/DisableProtocol", WIRESHARK_STOCK_CHECKBOX, "Disable Protocol...", NULL, NULL, G_CALLBACK(proto_disable_cb) }, + { "/ResolveName", NULL, "_Resolve Name", NULL, NULL, G_CALLBACK(resolve_name_cb) }, + { "/GotoCorrespondingPacket", NULL, "_Go to Corresponding Packet", NULL, NULL, G_CALLBACK(goto_framenum_cb) }, }; static const char *ui_desc_bytes_menu_popup = @@ -3028,9 +3028,9 @@ static const char *ui_desc_bytes_menu_popup = static const GtkRadioActionEntry bytes_menu_radio_action_entries [] = { - /* name, stock id, label, accel, tooltip, value */ - { "/HexView", NULL, "Hex View", NULL, NULL, BYTES_HEX }, - { "/BitsView", NULL, "Bits View", NULL, NULL, BYTES_BITS }, + /* name, stock id, label, accel, tooltip, value */ + { "/HexView", NULL, "Hex View", NULL, NULL, BYTES_HEX }, + { "/BitsView", NULL, "Bits View", NULL, NULL, BYTES_BITS }, }; static const char *ui_statusbar_profiles_menu_popup = @@ -3049,12 +3049,12 @@ static const char *ui_statusbar_profiles_menu_popup = "\n"; static const GtkActionEntry statusbar_profiles_menu_action_entries [] = { - { "/Profiles", NULL, "Configuration Profiles...", NULL, NULL, G_CALLBACK(profile_dialog_cb) }, - { "/New", GTK_STOCK_NEW, "New...", NULL, NULL, G_CALLBACK(profile_new_cb) }, - { "/Edit", GTK_STOCK_EDIT, "Edit...", NULL, NULL, G_CALLBACK(profile_edit_cb) }, - { "/Delete", GTK_STOCK_DELETE, "Delete", NULL, NULL, G_CALLBACK(profile_delete_cb) }, - { "/Change", NULL, "Change", NULL, NULL, NULL }, - { "/Change/Default", NULL, "Default", NULL, NULL, NULL }, + { "/Profiles", NULL, "Configuration Profiles...", NULL, NULL, G_CALLBACK(profile_dialog_cb) }, + { "/New", GTK_STOCK_NEW, "New...", NULL, NULL, G_CALLBACK(profile_new_cb) }, + { "/Edit", GTK_STOCK_EDIT, "Edit...", NULL, NULL, G_CALLBACK(profile_edit_cb) }, + { "/Delete", GTK_STOCK_DELETE, "Delete", NULL, NULL, G_CALLBACK(profile_delete_cb) }, + { "/Change", NULL, "Change", NULL, NULL, NULL }, + { "/Change/Default", NULL, "Default", NULL, NULL, NULL }, }; GtkWidget * @@ -3127,7 +3127,7 @@ main_menu_new(GtkAccelGroup ** table) { gtk_osxapplication_set_help_menu(theApp,GTK_MENU_ITEM(item)); /* Quit item is not needed */ - /* XXXX FIX ME */ + /* XXXX FIX ME */ /*gtk_item_factory_delete_item(main_menu_factory,"/File/Quit");*/ } @@ -3191,15 +3191,15 @@ static void menu_dissector_filter(capture_file *cf) { GList *list_entry = dissector_filter_list; dissector_filter_t *filter_entry; - guint merge_id; + guint merge_id; GtkActionGroup *action_group; GtkAction *action; GtkWidget *submenu_dissector_filters; - gchar *action_name; - guint i = 0; + gchar *action_name; + guint i = 0; - merge_id = gtk_ui_manager_new_merge_id (ui_manager_main_menubar); + merge_id = gtk_ui_manager_new_merge_id (ui_manager_main_menubar); action_group = gtk_action_group_new ("diessector-filters-group"); @@ -3234,27 +3234,27 @@ static void menu_dissector_filter(capture_file *cf) { return; } - while(list_entry != NULL) { + while(list_entry != NULL) { filter_entry = list_entry->data; - action_name = g_strdup_printf ("filter-%u", i); - /*g_warning("action_name %s, filter_entry->name %s",action_name,filter_entry->name);*/ - action = g_object_new (GTK_TYPE_ACTION, - "name", action_name, - "label", filter_entry->name, - "sensitive", menu_dissector_filter_spe_cb(/* frame_data *fd _U_*/ NULL, cf->edt, filter_entry), - NULL); - g_signal_connect (action, "activate", - G_CALLBACK (menu_dissector_filter_cb), filter_entry); - gtk_action_group_add_action (action_group, action); - g_object_unref (action); + action_name = g_strdup_printf ("filter-%u", i); + /*g_warning("action_name %s, filter_entry->name %s",action_name,filter_entry->name);*/ + action = g_object_new (GTK_TYPE_ACTION, + "name", action_name, + "label", filter_entry->name, + "sensitive", menu_dissector_filter_spe_cb(/* frame_data *fd _U_*/ NULL, cf->edt, filter_entry), + NULL); + g_signal_connect (action, "activate", + G_CALLBACK (menu_dissector_filter_cb), filter_entry); + gtk_action_group_add_action (action_group, action); + g_object_unref (action); - gtk_ui_manager_add_ui (ui_manager_main_menubar, merge_id, - "/Menubar/AnalyzeMenu/ConversationFilterMenu/Filters", - action_name, - action_name, - GTK_UI_MANAGER_MENUITEM, - FALSE); - i++; + gtk_ui_manager_add_ui (ui_manager_main_menubar, merge_id, + "/Menubar/AnalyzeMenu/ConversationFilterMenu/Filters", + action_name, + action_name, + GTK_UI_MANAGER_MENUITEM, + FALSE); + i++; list_entry = g_list_next(list_entry); } } @@ -3268,7 +3268,7 @@ menus_init(void) { guint merge_id; #ifdef NEW_MENU_CODE - gchar* gui_desc_file_name_and_path; + gchar* gui_desc_file_name_and_path; #endif if (initialize) { initialize = FALSE; @@ -3351,7 +3351,7 @@ menus_init(void) { 0); /* the position at which the group will be inserted. */ gtk_ui_manager_add_ui_from_string (ui_manager_tree_view_menu, ui_desc_tree_view_menu_popup, -1, &error); #if 0 - /* If we want to load the treewiew popup UI description from file */ + /* If we want to load the treewiew popup UI description from file */ gui_desc_file_name_and_path = get_ui_file_path("tree-view-ui.xml"); gtk_ui_manager_add_ui_from_file ( ui_manager_tree_view_menu, gui_desc_file_name_and_path, &error); g_free (gui_desc_file_name_and_path); @@ -3391,10 +3391,10 @@ menus_init(void) { 0); /* the position at which the group will be inserted. */ gtk_ui_manager_add_ui_from_string (ui_manager_bytes_menu, ui_desc_bytes_menu_popup, -1, &error); #if 0 - /* If we want to load the bytesview poupup UI description from file */ - gui_desc_file_name_and_path = get_ui_file_path("bytes-view-ui.xml"); + /* If we want to load the bytesview poupup UI description from file */ + gui_desc_file_name_and_path = get_ui_file_path("bytes-view-ui.xml"); gtk_ui_manager_add_ui_from_file ( ui_manager_bytes_menu, gui_desc_file_name_and_path, &error); - g_free (gui_desc_file_name_and_path); + g_free (gui_desc_file_name_and_path); #endif if (error != NULL) { @@ -3441,12 +3441,12 @@ menus_init(void) { ui_manager_main_menubar = gtk_ui_manager_new (); gtk_ui_manager_insert_action_group (ui_manager_main_menubar, main_menu_bar_action_group, 0); #ifndef NEW_MENU_CODE - + gtk_ui_manager_add_ui_from_string (ui_manager_main_menubar,ui_desc_menubar, -1, &error); #else - gui_desc_file_name_and_path = get_ui_file_path("main-menubar-ui.xml"); + gui_desc_file_name_and_path = get_ui_file_path("main-menubar-ui.xml"); gtk_ui_manager_add_ui_from_file ( ui_manager_main_menubar, gui_desc_file_name_and_path, &error); - g_free (gui_desc_file_name_and_path); + g_free (gui_desc_file_name_and_path); #endif if (error != NULL) { @@ -3496,11 +3496,11 @@ menus_init(void) { popup_menu_list = g_slist_append((GSList *)popup_menu_list, ui_manager_statusbar_profiles_menu); menu_dissector_filter(&cfile); - /* Only LUA uses this currently. NOTE that "placeholders" must exist in the GUI description */ - merge_lua_menu_items(merge_lua_menu_items_list); + /* Only LUA uses this currently. NOTE that "placeholders" must exist in the GUI description */ + merge_lua_menu_items(merge_lua_menu_items_list); - /* Add external menus and items */ - ws_menubar_build_external_menus(); + /* Add external menus and items */ + ws_menubar_build_external_menus(); /* Initialize enabled/disabled state of menu items */ set_menus_for_capture_file(NULL); @@ -3513,14 +3513,14 @@ menus_init(void) { #endif /* Hide not usable menus */ #ifndef WANT_PACKET_EDITOR - set_menu_visible(ui_manager_main_menubar, "/Menubar/EditMenu/EditPacket", FALSE); + set_menu_visible(ui_manager_main_menubar, "/Menubar/EditMenu/EditPacket", FALSE); #endif /* WANT_PACKET_EDITOR */ #ifndef HAVE_AIRPCAP - set_menu_visible(ui_manager_main_menubar, "/Menubar/ViewMenu/WirelessToolbar", FALSE); + set_menu_visible(ui_manager_main_menubar, "/Menubar/ViewMenu/WirelessToolbar", FALSE); #endif /* HAVE_AIRPCAP */ #ifndef HAVE_LIBPCAP - set_menu_visible(ui_manager_main_menubar, "/Menubar/CaptureMenu", FALSE); + set_menu_visible(ui_manager_main_menubar, "/Menubar/CaptureMenu", FALSE); #endif set_menus_for_captured_packets(FALSE); set_menus_for_selected_packet(&cfile); @@ -3535,20 +3535,20 @@ menus_init(void) { void ws_add_build_menubar_items_callback(gpointer callback) { - build_menubar_items_callback_list = g_list_append(build_menubar_items_callback_list, callback); + build_menubar_items_callback_list = g_list_append(build_menubar_items_callback_list, callback); } static void ws_menubar_build_external_menus(void) { - void (*callback)(gpointer); + void (*callback)(gpointer); - while(build_menubar_items_callback_list != NULL) { - callback = build_menubar_items_callback_list->data; - callback(ui_manager_main_menubar); - build_menubar_items_callback_list = g_list_next(build_menubar_items_callback_list); - } + while(build_menubar_items_callback_list != NULL) { + callback = build_menubar_items_callback_list->data; + callback(ui_manager_main_menubar); + build_menubar_items_callback_list = g_list_next(build_menubar_items_callback_list); + } } @@ -3561,8 +3561,8 @@ typedef struct _menu_item { const char *accelerator; const gchar *tooltip; GCallback callback; - gpointer callback_data; - gboolean enabled; + gpointer callback_data; + gboolean enabled; gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *, gpointer callback_data); gboolean (*selected_tree_row_enabled)(field_info *, gpointer callback_data); } menu_item_t; @@ -3575,12 +3575,12 @@ void register_lua_menu_bar_menu_items( const char *accelerator, const gchar *tooltip, gpointer callback, - gpointer callback_data, + gpointer callback_data, gboolean enabled, gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *, gpointer callback_data), gboolean (*selected_tree_row_enabled)(field_info *, gpointer callback_data)) { - menu_item_t *menu_item_data; + menu_item_t *menu_item_data; menu_item_data = g_malloc0(sizeof (menu_item_t)); menu_item_data->gui_path = gui_path; @@ -3591,7 +3591,7 @@ void register_lua_menu_bar_menu_items( menu_item_data->tooltip = tooltip; menu_item_data->callback = callback; menu_item_data->callback_data = callback_data; - menu_item_data->enabled = enabled; + menu_item_data->enabled = enabled; menu_item_data->selected_packet_enabled = selected_packet_enabled; menu_item_data->selected_tree_row_enabled = selected_tree_row_enabled; @@ -3603,15 +3603,15 @@ static void merge_lua_menu_items(GList *merge_lua_menu_items_list _U_) { #ifdef HAVE_LUA - guint merge_id; + guint merge_id; GtkActionGroup *action_group; GtkAction *action; - GtkWidget *lua_submenu; - gchar *action_name; - guint i = 0; - menu_item_t *menu_item_data; + GtkWidget *lua_submenu; + gchar *action_name; + guint i = 0; + menu_item_t *menu_item_data; - merge_id = gtk_ui_manager_new_merge_id (ui_manager_main_menubar); + merge_id = gtk_ui_manager_new_merge_id (ui_manager_main_menubar); action_group = gtk_action_group_new ("LUA-action-group"); @@ -3622,29 +3622,29 @@ merge_lua_menu_items(GList *merge_lua_menu_items_list _U_) gtk_ui_manager_insert_action_group (ui_manager_main_menubar, action_group, 0); - while(merge_lua_menu_items_list != NULL) { + while(merge_lua_menu_items_list != NULL) { menu_item_data = merge_lua_menu_items_list->data; - action_name = g_strdup_printf ("LUA-menuitem-%u", i); - /*g_warning("action_name %s, filter_entry->name %s",action_name,filter_entry->name);*/ - action = g_object_new (GTK_TYPE_ACTION, - "name", action_name, - "label", menu_item_data->label, + action_name = g_strdup_printf ("LUA-menuitem-%u", i); + /*g_warning("action_name %s, filter_entry->name %s",action_name,filter_entry->name);*/ + action = g_object_new (GTK_TYPE_ACTION, + "name", action_name, + "label", menu_item_data->label, "stock-id", menu_item_data->stock_id, - "tooltip", menu_item_data->tooltip, - "sensitive", menu_item_data->enabled, - NULL); - g_signal_connect (action, "activate", - G_CALLBACK (menu_item_data->callback), menu_item_data->callback_data); - gtk_action_group_add_action (action_group, action); - g_object_unref (action); + "tooltip", menu_item_data->tooltip, + "sensitive", menu_item_data->enabled, + NULL); + g_signal_connect (action, "activate", + G_CALLBACK (menu_item_data->callback), menu_item_data->callback_data); + gtk_action_group_add_action (action_group, action); + g_object_unref (action); - gtk_ui_manager_add_ui (ui_manager_main_menubar, merge_id, - "/Menubar/ToolsMenu/LUA/LUA-menu-items", - action_name, - action_name, - GTK_UI_MANAGER_MENUITEM, - FALSE); - i++; + gtk_ui_manager_add_ui (ui_manager_main_menubar, merge_id, + "/Menubar/ToolsMenu/LUA/LUA-menu-items", + action_name, + action_name, + GTK_UI_MANAGER_MENUITEM, + FALSE); + i++; merge_lua_menu_items_list = g_list_next(merge_lua_menu_items_list); } #endif @@ -3655,15 +3655,15 @@ static void add_menu_item(menu_item_t *node_data){ GtkActionGroup *action_group = NULL; GtkAction *action; - GList *action_groups, *l; - guint merge_id; + GList *action_groups, *l; + guint merge_id; - g_warning("path '%s', node_data->name '%s'",node_data->gui_path,node_data->name); - if(node_data->stock_id){ - g_warning("node_data->stock_id %s",node_data->stock_id); - } + g_warning("path '%s', node_data->name '%s'",node_data->gui_path,node_data->name); + if(node_data->stock_id){ + g_warning("node_data->stock_id %s",node_data->stock_id); + } - action_groups = gtk_ui_manager_get_action_groups (ui_manager_main_menubar); + action_groups = gtk_ui_manager_get_action_groups (ui_manager_main_menubar); for (l = action_groups; l != NULL; l = l->next) { GtkActionGroup *group = l->data; @@ -3674,16 +3674,16 @@ add_menu_item(menu_item_t *node_data){ break; } } - if(!action_group){ - g_warning("Failed to find the action group"); - return; - } - merge_id = gtk_ui_manager_new_merge_id (ui_manager_main_menubar); + if(!action_group){ + g_warning("Failed to find the action group"); + return; + } + merge_id = gtk_ui_manager_new_merge_id (ui_manager_main_menubar); action = g_object_new (GTK_TYPE_ACTION, "name", node_data->name, "label", node_data->label, - "stock_id", node_data->stock_id, + "stock_id", node_data->stock_id, "sensitive", node_data->enabled, NULL); gtk_action_group_add_action (action_group, action); @@ -3837,20 +3837,20 @@ recent_changed_cb (GtkUIManager *ui_manager, static void recent_clear_cb(GtkAction *action _U_, gpointer user_data _U_) { - GtkWidget *submenu_recent_files; - GList *recent_files_list; + GtkWidget *submenu_recent_files; + GList *recent_files_list; - /* Get the list of recent files, free the list and store the empty list with the widget */ - submenu_recent_files = gtk_ui_manager_get_widget(ui_manager_main_menubar, MENU_RECENT_FILES_PATH); - recent_files_list = g_object_get_data(G_OBJECT(submenu_recent_files), "recent-files-list"); - /* Free the name strings ?? */ - g_list_free(recent_files_list); - recent_files_list = NULL; - g_object_set_data(G_OBJECT(submenu_recent_files), "recent-files-list", recent_files_list); - /* Calling recent_changed_cb will rebuild the GUI call add_recent_items which will in turn call - * main_welcome_reset_recent_capture_files - */ - recent_changed_cb(ui_manager_main_menubar, NULL); + /* Get the list of recent files, free the list and store the empty list with the widget */ + submenu_recent_files = gtk_ui_manager_get_widget(ui_manager_main_menubar, MENU_RECENT_FILES_PATH); + recent_files_list = g_object_get_data(G_OBJECT(submenu_recent_files), "recent-files-list"); + /* Free the name strings ?? */ + g_list_free(recent_files_list); + recent_files_list = NULL; + g_object_set_data(G_OBJECT(submenu_recent_files), "recent-files-list", recent_files_list); + /* Calling recent_changed_cb will rebuild the GUI call add_recent_items which will in turn call + * main_welcome_reset_recent_capture_files + */ + recent_changed_cb(ui_manager_main_menubar, NULL); } static void @@ -4390,7 +4390,7 @@ menu_recent_read_finished(void) { menu_name_resolution_changed(); #ifdef HAVE_LIBPCAP - menu = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/AutoScrollinLiveCapture"); + menu = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/AutoScrollinLiveCapture"); if(!menu){ g_warning("menu_recent_read_finished: No menu found, path= /Menubar/ViewMenu/AutoScrollinLiveCapture"); }else{ @@ -4728,8 +4728,8 @@ packet_is_ssl(epan_dissect_t* edt) void set_menus_for_selected_packet(capture_file *cf) { - GList *list_entry = dissector_filter_list; - guint i = 0; + GList *list_entry = dissector_filter_list; + guint i = 0; /* Making the menu context-sensitive allows for easier selection of the desired item and has the added benefit, with large captures, of avoiding needless looping through huge lists for marked, ignored, @@ -4878,18 +4878,18 @@ set_menus_for_selected_packet(capture_file *cf) set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/StatisticsMenu/TCPStreamGraphMenu", tcp_graph_selected_packet_enabled(cf->current_frame,cf->edt, NULL)); - while(list_entry != NULL) { - dissector_filter_t *filter_entry; - gchar *path; + while(list_entry != NULL) { + dissector_filter_t *filter_entry; + gchar *path; - filter_entry = list_entry->data; - path = g_strdup_printf("/Menubar/AnalyzeMenu/ConversationFilterMenu/filter-%u", i); + filter_entry = list_entry->data; + path = g_strdup_printf("/Menubar/AnalyzeMenu/ConversationFilterMenu/filter-%u", i); - set_menu_sensitivity(ui_manager_main_menubar, path, - menu_dissector_filter_spe_cb(/* frame_data *fd _U_*/ NULL, cf->edt, filter_entry)); - i++; + set_menu_sensitivity(ui_manager_main_menubar, path, + menu_dissector_filter_spe_cb(/* frame_data *fd _U_*/ NULL, cf->edt, filter_entry)); + i++; list_entry = g_list_next(list_entry); - } + } } diff --git a/gtk/menus.c b/gtk/menus.c index b99fc86602..8943e0e987 100644 --- a/gtk/menus.c +++ b/gtk/menus.c @@ -371,14 +371,14 @@ build_conversation_filter(int action, gboolean show_dialog) static void new_window_cb(GtkWidget *widget) { - new_packet_window(widget, FALSE); + new_packet_window(widget, FALSE); } #ifdef WANT_PACKET_EDITOR static void edit_window_cb(GtkWidget *widget) { - new_packet_window(widget, TRUE); + new_packet_window(widget, TRUE); } #endif @@ -501,85 +501,85 @@ goto_previous_frame_conversation_cb(GtkWidget *w _U_, gpointer d _U_) static void tree_view_menu_apply_selected_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/Selected"); - match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/Selected"); + match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW); } static void tree_view_menu_apply_not_selected_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/NotSelected"); - match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/NotSelected"); + match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW); } static void tree_view_menu_apply_and_selected_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/AndSelected"); - match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/AndSelected"); + match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW); } static void tree_view_menu_apply_or_selected_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/OrSelected"); - match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/OrSelected"); + match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW); } static void tree_view_menu_apply_and_not_selected_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/AndNotSelected"); - match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/AndNotSelected"); + match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW); } static void tree_view_menu_apply_or_not_selected_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/OrNotSelected"); - match_selected_ptree_cb( widget , user_data,MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter/OrNotSelected"); + match_selected_ptree_cb( widget , user_data,MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW); } /* Prepare a filter */ static void tree_view_menu_prepare_selected_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/Selected"); - match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_REPLACE); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/Selected"); + match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_REPLACE); } static void tree_view_menu_prepare_not_selected_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/NotSelected"); - match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_NOT); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/NotSelected"); + match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_NOT); } static void tree_view_menu_prepare_and_selected_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/AndSelected"); - match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_AND); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/AndSelected"); + match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_AND); } static void tree_view_menu_prepare_or_selected_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/OrSelected"); - match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_OR); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/OrSelected"); + match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_OR); } static void tree_view_menu_prepare_and_not_selected_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/AndNotSelected"); - match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_AND_NOT); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/AndNotSelected"); + match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_AND_NOT); } static void tree_view_menu_prepare_or_not_selected_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/OrNotSelected"); - match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_OR_NOT); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter/OrNotSelected"); + match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_OR_NOT); } /* Prepare for use of GTKUImanager */ @@ -590,27 +590,27 @@ tree_view_menu_prepare_or_not_selected_cb(GtkAction *action _U_, gpointer user_d * various desktop environments: * * Windows: - * http://support.microsoft.com/kb/126449 + * http://support.microsoft.com/kb/126449 * * GNOME: - * http://library.gnome.org/users/user-guide/nightly/keyboard-skills.html.en + * http://library.gnome.org/users/user-guide/nightly/keyboard-skills.html.en * * KDE: - * http://developer.kde.org/documentation/standards/kde/style/keys/shortcuts.html + * http://developer.kde.org/documentation/standards/kde/style/keys/shortcuts.html * * In particular, do not use the following sequences for anything * other than their standard purposes: * - * O File->Open - * S File->Save - * P File->Print - * W File->Close - * Q File->Quit - * Z Edit->Undo (which we don't currently have) - * X Edit->Cut (which we don't currently have) - * C Edit->Copy (which we don't currently have) - * V Edit->Paste (which we don't currently have) - * A Edit->Select All (which we don't currently have) + * O File->Open + * S File->Save + * P File->Print + * W File->Close + * Q File->Quit + * Z Edit->Undo (which we don't currently have) + * X Edit->Cut (which we don't currently have) + * C Edit->Copy (which we don't currently have) + * V Edit->Paste (which we don't currently have) + * A Edit->Select All (which we don't currently have) * * Note that some if not all of the Edit keys above already perform those * functions in text boxes, such as the Filter box. Do not, under any @@ -758,7 +758,7 @@ static GtkItemFactoryEntry menu_items[] = 0, "", GTK_STOCK_PASTE,}, {"/Edit/", NULL, NULL, 0, "", NULL,}, {"/Edit/Select _All", "A", NULL, 0, -#ifdef GTK_STOCK_SELECT_ALL /* first appeared in 2.10 */ +#ifdef GTK_STOCK_SELECT_ALL /* first appeared in 2.10 */ "", GTK_STOCK_SELECT_ALL, #else NULL, NULL, @@ -786,12 +786,12 @@ static GtkItemFactoryEntry menu_items[] = {"/Edit/", NULL, NULL, 0, "", NULL,}, {"/Edit/Set Time Reference (toggle)", "T", GTK_MENU_FUNC(reftime_frame_cb), REFTIME_TOGGLE, "", WIRESHARK_STOCK_TIME,}, {"/Edit/Un-Time Reference All Packets", "T", GTK_MENU_FUNC(new_packet_list_untime_reference_all_frames_cb), 0, NULL, NULL,}, - {"/Edit/Time Shift...", NULL, GTK_MENU_FUNC(time_shift_cb), 0, "", WIRESHARK_STOCK_TIME,}, + {"/Edit/Time Shift...", NULL, GTK_MENU_FUNC(time_shift_cb), 0, "", WIRESHARK_STOCK_TIME,}, {"/Edit/Find Next Time Reference", "N", GTK_MENU_FUNC(reftime_frame_cb), REFTIME_FIND_NEXT, NULL, NULL,}, {"/Edit/Find Previous Time Reference", "B", GTK_MENU_FUNC(reftime_frame_cb), REFTIME_FIND_PREV, NULL, NULL,}, {"/Edit/", NULL, NULL, 0, "", NULL,}, #ifdef WANT_PACKET_EDITOR - {"/Edit/Edit packet", NULL, GTK_MENU_FUNC(edit_window_cb), 0, NULL, NULL, }, + {"/Edit/Edit packet", NULL, GTK_MENU_FUNC(edit_window_cb), 0, NULL, NULL, }, {"/Edit/", NULL, NULL, 0, "", NULL,}, #endif {"/Edit/_Configuration Profiles...", "A", GTK_MENU_FUNC(profile_dialog_cb), 0, NULL, NULL,}, @@ -1035,211 +1035,211 @@ static int nmenu_items = sizeof(menu_items) / sizeof(menu_items[0]); static void select_bytes_view_cb (GtkRadioAction *action, GtkRadioAction *current _U_, gpointer user_data _U_) { - gint value; + gint value; - value = gtk_radio_action_get_current_value (action); - /* Fix me */ - select_bytes_view( NULL, NULL, value); + value = gtk_radio_action_get_current_value (action); + /* Fix me */ + select_bytes_view( NULL, NULL, value); } static void sort_ascending_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/SortAscending"); - new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_SORT_ASCENDING); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/SortAscending"); + new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_SORT_ASCENDING); } static void sort_descending_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/SortDescending"); - new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_SORT_DESCENDING); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/SortDescending"); + new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_SORT_DESCENDING); } static void no_sorting_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/NoSorting"); - new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_SORT_NONE); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/NoSorting"); + new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_SORT_NONE); } static void packet_list_heading_show_resolved_cb(GtkAction *action _U_, gpointer user_data _U_) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/ShowResolved"); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/ShowResolved"); - new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_TOGGLE_RESOLVED); + new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_TOGGLE_RESOLVED); } static void packet_list_heading_align_left_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/AlignLeft"); - new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_ALIGN_LEFT); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/AlignLeft"); + new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_ALIGN_LEFT); } static void packet_list_heading_align_center_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/AlignCenter"); - new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_ALIGN_CENTER); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/AlignCenter"); + new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_ALIGN_CENTER); } static void packet_list_heading_align_right_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/AlignRight"); - new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_ALIGN_RIGHT); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/AlignRight"); + new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_ALIGN_RIGHT); } static void packet_list_heading_col_pref_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/ColumnPreferences"); - prefs_page_cb( widget , user_data, PREFS_PAGE_COLUMNS); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/ColumnPreferences"); + prefs_page_cb( widget , user_data, PREFS_PAGE_COLUMNS); } static void packet_list_heading_resize_col_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/ResizeColumn"); - new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_RESIZE); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/ResizeColumn"); + new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_RESIZE); } static void packet_list_heading_change_col_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/EditColumnDetails"); - new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_CHANGE); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/EditColumnDetails"); + new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_CHANGE); } static void packet_list_heading_activate_all_columns_cb(GtkAction *action _U_, gpointer user_data _U_) { - new_packet_list_set_all_columns_visible (); + new_packet_list_set_all_columns_visible (); } static void packet_list_heading_hide_col_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/HideColumn"); - new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_HIDE); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/HideColumn"); + new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_HIDE); } static void packet_list_heading_remove_col_cb(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/RemoveColumn"); - new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_REMOVE); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/RemoveColumn"); + new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_REMOVE); } static void packet_list_menu_set_ref_time_cb(GtkAction *action _U_, gpointer user_data) { - reftime_frame_cb( NULL /* widget _U_ */ , user_data, REFTIME_TOGGLE); + reftime_frame_cb( NULL /* widget _U_ */ , user_data, REFTIME_TOGGLE); } static void packet_list_menu_apply_selected_cb(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb( NULL /* widget _U_ */, user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW); + match_selected_plist_cb( NULL /* widget _U_ */, user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW); } static void packet_list_menu_apply_not_selected_cb(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW); + match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW); } static void packet_list_menu_apply_and_selected_cb(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW); + match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW); } static void packet_list_menu_apply_or_selected_cb(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW); + match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW); } static void packet_list_menu_apply_and_not_selected_cb(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW); + match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW); } static void packet_list_menu_apply_or_not_selected_cb(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb( NULL /* widget _U_ */ , user_data,MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW); + match_selected_plist_cb( NULL /* widget _U_ */ , user_data,MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW); } /* Prepare a filter */ static void packet_list_menu_prepare_selected_cb(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_REPLACE); + match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_REPLACE); } static void packet_list_menu_prepare_not_selected_cb(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_NOT); + match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_NOT); } static void packet_list_menu_prepare_and_selected_cb(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_AND); + match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_AND); } static void packet_list_menu_prepare_or_selected_cb(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_OR); + match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_OR); } static void packet_list_menu_prepare_and_not_selected_cb(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_AND_NOT); + match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_AND_NOT); } static void packet_list_menu_prepare_or_not_selected_cb(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_OR_NOT); + match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_OR_NOT); } static void packet_list_menu_conversation_ethernet_cb(GtkAction *action, gpointer user_data) { - conversation_cb( action, user_data, CONV_ETHER); + conversation_cb( action, user_data, CONV_ETHER); } static void packet_list_menu_conversation_ip_cb(GtkAction *action _U_, gpointer user_data) { - conversation_cb( action, user_data, CONV_IP); + conversation_cb( action, user_data, CONV_IP); } static void packet_list_menu_conversation_tcp_cb(GtkAction *action _U_, gpointer user_data) { - conversation_cb( action, user_data, CONV_TCP); + conversation_cb( action, user_data, CONV_TCP); } static void packet_list_menu_conversation_udp_cb(GtkAction *action _U_, gpointer user_data) { - conversation_cb( action, user_data, CONV_UDP); + conversation_cb( action, user_data, CONV_UDP); } static void packet_list_menu_conversation_pn_cba_cb(GtkAction *action _U_, gpointer user_data) { - conversation_cb( action, user_data, CONV_CBA); + conversation_cb( action, user_data, CONV_CBA); } /* Ethernet */ @@ -1247,67 +1247,67 @@ packet_list_menu_conversation_pn_cba_cb(GtkAction *action _U_, gpointer user_dat static void packet_list_menu_color_conv_ethernet_color1_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */, user_data, CONV_ETHER+1*256); + colorize_conversation_cb( NULL /* widget _U_ */, user_data, CONV_ETHER+1*256); } static void packet_list_menu_color_conv_ethernet_color2_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL/* widget _U_ */ , user_data, CONV_ETHER+1*256); + colorize_conversation_cb( NULL/* widget _U_ */ , user_data, CONV_ETHER+1*256); } static void packet_list_menu_color_conv_ethernet_color3_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_ETHER+3*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_ETHER+3*256); } static void packet_list_menu_color_conv_ethernet_color4_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_ETHER+4*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_ETHER+4*256); } static void packet_list_menu_color_conv_ethernet_color5_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_ETHER+5*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_ETHER+5*256); } static void packet_list_menu_color_conv_ethernet_color6_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_ETHER+6*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_ETHER+6*256); } static void packet_list_menu_color_conv_ethernet_color7_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_ETHER+7*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_ETHER+7*256); } static void packet_list_menu_color_conv_ethernet_color8_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_ETHER+8*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_ETHER+8*256); } static void packet_list_menu_color_conv_ethernet_color9_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_ETHER+9*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_ETHER+9*256); } static void packet_list_menu_color_conv_ethernet_color10_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_ETHER+10*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_ETHER+10*256); } static void packet_list_menu_color_conv_ethernet_new_rule_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_ETHER); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_ETHER); } /* IP */ @@ -1315,67 +1315,67 @@ packet_list_menu_color_conv_ethernet_new_rule_cb(GtkAction *action _U_, gpointer static void packet_list_menu_color_conv_ip_color1_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_IP+1*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_IP+1*256); } static void packet_list_menu_color_conv_ip_color2_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_IP+1*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_IP+1*256); } static void packet_list_menu_color_conv_ip_color3_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_IP+3*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_IP+3*256); } static void packet_list_menu_color_conv_ip_color4_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_IP+4*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_IP+4*256); } static void packet_list_menu_color_conv_ip_color5_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_IP+5*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_IP+5*256); } static void packet_list_menu_color_conv_ip_color6_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_IP+6*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_IP+6*256); } static void packet_list_menu_color_conv_ip_color7_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_IP+7*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_IP+7*256); } static void packet_list_menu_color_conv_ip_color8_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_IP+8*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_IP+8*256); } static void packet_list_menu_color_conv_ip_color9_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_IP+9*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_IP+9*256); } static void packet_list_menu_color_conv_ip_color10_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_IP+10*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_IP+10*256); } static void packet_list_menu_color_conv_ip_new_rule_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_TCP); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_TCP); } /* TCP */ @@ -1383,67 +1383,67 @@ packet_list_menu_color_conv_ip_new_rule_cb(GtkAction *action _U_, gpointer user_ static void packet_list_menu_color_conv_tcp_color1_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_TCP+1*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_TCP+1*256); } static void packet_list_menu_color_conv_tcp_color2_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_TCP+1*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_TCP+1*256); } static void packet_list_menu_color_conv_tcp_color3_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_TCP+3*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_TCP+3*256); } static void packet_list_menu_color_conv_tcp_color4_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_TCP+4*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_TCP+4*256); } static void packet_list_menu_color_conv_tcp_color5_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_TCP+5*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_TCP+5*256); } static void packet_list_menu_color_conv_tcp_color6_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_TCP+6*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_TCP+6*256); } static void packet_list_menu_color_conv_tcp_color7_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_TCP+7*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_TCP+7*256); } static void packet_list_menu_color_conv_tcp_color8_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_TCP+8*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_TCP+8*256); } static void packet_list_menu_color_conv_tcp_color9_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_TCP+9*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_TCP+9*256); } static void packet_list_menu_color_conv_tcp_color10_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_TCP+10*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_TCP+10*256); } static void packet_list_menu_color_conv_tcp_new_rule_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_TCP); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_TCP); } /* UDP */ @@ -1451,67 +1451,67 @@ packet_list_menu_color_conv_tcp_new_rule_cb(GtkAction *action _U_, gpointer user static void packet_list_menu_color_conv_udp_color1_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_UDP+1*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_UDP+1*256); } static void packet_list_menu_color_conv_udp_color2_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_UDP+1*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_UDP+1*256); } static void packet_list_menu_color_conv_udp_color3_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_UDP+3*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_UDP+3*256); } static void packet_list_menu_color_conv_udp_color4_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_UDP+4*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_UDP+4*256); } static void packet_list_menu_color_conv_udp_color5_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_UDP+5*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_UDP+5*256); } static void packet_list_menu_color_conv_udp_color6_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_UDP+6*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_UDP+6*256); } static void packet_list_menu_color_conv_udp_color7_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_UDP+7*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_UDP+7*256); } static void packet_list_menu_color_conv_udp_color8_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_UDP+8*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_UDP+8*256); } static void packet_list_menu_color_conv_udp_color9_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_UDP+9*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_UDP+9*256); } static void packet_list_menu_color_conv_udp_color10_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_UDP+10*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_UDP+10*256); } static void packet_list_menu_color_conv_udp_new_rule_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_UDP); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_UDP); } /* CONV_CBA */ @@ -1519,115 +1519,115 @@ packet_list_menu_color_conv_udp_new_rule_cb(GtkAction *action _U_, gpointer user static void packet_list_menu_color_conv_cba_color1_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_CBA+1*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_CBA+1*256); } static void packet_list_menu_color_conv_cba_color2_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_CBA+1*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_CBA+1*256); } static void packet_list_menu_color_conv_cba_color3_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_CBA+3*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_CBA+3*256); } static void packet_list_menu_color_conv_cba_color4_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_CBA+4*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_CBA+4*256); } static void packet_list_menu_color_conv_cba_color5_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_CBA+5*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_CBA+5*256); } static void packet_list_menu_color_conv_cba_color6_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_CBA+6*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_CBA+6*256); } static void packet_list_menu_color_conv_cba_color7_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_CBA+7*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_CBA+7*256); } static void packet_list_menu_color_conv_cba_color8_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_CBA+8*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_CBA+8*256); } static void packet_list_menu_color_conv_cba_color9_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_CBA+9*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_CBA+9*256); } static void packet_list_menu_color_conv_cba_color10_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_CBA+10*256); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_CBA+10*256); } static void packet_list_menu_color_conv_cba_new_rule_cb(GtkAction *action _U_, gpointer user_data) { - colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_CBA); + colorize_conversation_cb( NULL /* widget _U_ */ , user_data, CONV_CBA); } static void packet_list_menu_copy_sum_txt(GtkAction *action _U_, gpointer user_data) { - new_packet_list_copy_summary_cb(user_data, CS_TEXT); + new_packet_list_copy_summary_cb(user_data, CS_TEXT); } static void packet_list_menu_copy_sum_csv(GtkAction *action _U_, gpointer user_data) { - new_packet_list_copy_summary_cb(user_data, CS_CSV); + new_packet_list_copy_summary_cb(user_data, CS_CSV); } static void packet_list_menu_copy_as_flt(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY); + match_selected_plist_cb( NULL /* widget _U_ */ , user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY); } static void packet_list_menu_copy_bytes_oht_cb(GtkAction *action _U_, gpointer user_data) { - copy_hex_cb( NULL /* widget _U_ */ , user_data, CD_ALLINFO | CD_FLAGS_SELECTEDONLY); + copy_hex_cb( NULL /* widget _U_ */ , user_data, CD_ALLINFO | CD_FLAGS_SELECTEDONLY); } static void packet_list_menu_copy_bytes_oh_cb(GtkAction *action _U_, gpointer user_data) { - copy_hex_cb( NULL /* widget _U_ */ , user_data, CD_HEXCOLUMNS | CD_FLAGS_SELECTEDONLY); + copy_hex_cb( NULL /* widget _U_ */ , user_data, CD_HEXCOLUMNS | CD_FLAGS_SELECTEDONLY); } static void packet_list_menu_copy_bytes_text_cb(GtkAction *action _U_, gpointer user_data) { - copy_hex_cb( NULL /* widget _U_ */ , user_data, CD_TEXTONLY | CD_FLAGS_SELECTEDONLY); + copy_hex_cb( NULL /* widget _U_ */ , user_data, CD_TEXTONLY | CD_FLAGS_SELECTEDONLY); } static void packet_list_menu_copy_bytes_hex_strm_cb(GtkAction *action _U_, gpointer user_data) { - copy_hex_cb( NULL /* widget _U_ */ , user_data, CD_HEX | CD_FLAGS_SELECTEDONLY); + copy_hex_cb( NULL /* widget _U_ */ , user_data, CD_HEX | CD_FLAGS_SELECTEDONLY); } static void packet_list_menu_copy_bytes_bin_strm_cb(GtkAction *action _U_, gpointer user_data) { - copy_hex_cb( NULL /* widget _U_ */ , user_data, CD_BINARY | CD_FLAGS_SELECTEDONLY); + copy_hex_cb( NULL /* widget _U_ */ , user_data, CD_BINARY | CD_FLAGS_SELECTEDONLY); } /* tree */ @@ -1635,93 +1635,93 @@ packet_list_menu_copy_bytes_bin_strm_cb(GtkAction *action _U_, gpointer user_dat static void tree_view_menu_color_with_flt_color1_cb(GtkAction *action _U_, gpointer user_data) { - colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 1); + colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 1); } static void tree_view_menu_color_with_flt_color2_cb(GtkAction *action _U_, gpointer user_data) { - colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 2); + colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 2); } static void tree_view_menu_color_with_flt_color3_cb(GtkAction *action _U_, gpointer user_data) { - colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 3); + colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 3); } static void tree_view_menu_color_with_flt_color4_cb(GtkAction *action _U_, gpointer user_data) { - colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 4); + colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 4); } static void tree_view_menu_color_with_flt_color5_cb(GtkAction *action _U_, gpointer user_data) { - colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 5); + colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 5); } static void tree_view_menu_color_with_flt_color6_cb(GtkAction *action _U_, gpointer user_data) { - colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 6); + colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 6); } static void tree_view_menu_color_with_flt_color7_cb(GtkAction *action _U_, gpointer user_data) { - colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 7); + colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 7); } static void tree_view_menu_color_with_flt_color8_cb(GtkAction *action _U_, gpointer user_data) { - colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 8); + colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 8); } static void tree_view_menu_color_with_flt_color9_cb(GtkAction *action _U_, gpointer user_data) { - colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 9); + colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 9); } static void tree_view_menu_color_with_flt_color10_cb(GtkAction *action _U_, gpointer user_data) { - colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 10); + colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 10); } static void tree_view_menu_color_with_flt_new_rule_cb(GtkAction *action _U_, gpointer user_data) { - colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 0); + colorize_selected_ptree_cb( NULL /* widget _U_ */ , user_data, 0); } static void tree_view_menu_copy_desc(GtkAction *action _U_, gpointer user_data) { - copy_selected_plist_cb( NULL /* widget _U_ */ , user_data, COPY_SELECTED_DESCRIPTION); + copy_selected_plist_cb( NULL /* widget _U_ */ , user_data, COPY_SELECTED_DESCRIPTION); } static void tree_view_menu_copy_field(GtkAction *action _U_, gpointer user_data) { - copy_selected_plist_cb( NULL /* widget _U_ */ , user_data, COPY_SELECTED_FIELDNAME); + copy_selected_plist_cb( NULL /* widget _U_ */ , user_data, COPY_SELECTED_FIELDNAME); } static void tree_view_menu_copy_value(GtkAction *action _U_, gpointer user_data) { - copy_selected_plist_cb( NULL /* widget _U_ */ , user_data, COPY_SELECTED_VALUE); + copy_selected_plist_cb( NULL /* widget _U_ */ , user_data, COPY_SELECTED_VALUE); } static void tree_view_menu_copy_as_flt(GtkAction *action _U_, gpointer user_data) { - GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/Copy/AsFilter"); - match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY); + GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup/Copy/AsFilter"); + match_selected_ptree_cb( widget , user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY); } static const char *ui_desc_packet_list_heading_menu_popup = @@ -1750,25 +1750,25 @@ static const char *ui_desc_packet_list_heading_menu_popup = "\n"; static const GtkActionEntry packet_list_heading_menu_popup_action_entries[] = { - { "/Sort Ascending", GTK_STOCK_SORT_ASCENDING, "Sort Ascending", NULL, NULL, G_CALLBACK(sort_ascending_cb) }, - { "/Sort Descending", GTK_STOCK_SORT_DESCENDING, "Sort Descending", NULL, NULL, G_CALLBACK(sort_descending_cb) }, - { "/No Sorting", NULL, "No Sorting", NULL, NULL, G_CALLBACK(no_sorting_cb) }, - { "/Align Left", GTK_STOCK_JUSTIFY_LEFT, "Align Left", NULL, NULL, G_CALLBACK(packet_list_heading_align_left_cb) }, - { "/Align Center", GTK_STOCK_JUSTIFY_CENTER, "Align Center", NULL, NULL, G_CALLBACK(packet_list_heading_align_center_cb) }, - { "/Align Right", GTK_STOCK_JUSTIFY_RIGHT, "Align Right", NULL, NULL, G_CALLBACK(packet_list_heading_align_right_cb) }, - { "/Column Preferences", GTK_STOCK_PREFERENCES, "Column Preferences...", NULL, NULL, G_CALLBACK(packet_list_heading_col_pref_cb) }, - { "/Edit Column Details", WIRESHARK_STOCK_EDIT, "Edit Column Details...", NULL, NULL, G_CALLBACK(packet_list_heading_change_col_cb) }, - { "/Resize Column", WIRESHARK_STOCK_RESIZE_COLUMNS, "Resize Column", NULL, NULL, G_CALLBACK(packet_list_heading_resize_col_cb) }, - { "/Displayed Columns", NULL, "Displayed Columns", NULL, NULL, NULL }, - { "/Displayed Columns/Display All", NULL, "Display All", NULL, NULL, G_CALLBACK(packet_list_heading_activate_all_columns_cb) }, - { "/Hide Column", NULL, "Hide Column", NULL, NULL, G_CALLBACK(packet_list_heading_hide_col_cb) }, - { "/Remove Column", GTK_STOCK_DELETE, "Remove Column", NULL, NULL, G_CALLBACK(packet_list_heading_remove_col_cb) }, + { "/Sort Ascending", GTK_STOCK_SORT_ASCENDING, "Sort Ascending", NULL, NULL, G_CALLBACK(sort_ascending_cb) }, + { "/Sort Descending", GTK_STOCK_SORT_DESCENDING, "Sort Descending", NULL, NULL, G_CALLBACK(sort_descending_cb) }, + { "/No Sorting", NULL, "No Sorting", NULL, NULL, G_CALLBACK(no_sorting_cb) }, + { "/Align Left", GTK_STOCK_JUSTIFY_LEFT, "Align Left", NULL, NULL, G_CALLBACK(packet_list_heading_align_left_cb) }, + { "/Align Center", GTK_STOCK_JUSTIFY_CENTER, "Align Center", NULL, NULL, G_CALLBACK(packet_list_heading_align_center_cb) }, + { "/Align Right", GTK_STOCK_JUSTIFY_RIGHT, "Align Right", NULL, NULL, G_CALLBACK(packet_list_heading_align_right_cb) }, + { "/Column Preferences", GTK_STOCK_PREFERENCES, "Column Preferences...", NULL, NULL, G_CALLBACK(packet_list_heading_col_pref_cb) }, + { "/Edit Column Details", WIRESHARK_STOCK_EDIT, "Edit Column Details...", NULL, NULL, G_CALLBACK(packet_list_heading_change_col_cb) }, + { "/Resize Column", WIRESHARK_STOCK_RESIZE_COLUMNS, "Resize Column", NULL, NULL, G_CALLBACK(packet_list_heading_resize_col_cb) }, + { "/Displayed Columns", NULL, "Displayed Columns", NULL, NULL, NULL }, + { "/Displayed Columns/Display All", NULL, "Display All", NULL, NULL, G_CALLBACK(packet_list_heading_activate_all_columns_cb) }, + { "/Hide Column", NULL, "Hide Column", NULL, NULL, G_CALLBACK(packet_list_heading_hide_col_cb) }, + { "/Remove Column", GTK_STOCK_DELETE, "Remove Column", NULL, NULL, G_CALLBACK(packet_list_heading_remove_col_cb) }, }; static const GtkToggleActionEntry packet_list_heading_menu_toggle_action_entries[] = { - /* name, stock id, label, accel, tooltip, callback, is_active */ - {"/Show Resolved", NULL, "Show Resolved", NULL, NULL, G_CALLBACK(packet_list_heading_show_resolved_cb), FALSE}, + /* name, stock id, label, accel, tooltip, callback, is_active */ + {"/Show Resolved", NULL, "Show Resolved", NULL, NULL, G_CALLBACK(packet_list_heading_show_resolved_cb), FALSE}, }; static const char *ui_desc_packet_list_menu_popup = @@ -1901,133 +1901,133 @@ static const char *ui_desc_packet_list_menu_popup = "\n"; static const GtkActionEntry packet_list_menu_popup_action_entries[] = { - { "/MarkPacket", NULL, "Mark Packet (toggle)", NULL, NULL, G_CALLBACK(new_packet_list_mark_frame_cb) }, - { "/IgnorePacket", NULL, "Ignore Packet (toggle)", NULL, NULL, G_CALLBACK(new_packet_list_ignore_frame_cb) }, - { "/Set Time Reference", WIRESHARK_STOCK_TIME, "Set Time Reference (toggle)", NULL, NULL, G_CALLBACK(packet_list_menu_set_ref_time_cb) }, - { "/TimeShift", WIRESHARK_STOCK_TIME, "Time Shift...", NULL, NULL, G_CALLBACK(time_shift_cb) }, - { "/ManuallyResolveAddress", NULL, "Manually Resolve Address", NULL, NULL, G_CALLBACK(manual_addr_resolv_dlg) }, - { "/Apply as Filter", NULL, "Apply as Filter", NULL, NULL, NULL }, + { "/MarkPacket", NULL, "Mark Packet (toggle)", NULL, NULL, G_CALLBACK(new_packet_list_mark_frame_cb) }, + { "/IgnorePacket", NULL, "Ignore Packet (toggle)", NULL, NULL, G_CALLBACK(new_packet_list_ignore_frame_cb) }, + { "/Set Time Reference", WIRESHARK_STOCK_TIME, "Set Time Reference (toggle)", NULL, NULL, G_CALLBACK(packet_list_menu_set_ref_time_cb) }, + { "/TimeShift", WIRESHARK_STOCK_TIME, "Time Shift...", NULL, NULL, G_CALLBACK(time_shift_cb) }, + { "/ManuallyResolveAddress", NULL, "Manually Resolve Address", NULL, NULL, G_CALLBACK(manual_addr_resolv_dlg) }, + { "/Apply as Filter", NULL, "Apply as Filter", NULL, NULL, NULL }, - { "/Apply as Filter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(packet_list_menu_apply_selected_cb) }, - { "/Apply as Filter/Not Selected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_apply_not_selected_cb) }, - { "/Apply as Filter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(packet_list_menu_apply_and_selected_cb) }, - { "/Apply as Filter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(packet_list_menu_apply_or_selected_cb) }, - { "/Apply as Filter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_apply_and_not_selected_cb) }, - { "/Apply as Filter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_apply_or_not_selected_cb) }, + { "/Apply as Filter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(packet_list_menu_apply_selected_cb) }, + { "/Apply as Filter/Not Selected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_apply_not_selected_cb) }, + { "/Apply as Filter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(packet_list_menu_apply_and_selected_cb) }, + { "/Apply as Filter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(packet_list_menu_apply_or_selected_cb) }, + { "/Apply as Filter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_apply_and_not_selected_cb) }, + { "/Apply as Filter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_apply_or_not_selected_cb) }, - { "/Prepare a Filter", NULL, "Prepare a Filter", NULL, NULL, NULL }, - { "/Prepare a Filter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(packet_list_menu_prepare_selected_cb) }, - { "/Prepare a Filter/Not Selected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_prepare_not_selected_cb) }, - { "/Prepare a Filter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(packet_list_menu_prepare_and_selected_cb) }, - { "/Prepare a Filter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(packet_list_menu_prepare_or_selected_cb) }, - { "/Prepare a Filter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_prepare_and_not_selected_cb) }, - { "/Prepare a Filter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_prepare_or_not_selected_cb) }, + { "/Prepare a Filter", NULL, "Prepare a Filter", NULL, NULL, NULL }, + { "/Prepare a Filter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(packet_list_menu_prepare_selected_cb) }, + { "/Prepare a Filter/Not Selected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_prepare_not_selected_cb) }, + { "/Prepare a Filter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(packet_list_menu_prepare_and_selected_cb) }, + { "/Prepare a Filter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(packet_list_menu_prepare_or_selected_cb) }, + { "/Prepare a Filter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_prepare_and_not_selected_cb) }, + { "/Prepare a Filter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(packet_list_menu_prepare_or_not_selected_cb) }, - { "/Conversation Filter", NULL, "Conversation Filter", NULL, NULL, NULL }, - { "/Conversation Filter/Ethernet", NULL, "Ethernet", NULL, NULL, G_CALLBACK(packet_list_menu_conversation_ethernet_cb) }, - { "/Conversation Filter/IP", NULL, "IP", NULL, NULL, G_CALLBACK(packet_list_menu_conversation_ip_cb) }, - { "/Conversation Filter/TCP", NULL, "TCP", NULL, NULL, G_CALLBACK(packet_list_menu_conversation_tcp_cb) }, - { "/Conversation Filter/UDP", NULL, "UDP", NULL, NULL, G_CALLBACK(packet_list_menu_conversation_udp_cb) }, - { "/Conversation Filter/PN-CBA", NULL, "PN-CBA", NULL, NULL, G_CALLBACK(packet_list_menu_conversation_pn_cba_cb) }, + { "/Conversation Filter", NULL, "Conversation Filter", NULL, NULL, NULL }, + { "/Conversation Filter/Ethernet", NULL, "Ethernet", NULL, NULL, G_CALLBACK(packet_list_menu_conversation_ethernet_cb) }, + { "/Conversation Filter/IP", NULL, "IP", NULL, NULL, G_CALLBACK(packet_list_menu_conversation_ip_cb) }, + { "/Conversation Filter/TCP", NULL, "TCP", NULL, NULL, G_CALLBACK(packet_list_menu_conversation_tcp_cb) }, + { "/Conversation Filter/UDP", NULL, "UDP", NULL, NULL, G_CALLBACK(packet_list_menu_conversation_udp_cb) }, + { "/Conversation Filter/PN-CBA", NULL, "PN-CBA", NULL, NULL, G_CALLBACK(packet_list_menu_conversation_pn_cba_cb) }, - { "/Colorize Conversation", NULL, "Colorize Conversation", NULL, NULL, NULL }, + { "/Colorize Conversation", NULL, "Colorize Conversation", NULL, NULL, NULL }, - { "/Colorize Conversation/Ethernet", NULL, "Ethernet", NULL, NULL, NULL }, + { "/Colorize Conversation/Ethernet", NULL, "Ethernet", NULL, NULL, NULL }, - { "/Colorize Conversation/Ethernet/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color1_cb) }, - { "/Colorize Conversation/Ethernet/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color2_cb) }, - { "/Colorize Conversation/Ethernet/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color3_cb) }, - { "/Colorize Conversation/Ethernet/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color4_cb) }, - { "/Colorize Conversation/Ethernet/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color5_cb) }, - { "/Colorize Conversation/Ethernet/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color6_cb) }, - { "/Colorize Conversation/Ethernet/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color7_cb) }, - { "/Colorize Conversation/Ethernet/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color8_cb) }, - { "/Colorize Conversation/Ethernet/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color9_cb) }, - { "/Colorize Conversation/Ethernet/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color10_cb) }, - { "/Colorize Conversation/Ethernet/New Coloring Rule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_new_rule_cb) }, + { "/Colorize Conversation/Ethernet/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color1_cb) }, + { "/Colorize Conversation/Ethernet/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color2_cb) }, + { "/Colorize Conversation/Ethernet/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color3_cb) }, + { "/Colorize Conversation/Ethernet/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color4_cb) }, + { "/Colorize Conversation/Ethernet/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color5_cb) }, + { "/Colorize Conversation/Ethernet/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color6_cb) }, + { "/Colorize Conversation/Ethernet/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color7_cb) }, + { "/Colorize Conversation/Ethernet/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color8_cb) }, + { "/Colorize Conversation/Ethernet/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color9_cb) }, + { "/Colorize Conversation/Ethernet/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_color10_cb) }, + { "/Colorize Conversation/Ethernet/New Coloring Rule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ethernet_new_rule_cb) }, - { "/Colorize Conversation/IP", NULL, "IP", NULL, NULL, NULL }, + { "/Colorize Conversation/IP", NULL, "IP", NULL, NULL, NULL }, - { "/Colorize Conversation/IP/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color1_cb) }, - { "/Colorize Conversation/IP/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color2_cb) }, - { "/Colorize Conversation/IP/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color3_cb) }, - { "/Colorize Conversation/IP/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color4_cb) }, - { "/Colorize Conversation/IP/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color5_cb) }, - { "/Colorize Conversation/IP/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color6_cb) }, - { "/Colorize Conversation/IP/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color7_cb) }, - { "/Colorize Conversation/IP/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color8_cb) }, - { "/Colorize Conversation/IP/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color9_cb) }, - { "/Colorize Conversation/IP/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color10_cb) }, - { "/Colorize Conversation/IP/New Coloring Rule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_new_rule_cb) }, + { "/Colorize Conversation/IP/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color1_cb) }, + { "/Colorize Conversation/IP/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color2_cb) }, + { "/Colorize Conversation/IP/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color3_cb) }, + { "/Colorize Conversation/IP/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color4_cb) }, + { "/Colorize Conversation/IP/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color5_cb) }, + { "/Colorize Conversation/IP/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color6_cb) }, + { "/Colorize Conversation/IP/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color7_cb) }, + { "/Colorize Conversation/IP/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color8_cb) }, + { "/Colorize Conversation/IP/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color9_cb) }, + { "/Colorize Conversation/IP/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_color10_cb) }, + { "/Colorize Conversation/IP/New Coloring Rule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_ip_new_rule_cb) }, - { "/Colorize Conversation/TCP", NULL, "TCP", NULL, NULL, NULL }, + { "/Colorize Conversation/TCP", NULL, "TCP", NULL, NULL, NULL }, - { "/Colorize Conversation/TCP/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color1_cb) }, - { "/Colorize Conversation/TCP/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color2_cb) }, - { "/Colorize Conversation/TCP/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color3_cb) }, - { "/Colorize Conversation/TCP/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color4_cb) }, - { "/Colorize Conversation/TCP/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color5_cb) }, - { "/Colorize Conversation/TCP/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color6_cb) }, - { "/Colorize Conversation/TCP/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color7_cb) }, - { "/Colorize Conversation/TCP/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color8_cb) }, - { "/Colorize Conversation/TCP/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color9_cb) }, - { "/Colorize Conversation/TCP/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color10_cb) }, - { "/Colorize Conversation/TCP/New Coloring Rule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_new_rule_cb) }, + { "/Colorize Conversation/TCP/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color1_cb) }, + { "/Colorize Conversation/TCP/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color2_cb) }, + { "/Colorize Conversation/TCP/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color3_cb) }, + { "/Colorize Conversation/TCP/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color4_cb) }, + { "/Colorize Conversation/TCP/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color5_cb) }, + { "/Colorize Conversation/TCP/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color6_cb) }, + { "/Colorize Conversation/TCP/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color7_cb) }, + { "/Colorize Conversation/TCP/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color8_cb) }, + { "/Colorize Conversation/TCP/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color9_cb) }, + { "/Colorize Conversation/TCP/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_color10_cb) }, + { "/Colorize Conversation/TCP/New Coloring Rule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_tcp_new_rule_cb) }, - { "/Colorize Conversation/UDP", NULL, "UDP", NULL, NULL, NULL }, + { "/Colorize Conversation/UDP", NULL, "UDP", NULL, NULL, NULL }, - { "/Colorize Conversation/UDP/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color1_cb) }, - { "/Colorize Conversation/UDP/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color2_cb) }, - { "/Colorize Conversation/UDP/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color3_cb) }, - { "/Colorize Conversation/UDP/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color4_cb) }, - { "/Colorize Conversation/UDP/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color5_cb) }, - { "/Colorize Conversation/UDP/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color6_cb) }, - { "/Colorize Conversation/UDP/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color7_cb) }, - { "/Colorize Conversation/UDP/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color8_cb) }, - { "/Colorize Conversation/UDP/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color9_cb) }, - { "/Colorize Conversation/UDP/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color10_cb) }, - { "/Colorize Conversation/UDP/New Coloring Rule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_new_rule_cb) }, + { "/Colorize Conversation/UDP/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color1_cb) }, + { "/Colorize Conversation/UDP/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color2_cb) }, + { "/Colorize Conversation/UDP/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color3_cb) }, + { "/Colorize Conversation/UDP/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color4_cb) }, + { "/Colorize Conversation/UDP/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color5_cb) }, + { "/Colorize Conversation/UDP/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color6_cb) }, + { "/Colorize Conversation/UDP/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color7_cb) }, + { "/Colorize Conversation/UDP/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color8_cb) }, + { "/Colorize Conversation/UDP/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color9_cb) }, + { "/Colorize Conversation/UDP/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_color10_cb) }, + { "/Colorize Conversation/UDP/New Coloring Rule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_udp_new_rule_cb) }, - { "/Colorize Conversation/PN-CBA", NULL, "PN-CBA Server", NULL, NULL, NULL }, + { "/Colorize Conversation/PN-CBA", NULL, "PN-CBA Server", NULL, NULL, NULL }, - { "/Colorize Conversation/PN-CBA/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color1_cb) }, - { "/Colorize Conversation/PN-CBA/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color2_cb) }, - { "/Colorize Conversation/PN-CBA/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color3_cb) }, - { "/Colorize Conversation/PN-CBA/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color4_cb) }, - { "/Colorize Conversation/PN-CBA/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color5_cb) }, - { "/Colorize Conversation/PN-CBA/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color6_cb) }, - { "/Colorize Conversation/PN-CBA/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color7_cb) }, - { "/Colorize Conversation/PN-CBA/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color8_cb) }, - { "/Colorize Conversation/PN-CBA/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color9_cb) }, - { "/Colorize Conversation/PN-CBA/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color10_cb) }, - { "/Colorize Conversation/PN-CBA/New Coloring Rule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_new_rule_cb) }, + { "/Colorize Conversation/PN-CBA/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color1_cb) }, + { "/Colorize Conversation/PN-CBA/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color2_cb) }, + { "/Colorize Conversation/PN-CBA/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color3_cb) }, + { "/Colorize Conversation/PN-CBA/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color4_cb) }, + { "/Colorize Conversation/PN-CBA/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color5_cb) }, + { "/Colorize Conversation/PN-CBA/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color6_cb) }, + { "/Colorize Conversation/PN-CBA/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color7_cb) }, + { "/Colorize Conversation/PN-CBA/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color8_cb) }, + { "/Colorize Conversation/PN-CBA/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color9_cb) }, + { "/Colorize Conversation/PN-CBA/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_color10_cb) }, + { "/Colorize Conversation/PN-CBA/New Coloring Rule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(packet_list_menu_color_conv_cba_new_rule_cb) }, - { "/SCTP", NULL, "SCTP", NULL, NULL, NULL }, - { "/SCTP/Analyse this Association", NULL, "Analyse this Association", NULL, NULL, G_CALLBACK(sctp_analyse_start) }, - { "/SCTP/Prepare Filter for this Association", NULL, "Prepare Filter for this Association", NULL, NULL, G_CALLBACK(sctp_set_assoc_filter) }, + { "/SCTP", NULL, "SCTP", NULL, NULL, NULL }, + { "/SCTP/Analyse this Association", NULL, "Analyse this Association", NULL, NULL, G_CALLBACK(sctp_analyse_start) }, + { "/SCTP/Prepare Filter for this Association", NULL, "Prepare Filter for this Association", NULL, NULL, G_CALLBACK(sctp_set_assoc_filter) }, - { "/Follow TCP Stream", NULL, "Follow TCP Stream", NULL, NULL, G_CALLBACK(follow_tcp_stream_cb) }, - { "/Follow UDP Stream", NULL, "Follow UDP Stream", NULL, NULL, G_CALLBACK(follow_udp_stream_cb) }, - { "/Follow SSL Stream", NULL, "Follow SSL Stream", NULL, NULL, G_CALLBACK(follow_ssl_stream_cb) }, + { "/Follow TCP Stream", NULL, "Follow TCP Stream", NULL, NULL, G_CALLBACK(follow_tcp_stream_cb) }, + { "/Follow UDP Stream", NULL, "Follow UDP Stream", NULL, NULL, G_CALLBACK(follow_udp_stream_cb) }, + { "/Follow SSL Stream", NULL, "Follow SSL Stream", NULL, NULL, G_CALLBACK(follow_ssl_stream_cb) }, - { "/Copy", NULL, "Copy", NULL, NULL, NULL }, - { "/Copy/SummaryTxt", NULL, "Summary (Text)", NULL, NULL, G_CALLBACK(packet_list_menu_copy_sum_txt) }, - { "/Copy/SummaryCSV", NULL, "Summary (CSV)", NULL, NULL, G_CALLBACK(packet_list_menu_copy_sum_csv) }, - { "/Copy/AsFilter", NULL, "As Filter", NULL, NULL, G_CALLBACK(packet_list_menu_copy_as_flt) }, + { "/Copy", NULL, "Copy", NULL, NULL, NULL }, + { "/Copy/SummaryTxt", NULL, "Summary (Text)", NULL, NULL, G_CALLBACK(packet_list_menu_copy_sum_txt) }, + { "/Copy/SummaryCSV", NULL, "Summary (CSV)", NULL, NULL, G_CALLBACK(packet_list_menu_copy_sum_csv) }, + { "/Copy/AsFilter", NULL, "As Filter", NULL, NULL, G_CALLBACK(packet_list_menu_copy_as_flt) }, - { "/Copy/Bytes", NULL, "Bytes", NULL, NULL, NULL }, - { "/Copy/Bytes/OffsetHexText", NULL, "Offset Hex Text", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_oht_cb) }, - { "/Copy/Bytes/OffsetHex", NULL, "Offset Hex", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_oh_cb) }, - { "/Copy/Bytes/PrintableTextOnly", NULL, "Printable Text Only", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_text_cb) }, + { "/Copy/Bytes", NULL, "Bytes", NULL, NULL, NULL }, + { "/Copy/Bytes/OffsetHexText", NULL, "Offset Hex Text", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_oht_cb) }, + { "/Copy/Bytes/OffsetHex", NULL, "Offset Hex", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_oh_cb) }, + { "/Copy/Bytes/PrintableTextOnly", NULL, "Printable Text Only", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_text_cb) }, - { "/Copy/Bytes/HexStream", NULL, "Hex Stream", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_hex_strm_cb) }, - { "/Copy/Bytes/BinaryStream", NULL, "Binary Stream", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_bin_strm_cb) }, + { "/Copy/Bytes/HexStream", NULL, "Hex Stream", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_hex_strm_cb) }, + { "/Copy/Bytes/BinaryStream", NULL, "Binary Stream", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_bin_strm_cb) }, - { "/DecodeAs", WIRESHARK_STOCK_DECODE_AS, "Decode As...", NULL, NULL, G_CALLBACK(decode_as_cb) }, - { "/Print", GTK_STOCK_PRINT, "Print...", NULL, NULL, G_CALLBACK(file_print_selected_cmd_cb) }, - { "/ShowPacketinNewWindow", NULL, "Show Packet in New Window", NULL, NULL, G_CALLBACK(new_window_cb) }, + { "/DecodeAs", WIRESHARK_STOCK_DECODE_AS, "Decode As...", NULL, NULL, G_CALLBACK(decode_as_cb) }, + { "/Print", GTK_STOCK_PRINT, "Print...", NULL, NULL, G_CALLBACK(file_print_selected_cmd_cb) }, + { "/ShowPacketinNewWindow", NULL, "Show Packet in New Window", NULL, NULL, G_CALLBACK(new_window_cb) }, }; @@ -2104,69 +2104,69 @@ static const char *ui_desc_tree_view_menu_popup = "\n"; static const GtkActionEntry tree_view_menu_popup_action_entries[] = { - { "/ExpandSubtrees", NULL, "Expand Subtrees", NULL, NULL, G_CALLBACK(expand_tree_cb) }, - { "/ExpandAll", NULL, "Expand All", NULL, NULL, G_CALLBACK(expand_all_cb) }, - { "/CollapseAll", NULL, "Collapse All", NULL, NULL, G_CALLBACK(collapse_all_cb) }, - { "/Apply as Column", NULL, "Apply as Column", NULL, NULL, G_CALLBACK(apply_as_custom_column_cb) }, - { "/Apply as Filter", NULL, "Apply as Filter", NULL, NULL, NULL }, + { "/ExpandSubtrees", NULL, "Expand Subtrees", NULL, NULL, G_CALLBACK(expand_tree_cb) }, + { "/ExpandAll", NULL, "Expand All", NULL, NULL, G_CALLBACK(expand_all_cb) }, + { "/CollapseAll", NULL, "Collapse All", NULL, NULL, G_CALLBACK(collapse_all_cb) }, + { "/Apply as Column", NULL, "Apply as Column", NULL, NULL, G_CALLBACK(apply_as_custom_column_cb) }, + { "/Apply as Filter", NULL, "Apply as Filter", NULL, NULL, NULL }, - { "/Apply as Filter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(tree_view_menu_apply_selected_cb) }, - { "/Apply as Filter/Not Selected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_not_selected_cb) }, - { "/Apply as Filter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_and_selected_cb) }, - { "/Apply as Filter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_or_selected_cb) }, - { "/Apply as Filter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_and_not_selected_cb) }, - { "/Apply as Filter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_or_not_selected_cb) }, + { "/Apply as Filter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(tree_view_menu_apply_selected_cb) }, + { "/Apply as Filter/Not Selected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_not_selected_cb) }, + { "/Apply as Filter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_and_selected_cb) }, + { "/Apply as Filter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_or_selected_cb) }, + { "/Apply as Filter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_and_not_selected_cb) }, + { "/Apply as Filter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_apply_or_not_selected_cb) }, - { "/Prepare a Filter", NULL, "Prepare a Filter", NULL, NULL, NULL }, - { "/Prepare a Filter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(tree_view_menu_prepare_selected_cb) }, - { "/Prepare a Filter/Not Selected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_not_selected_cb) }, - { "/Prepare a Filter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_and_selected_cb) }, - { "/Prepare a Filter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_or_selected_cb) }, - { "/Prepare a Filter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_and_not_selected_cb) }, - { "/Prepare a Filter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_or_not_selected_cb) }, + { "/Prepare a Filter", NULL, "Prepare a Filter", NULL, NULL, NULL }, + { "/Prepare a Filter/Selected", NULL, "_Selected" , NULL, NULL, G_CALLBACK(tree_view_menu_prepare_selected_cb) }, + { "/Prepare a Filter/Not Selected", NULL, "_Not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_not_selected_cb) }, + { "/Prepare a Filter/AndSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _and Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_and_selected_cb) }, + { "/Prepare a Filter/OrSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " _or Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_or_selected_cb) }, + { "/Prepare a Filter/AndNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " a_nd not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_and_not_selected_cb) }, + { "/Prepare a Filter/OrNotSelected", NULL, UTF8_HORIZONTAL_ELLIPSIS " o_r not Selected", NULL, NULL, G_CALLBACK(tree_view_menu_prepare_or_not_selected_cb) }, - { "/Colorize with Filter", NULL, "Colorize with Filter", NULL, NULL, NULL }, - { "/Colorize with Filter/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color1_cb) }, - { "/Colorize with Filter/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color2_cb) }, - { "/Colorize with Filter/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color3_cb) }, - { "/Colorize with Filter/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color4_cb) }, - { "/Colorize with Filter/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color5_cb) }, - { "/Colorize with Filter/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color6_cb) }, - { "/Colorize with Filter/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color7_cb) }, - { "/Colorize with Filter/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color8_cb) }, - { "/Colorize with Filter/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color9_cb) }, - { "/Colorize with Filter/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color10_cb) }, - { "/Colorize with Filter/New Coloring Rule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_new_rule_cb) }, + { "/Colorize with Filter", NULL, "Colorize with Filter", NULL, NULL, NULL }, + { "/Colorize with Filter/Color 1", WIRESHARK_STOCK_COLOR1, "Color 1", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color1_cb) }, + { "/Colorize with Filter/Color 2", WIRESHARK_STOCK_COLOR2, "Color 2", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color2_cb) }, + { "/Colorize with Filter/Color 3", WIRESHARK_STOCK_COLOR3, "Color 3", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color3_cb) }, + { "/Colorize with Filter/Color 4", WIRESHARK_STOCK_COLOR4, "Color 4", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color4_cb) }, + { "/Colorize with Filter/Color 5", WIRESHARK_STOCK_COLOR5, "Color 5", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color5_cb) }, + { "/Colorize with Filter/Color 6", WIRESHARK_STOCK_COLOR6, "Color 6", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color6_cb) }, + { "/Colorize with Filter/Color 7", WIRESHARK_STOCK_COLOR7, "Color 7", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color7_cb) }, + { "/Colorize with Filter/Color 8", WIRESHARK_STOCK_COLOR8, "Color 8", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color8_cb) }, + { "/Colorize with Filter/Color 9", WIRESHARK_STOCK_COLOR9, "Color 9", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color9_cb) }, + { "/Colorize with Filter/Color 10", WIRESHARK_STOCK_COLOR0, "Color 10", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_color10_cb) }, + { "/Colorize with Filter/New Coloring Rule", NULL, "New Coloring Rule...", NULL, NULL, G_CALLBACK(tree_view_menu_color_with_flt_new_rule_cb) }, - { "/Follow TCP Stream", NULL, "Follow TCP Stream", NULL, NULL, G_CALLBACK(follow_tcp_stream_cb) }, - { "/Follow UDP Stream", NULL, "Follow UDP Stream", NULL, NULL, G_CALLBACK(follow_udp_stream_cb) }, - { "/Follow SSL Stream", NULL, "Follow SSL Stream", NULL, NULL, G_CALLBACK(follow_ssl_stream_cb) }, + { "/Follow TCP Stream", NULL, "Follow TCP Stream", NULL, NULL, G_CALLBACK(follow_tcp_stream_cb) }, + { "/Follow UDP Stream", NULL, "Follow UDP Stream", NULL, NULL, G_CALLBACK(follow_udp_stream_cb) }, + { "/Follow SSL Stream", NULL, "Follow SSL Stream", NULL, NULL, G_CALLBACK(follow_ssl_stream_cb) }, - { "/Copy", NULL, "Copy", NULL, NULL, NULL }, - { "/Copy/Description", NULL, "Description", NULL, NULL, G_CALLBACK(tree_view_menu_copy_desc) }, - { "/Copy/Fieldname", NULL, "Fieldname", NULL, NULL, G_CALLBACK(tree_view_menu_copy_field) }, - { "/Copy/Value", NULL, "Value", NULL, NULL, G_CALLBACK(tree_view_menu_copy_value) }, + { "/Copy", NULL, "Copy", NULL, NULL, NULL }, + { "/Copy/Description", NULL, "Description", NULL, NULL, G_CALLBACK(tree_view_menu_copy_desc) }, + { "/Copy/Fieldname", NULL, "Fieldname", NULL, NULL, G_CALLBACK(tree_view_menu_copy_field) }, + { "/Copy/Value", NULL, "Value", NULL, NULL, G_CALLBACK(tree_view_menu_copy_value) }, - { "/Copy/AsFilter", NULL, "As Filter", NULL, NULL, G_CALLBACK(tree_view_menu_copy_as_flt) }, + { "/Copy/AsFilter", NULL, "As Filter", NULL, NULL, G_CALLBACK(tree_view_menu_copy_as_flt) }, - { "/Copy/Bytes", NULL, "Bytes", NULL, NULL, NULL }, - { "/Copy/Bytes/OffsetHexText", NULL, "Offset Hex Text", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_oht_cb) }, - { "/Copy/Bytes/OffsetHex", NULL, "Offset Hex", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_oh_cb) }, - { "/Copy/Bytes/PrintableTextOnly", NULL, "Printable Text Only", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_text_cb) }, + { "/Copy/Bytes", NULL, "Bytes", NULL, NULL, NULL }, + { "/Copy/Bytes/OffsetHexText", NULL, "Offset Hex Text", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_oht_cb) }, + { "/Copy/Bytes/OffsetHex", NULL, "Offset Hex", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_oh_cb) }, + { "/Copy/Bytes/PrintableTextOnly", NULL, "Printable Text Only", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_text_cb) }, - { "/Copy/Bytes/HexStream", NULL, "Hex Stream", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_hex_strm_cb) }, - { "/Copy/Bytes/BinaryStream", NULL, "Binary Stream", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_bin_strm_cb) }, + { "/Copy/Bytes/HexStream", NULL, "Hex Stream", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_hex_strm_cb) }, + { "/Copy/Bytes/BinaryStream", NULL, "Binary Stream", NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_bin_strm_cb) }, - { "/ExportSelectedPacketBytes", NULL, "Export Selected Packet Bytes...", NULL, NULL, G_CALLBACK(savehex_cb) }, + { "/ExportSelectedPacketBytes", NULL, "Export Selected Packet Bytes...", NULL, NULL, G_CALLBACK(savehex_cb) }, - { "/WikiProtocolPage", WIRESHARK_STOCK_WIKI, "Wiki Protocol Page", NULL, NULL, G_CALLBACK(selected_ptree_info_cb) }, - { "/FilterFieldReference", WIRESHARK_STOCK_INTERNET, "Filter Field Reference", NULL, NULL, G_CALLBACK(selected_ptree_ref_cb) }, - { "/ProtocolHelp", NULL, "Protocol Help", NULL, NULL, NULL }, - { "/ProtocolPreferences", NULL, "Protocol Preferences", NULL, NULL, NULL }, - { "/DecodeAs", WIRESHARK_STOCK_DECODE_AS, "Decode As...", NULL, NULL, G_CALLBACK(decode_as_cb) }, - { "/DisableProtocol", WIRESHARK_STOCK_CHECKBOX, "Disable Protocol...", NULL, NULL, G_CALLBACK(proto_disable_cb) }, - { "/ResolveName", NULL, "_Resolve Name", NULL, NULL, G_CALLBACK(resolve_name_cb) }, - { "/GotoCorrespondingPacket", NULL, "_Go to Corresponding Packet", NULL, NULL, G_CALLBACK(goto_framenum_cb) }, + { "/WikiProtocolPage", WIRESHARK_STOCK_WIKI, "Wiki Protocol Page", NULL, NULL, G_CALLBACK(selected_ptree_info_cb) }, + { "/FilterFieldReference", WIRESHARK_STOCK_INTERNET, "Filter Field Reference", NULL, NULL, G_CALLBACK(selected_ptree_ref_cb) }, + { "/ProtocolHelp", NULL, "Protocol Help", NULL, NULL, NULL }, + { "/ProtocolPreferences", NULL, "Protocol Preferences", NULL, NULL, NULL }, + { "/DecodeAs", WIRESHARK_STOCK_DECODE_AS, "Decode As...", NULL, NULL, G_CALLBACK(decode_as_cb) }, + { "/DisableProtocol", WIRESHARK_STOCK_CHECKBOX, "Disable Protocol...", NULL, NULL, G_CALLBACK(proto_disable_cb) }, + { "/ResolveName", NULL, "_Resolve Name", NULL, NULL, G_CALLBACK(resolve_name_cb) }, + { "/GotoCorrespondingPacket", NULL, "_Go to Corresponding Packet", NULL, NULL, G_CALLBACK(goto_framenum_cb) }, }; static const char *ui_desc_bytes_menu_popup = @@ -2178,9 +2178,9 @@ static const char *ui_desc_bytes_menu_popup = "\n"; static const GtkRadioActionEntry bytes_menu_radio_action_entries [] = { - /* name, stock id, label, accel, tooltip, value */ - { "/HexView", NULL, "Hex View", NULL, NULL, BYTES_HEX }, - { "/BitsView", NULL, "Bits View", NULL, NULL, BYTES_BITS }, + /* name, stock id, label, accel, tooltip, value */ + { "/HexView", NULL, "Hex View", NULL, NULL, BYTES_HEX }, + { "/BitsView", NULL, "Bits View", NULL, NULL, BYTES_BITS }, }; static const char *ui_statusbar_profiles_menu_popup = @@ -2199,12 +2199,12 @@ static const char *ui_statusbar_profiles_menu_popup = "\n"; static const GtkActionEntry statusbar_profiles_menu_action_entries [] = { - { "/Profiles", NULL, "Configuration Profiles...", NULL, NULL, G_CALLBACK(profile_dialog_cb) }, - { "/New", GTK_STOCK_NEW, "New...", NULL, NULL, G_CALLBACK(profile_new_cb) }, - { "/Edit", GTK_STOCK_EDIT, "Edit...", NULL, NULL, G_CALLBACK(profile_edit_cb) }, - { "/Delete", GTK_STOCK_DELETE, "Delete", NULL, NULL, G_CALLBACK(profile_delete_cb) }, - { "/Change", NULL, "Change", NULL, NULL, NULL }, - { "/Change/Default", NULL, "Default", NULL, NULL, NULL }, + { "/Profiles", NULL, "Configuration Profiles...", NULL, NULL, G_CALLBACK(profile_dialog_cb) }, + { "/New", GTK_STOCK_NEW, "New...", NULL, NULL, G_CALLBACK(profile_new_cb) }, + { "/Edit", GTK_STOCK_EDIT, "Edit...", NULL, NULL, G_CALLBACK(profile_edit_cb) }, + { "/Delete", GTK_STOCK_DELETE, "Delete", NULL, NULL, G_CALLBACK(profile_delete_cb) }, + { "/Change", NULL, "Change", NULL, NULL, NULL }, + { "/Change/Default", NULL, "Default", NULL, NULL, NULL }, }; GtkWidget * @@ -2351,7 +2351,7 @@ static void menu_dissector_filter(void) { NULL /* selected_tree_row_enabled */, filter_entry); - list_entry = g_list_next(list_entry); + list_entry = g_list_next(list_entry); } } @@ -2590,7 +2590,7 @@ static GList * tap_menu_item_add( child->stock_id = stock_id; child->tooltip = tooltip; child->callback = callback; - child->enabled = enabled; + child->enabled = enabled; child->selected_packet_enabled = selected_packet_enabled; child->selected_tree_row_enabled = selected_tree_row_enabled; child->callback_data = callback_data; @@ -2733,7 +2733,7 @@ gboolean enabled = FALSE; g_strlcpy(menupath, toolspath, menupathlen); g_strlcat(menupath, name, menupathlen); - gui_path = menupath; + gui_path = menupath; /* * Construct an item factory entry for the item, and add it to * the main menu. @@ -2785,7 +2785,7 @@ register_stat_menu_item( register_stat_menu_item_stock( name, group, - NULL, /* stock_id */ + NULL, /* stock_id */ callback, selected_packet_enabled, selected_tree_row_enabled, @@ -2798,7 +2798,7 @@ static guint merge_tap_menus_layered(GList *node, gint group) { GList *child; guint added = 0; menu_item_t *node_data = node->data; - size_t namelen; + size_t namelen; /* * Is this a leaf node or an interior node? @@ -2814,9 +2814,9 @@ static guint merge_tap_menus_layered(GList *node, gint group) { */ if (node_data->gui_path != NULL && group == node_data->group) { entry = g_malloc0(sizeof (GtkItemFactoryEntry)); - namelen = strlen(node_data->gui_path) + 1; - entry->path = g_malloc(namelen); - g_strlcpy(entry->path, node_data->gui_path, namelen); + namelen = strlen(node_data->gui_path) + 1; + entry->path = g_malloc(namelen); + g_strlcpy(entry->path, node_data->gui_path, namelen); entry->callback = node_data->callback; switch(group) { case(REGISTER_STAT_GROUP_UNSORTED): @@ -2867,9 +2867,9 @@ static guint merge_tap_menus_layered(GList *node, gint group) { */ if (node_data->gui_path != NULL && group == node_data->group) { entry = g_malloc0(sizeof (GtkItemFactoryEntry)); - namelen = strlen(node_data->gui_path) + 1; - entry->path = g_malloc(namelen); - g_strlcpy(entry->path, node_data->gui_path, namelen); + namelen = strlen(node_data->gui_path) + 1; + entry->path = g_malloc(namelen); + g_strlcpy(entry->path, node_data->gui_path, namelen); entry->item_type = ""; gtk_item_factory_create_item(main_menu_factory, entry, @@ -4742,7 +4742,7 @@ set_menus_for_selected_tree_row(capture_file *cf) set_menu_sensitivity_old("/Analyze/Prepare a Filter", FALSE); set_menu_sensitivity_old("/View/Expand Subtrees", FALSE); - } + } walk_menu_tree_for_selected_tree_row(tap_menu_tree_root, cf->finfo_selected); } diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c index 9f991ca5e0..9c71d18cef 100644 --- a/gtk/prefs_dlg.c +++ b/gtk/prefs_dlg.c @@ -80,25 +80,25 @@ static void prefs_main_destroy_cb(GtkWidget *, gpointer); static void prefs_tree_select_cb(GtkTreeSelection *, gpointer); -#define E_PREFSW_SCROLLW_KEY "prefsw_scrollw" -#define E_PREFSW_TREE_KEY "prefsw_tree" -#define E_PREFSW_NOTEBOOK_KEY "prefsw_notebook" -#define E_PREFSW_SAVE_BT_KEY "prefsw_save_bt" -#define E_PAGE_ITER_KEY "page_iter" -#define E_PAGE_MODULE_KEY "page_module" -#define E_PAGESW_FRAME_KEY "pagesw_frame" +#define E_PREFSW_SCROLLW_KEY "prefsw_scrollw" +#define E_PREFSW_TREE_KEY "prefsw_tree" +#define E_PREFSW_NOTEBOOK_KEY "prefsw_notebook" +#define E_PREFSW_SAVE_BT_KEY "prefsw_save_bt" +#define E_PAGE_ITER_KEY "page_iter" +#define E_PAGE_MODULE_KEY "page_module" +#define E_PAGESW_FRAME_KEY "pagesw_frame" -#define E_GUI_PAGE_KEY "gui_options_page" -#define E_GUI_LAYOUT_PAGE_KEY "gui_layout_page" -#define E_GUI_COLUMN_PAGE_KEY "gui_column_options_page" -#define E_GUI_FONT_PAGE_KEY "gui_font_options_page" -#define E_GUI_COLORS_PAGE_KEY "gui_colors_options_page" -#define E_CAPTURE_PAGE_KEY "capture_options_page" -#define E_PRINT_PAGE_KEY "printer_options_page" -#define E_NAMERES_PAGE_KEY "nameres_options_page" -#define E_TAPS_PAGE_KEY "taps_options_page" -#define E_PROTOCOLS_PAGE_KEY "protocols_options_page" -#define E_FILTER_EXPRESSIONS_PAGE_KEY "filter_expressions_page" +#define E_GUI_PAGE_KEY "gui_options_page" +#define E_GUI_LAYOUT_PAGE_KEY "gui_layout_page" +#define E_GUI_COLUMN_PAGE_KEY "gui_column_options_page" +#define E_GUI_FONT_PAGE_KEY "gui_font_options_page" +#define E_GUI_COLORS_PAGE_KEY "gui_colors_options_page" +#define E_CAPTURE_PAGE_KEY "capture_options_page" +#define E_PRINT_PAGE_KEY "printer_options_page" +#define E_NAMERES_PAGE_KEY "nameres_options_page" +#define E_TAPS_PAGE_KEY "taps_options_page" +#define E_PROTOCOLS_PAGE_KEY "protocols_options_page" +#define E_FILTER_EXPRESSIONS_PAGE_KEY "filter_expressions_page" /* * Keep a static pointer to the current "Preferences" window, if any, so that diff --git a/gtk/proto_hier_stats_dlg.c b/gtk/proto_hier_stats_dlg.c index 902219510b..8d04a4e53f 100644 --- a/gtk/proto_hier_stats_dlg.c +++ b/gtk/proto_hier_stats_dlg.c @@ -99,99 +99,99 @@ proto_hier_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data _U_, g static void apply_as_selected_cb(GtkWidget *widget, gpointer user_data) { - proto_hier_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_SELECTED, 0)); + proto_hier_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_SELECTED, 0)); } static void apply_as_not_selected_cb(GtkWidget *widget, gpointer user_data) { - proto_hier_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_NOT_SELECTED, 0)); + proto_hier_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_NOT_SELECTED, 0)); } static void apply_as_and_selected_cb(GtkWidget *widget, gpointer user_data) { - proto_hier_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_SELECTED, 0)); + proto_hier_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_SELECTED, 0)); } static void apply_as_or_selected_cb(GtkWidget *widget, gpointer user_data) { - proto_hier_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_SELECTED, 0)); + proto_hier_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_SELECTED, 0)); } static void apply_as_and_not_selected_cb(GtkWidget *widget, gpointer user_data) { - proto_hier_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, 0)); + proto_hier_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, 0)); } static void apply_as_or_not_selected_cb(GtkWidget *widget, gpointer user_data) { - proto_hier_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, 0)); + proto_hier_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, 0)); } static void prep_as_selected_cb(GtkWidget *widget, gpointer user_data) { - proto_hier_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_SELECTED, 0)); + proto_hier_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_SELECTED, 0)); } static void prep_as_not_selected_cb(GtkWidget *widget, gpointer user_data) { - proto_hier_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, 0)); + proto_hier_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, 0)); } static void prep_as_and_selected_cb(GtkWidget *widget, gpointer user_data) { - proto_hier_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_SELECTED, 0)); + proto_hier_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_SELECTED, 0)); } static void prep_as_or_selected_cb(GtkWidget *widget, gpointer user_data) { - proto_hier_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_SELECTED, 0)); + proto_hier_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_SELECTED, 0)); } static void prep_as_and_not_selected_cb(GtkWidget *widget, gpointer user_data) { - proto_hier_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, 0)); + proto_hier_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, 0)); } static void prep_as_or_not_selected_cb(GtkWidget *widget, gpointer user_data) { - proto_hier_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, 0)); + proto_hier_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, 0)); } static void find_selected_cb(GtkWidget *widget, gpointer user_data) { - proto_hier_select_filter_cb( widget , user_data, CALLBACK_FIND_FRAME(ACTYPE_SELECTED, 0)); + proto_hier_select_filter_cb( widget , user_data, CALLBACK_FIND_FRAME(ACTYPE_SELECTED, 0)); } static void find_not_selected_cb(GtkWidget *widget, gpointer user_data) { - proto_hier_select_filter_cb( widget , user_data, CALLBACK_FIND_FRAME(ACTYPE_NOT_SELECTED, 0)); + proto_hier_select_filter_cb( widget , user_data, CALLBACK_FIND_FRAME(ACTYPE_NOT_SELECTED, 0)); } static void find_prev_selected_cb(GtkWidget *widget, gpointer user_data) { - proto_hier_select_filter_cb( widget , user_data, CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, 0)); + proto_hier_select_filter_cb( widget , user_data, CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, 0)); } static void find_prev_not_selected_cb(GtkWidget *widget, gpointer user_data) { - proto_hier_select_filter_cb( widget , user_data, CALLBACK_FIND_PREVIOUS(ACTYPE_NOT_SELECTED, 0)); + proto_hier_select_filter_cb( widget , user_data, CALLBACK_FIND_PREVIOUS(ACTYPE_NOT_SELECTED, 0)); } static void find_next_selected_cb(GtkWidget *widget, gpointer user_data) { - proto_hier_select_filter_cb( widget , user_data, CALLBACK_FIND_NEXT(ACTYPE_SELECTED, 0)); + proto_hier_select_filter_cb( widget , user_data, CALLBACK_FIND_NEXT(ACTYPE_SELECTED, 0)); } static void find_next_not_selected_cb(GtkWidget *widget, gpointer user_data) { - proto_hier_select_filter_cb( widget , user_data, CALLBACK_FIND_NEXT(ACTYPE_NOT_SELECTED, 0)); + proto_hier_select_filter_cb( widget , user_data, CALLBACK_FIND_NEXT(ACTYPE_NOT_SELECTED, 0)); } static void color_selected_cb(GtkWidget *widget, gpointer user_data) { - proto_hier_select_filter_cb( widget , user_data, CALLBACK_COLORIZE(ACTYPE_SELECTED, 0)); + proto_hier_select_filter_cb( widget , user_data, CALLBACK_COLORIZE(ACTYPE_SELECTED, 0)); } @@ -244,44 +244,44 @@ static const char *ui_desc_proto_hier_stats_filter_popup = * const gchar *tooltip; * GCallback callback; * } GtkActionEntry; - * const gchar *name; The name of the action. - * const gchar *stock_id; The stock id for the action, or the name of an icon from the icon theme. - * const gchar *label; The label for the action. This field should typically be marked for translation, - * see gtk_action_group_set_translation_domain(). - * If label is NULL, the label of the stock item with id stock_id is used. - * const gchar *accelerator; The accelerator for the action, in the format understood by gtk_accelerator_parse(). - * const gchar *tooltip; The tooltip for the action. This field should typically be marked for translation, + * const gchar *name; The name of the action. + * const gchar *stock_id; The stock id for the action, or the name of an icon from the icon theme. + * const gchar *label; The label for the action. This field should typically be marked for translation, * see gtk_action_group_set_translation_domain(). - * GCallback callback; The function to call when the action is activated. + * If label is NULL, the label of the stock item with id stock_id is used. + * const gchar *accelerator; The accelerator for the action, in the format understood by gtk_accelerator_parse(). + * const gchar *tooltip; The tooltip for the action. This field should typically be marked for translation, + * see gtk_action_group_set_translation_domain(). + * GCallback callback; The function to call when the action is activated. * */ static const GtkActionEntry proto_hier_stats_popup_entries[] = { - { "/Apply as Filter", NULL, "Apply as Filter", NULL, NULL, NULL }, - { "/Prepare a Filter", NULL, "Prepare a Filter", NULL, NULL, NULL }, - { "/Find Frame", NULL, "Find Frame", NULL, NULL, NULL }, - { "/Find Frame/Find Frame", NULL, "Find Frame", NULL, NULL, NULL }, - { "/Find Frame/Find Next", NULL, "Find Next" , NULL, NULL, NULL }, - { "/Find Frame/Find Previous", NULL, "Find Previous", NULL, NULL, NULL }, - { "/Colorize Procedure", NULL, "Colorize Procedure", NULL, NULL, NULL }, - { "/Apply as Filter/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(apply_as_selected_cb) }, - { "/Apply as Filter/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(apply_as_not_selected_cb) }, - { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", G_CALLBACK(apply_as_and_selected_cb) }, - { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", G_CALLBACK(apply_as_or_selected_cb) }, - { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", G_CALLBACK(apply_as_and_not_selected_cb) }, - { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", G_CALLBACK(apply_as_or_not_selected_cb) }, - { "/Prepare a Filter/Selected", NULL, "Selected", NULL, "selcted", G_CALLBACK(prep_as_selected_cb) }, - { "/Prepare a Filter/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(prep_as_not_selected_cb) }, - { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", G_CALLBACK(prep_as_and_selected_cb) }, - { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", G_CALLBACK(prep_as_or_selected_cb) }, - { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", G_CALLBACK(prep_as_and_not_selected_cb) }, - { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", G_CALLBACK(prep_as_or_not_selected_cb) }, - { "/Find Frame/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_selected_cb) }, - { "/Find Frame/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_not_selected_cb) }, - { "/Find Previous/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_prev_selected_cb) }, - { "/Find Previous/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_prev_not_selected_cb) }, - { "/Find Next/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_next_selected_cb) }, - { "/Find Next/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_next_not_selected_cb) }, - { "/Colorize Procedure/Colorize Protocol", NULL, "Colorize Protocol", NULL, "Colorize Protocol", G_CALLBACK(color_selected_cb) }, + { "/Apply as Filter", NULL, "Apply as Filter", NULL, NULL, NULL }, + { "/Prepare a Filter", NULL, "Prepare a Filter", NULL, NULL, NULL }, + { "/Find Frame", NULL, "Find Frame", NULL, NULL, NULL }, + { "/Find Frame/Find Frame", NULL, "Find Frame", NULL, NULL, NULL }, + { "/Find Frame/Find Next", NULL, "Find Next" , NULL, NULL, NULL }, + { "/Find Frame/Find Previous", NULL, "Find Previous", NULL, NULL, NULL }, + { "/Colorize Procedure", NULL, "Colorize Procedure", NULL, NULL, NULL }, + { "/Apply as Filter/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(apply_as_selected_cb) }, + { "/Apply as Filter/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(apply_as_not_selected_cb) }, + { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", G_CALLBACK(apply_as_and_selected_cb) }, + { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", G_CALLBACK(apply_as_or_selected_cb) }, + { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", G_CALLBACK(apply_as_and_not_selected_cb) }, + { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", G_CALLBACK(apply_as_or_not_selected_cb) }, + { "/Prepare a Filter/Selected", NULL, "Selected", NULL, "selcted", G_CALLBACK(prep_as_selected_cb) }, + { "/Prepare a Filter/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(prep_as_not_selected_cb) }, + { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", G_CALLBACK(prep_as_and_selected_cb) }, + { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", G_CALLBACK(prep_as_or_selected_cb) }, + { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", G_CALLBACK(prep_as_and_not_selected_cb) }, + { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", G_CALLBACK(prep_as_or_not_selected_cb) }, + { "/Find Frame/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_selected_cb) }, + { "/Find Frame/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_not_selected_cb) }, + { "/Find Previous/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_prev_selected_cb) }, + { "/Find Previous/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_prev_not_selected_cb) }, + { "/Find Next/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_next_selected_cb) }, + { "/Find Next/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_next_not_selected_cb) }, + { "/Colorize Procedure/Colorize Protocol", NULL, "Colorize Protocol", NULL, "Colorize Protocol", G_CALLBACK(color_selected_cb) }, }; static void @@ -388,31 +388,31 @@ static void proto_hier_create_popup_menu(void) { - GtkUIManager *ui_manager; - GtkActionGroup *action_group; - GError *error = NULL; - GtkWidget *popup_menu_object; + GtkUIManager *ui_manager; + GtkActionGroup *action_group; + GError *error = NULL; + GtkWidget *popup_menu_object; - action_group = gtk_action_group_new ("ProtoHierStatsTFilterPopupActionGroup"); - gtk_action_group_add_actions (action_group, /* the action group */ - (gpointer)proto_hier_stats_popup_entries, /* an array of action descriptions */ - G_N_ELEMENTS(proto_hier_stats_popup_entries), /* the number of entries */ - NULL); /* data to pass to the action callbacks */ + action_group = gtk_action_group_new ("ProtoHierStatsTFilterPopupActionGroup"); + gtk_action_group_add_actions (action_group, /* the action group */ + (gpointer)proto_hier_stats_popup_entries, /* an array of action descriptions */ + G_N_ELEMENTS(proto_hier_stats_popup_entries), /* the number of entries */ + NULL); /* data to pass to the action callbacks */ - ui_manager = gtk_ui_manager_new (); - gtk_ui_manager_insert_action_group (ui_manager, - action_group, - 0); /* the position at which the group will be inserted */ - gtk_ui_manager_add_ui_from_string (ui_manager,ui_desc_proto_hier_stats_filter_popup, -1, &error); - if (error != NULL) + ui_manager = gtk_ui_manager_new (); + gtk_ui_manager_insert_action_group (ui_manager, + action_group, + 0); /* the position at which the group will be inserted */ + gtk_ui_manager_add_ui_from_string (ui_manager,ui_desc_proto_hier_stats_filter_popup, -1, &error); + if (error != NULL) { fprintf (stderr, "Warning: building proto hier ststs filter popup failed: %s\n", error->message); g_error_free (error); error = NULL; } - popup_menu_object = gtk_ui_manager_get_widget(ui_manager, "/ProtoHierStatsFilterPopup"); - g_signal_connect(tree, "button_press_event", G_CALLBACK(proto_hier_show_popup_menu_cb), popup_menu_object); + popup_menu_object = gtk_ui_manager_get_widget(ui_manager, "/ProtoHierStatsFilterPopup"); + g_signal_connect(tree, "button_press_event", G_CALLBACK(proto_hier_show_popup_menu_cb), popup_menu_object); } @@ -421,7 +421,7 @@ proto_hier_create_popup_menu(void) static void create_tree(GtkWidget *container, ph_stats_t *ps) { - GtkWidget *sw; + GtkWidget *sw; GtkTreeView *tree_view; GtkTreeStore *store; GtkCellRenderer *renderer;