osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Replace tabs by spaces when editor modelines has "expandtab" 

Change-Id: If7a6f2697be732ae4f94ed8b845fd293c32510f7
Also: tabs-stops should be 8
Reviewed-on: https://code.wireshark.org/review/7100
Reviewed-by: Bill Meier <wmeier@newsguy.com>
This commit is contained in:
Bill Meier 2015-02-13 12:05:26 -05:00
parent 936f685af5
commit 9c866ff971
36 changed files with 4528 additions and 4528 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asn1/rtse/packet-rtse-template.c
View File

@ -181,7 +181,7 @@ call_rtse_external_type_callback(gboolean implicit_tag _U_, tvbuff_t *tvb, int o
}
if (oid)
offset = call_rtse_oid_callback(oid, tvb, offset, actx->pinfo, top_tree ? top_tree : tree, actx->private_data);
offset = call_rtse_oid_callback(oid, tvb, offset, actx->pinfo, top_tree ? top_tree : tree, actx->private_data);
return offset;
}

8
epan/address_types.c
View File

@ -791,10 +791,10 @@ void address_types_initialize(void)
}
/* Given an address type id, return an address_type_t* */
#define ADDR_TYPE_LOOKUP(addr_type, result) \
/* Check input */ \
g_assert(addr_type < MAX_ADDR_TYPE_VALUE); \
result = type_list[addr_type];
#define ADDR_TYPE_LOOKUP(addr_type, result) \
/* Check input */ \
g_assert(addr_type < MAX_ADDR_TYPE_VALUE); \
result = type_list[addr_type];
static int address_type_get_length(const address* addr)
{

4
epan/conversation_table.c
View File

@ -166,7 +166,7 @@ set_conv_gui_data(gpointer data, gpointer user_data)
g_string_append(conv_cmd_str, proto_get_protocol_filter_name(table->proto_id));
cmd_string_list_ = g_list_append(cmd_string_list_, conv_cmd_str->str);
ui_info.group = REGISTER_STAT_GROUP_CONVERSATION_LIST;
ui_info.title = NULL; /* construct this from the protocol info? */
ui_info.title = NULL; /* construct this from the protocol info? */
ui_info.cli_string = g_string_free(conv_cmd_str, FALSE);
ui_info.tap_init_cb = dissector_conversation_init;
ui_info.index = -1;
@ -191,7 +191,7 @@ set_host_gui_data(gpointer data, gpointer user_data)
g_string_printf(host_cmd_str, "%s,%s", HOSTLIST_TAP_PREFIX, proto_get_protocol_filter_name(table->proto_id));
ui_info.group = REGISTER_STAT_GROUP_ENDPOINT_LIST;
ui_info.title = NULL; /* construct this from the protocol info? */
ui_info.title = NULL; /* construct this from the protocol info? */
ui_info.cli_string = g_string_free(host_cmd_str, FALSE);
ui_info.tap_init_cb = dissector_hostlist_init;
ui_info.index = -1;

4
epan/dissectors/packet-3g-a11.c
View File

@ -1585,7 +1585,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
/* flags */
proto_tree_add_bitmask(a11_tree, tvb, offset, hf_a11_flags,
ett_a11_flags, a11_flags, ENC_NA);
ett_a11_flags, a11_flags, ENC_NA);
offset += 1;
/* lifetime */
@ -1905,7 +1905,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
/* flags */
proto_tree_add_bitmask(a11_tree, tvb, offset, hf_a11_flags,
ett_a11_flags, a11_flags, ENC_NA);
ett_a11_flags, a11_flags, ENC_NA);
offset += 1;
/* lifetime */

10
epan/dissectors/packet-ansi_683.c
View File

@ -1123,11 +1123,11 @@ msg_download_req(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint len,
* 4.5.1.3
*/
static const value_string akey_protocol_revision_vals[] = {
{ 0x02, "2G A-key generation" },
{ 0x03, "2G A-key and 3G Root Key generation" },
{ 0x04, "3G Root Key generation" },
{ 0x05, "Enhanced 3G Root Key generation" },
{ 0, NULL },
{ 0x02, "2G A-key generation" },
{ 0x03, "2G A-key and 3G Root Key generation" },
{ 0x04, "3G Root Key generation" },
{ 0x05, "Enhanced 3G Root Key generation" },
{ 0, NULL },
};
static void

2
epan/dissectors/packet-assa_r3.c
View File

@ -6040,7 +6040,7 @@ dissect_r3_cmd_clearnvram (tvbuff_t *tvb, guint32 start_offset, guint32 length _
proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_bitmask(tree, tvb, start_offset + 2, hf_r3_nvramclearoptions,
ett_r3clearnvram, r3_nvramclearoptions, ENC_LITTLE_ENDIAN);
ett_r3clearnvram, r3_nvramclearoptions, ENC_LITTLE_ENDIAN);
}
static void

18
epan/dissectors/packet-dtn.c
View File

@ -1072,13 +1072,13 @@ dissect_payload_header(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int
/* This is really a SDNV but there are only 7 bits defined so leave it this way*/
if (version == 4) {
static const gint *flags[] = {
&hf_bundle_payload_flags_replicate_hdr,
&hf_bundle_payload_flags_xmit_report,
&hf_bundle_payload_flags_discard_on_fail,
&hf_bundle_payload_flags_last_header,
NULL
};
static const gint *flags[] = {
&hf_bundle_payload_flags_replicate_hdr,
&hf_bundle_payload_flags_xmit_report,
&hf_bundle_payload_flags_discard_on_fail,
&hf_bundle_payload_flags_last_header,
NULL
};
guint8 procflags;
procflags = tvb_get_guint8(tvb, offset);
@ -1088,8 +1088,8 @@ dissect_payload_header(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int
else {
*lastheader = FALSE;
}
proto_tree_add_bitmask(payload_tree, tvb, offset, hf_bundle_payload_flags,
ett_payload_flags, flags, ENC_BIG_ENDIAN);
proto_tree_add_bitmask(payload_tree, tvb, offset, hf_bundle_payload_flags,
ett_payload_flags, flags, ENC_BIG_ENDIAN);
++offset;
}
else { /*Bundle Protocol Version 5*/

8
epan/dissectors/packet-e212.h
View File

@ -30,10 +30,10 @@
extern value_string_ext E212_codes_ext;
typedef enum {
E212_NONE,
E212_LAI,
E212_RAI,
E212_SAI
E212_NONE,
E212_LAI,
E212_RAI,
E212_SAI
} e212_number_type_t;
gchar* dissect_e212_mcc_mnc_wmem_packet_str(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, e212_number_type_t number_type, gboolean little_endian);

12
epan/dissectors/packet-gsm_a_dtap.c
View File

@ -1100,8 +1100,8 @@ de_emerg_num_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 o
item = proto_tree_add_string(subtree, hf_gsm_a_dtap_emergency_bcd_num, tvb, curr_offset, en_len, digit_str);
/* Check for overdicadic digits, we used the standard digit map from tvbuff.c
* 0 1 2 3 4 5 6 7 8 9 a b c d e f
* '0','1','2','3','4','5','6','7','8','9','?','?','?','?','?','?'
* 0 1 2 3 4 5 6 7 8 9 a b c d e f
* '0','1','2','3','4','5','6','7','8','9','?','?','?','?','?','?'
*
*/
if(strchr(digit_str,'?')){
@ -2171,10 +2171,10 @@ de_bcd_num(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset,
a_bigbuf);
/* Check for overdicadic digits, we used the standard digit map from tvbuff.c
* 0 1 2 3 4 5 6 7 8 9 a b c d e f
* '0','1','2','3','4','5','6','7','8','9','?','?','?','?','?','?'
*
*/
* 0 1 2 3 4 5 6 7 8 9 a b c d e f
* '0','1','2','3','4','5','6','7','8','9','?','?','?','?','?','?'
*
*/
if(strchr(digit_str,'?')){
expert_add_info(pinfo, item, &ei_gsm_a_dtap_end_mark_unexpected);
}

774
epan/dissectors/packet-ieee80211-radio.c
View File

@ -64,398 +64,398 @@ static const value_string bandwidth_vals[] = {
*
* Indices are:
*
* the MCS index (0-76);
* the MCS index (0-76);
*
* 0 for 20 MHz, 1 for 40 MHz;
* 0 for 20 MHz, 1 for 40 MHz;
*
* 0 for a long guard interval, 1 for a short guard interval.
* 0 for a long guard interval, 1 for a short guard interval.
*/
WS_DLL_PUBLIC_DEF
const float ieee80211_float_htrates[MAX_MCS_INDEX+1][2][2] = {
/* MCS 0 */
{ /* 20 Mhz */ { 6.5f, /* SGI */ 7.2f, },
/* 40 Mhz */ { 13.5f, /* SGI */ 15.0f, },
},
/* MCS 1 */
{ /* 20 Mhz */ { 13.0f, /* SGI */ 14.4f, },
/* 40 Mhz */ { 27.0f, /* SGI */ 30.0f, },
},
/* MCS 2 */
{ /* 20 Mhz */ { 19.5f, /* SGI */ 21.7f, },
/* 40 Mhz */ { 40.5f, /* SGI */ 45.0f, },
},
/* MCS 3 */
{ /* 20 Mhz */ { 26.0f, /* SGI */ 28.9f, },
/* 40 Mhz */ { 54.0f, /* SGI */ 60.0f, },
},
/* MCS 4 */
{ /* 20 Mhz */ { 39.0f, /* SGI */ 43.3f, },
/* 40 Mhz */ { 81.0f, /* SGI */ 90.0f, },
},
/* MCS 5 */
{ /* 20 Mhz */ { 52.0f, /* SGI */ 57.8f, },
/* 40 Mhz */ { 108.0f, /* SGI */ 120.0f, },
},
/* MCS 6 */
{ /* 20 Mhz */ { 58.5f, /* SGI */ 65.0f, },
/* 40 Mhz */ { 121.5f, /* SGI */ 135.0f, },
},
/* MCS 7 */
{ /* 20 Mhz */ { 65.0f, /* SGI */ 72.2f, },
/* 40 Mhz */ { 135.0f, /* SGI */ 150.0f, },
},
/* MCS 8 */
{ /* 20 Mhz */ { 13.0f, /* SGI */ 14.4f, },
/* 40 Mhz */ { 27.0f, /* SGI */ 30.0f, },
},
/* MCS 9 */
{ /* 20 Mhz */ { 26.0f, /* SGI */ 28.9f, },
/* 40 Mhz */ { 54.0f, /* SGI */ 60.0f, },
},
/* MCS 10 */
{ /* 20 Mhz */ { 39.0f, /* SGI */ 43.3f, },
/* 40 Mhz */ { 81.0f, /* SGI */ 90.0f, },
},
/* MCS 11 */
{ /* 20 Mhz */ { 52.0f, /* SGI */ 57.8f, },
/* 40 Mhz */ { 108.0f, /* SGI */ 120.0f, },
},
/* MCS 12 */
{ /* 20 Mhz */ { 78.0f, /* SGI */ 86.7f, },
/* 40 Mhz */ { 162.0f, /* SGI */ 180.0f, },
},
/* MCS 13 */
{ /* 20 Mhz */ { 104.0f, /* SGI */ 115.6f, },
/* 40 Mhz */ { 216.0f, /* SGI */ 240.0f, },
},
/* MCS 14 */
{ /* 20 Mhz */ { 117.0f, /* SGI */ 130.0f, },
/* 40 Mhz */ { 243.0f, /* SGI */ 270.0f, },
},
/* MCS 15 */
{ /* 20 Mhz */ { 130.0f, /* SGI */ 144.4f, },
/* 40 Mhz */ { 270.0f, /* SGI */ 300.0f, },
},
/* MCS 16 */
{ /* 20 Mhz */ { 19.5f, /* SGI */ 21.7f, },
/* 40 Mhz */ { 40.5f, /* SGI */ 45.0f, },
},
/* MCS 17 */
{ /* 20 Mhz */ { 39.0f, /* SGI */ 43.3f, },
/* 40 Mhz */ { 81.0f, /* SGI */ 90.0f, },
},
/* MCS 18 */
{ /* 20 Mhz */ { 58.5f, /* SGI */ 65.0f, },
/* 40 Mhz */ { 121.5f, /* SGI */ 135.0f, },
},
/* MCS 19 */
{ /* 20 Mhz */ { 78.0f, /* SGI */ 86.7f, },
/* 40 Mhz */ { 162.0f, /* SGI */ 180.0f, },
},
/* MCS 20 */
{ /* 20 Mhz */ { 117.0f, /* SGI */ 130.0f, },
/* 40 Mhz */ { 243.0f, /* SGI */ 270.0f, },
},
/* MCS 21 */
{ /* 20 Mhz */ { 156.0f, /* SGI */ 173.3f, },
/* 40 Mhz */ { 324.0f, /* SGI */ 360.0f, },
},
/* MCS 22 */
{ /* 20 Mhz */ { 175.5f, /* SGI */ 195.0f, },
/* 40 Mhz */ { 364.5f, /* SGI */ 405.0f, },
},
/* MCS 23 */
{ /* 20 Mhz */ { 195.0f, /* SGI */ 216.7f, },
/* 40 Mhz */ { 405.0f, /* SGI */ 450.0f, },
},
/* MCS 24 */
{ /* 20 Mhz */ { 26.0f, /* SGI */ 28.9f, },
/* 40 Mhz */ { 54.0f, /* SGI */ 60.0f, },
},
/* MCS 25 */
{ /* 20 Mhz */ { 52.0f, /* SGI */ 57.8f, },
/* 40 Mhz */ { 108.0f, /* SGI */ 120.0f, },
},
/* MCS 26 */
{ /* 20 Mhz */ { 78.0f, /* SGI */ 86.7f, },
/* 40 Mhz */ { 162.0f, /* SGI */ 180.0f, },
},
/* MCS 27 */
{ /* 20 Mhz */ { 104.0f, /* SGI */ 115.6f, },
/* 40 Mhz */ { 216.0f, /* SGI */ 240.0f, },
},
/* MCS 28 */
{ /* 20 Mhz */ { 156.0f, /* SGI */ 173.3f, },
/* 40 Mhz */ { 324.0f, /* SGI */ 360.0f, },
},
/* MCS 29 */
{ /* 20 Mhz */ { 208.0f, /* SGI */ 231.1f, },
/* 40 Mhz */ { 432.0f, /* SGI */ 480.0f, },
},
/* MCS 30 */
{ /* 20 Mhz */ { 234.0f, /* SGI */ 260.0f, },
/* 40 Mhz */ { 486.0f, /* SGI */ 540.0f, },
},
/* MCS 31 */
{ /* 20 Mhz */ { 260.0f, /* SGI */ 288.9f, },
/* 40 Mhz */ { 540.0f, /* SGI */ 600.0f, },
},
/* MCS 32 */
{ /* 20 Mhz */ { 0.0f, /* SGI */ 0.0f, }, /* not valid */
/* 40 Mhz */ { 6.0f, /* SGI */ 6.7f, },
},
/* MCS 33 */
{ /* 20 Mhz */ { 39.0f, /* SGI */ 43.3f, },
/* 40 Mhz */ { 81.0f, /* SGI */ 90.0f, },
},
/* MCS 34 */
{ /* 20 Mhz */ { 52.0f, /* SGI */ 57.8f, },
/* 40 Mhz */ { 108.0f, /* SGI */ 120.0f, },
},
/* MCS 35 */
{ /* 20 Mhz */ { 65.0f, /* SGI */ 72.2f, },
/* 40 Mhz */ { 135.0f, /* SGI */ 150.0f, },
},
/* MCS 36 */
{ /* 20 Mhz */ { 58.5f, /* SGI */ 65.0f, },
/* 40 Mhz */ { 121.5f, /* SGI */ 135.0f, },
},
/* MCS 37 */
{ /* 20 Mhz */ { 78.0f, /* SGI */ 86.7f, },
/* 40 Mhz */ { 162.0f, /* SGI */ 180.0f, },
},
/* MCS 38 */
{ /* 20 Mhz */ { 97.5f, /* SGI */ 108.3f, },
/* 40 Mhz */ { 202.5f, /* SGI */ 225.0f, },
},
/* MCS 39 */
{ /* 20 Mhz */ { 52.0f, /* SGI */ 57.8f, },
/* 40 Mhz */ { 108.0f, /* SGI */ 120.0f, },
},
/* MCS 40 */
{ /* 20 Mhz */ { 65.0f, /* SGI */ 72.2f, },
/* 40 Mhz */ { 135.0f, /* SGI */ 150.0f, },
},
/* MCS 41 */
{ /* 20 Mhz */ { 65.0f, /* SGI */ 72.2f, },
/* 40 Mhz */ { 135.0f, /* SGI */ 150.0f, },
},
/* MCS 42 */
{ /* 20 Mhz */ { 78.0f, /* SGI */ 86.7f, },
/* 40 Mhz */ { 162.0f, /* SGI */ 180.0f, },
},
/* MCS 43 */
{ /* 20 Mhz */ { 91.0f, /* SGI */ 101.1f, },
/* 40 Mhz */ { 189.0f, /* SGI */ 210.0f, },
},
/* MCS 44 */
{ /* 20 Mhz */ { 91.0f, /* SGI */ 101.1f, },
/* 40 Mhz */ { 189.0f, /* SGI */ 210.0f, },
},
/* MCS 45 */
{ /* 20 Mhz */ { 104.0f, /* SGI */ 115.6f, },
/* 40 Mhz */ { 216.0f, /* SGI */ 240.0f, },
},
/* MCS 46 */
{ /* 20 Mhz */ { 78.0f, /* SGI */ 86.7f, },
/* 40 Mhz */ { 162.0f, /* SGI */ 180.0f, },
},
/* MCS 47 */
{ /* 20 Mhz */ { 97.5f, /* SGI */ 108.3f, },
/* 40 Mhz */ { 202.5f, /* SGI */ 225.0f, },
},
/* MCS 48 */
{ /* 20 Mhz */ { 97.5f, /* SGI */ 108.3f, },
/* 40 Mhz */ { 202.5f, /* SGI */ 225.0f, },
},
/* MCS 49 */
{ /* 20 Mhz */ { 117.0f, /* SGI */ 130.0f, },
/* 40 Mhz */ { 243.0f, /* SGI */ 270.0f, },
},
/* MCS 50 */
{ /* 20 Mhz */ { 136.5f, /* SGI */ 151.7f, },
/* 40 Mhz */ { 283.5f, /* SGI */ 315.0f, },
},
/* MCS 51 */
{ /* 20 Mhz */ { 136.5f, /* SGI */ 151.7f, },
/* 40 Mhz */ { 283.5f, /* SGI */ 315.0f, },
},
/* MCS 52 */
{ /* 20 Mhz */ { 156.0f, /* SGI */ 173.3f, },
/* 40 Mhz */ { 324.0f, /* SGI */ 360.0f, },
},
/* MCS 53 */
{ /* 20 Mhz */ { 65.0f, /* SGI */ 72.2f, },
/* 40 Mhz */ { 135.0f, /* SGI */ 150.0f, },
},
/* MCS 54 */
{ /* 20 Mhz */ { 78.0f, /* SGI */ 86.7f, },
/* 40 Mhz */ { 162.0f, /* SGI */ 180.0f, },
},
/* MCS 55 */
{ /* 20 Mhz */ { 91.0f, /* SGI */ 101.1f, },
/* 40 Mhz */ { 189.0f, /* SGI */ 210.0f, },
},
/* MCS 56 */
{ /* 20 Mhz */ { 78.0f, /* SGI */ 86.7f, },
/* 40 Mhz */ { 162.0f, /* SGI */ 180.0f, },
},
/* MCS 57 */
{ /* 20 Mhz */ { 91.0f, /* SGI */ 101.1f, },
/* 40 Mhz */ { 189.0f, /* SGI */ 210.0f, },
},
/* MCS 58 */
{ /* 20 Mhz */ { 104.0f, /* SGI */ 115.6f, },
/* 40 Mhz */ { 216.0f, /* SGI */ 240.0f, },
},
/* MCS 59 */
{ /* 20 Mhz */ { 117.0f, /* SGI */ 130.0f, },
/* 40 Mhz */ { 243.0f, /* SGI */ 270.0f, },
},
/* MCS 60 */
{ /* 20 Mhz */ { 104.0f, /* SGI */ 115.6f, },
/* 40 Mhz */ { 216.0f, /* SGI */ 240.0f, },
},
/* MCS 61 */
{ /* 20 Mhz */ { 117.0f, /* SGI */ 130.0f, },
/* 40 Mhz */ { 243.0f, /* SGI */ 270.0f, },
},
/* MCS 62 */
{ /* 20 Mhz */ { 130.0f, /* SGI */ 144.4f, },
/* 40 Mhz */ { 270.0f, /* SGI */ 300.0f, },
},
/* MCS 63 */
{ /* 20 Mhz */ { 130.0f, /* SGI */ 144.4f, },
/* 40 Mhz */ { 270.0f, /* SGI */ 300.0f, },
},
/* MCS 64 */
{ /* 20 Mhz */ { 143.0f, /* SGI */ 158.9f, },
/* 40 Mhz */ { 297.0f, /* SGI */ 330.0f, },
},
/* MCS 65 */
{ /* 20 Mhz */ { 97.5f, /* SGI */ 108.3f, },
/* 40 Mhz */ { 202.5f, /* SGI */ 225.0f, },
},
/* MCS 66 */
{ /* 20 Mhz */ { 117.0f, /* SGI */ 130.0f, },
/* 40 Mhz */ { 243.0f, /* SGI */ 270.0f, },
},
/* MCS 67 */
{ /* 20 Mhz */ { 136.5f, /* SGI */ 151.7f, },
/* 40 Mhz */ { 283.5f, /* SGI */ 315.0f, },
},
/* MCS 68 */
{ /* 20 Mhz */ { 117.0f, /* SGI */ 130.0f, },
/* 40 Mhz */ { 243.0f, /* SGI */ 270.0f, },
},
/* MCS 69 */
{ /* 20 Mhz */ { 136.5f, /* SGI */ 151.7f, },
/* 40 Mhz */ { 283.5f, /* SGI */ 315.0f, },
},
/* MCS 70 */
{ /* 20 Mhz */ { 156.0f, /* SGI */ 173.3f, },
/* 40 Mhz */ { 324.0f, /* SGI */ 360.0f, },
},
/* MCS 71 */
{ /* 20 Mhz */ { 175.5f, /* SGI */ 195.0f, },
/* 40 Mhz */ { 364.5f, /* SGI */ 405.0f, },
},
/* MCS 72 */
{ /* 20 Mhz */ { 156.0f, /* SGI */ 173.3f, },
/* 40 Mhz */ { 324.0f, /* SGI */ 360.0f, },
},
/* MCS 73 */
{ /* 20 Mhz */ { 175.5f, /* SGI */ 195.0f, },
/* 40 Mhz */ { 364.5f, /* SGI */ 405.0f, },
},
/* MCS 74 */
{ /* 20 Mhz */ { 195.0f, /* SGI */ 216.7f, },
/* 40 Mhz */ { 405.0f, /* SGI */ 450.0f, },
},
/* MCS 75 */
{ /* 20 Mhz */ { 195.0f, /* SGI */ 216.7f, },
/* 40 Mhz */ { 405.0f, /* SGI */ 450.0f, },
},
/* MCS 76 */
{ /* 20 Mhz */ { 214.5f, /* SGI */ 238.3f, },
/* 40 Mhz */ { 445.5f, /* SGI */ 495.0f, },
},
/* MCS 0 */
{ /* 20 Mhz */ { 6.5f, /* SGI */ 7.2f, },
/* 40 Mhz */ { 13.5f, /* SGI */ 15.0f, },
},
/* MCS 1 */
{ /* 20 Mhz */ { 13.0f, /* SGI */ 14.4f, },
/* 40 Mhz */ { 27.0f, /* SGI */ 30.0f, },
},
/* MCS 2 */
{ /* 20 Mhz */ { 19.5f, /* SGI */ 21.7f, },
/* 40 Mhz */ { 40.5f, /* SGI */ 45.0f, },
},
/* MCS 3 */
{ /* 20 Mhz */ { 26.0f, /* SGI */ 28.9f, },
/* 40 Mhz */ { 54.0f, /* SGI */ 60.0f, },
},
/* MCS 4 */
{ /* 20 Mhz */ { 39.0f, /* SGI */ 43.3f, },
/* 40 Mhz */ { 81.0f, /* SGI */ 90.0f, },
},
/* MCS 5 */
{ /* 20 Mhz */ { 52.0f, /* SGI */ 57.8f, },
/* 40 Mhz */ { 108.0f, /* SGI */ 120.0f, },
},
/* MCS 6 */
{ /* 20 Mhz */ { 58.5f, /* SGI */ 65.0f, },
/* 40 Mhz */ { 121.5f, /* SGI */ 135.0f, },
},
/* MCS 7 */
{ /* 20 Mhz */ { 65.0f, /* SGI */ 72.2f, },
/* 40 Mhz */ { 135.0f, /* SGI */ 150.0f, },
},
/* MCS 8 */
{ /* 20 Mhz */ { 13.0f, /* SGI */ 14.4f, },
/* 40 Mhz */ { 27.0f, /* SGI */ 30.0f, },
},
/* MCS 9 */
{ /* 20 Mhz */ { 26.0f, /* SGI */ 28.9f, },
/* 40 Mhz */ { 54.0f, /* SGI */ 60.0f, },
},
/* MCS 10 */
{ /* 20 Mhz */ { 39.0f, /* SGI */ 43.3f, },
/* 40 Mhz */ { 81.0f, /* SGI */ 90.0f, },
},
/* MCS 11 */
{ /* 20 Mhz */ { 52.0f, /* SGI */ 57.8f, },
/* 40 Mhz */ { 108.0f, /* SGI */ 120.0f, },
},
/* MCS 12 */
{ /* 20 Mhz */ { 78.0f, /* SGI */ 86.7f, },
/* 40 Mhz */ { 162.0f, /* SGI */ 180.0f, },
},
/* MCS 13 */
{ /* 20 Mhz */ { 104.0f, /* SGI */ 115.6f, },
/* 40 Mhz */ { 216.0f, /* SGI */ 240.0f, },
},
/* MCS 14 */
{ /* 20 Mhz */ { 117.0f, /* SGI */ 130.0f, },
/* 40 Mhz */ { 243.0f, /* SGI */ 270.0f, },
},
/* MCS 15 */
{ /* 20 Mhz */ { 130.0f, /* SGI */ 144.4f, },
/* 40 Mhz */ { 270.0f, /* SGI */ 300.0f, },
},
/* MCS 16 */
{ /* 20 Mhz */ { 19.5f, /* SGI */ 21.7f, },
/* 40 Mhz */ { 40.5f, /* SGI */ 45.0f, },
},
/* MCS 17 */
{ /* 20 Mhz */ { 39.0f, /* SGI */ 43.3f, },
/* 40 Mhz */ { 81.0f, /* SGI */ 90.0f, },
},
/* MCS 18 */
{ /* 20 Mhz */ { 58.5f, /* SGI */ 65.0f, },
/* 40 Mhz */ { 121.5f, /* SGI */ 135.0f, },
},
/* MCS 19 */
{ /* 20 Mhz */ { 78.0f, /* SGI */ 86.7f, },
/* 40 Mhz */ { 162.0f, /* SGI */ 180.0f, },
},
/* MCS 20 */
{ /* 20 Mhz */ { 117.0f, /* SGI */ 130.0f, },
/* 40 Mhz */ { 243.0f, /* SGI */ 270.0f, },
},
/* MCS 21 */
{ /* 20 Mhz */ { 156.0f, /* SGI */ 173.3f, },
/* 40 Mhz */ { 324.0f, /* SGI */ 360.0f, },
},
/* MCS 22 */
{ /* 20 Mhz */ { 175.5f, /* SGI */ 195.0f, },
/* 40 Mhz */ { 364.5f, /* SGI */ 405.0f, },
},
/* MCS 23 */
{ /* 20 Mhz */ { 195.0f, /* SGI */ 216.7f, },
/* 40 Mhz */ { 405.0f, /* SGI */ 450.0f, },
},
/* MCS 24 */
{ /* 20 Mhz */ { 26.0f, /* SGI */ 28.9f, },
/* 40 Mhz */ { 54.0f, /* SGI */ 60.0f, },
},
/* MCS 25 */
{ /* 20 Mhz */ { 52.0f, /* SGI */ 57.8f, },
/* 40 Mhz */ { 108.0f, /* SGI */ 120.0f, },
},
/* MCS 26 */
{ /* 20 Mhz */ { 78.0f, /* SGI */ 86.7f, },
/* 40 Mhz */ { 162.0f, /* SGI */ 180.0f, },
},
/* MCS 27 */
{ /* 20 Mhz */ { 104.0f, /* SGI */ 115.6f, },
/* 40 Mhz */ { 216.0f, /* SGI */ 240.0f, },
},
/* MCS 28 */
{ /* 20 Mhz */ { 156.0f, /* SGI */ 173.3f, },
/* 40 Mhz */ { 324.0f, /* SGI */ 360.0f, },
},
/* MCS 29 */
{ /* 20 Mhz */ { 208.0f, /* SGI */ 231.1f, },
/* 40 Mhz */ { 432.0f, /* SGI */ 480.0f, },
},
/* MCS 30 */
{ /* 20 Mhz */ { 234.0f, /* SGI */ 260.0f, },
/* 40 Mhz */ { 486.0f, /* SGI */ 540.0f, },
},
/* MCS 31 */
{ /* 20 Mhz */ { 260.0f, /* SGI */ 288.9f, },
/* 40 Mhz */ { 540.0f, /* SGI */ 600.0f, },
},
/* MCS 32 */
{ /* 20 Mhz */ { 0.0f, /* SGI */ 0.0f, }, /* not valid */
/* 40 Mhz */ { 6.0f, /* SGI */ 6.7f, },
},
/* MCS 33 */
{ /* 20 Mhz */ { 39.0f, /* SGI */ 43.3f, },
/* 40 Mhz */ { 81.0f, /* SGI */ 90.0f, },
},
/* MCS 34 */
{ /* 20 Mhz */ { 52.0f, /* SGI */ 57.8f, },
/* 40 Mhz */ { 108.0f, /* SGI */ 120.0f, },
},
/* MCS 35 */
{ /* 20 Mhz */ { 65.0f, /* SGI */ 72.2f, },
/* 40 Mhz */ { 135.0f, /* SGI */ 150.0f, },
},
/* MCS 36 */
{ /* 20 Mhz */ { 58.5f, /* SGI */ 65.0f, },
/* 40 Mhz */ { 121.5f, /* SGI */ 135.0f, },
},
/* MCS 37 */
{ /* 20 Mhz */ { 78.0f, /* SGI */ 86.7f, },
/* 40 Mhz */ { 162.0f, /* SGI */ 180.0f, },
},
/* MCS 38 */
{ /* 20 Mhz */ { 97.5f, /* SGI */ 108.3f, },
/* 40 Mhz */ { 202.5f, /* SGI */ 225.0f, },
},
/* MCS 39 */
{ /* 20 Mhz */ { 52.0f, /* SGI */ 57.8f, },
/* 40 Mhz */ { 108.0f, /* SGI */ 120.0f, },
},
/* MCS 40 */
{ /* 20 Mhz */ { 65.0f, /* SGI */ 72.2f, },
/* 40 Mhz */ { 135.0f, /* SGI */ 150.0f, },
},
/* MCS 41 */
{ /* 20 Mhz */ { 65.0f, /* SGI */ 72.2f, },
/* 40 Mhz */ { 135.0f, /* SGI */ 150.0f, },
},
/* MCS 42 */
{ /* 20 Mhz */ { 78.0f, /* SGI */ 86.7f, },
/* 40 Mhz */ { 162.0f, /* SGI */ 180.0f, },
},
/* MCS 43 */
{ /* 20 Mhz */ { 91.0f, /* SGI */ 101.1f, },
/* 40 Mhz */ { 189.0f, /* SGI */ 210.0f, },
},
/* MCS 44 */
{ /* 20 Mhz */ { 91.0f, /* SGI */ 101.1f, },
/* 40 Mhz */ { 189.0f, /* SGI */ 210.0f, },
},
/* MCS 45 */
{ /* 20 Mhz */ { 104.0f, /* SGI */ 115.6f, },
/* 40 Mhz */ { 216.0f, /* SGI */ 240.0f, },
},
/* MCS 46 */
{ /* 20 Mhz */ { 78.0f, /* SGI */ 86.7f, },
/* 40 Mhz */ { 162.0f, /* SGI */ 180.0f, },
},
/* MCS 47 */
{ /* 20 Mhz */ { 97.5f, /* SGI */ 108.3f, },
/* 40 Mhz */ { 202.5f, /* SGI */ 225.0f, },
},
/* MCS 48 */
{ /* 20 Mhz */ { 97.5f, /* SGI */ 108.3f, },
/* 40 Mhz */ { 202.5f, /* SGI */ 225.0f, },
},
/* MCS 49 */
{ /* 20 Mhz */ { 117.0f, /* SGI */ 130.0f, },
/* 40 Mhz */ { 243.0f, /* SGI */ 270.0f, },
},
/* MCS 50 */
{ /* 20 Mhz */ { 136.5f, /* SGI */ 151.7f, },
/* 40 Mhz */ { 283.5f, /* SGI */ 315.0f, },
},
/* MCS 51 */
{ /* 20 Mhz */ { 136.5f, /* SGI */ 151.7f, },
/* 40 Mhz */ { 283.5f, /* SGI */ 315.0f, },
},
/* MCS 52 */
{ /* 20 Mhz */ { 156.0f, /* SGI */ 173.3f, },
/* 40 Mhz */ { 324.0f, /* SGI */ 360.0f, },
},
/* MCS 53 */
{ /* 20 Mhz */ { 65.0f, /* SGI */ 72.2f, },
/* 40 Mhz */ { 135.0f, /* SGI */ 150.0f, },
},
/* MCS 54 */
{ /* 20 Mhz */ { 78.0f, /* SGI */ 86.7f, },
/* 40 Mhz */ { 162.0f, /* SGI */ 180.0f, },
},
/* MCS 55 */
{ /* 20 Mhz */ { 91.0f, /* SGI */ 101.1f, },
/* 40 Mhz */ { 189.0f, /* SGI */ 210.0f, },
},
/* MCS 56 */
{ /* 20 Mhz */ { 78.0f, /* SGI */ 86.7f, },
/* 40 Mhz */ { 162.0f, /* SGI */ 180.0f, },
},
/* MCS 57 */
{ /* 20 Mhz */ { 91.0f, /* SGI */ 101.1f, },
/* 40 Mhz */ { 189.0f, /* SGI */ 210.0f, },
},
/* MCS 58 */
{ /* 20 Mhz */ { 104.0f, /* SGI */ 115.6f, },
/* 40 Mhz */ { 216.0f, /* SGI */ 240.0f, },
},
/* MCS 59 */
{ /* 20 Mhz */ { 117.0f, /* SGI */ 130.0f, },
/* 40 Mhz */ { 243.0f, /* SGI */ 270.0f, },
},
/* MCS 60 */
{ /* 20 Mhz */ { 104.0f, /* SGI */ 115.6f, },
/* 40 Mhz */ { 216.0f, /* SGI */ 240.0f, },
},
/* MCS 61 */
{ /* 20 Mhz */ { 117.0f, /* SGI */ 130.0f, },
/* 40 Mhz */ { 243.0f, /* SGI */ 270.0f, },
},
/* MCS 62 */
{ /* 20 Mhz */ { 130.0f, /* SGI */ 144.4f, },
/* 40 Mhz */ { 270.0f, /* SGI */ 300.0f, },
},
/* MCS 63 */
{ /* 20 Mhz */ { 130.0f, /* SGI */ 144.4f, },
/* 40 Mhz */ { 270.0f, /* SGI */ 300.0f, },
},
/* MCS 64 */
{ /* 20 Mhz */ { 143.0f, /* SGI */ 158.9f, },
/* 40 Mhz */ { 297.0f, /* SGI */ 330.0f, },
},
/* MCS 65 */
{ /* 20 Mhz */ { 97.5f, /* SGI */ 108.3f, },
/* 40 Mhz */ { 202.5f, /* SGI */ 225.0f, },
},
/* MCS 66 */
{ /* 20 Mhz */ { 117.0f, /* SGI */ 130.0f, },
/* 40 Mhz */ { 243.0f, /* SGI */ 270.0f, },
},
/* MCS 67 */
{ /* 20 Mhz */ { 136.5f, /* SGI */ 151.7f, },
/* 40 Mhz */ { 283.5f, /* SGI */ 315.0f, },
},
/* MCS 68 */
{ /* 20 Mhz */ { 117.0f, /* SGI */ 130.0f, },
/* 40 Mhz */ { 243.0f, /* SGI */ 270.0f, },
},
/* MCS 69 */
{ /* 20 Mhz */ { 136.5f, /* SGI */ 151.7f, },
/* 40 Mhz */ { 283.5f, /* SGI */ 315.0f, },
},
/* MCS 70 */
{ /* 20 Mhz */ { 156.0f, /* SGI */ 173.3f, },
/* 40 Mhz */ { 324.0f, /* SGI */ 360.0f, },
},
/* MCS 71 */
{ /* 20 Mhz */ { 175.5f, /* SGI */ 195.0f, },
/* 40 Mhz */ { 364.5f, /* SGI */ 405.0f, },
},
/* MCS 72 */
{ /* 20 Mhz */ { 156.0f, /* SGI */ 173.3f, },
/* 40 Mhz */ { 324.0f, /* SGI */ 360.0f, },
},
/* MCS 73 */
{ /* 20 Mhz */ { 175.5f, /* SGI */ 195.0f, },
/* 40 Mhz */ { 364.5f, /* SGI */ 405.0f, },
},
/* MCS 74 */
{ /* 20 Mhz */ { 195.0f, /* SGI */ 216.7f, },
/* 40 Mhz */ { 405.0f, /* SGI */ 450.0f, },
},
/* MCS 75 */
{ /* 20 Mhz */ { 195.0f, /* SGI */ 216.7f, },
/* 40 Mhz */ { 405.0f, /* SGI */ 450.0f, },
},
/* MCS 76 */
{ /* 20 Mhz */ { 214.5f, /* SGI */ 238.3f, },
/* 40 Mhz */ { 445.5f, /* SGI */ 495.0f, },
},
};
static gint ett_radio = -1;

2
epan/dissectors/packet-mpls-psc.c
View File

@ -237,7 +237,7 @@ proto_register_mpls_psc(void)
void
proto_reg_handoff_mpls_psc(void)
{
dissector_handle_t mpls_psc_handle;
dissector_handle_t mpls_psc_handle;
mpls_psc_handle = create_dissector_handle( dissect_mpls_psc, proto_mpls_psc );
dissector_add_uint("pwach.channel_type", 0x0024, mpls_psc_handle); /* FF: PSC, RFC 6378 */

6
epan/dissectors/packet-mpls.c
View File

@ -399,10 +399,10 @@ dissect_pw_ach(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
next_tvb = tvb_new_subset_remaining(tvb, 4);
if (!dissector_try_uint(pw_ach_subdissector_table, channel_type, next_tvb, pinfo, tree))
{
if (!dissector_try_uint(pw_ach_subdissector_table, channel_type, next_tvb, pinfo, tree))
{
call_dissector(dissector_data, next_tvb, pinfo, tree);
}
}
if (channel_type == ACH_TYPE_BFD_CV)
{

16
epan/dissectors/packet-nbns.c
View File

@ -1108,15 +1108,15 @@ static dissector_handle_t data_handle;
static void
dissect_netbios_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
heur_dtbl_entry_t *hdtbl_entry;
heur_dtbl_entry_t *hdtbl_entry;
/*
* Try the heuristic dissectors for NetBIOS; if none of them
* accept the packet, dissect it as data.
*/
if (!dissector_try_heuristic(netbios_heur_subdissector_list,
tvb, pinfo, tree, &hdtbl_entry, NULL))
call_dissector(data_handle,tvb, pinfo, tree);
/*
* Try the heuristic dissectors for NetBIOS; if none of them
* accept the packet, dissect it as data.
*/
if (!dissector_try_heuristic(netbios_heur_subdissector_list,
tvb, pinfo, tree, &hdtbl_entry, NULL))
call_dissector(data_handle,tvb, pinfo, tree);
}
/* NetBIOS datagram packet, from RFC 1002, page 32 */

2
epan/dissectors/packet-nsip.c
View File

@ -603,7 +603,7 @@ decode_iei_control_bits(nsip_ie_t *ie _U_, build_info_t *bi, int ie_start_offset
control_bits = tvb_get_guint8(bi->tvb, bi->offset);
proto_tree_add_bitmask(bi->nsip_tree, bi->tvb, ie_start_offset, hf_nsip_control_bits,
ett_nsip_control_bits, flags, ENC_NA);
ett_nsip_control_bits, flags, ENC_NA);
bi->offset++;
if (control_bits & NSIP_MASK_CONTROL_BITS_R) {

16
epan/dissectors/packet-ppp.c
View File

@ -4116,13 +4116,13 @@ dissect_bcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
guint8 mac_type;
gint captured_length, reported_length, pad_length;
tvbuff_t *next_tvb;
static const int * bcp_flags[] = {
&hf_bcp_fcs_present,
&hf_bcp_zeropad,
&hf_bcp_bcontrol,
&hf_bcp_pads,
NULL
};
static const int * bcp_flags[] = {
&hf_bcp_fcs_present,
&hf_bcp_zeropad,
&hf_bcp_bcontrol,
&hf_bcp_pads,
NULL
};
col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP BCP");
col_clear(pinfo->cinfo, COL_INFO);
@ -5457,7 +5457,7 @@ proto_reg_handoff_ppp(void)
dissector_add_uint("osinl.excl", NLPID_PPP, ppp_handle);
dissector_add_uint("gre.proto", ETHERTYPE_PPP, ppp_hdlc_handle);
dissector_add_uint("juniper.proto", JUNIPER_PROTO_PPP, ppp_handle);
dissector_add_uint("sflow_245.header_protocol", SFLOW_245_HEADER_PPP, ppp_hdlc_handle);
dissector_add_uint("sflow_245.header_protocol", SFLOW_245_HEADER_PPP, ppp_hdlc_handle);
}
void

2
epan/dissectors/packet-rgmp.c
View File

@ -43,7 +43,7 @@ static int hf_maddr = -1;
static int ett_rgmp = -1;
#define MC_RGMP 0xe0000019
#define MC_RGMP 0xe0000019
static const value_string rgmp_types[] = {
{IGMP_RGMP_LEAVE, "Leave"},

2
epan/dissectors/packet-rtse.c
View File

@ -231,7 +231,7 @@ call_rtse_external_type_callback(gboolean implicit_tag _U_, tvbuff_t *tvb, int o
}
if (oid)
offset = call_rtse_oid_callback(oid, tvb, offset, actx->pinfo, top_tree ? top_tree : tree, actx->private_data);
offset = call_rtse_oid_callback(oid, tvb, offset, actx->pinfo, top_tree ? top_tree : tree, actx->private_data);
return offset;
}

6
epan/dissectors/packet-sflow.c
View File

@ -688,11 +688,11 @@ dissect_sflow_245_sampled_header(tvbuff_t *tvb, packet_info *pinfo,
TRY
{
if ((global_dissect_samp_headers == FALSE) ||
if ((global_dissect_samp_headers == FALSE) ||
!dissector_try_uint(header_subdissector_table, header_proto, next_tvb, pinfo, sflow_245_header_tree))
{
{
call_dissector(data_handle, next_tvb, pinfo, sflow_245_header_tree);
}
}
}
CATCH_BOUNDS_ERRORS {

6636
epan/dissectors/packet-sigcomp.c
View File

File diff suppressed because it is too large Load Diff

2
epan/dissectors/packet-srvloc.c
View File

@ -367,7 +367,7 @@ dissect_authblk(tvbuff_t *tvb, int offset, proto_tree *tree)
{
guint16 length;
proto_tree_add_item(tree, hf_srvloc_timestamp, tvb, offset, 8, ENC_TIME_NTP|ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_srvloc_timestamp, tvb, offset, 8, ENC_TIME_NTP|ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_srvloc_block_structure_descriptor, tvb, offset + 8, 2, ENC_BIG_ENDIAN);
length = tvb_get_ntohs(tvb, offset + 10);
proto_tree_add_item(tree, hf_srvloc_authenticator_length, tvb, offset + 10, 2, ENC_BIG_ENDIAN);

470
epan/jsmn/jsmn.c
View File

@ -28,18 +28,18 @@
* Allocates a fresh unused token from the token pull.
*/
static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser,
jsmntok_t *tokens, size_t num_tokens) {
jsmntok_t *tok;
if (parser->toknext >= num_tokens) {
return NULL;
}
tok = &tokens[parser->toknext++];
tok->start = tok->end = -1;
tok->size = 0;
jsmntok_t *tokens, size_t num_tokens) {
jsmntok_t *tok;
if (parser->toknext >= num_tokens) {
return NULL;
}
tok = &tokens[parser->toknext++];
tok->start = tok->end = -1;
tok->size = 0;
#ifdef JSMN_PARENT_LINKS
tok->parent = -1;
tok->parent = -1;
#endif
return tok;
return tok;
}
/**
@ -47,278 +47,278 @@ static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser,
*/
static void jsmn_fill_token(jsmntok_t *token, jsmntype_t type,
int start, int end) {
token->type = type;
token->start = start;
token->end = end;
token->size = 0;
token->type = type;
token->start = start;
token->end = end;
token->size = 0;
}
/**
* Fills next available token with JSON primitive.
*/
static int jsmn_parse_primitive(jsmn_parser *parser, const char *js,
size_t len, jsmntok_t *tokens, size_t num_tokens) {
jsmntok_t *token;
int start;
size_t len, jsmntok_t *tokens, size_t num_tokens) {
jsmntok_t *token;
int start;
start = parser->pos;
start = parser->pos;
for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
switch (js[parser->pos]) {
for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
switch (js[parser->pos]) {
#ifndef JSMN_STRICT
/* In strict mode primitive must be followed by "," or "}" or "]" */
case ':':
/* In strict mode primitive must be followed by "," or "}" or "]" */
case ':':
#endif
case '\t' : case '\r' : case '\n' : case ' ' :
case ',' : case ']' : case '}' :
goto found;
}
if (js[parser->pos] < 32 || js[parser->pos] >= 127) {
parser->pos = start;
return JSMN_ERROR_INVAL;
}
}
case '\t' : case '\r' : case '\n' : case ' ' :
case ',' : case ']' : case '}' :
goto found;
}
if (js[parser->pos] < 32 || js[parser->pos] >= 127) {
parser->pos = start;
return JSMN_ERROR_INVAL;
}
}
#ifdef JSMN_STRICT
/* In strict mode primitive must be followed by a comma/object/array */
parser->pos = start;
return JSMN_ERROR_PART;
/* In strict mode primitive must be followed by a comma/object/array */
parser->pos = start;
return JSMN_ERROR_PART;
#endif
found:
if (tokens == NULL) {
parser->pos--;
return 0;
}
token = jsmn_alloc_token(parser, tokens, num_tokens);
if (token == NULL) {
parser->pos = start;
return JSMN_ERROR_NOMEM;
}
jsmn_fill_token(token, JSMN_PRIMITIVE, start, parser->pos);
if (tokens == NULL) {
parser->pos--;
return 0;
}
token = jsmn_alloc_token(parser, tokens, num_tokens);
if (token == NULL) {
parser->pos = start;
return JSMN_ERROR_NOMEM;
}
jsmn_fill_token(token, JSMN_PRIMITIVE, start, parser->pos);
#ifdef JSMN_PARENT_LINKS
token->parent = parser->toksuper;
token->parent = parser->toksuper;
#endif
parser->pos--;
return 0;
parser->pos--;
return 0;
}
/**
* Filsl next token with JSON string.
*/
static int jsmn_parse_string(jsmn_parser *parser, const char *js,
size_t len, jsmntok_t *tokens, size_t num_tokens) {
jsmntok_t *token;
size_t len, jsmntok_t *tokens, size_t num_tokens) {
jsmntok_t *token;
int start = parser->pos;
int start = parser->pos;
parser->pos++;
parser->pos++;
/* Skip starting quote */
for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
char c = js[parser->pos];
/* Skip starting quote */
for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
char c = js[parser->pos];
/* Quote: end of string */
if (c == '\"') {
if (tokens == NULL) {
return 0;
}
token = jsmn_alloc_token(parser, tokens, num_tokens);
if (token == NULL) {
parser->pos = start;
return JSMN_ERROR_NOMEM;
}
jsmn_fill_token(token, JSMN_STRING, start+1, parser->pos);
/* Quote: end of string */
if (c == '\"') {
if (tokens == NULL) {
return 0;
}
token = jsmn_alloc_token(parser, tokens, num_tokens);
if (token == NULL) {
parser->pos = start;
return JSMN_ERROR_NOMEM;
}
jsmn_fill_token(token, JSMN_STRING, start+1, parser->pos);
#ifdef JSMN_PARENT_LINKS
token->parent = parser->toksuper;
token->parent = parser->toksuper;
#endif
return 0;
}
return 0;
}
/* Backslash: Quoted symbol expected */
if (c == '\\' && parser->pos + 1 < len) {
int i;
parser->pos++;
switch (js[parser->pos]) {
/* Allowed escaped symbols */
case '\"': case '/' : case '\\' : case 'b' :
case 'f' : case 'r' : case 'n' : case 't' :
break;
/* Allows escaped symbol \uXXXX */
case 'u':
parser->pos++;
for(i = 0; i < 4 && parser->pos < len && js[parser->pos] != '\0'; i++) {
/* If it isn't a hex character we have an error */
if(!((js[parser->pos] >= 48 && js[parser->pos] <= 57) || /* 0-9 */
(js[parser->pos] >= 65 && js[parser->pos] <= 70) || /* A-F */
(js[parser->pos] >= 97 && js[parser->pos] <= 102))) { /* a-f */
parser->pos = start;
return JSMN_ERROR_INVAL;
}
parser->pos++;
}
parser->pos--;
break;
/* Unexpected symbol */
default:
parser->pos = start;
return JSMN_ERROR_INVAL;
}
}
}
parser->pos = start;
return JSMN_ERROR_PART;
/* Backslash: Quoted symbol expected */
if (c == '\\' && parser->pos + 1 < len) {
int i;
parser->pos++;
switch (js[parser->pos]) {
/* Allowed escaped symbols */
case '\"': case '/' : case '\\' : case 'b' :
case 'f' : case 'r' : case 'n' : case 't' :
break;
/* Allows escaped symbol \uXXXX */
case 'u':
parser->pos++;
for(i = 0; i < 4 && parser->pos < len && js[parser->pos] != '\0'; i++) {
/* If it isn't a hex character we have an error */
if(!((js[parser->pos] >= 48 && js[parser->pos] <= 57) || /* 0-9 */
(js[parser->pos] >= 65 && js[parser->pos] <= 70) || /* A-F */
(js[parser->pos] >= 97 && js[parser->pos] <= 102))) { /* a-f */
parser->pos = start;
return JSMN_ERROR_INVAL;
}
parser->pos++;
}
parser->pos--;
break;
/* Unexpected symbol */
default:
parser->pos = start;
return JSMN_ERROR_INVAL;
}
}
}
parser->pos = start;
return JSMN_ERROR_PART;
}
/**
* Parse JSON string and fill tokens.
*/
int jsmn_parse(jsmn_parser *parser, const char *js, size_t len,
jsmntok_t *tokens, unsigned int num_tokens) {
int r;
int i;
jsmntok_t *token;
int count = 0;
jsmntok_t *tokens, unsigned int num_tokens) {
int r;
int i;
jsmntok_t *token;
int count = 0;
for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
char c;
jsmntype_t type;
for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
char c;
jsmntype_t type;
c = js[parser->pos];
switch (c) {
case '{': case '[':
count++;
if (tokens == NULL) {
break;
}
token = jsmn_alloc_token(parser, tokens, num_tokens);
if (token == NULL)
return JSMN_ERROR_NOMEM;
if (parser->toksuper != -1) {
tokens[parser->toksuper].size++;
c = js[parser->pos];
switch (c) {
case '{': case '[':
count++;
if (tokens == NULL) {
break;
}
token = jsmn_alloc_token(parser, tokens, num_tokens);
if (token == NULL)
return JSMN_ERROR_NOMEM;
if (parser->toksuper != -1) {
tokens[parser->toksuper].size++;
#ifdef JSMN_PARENT_LINKS
token->parent = parser->toksuper;
token->parent = parser->toksuper;
#endif
}
token->type = (c == '{' ? JSMN_OBJECT : JSMN_ARRAY);
token->start = parser->pos;
parser->toksuper = parser->toknext - 1;
break;
case '}': case ']':
if (tokens == NULL)
break;
type = (c == '}' ? JSMN_OBJECT : JSMN_ARRAY);
}
token->type = (c == '{' ? JSMN_OBJECT : JSMN_ARRAY);
token->start = parser->pos;
parser->toksuper = parser->toknext - 1;
break;
case '}': case ']':
if (tokens == NULL)
break;
type = (c == '}' ? JSMN_OBJECT : JSMN_ARRAY);
#ifdef JSMN_PARENT_LINKS
if (parser->toknext < 1) {
return JSMN_ERROR_INVAL;
}
token = &tokens[parser->toknext - 1];
for (;;) {
if (token->start != -1 && token->end == -1) {
if (token->type != type) {
return JSMN_ERROR_INVAL;
}
token->end = parser->pos + 1;
parser->toksuper = token->parent;
break;
}
if (token->parent == -1) {
break;
}
token = &tokens[token->parent];
}
if (parser->toknext < 1) {
return JSMN_ERROR_INVAL;
}
token = &tokens[parser->toknext - 1];
for (;;) {
if (token->start != -1 && token->end == -1) {
if (token->type != type) {
return JSMN_ERROR_INVAL;
}
token->end = parser->pos + 1;
parser->toksuper = token->parent;
break;
}
if (token->parent == -1) {
break;
}
token = &tokens[token->parent];
}
#else
for (i = parser->toknext - 1; i >= 0; i--) {
token = &tokens[i];
if (token->start != -1 && token->end == -1) {
if (token->type != type) {
return JSMN_ERROR_INVAL;
}
parser->toksuper = -1;
token->end = parser->pos + 1;
break;
}
}
/* Error if unmatched closing bracket */
if (i == -1) return JSMN_ERROR_INVAL;
for (; i >= 0; i--) {
token = &tokens[i];
if (token->start != -1 && token->end == -1) {
parser->toksuper = i;
break;
}
}
for (i = parser->toknext - 1; i >= 0; i--) {
token = &tokens[i];
if (token->start != -1 && token->end == -1) {
if (token->type != type) {
return JSMN_ERROR_INVAL;
}
parser->toksuper = -1;
token->end = parser->pos + 1;
break;
}
}
/* Error if unmatched closing bracket */
if (i == -1) return JSMN_ERROR_INVAL;
for (; i >= 0; i--) {
token = &tokens[i];
if (token->start != -1 && token->end == -1) {
parser->toksuper = i;
break;
}
}
#endif
break;
case '\"':
r = jsmn_parse_string(parser, js, len, tokens, num_tokens);
if (r < 0) return r;
count++;
if (parser->toksuper != -1 && tokens != NULL)
tokens[parser->toksuper].size++;
break;
case '\t' : case '\r' : case '\n' : case ' ':
break;
case ':':
parser->toksuper = parser->toknext - 1;
break;
case ',':
if (tokens != NULL && parser->toksuper != -1 &&
tokens[parser->toksuper].type != JSMN_ARRAY &&
tokens[parser->toksuper].type != JSMN_OBJECT) {
break;
case '\"':
r = jsmn_parse_string(parser, js, len, tokens, num_tokens);
if (r < 0) return r;
count++;
if (parser->toksuper != -1 && tokens != NULL)
tokens[parser->toksuper].size++;
break;
case '\t' : case '\r' : case '\n' : case ' ':
break;
case ':':
parser->toksuper = parser->toknext - 1;
break;
case ',':
if (tokens != NULL && parser->toksuper != -1 &&
tokens[parser->toksuper].type != JSMN_ARRAY &&
tokens[parser->toksuper].type != JSMN_OBJECT) {
#ifdef JSMN_PARENT_LINKS
parser->toksuper = tokens[parser->toksuper].parent;
parser->toksuper = tokens[parser->toksuper].parent;
#else
for (i = parser->toknext - 1; i >= 0; i--) {
if (tokens[i].type == JSMN_ARRAY || tokens[i].type == JSMN_OBJECT) {
if (tokens[i].start != -1 && tokens[i].end == -1) {
parser->toksuper = i;
break;
}
}
}
for (i = parser->toknext - 1; i >= 0; i--) {
if (tokens[i].type == JSMN_ARRAY || tokens[i].type == JSMN_OBJECT) {
if (tokens[i].start != -1 && tokens[i].end == -1) {
parser->toksuper = i;
break;
}
}
}
#endif
}
break;
}
break;
#ifdef JSMN_STRICT
/* In strict mode primitives are: numbers and booleans */
case '-': case '0': case '1' : case '2': case '3' : case '4':
case '5': case '6': case '7' : case '8': case '9':
case 't': case 'f': case 'n' :
/* And they must not be keys of the object */
if (tokens != NULL && parser->toksuper != -1) {
jsmntok_t *t = &tokens[parser->toksuper];
if (t->type == JSMN_OBJECT ||
(t->type == JSMN_STRING && t->size != 0)) {
return JSMN_ERROR_INVAL;
}
}
/* In strict mode primitives are: numbers and booleans */
case '-': case '0': case '1' : case '2': case '3' : case '4':
case '5': case '6': case '7' : case '8': case '9':
case 't': case 'f': case 'n' :
/* And they must not be keys of the object */
if (tokens != NULL && parser->toksuper != -1) {
jsmntok_t *t = &tokens[parser->toksuper];
if (t->type == JSMN_OBJECT ||
(t->type == JSMN_STRING && t->size != 0)) {
return JSMN_ERROR_INVAL;
}
}
#else
/* In non-strict mode every unquoted value is a primitive */
default:
/* In non-strict mode every unquoted value is a primitive */
default:
#endif
r = jsmn_parse_primitive(parser, js, len, tokens, num_tokens);
if (r < 0) return r;
count++;
if (parser->toksuper != -1 && tokens != NULL)
tokens[parser->toksuper].size++;
break;
r = jsmn_parse_primitive(parser, js, len, tokens, num_tokens);
if (r < 0) return r;
count++;
if (parser->toksuper != -1 && tokens != NULL)
tokens[parser->toksuper].size++;
break;
#ifdef JSMN_STRICT
/* Unexpected char in strict mode */
default:
return JSMN_ERROR_INVAL;
/* Unexpected char in strict mode */
default:
return JSMN_ERROR_INVAL;
#endif
}
}
}
}
for (i = parser->toknext - 1; i >= 0; i--) {
/* Unmatched opened object or array */
if (tokens[i].start != -1 && tokens[i].end == -1) {
return JSMN_ERROR_PART;
}
}
for (i = parser->toknext - 1; i >= 0; i--) {
/* Unmatched opened object or array */
if (tokens[i].start != -1 && tokens[i].end == -1) {
return JSMN_ERROR_PART;
}
}
return count;
return count;
}
/**
@ -326,9 +326,9 @@ int jsmn_parse(jsmn_parser *parser, const char *js, size_t len,
* available.
*/
void jsmn_init(jsmn_parser *parser) {
parser->pos = 0;
parser->toknext = 0;
parser->toksuper = -1;
parser->pos = 0;
parser->toknext = 0;
parser->toksuper = -1;
}
/*
@ -336,10 +336,10 @@ void jsmn_init(jsmn_parser *parser) {
*
* Local variables:
* c-basic-offset: 4
* tab-width: 4
* tab-width: 8
* indent-tabs-mode: nil
* End:
*
* vi: set shiftwidth=4 tabstop=4 expandtab:
* :indentSize=4:tabSize=4:noTabs=true:
* vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true:
*/

52
epan/jsmn/jsmn.h
View File

@ -31,25 +31,25 @@ extern "C" {
/**
* JSON type identifier. Basic types are:
* o Object
* o Array
* o String
* o Other primitive: number, boolean (true/false) or null
* o Object
* o Array
* o String
* o Other primitive: number, boolean (true/false) or null
*/
typedef enum {
JSMN_PRIMITIVE = 0,
JSMN_OBJECT = 1,
JSMN_ARRAY = 2,
JSMN_STRING = 3
JSMN_PRIMITIVE = 0,
JSMN_OBJECT = 1,
JSMN_ARRAY = 2,
JSMN_STRING = 3
} jsmntype_t;
typedef enum {
/* Not enough tokens were provided */
JSMN_ERROR_NOMEM = -1,
/* Invalid character inside JSON string */
JSMN_ERROR_INVAL = -2,
/* The string is not a full JSON packet, more bytes expected */
JSMN_ERROR_PART = -3
/* Not enough tokens were provided */
JSMN_ERROR_NOMEM = -1,
/* Invalid character inside JSON string */
JSMN_ERROR_INVAL = -2,
/* The string is not a full JSON packet, more bytes expected */
JSMN_ERROR_PART = -3
} jsmnerr_t;
/**
@ -60,12 +60,12 @@ typedef enum {
* size the size of the token
*/
typedef struct {
jsmntype_t type;
int start;
int end;
int size;
jsmntype_t type;
int start;
int end;
int size;
#ifdef JSMN_PARENT_LINKS
int parent;
int parent;
#endif
} jsmntok_t;
@ -74,9 +74,9 @@ typedef struct {
* the string being parsed now and current position in that string
*/
typedef struct {
unsigned int pos; /* offset in the JSON string */
unsigned int toknext; /* next token to allocate */
int toksuper; /* superior token node, e.g parent object or array */
unsigned int pos; /* offset in the JSON string */
unsigned int toknext; /* next token to allocate */
int toksuper; /* superior token node, e.g parent object or array */
} jsmn_parser;
/**
@ -89,7 +89,7 @@ void jsmn_init(jsmn_parser *parser);
* a single JSON object.
*/
int jsmn_parse(jsmn_parser *parser, const char *js, size_t len,
jsmntok_t *tokens, unsigned int num_tokens);
jsmntok_t *tokens, unsigned int num_tokens);
#ifdef __cplusplus
}
@ -102,10 +102,10 @@ int jsmn_parse(jsmn_parser *parser, const char *js, size_t len,
*
* Local variables:
* c-basic-offset: 4
* tab-width: 4
* tab-width: 8
* indent-tabs-mode: nil
* End:
*
* vi: set shiftwidth=4 tabstop=4 expandtab:
* :indentSize=4:tabSize=4:noTabs=true:
* vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=9:noTabs=true:
*/

120
epan/rtp_pt.h
View File

@ -35,71 +35,71 @@ extern "C" {
* Table B.2 / H.225.0
* Also RFC 3551, and
*
* http://www.iana.org/assignments/rtp-parameters
* http://www.iana.org/assignments/rtp-parameters
*/
#define PT_PCMU 0 /* RFC 3551 */
#define PT_1016 1 /* RFC 1890 (reserved in RFC 3551) */
#define PT_G721 2 /* RFC 1890 (reserved in RFC 3551) */
#define PT_GSM 3 /* RFC 3551 */
#define PT_G723 4 /* From Vineet Kumar of Intel; see the Web page */
#define PT_DVI4_8000 5 /* RFC 3551 */
#define PT_DVI4_16000 6 /* RFC 3551 */
#define PT_LPC 7 /* RFC 3551 */
#define PT_PCMA 8 /* RFC 3551 */
#define PT_G722 9 /* RFC 3551 */
#define PT_L16_STEREO 10 /* RFC 3551 */
#define PT_L16_MONO 11 /* RFC 3551 */
#define PT_QCELP 12 /* Qualcomm Code Excited Linear Predictive coding? */
#define PT_CN 13 /* RFC 3389 */
#define PT_MPA 14 /* RFC 3551, RFC 2250 */
#define PT_G728 15 /* RFC 3551 */
#define PT_DVI4_11025 16 /* from Joseph Di Pol of Sun; see the Web page */
#define PT_DVI4_22050 17 /* from Joseph Di Pol of Sun; see the Web page */
#define PT_G729 18
#define PT_CN_OLD 19 /* Payload type reserved (old version Comfort Noise) */
#define PT_CELB 25 /* RFC 2029 */
#define PT_JPEG 26 /* RFC 2435 */
#define PT_NV 28 /* RFC 1890 */
#define PT_H261 31 /* RFC 2032 */
#define PT_MPV 32 /* RFC 2250 */
#define PT_MP2T 33 /* RFC 2250 */
#define PT_H263 34 /* from Chunrong Zhu of Intel; see the Web page */
#define PT_PCMU 0 /* RFC 3551 */
#define PT_1016 1 /* RFC 1890 (reserved in RFC 3551) */
#define PT_G721 2 /* RFC 1890 (reserved in RFC 3551) */
#define PT_GSM 3 /* RFC 3551 */
#define PT_G723 4 /* From Vineet Kumar of Intel; see the Web page */
#define PT_DVI4_8000 5 /* RFC 3551 */
#define PT_DVI4_16000 6 /* RFC 3551 */
#define PT_LPC 7 /* RFC 3551 */
#define PT_PCMA 8 /* RFC 3551 */
#define PT_G722 9 /* RFC 3551 */
#define PT_L16_STEREO 10 /* RFC 3551 */
#define PT_L16_MONO 11 /* RFC 3551 */
#define PT_QCELP 12 /* Qualcomm Code Excited Linear Predictive coding? */
#define PT_CN 13 /* RFC 3389 */
#define PT_MPA 14 /* RFC 3551, RFC 2250 */
#define PT_G728 15 /* RFC 3551 */
#define PT_DVI4_11025 16 /* from Joseph Di Pol of Sun; see the Web page */
#define PT_DVI4_22050 17 /* from Joseph Di Pol of Sun; see the Web page */
#define PT_G729 18
#define PT_CN_OLD 19 /* Payload type reserved (old version Comfort Noise) */
#define PT_CELB 25 /* RFC 2029 */
#define PT_JPEG 26 /* RFC 2435 */
#define PT_NV 28 /* RFC 1890 */
#define PT_H261 31 /* RFC 2032 */
#define PT_MPV 32 /* RFC 2250 */
#define PT_MP2T 33 /* RFC 2250 */
#define PT_H263 34 /* from Chunrong Zhu of Intel; see the Web page */
/* Added to by Alex Lindberg to cover port ranges 96-127 - Dynamic RTP
Some of these ports are used by Avaya for Modem and FAX support */
#define PT_UNDF_96 96 /* RFC 3551 */
#define PT_UNDF_97 97
#define PT_UNDF_98 98
#define PT_UNDF_99 99
#define PT_UNDF_100 100
#define PT_UNDF_101 101
#define PT_UNDF_102 102
#define PT_UNDF_103 103
#define PT_UNDF_104 104
#define PT_UNDF_105 105
#define PT_UNDF_106 106
#define PT_UNDF_107 107
#define PT_UNDF_108 108
#define PT_UNDF_109 109
#define PT_UNDF_110 110
#define PT_UNDF_111 111
#define PT_UNDF_112 112
#define PT_UNDF_113 113
#define PT_UNDF_114 114
#define PT_UNDF_115 115
#define PT_UNDF_116 116
#define PT_UNDF_117 117
#define PT_UNDF_118 118
#define PT_UNDF_119 119
#define PT_UNDF_120 120
#define PT_UNDF_121 121
#define PT_UNDF_122 122
#define PT_UNDF_123 123
#define PT_UNDF_124 124
#define PT_UNDF_125 125
#define PT_UNDF_126 126
#define PT_UNDF_127 127
#define PT_UNDF_96 96 /* RFC 3551 */
#define PT_UNDF_97 97
#define PT_UNDF_98 98
#define PT_UNDF_99 99
#define PT_UNDF_100 100
#define PT_UNDF_101 101
#define PT_UNDF_102 102
#define PT_UNDF_103 103
#define PT_UNDF_104 104
#define PT_UNDF_105 105
#define PT_UNDF_106 106
#define PT_UNDF_107 107
#define PT_UNDF_108 108
#define PT_UNDF_109 109
#define PT_UNDF_110 110
#define PT_UNDF_111 111
#define PT_UNDF_112 112
#define PT_UNDF_113 113
#define PT_UNDF_114 114
#define PT_UNDF_115 115
#define PT_UNDF_116 116
#define PT_UNDF_117 117
#define PT_UNDF_118 118
#define PT_UNDF_119 119
#define PT_UNDF_120 120
#define PT_UNDF_121 121
#define PT_UNDF_122 122
#define PT_UNDF_123 123
#define PT_UNDF_124 124
#define PT_UNDF_125 125
#define PT_UNDF_126 126
#define PT_UNDF_127 127
WS_DLL_PUBLIC value_string_ext rtp_payload_type_vals_ext;
WS_DLL_PUBLIC value_string_ext rtp_payload_type_short_vals_ext;

34
epan/stat_tap_ui.h
View File

@ -37,32 +37,32 @@ extern "C" {
#include <epan/stat_groups.h>
typedef enum {
PARAM_UINT,
PARAM_STRING,
PARAM_ENUM,
PARAM_UUID,
PARAM_FILTER
PARAM_UINT,
PARAM_STRING,
PARAM_ENUM,
PARAM_UUID,
PARAM_FILTER
} param_type;
typedef struct _tap_param {
param_type type; /* type of parameter */
const char *name; /* name to use in error messages */
const char *title; /* title to use in GUI widgets */
const enum_val_t *enum_vals; /* values for PARAM_ENUM */
gboolean optional; /* TRUE if the parameter is optional */
param_type type; /* type of parameter */
const char *name; /* name to use in error messages */
const char *title; /* title to use in GUI widgets */
const enum_val_t *enum_vals; /* values for PARAM_ENUM */
gboolean optional; /* TRUE if the parameter is optional */
} tap_param;
/*
* UI information for a tap.
*/
typedef struct _stat_tap_ui {
register_stat_group_t group; /* group to which statistic belongs */
const char *title; /* title of statistic */
const char *cli_string; /* initial part of the "-z" argument for statistic */
void (* tap_init_cb)(const char *,void*); /* callback to init function of the tap */
gint index; /* initiate this value always with "-1" */
size_t nparams; /* number of parameters */
tap_param *params; /* pointer to table of parameter info */
register_stat_group_t group; /* group to which statistic belongs */
const char *title; /* title of statistic */
const char *cli_string; /* initial part of the "-z" argument for statistic */
void (* tap_init_cb)(const char *, void*); /* callback to init function of the tap */
gint index; /* initiate this value always with "-1" */
size_t nparams; /* number of parameters */
tap_param *params; /* pointer to table of parameter info */
} stat_tap_ui;
/** Register UI information for a tap.

2
epan/wslua/wslua_util.c
View File

@ -271,7 +271,7 @@ WSLUA_FUNCTION wslua_register_stat_cmd_arg(lua_State* L) {
sc->func_ref = luaL_ref(L, LUA_REGISTRYINDEX);
lua_remove(L,1);
ui_info.group = REGISTER_STAT_GROUP_UNSORTED; /* XXX - need group for CLI-only? */
ui_info.group = REGISTER_STAT_GROUP_UNSORTED; /* XXX - need group for CLI-only? */
ui_info.title = NULL;
ui_info.cli_string = arg;
ui_info.tap_init_cb = statcmd_init;

4
log.h
View File

@ -27,10 +27,10 @@
#define LOG_DOMAIN_CAPTURE "Capture"
/* capture child domain (the capture child might also contain file domain messages!) */
#define LOG_DOMAIN_CAPTURE_CHILD "CaptureChild"
#define LOG_DOMAIN_CAPTURE_CHILD "CaptureChild"
/* main domain */
#define LOG_DOMAIN_MAIN "Main"
#define LOG_DOMAIN_MAIN "Main"
/* enable very verbose capture log debug output */
/* (might slightly degrade performance) */

2
sync_pipe.h
View File

@ -38,7 +38,7 @@
* Expression, as the error message for an incorrect filter expression
* is a bit larger than the filter expression.
*/
#define SP_MAX_MSG_LEN 4096
#define SP_MAX_MSG_LEN 4096
/* Size of buffer to hold decimal representation of

142
ui/filters.c
View File

@ -40,17 +40,17 @@
/*
* Old filter file name.
*/
#define FILTER_FILE_NAME "filters"
#define FILTER_FILE_NAME "filters"
/*
* Capture filter file name.
*/
#define CFILTER_FILE_NAME "cfilters"
#define CFILTER_FILE_NAME "cfilters"
/*
* Display filter file name.
*/
#define DFILTER_FILE_NAME "dfilters"
#define DFILTER_FILE_NAME "dfilters"
/*
* List of capture filters - saved.
@ -81,7 +81,7 @@ static GList *display_edited_filters = NULL;
* and "*errno_return" is set to the error.
*/
#define INIT_BUF_SIZE 128
#define INIT_BUF_SIZE 128
static GList *
add_filter_entry(GList *fl, const char *filt_name, const char *filt_expr)
@ -150,7 +150,7 @@ read_filter_list(filter_list_type_t list_type, char **pref_path_return,
int filt_name_index, filt_expr_index;
int line = 1;
*pref_path_return = NULL; /* assume no error */
*pref_path_return = NULL; /* assume no error */
switch (list_type) {
@ -198,14 +198,14 @@ read_filter_list(filter_list_type_t list_type, char **pref_path_return,
/*
* Did that fail because the file didn't exist?
*/
if (errno != ENOENT) {
/*
* No. Just give up.
*/
*pref_path_return = ff_path;
*errno_return = errno;
return;
}
if (errno != ENOENT) {
/*
* No. Just give up.
*/
*pref_path_return = ff_path;
*errno_return = errno;
return;
}
/*
* Try to open the global "cfilters/dfilters" file */
@ -213,17 +213,17 @@ read_filter_list(filter_list_type_t list_type, char **pref_path_return,
ff_path = get_datafile_path(ff_name);
if ((ff = ws_fopen(ff_path, "r")) == NULL) {
/*
* Well, that didn't work, either. Just give up.
* Return an error if the file existed but we couldn't open it.
*/
if (errno != ENOENT) {
*pref_path_return = ff_path;
*errno_return = errno;
} else {
g_free(ff_path);
}
return;
/*
* Well, that didn't work, either. Just give up.
* Return an error if the file existed but we couldn't open it.
*/
if (errno != ENOENT) {
*pref_path_return = ff_path;
*errno_return = errno;
} else {
g_free(ff_path);
}
return;
}
}
}
@ -243,7 +243,7 @@ read_filter_list(filter_list_type_t list_type, char **pref_path_return,
for (line = 1; ; line++) {
/* Lines in a filter file are of the form
"name" expression
"name" expression
where "name" is a name, in quotes - backslashes in the name
escape the next character, so quotes and backslashes can appear
@ -254,7 +254,7 @@ read_filter_list(filter_list_type_t list_type, char **pref_path_return,
c = skip_whitespace(ff);
if (c == EOF)
break; /* Nothing more to read */
break; /* Nothing more to read */
if (c == '\n')
continue; /* Blank line. */
@ -262,9 +262,9 @@ read_filter_list(filter_list_type_t list_type, char **pref_path_return,
If it's not a quote, it's an error. */
if (c != '"') {
g_warning("'%s' line %d doesn't have a quoted filter name.", ff_path,
line);
line);
while (c != '\n')
c = getc(ff); /* skip to the end of the line */
c = getc(ff); /* skip to the end of the line */
continue;
}
@ -273,28 +273,28 @@ read_filter_list(filter_list_type_t list_type, char **pref_path_return,
for (;;) {
c = getc_crlf(ff);
if (c == EOF || c == '\n')
break; /* End of line - or end of file */
break; /* End of line - or end of file */
if (c == '"') {
/* Closing quote. */
if (filt_name_index >= filt_name_len) {
/* Filter name buffer isn't long enough; double its length. */
filt_name_len *= 2;
filt_name = (char *)g_realloc(filt_name, filt_name_len + 1);
}
filt_name[filt_name_index] = '\0';
break;
/* Closing quote. */
if (filt_name_index >= filt_name_len) {
/* Filter name buffer isn't long enough; double its length. */
filt_name_len *= 2;
filt_name = (char *)g_realloc(filt_name, filt_name_len + 1);
}
filt_name[filt_name_index] = '\0';
break;
}
if (c == '\\') {
/* Next character is escaped */
c = getc_crlf(ff);
if (c == EOF || c == '\n')
break; /* End of line - or end of file */
/* Next character is escaped */
c = getc_crlf(ff);
if (c == EOF || c == '\n')
break; /* End of line - or end of file */
}
/* Add this character to the filter name string. */
if (filt_name_index >= filt_name_len) {
/* Filter name buffer isn't long enough; double its length. */
filt_name_len *= 2;
filt_name = (char *)g_realloc(filt_name, filt_name_len + 1);
/* Filter name buffer isn't long enough; double its length. */
filt_name_len *= 2;
filt_name = (char *)g_realloc(filt_name, filt_name_len + 1);
}
filt_name[filt_name_index] = c;
filt_name_index++;
@ -302,17 +302,17 @@ read_filter_list(filter_list_type_t list_type, char **pref_path_return,
if (c == EOF) {
if (!ferror(ff)) {
/* EOF, not error; no newline seen before EOF */
g_warning("'%s' line %d doesn't have a newline.", ff_path,
line);
/* EOF, not error; no newline seen before EOF */
g_warning("'%s' line %d doesn't have a newline.", ff_path,
line);
}
break; /* nothing more to read */
break; /* nothing more to read */
}
if (c != '"') {
/* No newline seen before end-of-line */
g_warning("'%s' line %d doesn't have a closing quote.", ff_path,
line);
line);
continue;
}
@ -321,17 +321,17 @@ read_filter_list(filter_list_type_t list_type, char **pref_path_return,
if (c == EOF) {
if (!ferror(ff)) {
/* EOF, not error; no newline seen before EOF */
g_warning("'%s' line %d doesn't have a newline.", ff_path,
line);
/* EOF, not error; no newline seen before EOF */
g_warning("'%s' line %d doesn't have a newline.", ff_path,
line);
}
break; /* nothing more to read */
break; /* nothing more to read */
}
if (c == '\n') {
/* No filter expression */
g_warning("'%s' line %d doesn't have a filter expression.", ff_path,
line);
line);
continue;
}
@ -341,9 +341,9 @@ read_filter_list(filter_list_type_t list_type, char **pref_path_return,
for (;;) {
/* Add this character to the filter expression string. */
if (filt_expr_index >= filt_expr_len) {
/* Filter expressioin buffer isn't long enough; double its length. */
filt_expr_len *= 2;
filt_expr = (char *)g_realloc(filt_expr, filt_expr_len + 1);
/* Filter expressioin buffer isn't long enough; double its length. */
filt_expr_len *= 2;
filt_expr = (char *)g_realloc(filt_expr, filt_expr_len + 1);
}
filt_expr[filt_expr_index] = c;
filt_expr_index++;
@ -351,16 +351,16 @@ read_filter_list(filter_list_type_t list_type, char **pref_path_return,
/* Get the next character. */
c = getc_crlf(ff);
if (c == EOF || c == '\n')
break;
break;
}
if (c == EOF) {
if (!ferror(ff)) {
/* EOF, not error; no newline seen before EOF */
g_warning("'%s' line %d doesn't have a newline.", ff_path,
line);
/* EOF, not error; no newline seen before EOF */
g_warning("'%s' line %d doesn't have a newline.", ff_path,
line);
}
break; /* nothing more to read */
break; /* nothing more to read */
}
/* We saw the ending newline; terminate the filter expression string */
@ -452,7 +452,7 @@ add_to_filter_list(filter_list_type_t list_type, const char *name,
{
GList **flpp;
flpp = get_filter_list(list_type);
flpp = get_filter_list(list_type);
*flpp = add_filter_entry(*flpp, name, expression);
return g_list_last(*flpp);
@ -466,7 +466,7 @@ remove_from_filter_list(filter_list_type_t list_type, GList *fl_entry)
{
GList **flpp;
flpp = get_filter_list(list_type);
flpp = get_filter_list(list_type);
*flpp = remove_filter_entry(*flpp, fl_entry);
}
@ -483,14 +483,14 @@ save_filter_list(filter_list_type_t list_type, char **pref_path_return,
int *errno_return)
{
const gchar *ff_name;
gchar *ff_path, *ff_path_new;
GList *fl;
GList *flpp;
filter_def *filt;
FILE *ff;
guchar *p, c;
gchar *ff_path, *ff_path_new;
GList *fl;
GList *flpp;
filter_def *filt;
FILE *ff;
guchar *p, c;
*pref_path_return = NULL; /* assume no error */
*pref_path_return = NULL; /* assume no error */
switch (list_type) {

2
ui/gtk/conversations_table.c
View File

@ -1594,7 +1594,7 @@ draw_ct_table_addresses(conversations_table *ct)
while (iter_valid) {
conv_item_t *conv_item;
char *src_addr, *dst_addr, *src_port, *dst_port;
char *src_addr, *dst_addr, *src_port, *dst_port;
gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, CONV_INDEX_COLUMN, &idx, -1);
conv_item = &g_array_index(ct->hash.conv_array, conv_item_t, idx);

4
ui/preference_utils.h
View File

@ -88,8 +88,8 @@ extern void prefs_main_write(void);
* @param custom_occurrence custom occurrence
*/
void column_prefs_add_custom(gint fmt, const gchar *title,
const gchar *custom_field,
gint custom_occurrence);
const gchar *custom_field,
gint custom_occurrence);
/** Remove a column.
*

468
ui/voip_calls.c
View File

@ -23,12 +23,12 @@
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
@ -140,8 +140,8 @@ typedef struct {
#define H245_MAX 6
typedef struct _h245_labels {
guint32 frame_num;
gint8 labels_count;
guint32 frame_num;
gint8 labels_count;
graph_str labels[H245_MAX];
} h245_labels_t;
@ -401,7 +401,7 @@ static guint change_call_num_graph(voip_calls_tapinfo_t *tapinfo _U_, guint16 ca
{
seq_analysis_item_t *gai;
GList *list;
guint items_changed;
guint items_changed;
items_changed = 0;
if(tapinfo->graph_analysis){
@ -424,10 +424,10 @@ static guint change_call_num_graph(voip_calls_tapinfo_t *tapinfo _U_, guint16 ca
static void insert_to_graph_t38(voip_calls_tapinfo_t *tapinfo, packet_info *pinfo, epan_dissect_t *edt, const gchar *frame_label, const gchar *comment, guint16 call_num, address *src_addr, address *dst_addr, guint16 line_style, guint32 frame_num)
{
seq_analysis_item_t *gai, *new_gai;
GList *list;
guint item_num;
gboolean inserted;
gchar time_str[COL_MAX_LEN];
GList *list;
guint item_num;
gboolean inserted;
gchar time_str[COL_MAX_LEN];
new_gai = (seq_analysis_item_t *)g_malloc(sizeof(seq_analysis_item_t));
new_gai->fd = packet_list_get_row_data(frame_num);
@ -486,8 +486,8 @@ static void insert_to_graph_t38(voip_calls_tapinfo_t *tapinfo, packet_info *pinf
static int
rtp_event_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *rtp_event_info)
{
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_rtp_event_);
const struct _rtp_event_info *pi = (const struct _rtp_event_info *)rtp_event_info;
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_rtp_event_);
const struct _rtp_event_info *pi = (const struct _rtp_event_info *)rtp_event_info;
/* do not consider RTP events packets without a setup frame */
if (pi->info_setup_frame_num == 0) {
@ -527,7 +527,7 @@ rtp_event_init_tap(voip_calls_tapinfo_t *tap_id_base)
void
remove_tap_listener_rtp_event(voip_calls_tapinfo_t *tap_id_base)
{
remove_tap_listener(tap_base_to_id(tap_id_base, tap_id_offset_rtp_event_));
remove_tap_listener(tap_base_to_id(tap_id_base, tap_id_offset_rtp_event_));
}
/****************************************************************************/
@ -566,9 +566,9 @@ static gboolean
rtp_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, void const *rtp_info_ptr)
{
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_rtp_);
rtp_stream_info_t *tmp_listinfo;
rtp_stream_info_t *strinfo = NULL;
GList *list;
rtp_stream_info_t *tmp_listinfo;
rtp_stream_info_t *strinfo = NULL;
GList *list;
struct _rtp_conversation_info *p_conv_data = NULL;
const struct _rtp_info *rtp_info = (const struct _rtp_info *)rtp_info_ptr;
@ -661,14 +661,14 @@ static void
rtp_draw(void *tap_offset_ptr)
{
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_rtp_);
GList *rtp_streams_list;
rtp_stream_info_t *rtp_listinfo;
GList *rtp_streams_list;
rtp_stream_info_t *rtp_listinfo;
/* GList *voip_calls_graph_list; */
seq_analysis_item_t *gai = NULL;
seq_analysis_item_t *new_gai;
guint16 conv_num;
guint32 duration;
gchar time_str[COL_MAX_LEN];
seq_analysis_item_t *gai = NULL;
seq_analysis_item_t *new_gai;
guint16 conv_num;
guint32 duration;
gchar time_str[COL_MAX_LEN];
/* add each rtp stream to the graph */
rtp_streams_list = g_list_first(tapinfo->rtp_stream_list);
@ -729,83 +729,83 @@ rtp_draw(void *tap_offset_ptr)
static void
rtp_packet_draw(void *tap_offset_ptr)
{
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_rtp_);
GList *rtp_streams_list;
rtp_stream_info_t *rtp_listinfo;
GList *voip_calls_graph_list;
guint item;
seq_analysis_item_t *gai;
seq_analysis_item_t *new_gai;
guint16 conv_num;
guint32 duration;
gchar time_str[COL_MAX_LEN];
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_rtp_);
GList *rtp_streams_list;
rtp_stream_info_t *rtp_listinfo;
GList *voip_calls_graph_list;
guint item;
seq_analysis_item_t *gai;
seq_analysis_item_t *new_gai;
guint16 conv_num;
guint32 duration;
gchar time_str[COL_MAX_LEN];
/* add each rtp stream to the graph */
/* add each rtp stream to the graph */
rtp_streams_list = g_list_first(tapinfo->stream_list);
while (rtp_streams_list)
{
rtp_listinfo = rtp_streams_list->data;
while (rtp_streams_list)
{
rtp_listinfo = rtp_streams_list->data;
/* using the setup frame number of the RTP stream, we get the call number that it belongs to*/
voip_calls_graph_list = g_list_first(tapinfo->graph_analysis->list);
while (voip_calls_graph_list)
{
gai = voip_calls_graph_list->data;
conv_num = gai->conv_num;
/* if we get the setup frame number, then get the time position to graph the RTP arrow */
if (rtp_listinfo->setup_frame_number == gai->fd->num) {
/* look again from the beginning because there are cases where the Setup frame is after the RTP */
voip_calls_graph_list = g_list_first(tapinfo->graph_analysis->list);
item = 0;
while(voip_calls_graph_list) {
gai = voip_calls_graph_list->data;
/* if RTP was already in the Graph, just update the comment information */
if (rtp_listinfo->start_fd->num == gai->fd->num) {
duration = (guint32)(nstime_to_msec(&rtp_listinfo->stop_fd->rel_ts) - nstime_to_msec(&rtp_listinfo->start_fd->rel_ts));
g_free(gai->comment);
gai->comment = g_strdup_printf("%s Num packets:%u Duration:%u.%03us SSRC:0x%X",
(rtp_listinfo->is_srtp)?"SRTP":"RTP", rtp_listinfo->npackets,
duration/1000,(duration%1000), rtp_listinfo->ssrc);
break;
}
/* using the setup frame number of the RTP stream, we get the call number that it belongs to*/
voip_calls_graph_list = g_list_first(tapinfo->graph_analysis->list);
while (voip_calls_graph_list)
{
gai = voip_calls_graph_list->data;
conv_num = gai->conv_num;
/* if we get the setup frame number, then get the time position to graph the RTP arrow */
if (rtp_listinfo->setup_frame_number == gai->fd->num) {
/* look again from the beginning because there are cases where the Setup frame is after the RTP */
voip_calls_graph_list = g_list_first(tapinfo->graph_analysis->list);
item = 0;
while(voip_calls_graph_list) {
gai = voip_calls_graph_list->data;
/* if RTP was already in the Graph, just update the comment information */
if (rtp_listinfo->start_fd->num == gai->fd->num) {
duration = (guint32)(nstime_to_msec(&rtp_listinfo->stop_fd->rel_ts) - nstime_to_msec(&rtp_listinfo->start_fd->rel_ts));
g_free(gai->comment);
gai->comment = g_strdup_printf("%s Num packets:%u Duration:%u.%03us SSRC:0x%X",
(rtp_listinfo->is_srtp)?"SRTP":"RTP", rtp_listinfo->npackets,
duration/1000,(duration%1000), rtp_listinfo->ssrc);
break;
}
/* we increment the list here to be able to check if it is the last item in this calls, which means the RTP is after so we have to draw it */
voip_calls_graph_list = g_list_next(voip_calls_graph_list);
if (!voip_calls_graph_list) item++;
/* we increment the list here to be able to check if it is the last item in this calls, which means the RTP is after so we have to draw it */
voip_calls_graph_list = g_list_next(voip_calls_graph_list);
if (!voip_calls_graph_list) item++;
/* add the RTP item to the graph if was not there*/
if (rtp_listinfo->start_fd->num<gai->fd->num || !voip_calls_graph_list) {
new_gai = g_malloc(sizeof(seq_analysis_item_t));
new_gai->fd = rtp_listinfo->start_fd;
COPY_ADDRESS(&(new_gai->src_addr),&(rtp_listinfo->src_addr));
COPY_ADDRESS(&(new_gai->dst_addr),&(rtp_listinfo->dest_addr));
new_gai->port_src = rtp_listinfo->src_port;
new_gai->port_dst = rtp_listinfo->dest_port;
duration = (guint32)(nstime_to_msec(&rtp_listinfo->stop_fd->rel_ts) - nstime_to_msec(&rtp_listinfo->start_fd->rel_ts));
new_gai->frame_label = g_strdup_printf("%s (%s) %s",
(rtp_listinfo->is_srtp)?"SRTP":"RTP",
rtp_listinfo->payload_type_str,
(rtp_listinfo->rtp_event == -1)?
"":val_to_str_ext_const(rtp_listinfo->rtp_event, &rtp_event_type_values_ext, "Unknown RTP Event"));
new_gai->comment = g_strdup_printf("%s Num packets:%u Duration:%u.%03us SSRC:0x%X",
(rtp_listinfo->is_srtp)?"SRTP":"RTP", rtp_listinfo->npackets,
duration/1000,(duration%1000), rtp_listinfo->ssrc);
new_gai->conv_num = conv_num;
set_fd_time(cfile.epan, new_gai->fd, time_str);
new_gai->time_str = g_strdup(time_str);
new_gai->display=FALSE;
new_gai->line_style = 2; /* the arrow line will be 2 pixels width */
tapinfo->graph_analysis->list = g_list_insert(tapinfo->graph_analysis->list, new_gai, item);
break;
}
if (voip_calls_graph_list) item++;
}
break;
}
voip_calls_graph_list = g_list_next(voip_calls_graph_list);
}
rtp_streams_list = g_list_next(rtp_streams_list);
}
/* add the RTP item to the graph if was not there*/
if (rtp_listinfo->start_fd->num<gai->fd->num || !voip_calls_graph_list) {
new_gai = g_malloc(sizeof(seq_analysis_item_t));
new_gai->fd = rtp_listinfo->start_fd;
COPY_ADDRESS(&(new_gai->src_addr),&(rtp_listinfo->src_addr));
COPY_ADDRESS(&(new_gai->dst_addr),&(rtp_listinfo->dest_addr));
new_gai->port_src = rtp_listinfo->src_port;
new_gai->port_dst = rtp_listinfo->dest_port;
duration = (guint32)(nstime_to_msec(&rtp_listinfo->stop_fd->rel_ts) - nstime_to_msec(&rtp_listinfo->start_fd->rel_ts));
new_gai->frame_label = g_strdup_printf("%s (%s) %s",
(rtp_listinfo->is_srtp)?"SRTP":"RTP",
rtp_listinfo->payload_type_str,
(rtp_listinfo->rtp_event == -1)?
"":val_to_str_ext_const(rtp_listinfo->rtp_event, &rtp_event_type_values_ext, "Unknown RTP Event"));
new_gai->comment = g_strdup_printf("%s Num packets:%u Duration:%u.%03us SSRC:0x%X",
(rtp_listinfo->is_srtp)?"SRTP":"RTP", rtp_listinfo->npackets,
duration/1000,(duration%1000), rtp_listinfo->ssrc);
new_gai->conv_num = conv_num;
set_fd_time(cfile.epan, new_gai->fd, time_str);
new_gai->time_str = g_strdup(time_str);
new_gai->display=FALSE;
new_gai->line_style = 2; /* the arrow line will be 2 pixels width */
tapinfo->graph_analysis->list = g_list_insert(tapinfo->graph_analysis->list, new_gai, item);
break;
}
if (voip_calls_graph_list) item++;
}
break;
}
voip_calls_graph_list = g_list_next(voip_calls_graph_list);
}
rtp_streams_list = g_list_next(rtp_streams_list);
}
}
#endif
@ -844,19 +844,19 @@ remove_tap_listener_rtp(voip_calls_tapinfo_t *tap_id_base)
static gboolean
t38_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *t38_info_ptr)
{
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_t38_);
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_t38_);
voip_calls_info_t *callsinfo = NULL;
voip_calls_info_t *tmp_listinfo;
GList *voip_calls_graph_list = NULL;
GList *list;
gchar *frame_label = NULL;
gchar *comment = NULL;
seq_analysis_item_t *tmp_gai, *gai = NULL;
gchar *tmp_str1, *tmp_str2;
guint16 line_style = 2;
double duration;
int conv_num = -1;
voip_calls_info_t *callsinfo = NULL;
voip_calls_info_t *tmp_listinfo;
GList *voip_calls_graph_list = NULL;
GList *list;
gchar *frame_label = NULL;
gchar *comment = NULL;
seq_analysis_item_t *tmp_gai, *gai = NULL;
gchar *tmp_str1, *tmp_str2;
guint16 line_style = 2;
double duration;
int conv_num = -1;
const t38_packet_info *t38_info = (const t38_packet_info *)t38_info_ptr;
@ -934,7 +934,7 @@ t38_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const
comment = g_strdup_printf("t38:t30 Ind:%s", tmp_str1);
wmem_free(NULL, tmp_str1);
line_style = 1;
} else if (t38_info->type_msg == 1) { /* 1=data */
} else if (t38_info->type_msg == 1) { /* 1=data */
switch(t38_info->Data_Field_field_type_value) {
case 0: /* hdlc-data */
break;
@ -1037,17 +1037,17 @@ free_sip_info(gpointer p) {
static gboolean
sip_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt , const void *SIPinfo)
{
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_sip_);
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_sip_);
/* we just take note of the ISUP data here; when we receive the MTP3 part everything will
be compared with existing calls */
voip_calls_info_t *callsinfo = NULL;
sip_calls_info_t *tmp_sipinfo = NULL;
address tmp_src, tmp_dst;
gchar *frame_label = NULL;
gchar *comment = NULL;
gchar *old_comment = NULL;
gchar *key=NULL;
voip_calls_info_t *callsinfo = NULL;
sip_calls_info_t *tmp_sipinfo = NULL;
address tmp_src, tmp_dst;
gchar *frame_label = NULL;
gchar *comment = NULL;
gchar *old_comment = NULL;
gchar *key = NULL;
const sip_info_value_t *pi = (const sip_info_value_t *)SIPinfo;
@ -1247,16 +1247,16 @@ remove_tap_listener_sip_calls(voip_calls_tapinfo_t *tap_id_base)
static gboolean
isup_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *isup_info)
{
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_isup_);
voip_calls_info_t *tmp_listinfo;
voip_calls_info_t *callsinfo = NULL;
isup_calls_info_t *tmp_isupinfo;
gboolean found = FALSE;
gboolean forward = FALSE;
gboolean right_pair;
GList *list;
gchar *frame_label = NULL;
gchar *comment = NULL;
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_isup_);
voip_calls_info_t *tmp_listinfo;
voip_calls_info_t *callsinfo = NULL;
isup_calls_info_t *tmp_isupinfo;
gboolean found = FALSE;
gboolean forward = FALSE;
gboolean right_pair;
GList *list;
gchar *frame_label = NULL;
gchar *comment = NULL;
const isup_tap_rec_t *pi = (const isup_tap_rec_t *)isup_info;
@ -1443,7 +1443,7 @@ static gboolean
mtp3_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *mtp3_info)
{
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_mtp3_);
const mtp3_tap_rec_t *pi = (const mtp3_tap_rec_t *)mtp3_info;
const mtp3_tap_rec_t *pi = (const mtp3_tap_rec_t *)mtp3_info;
/* keep the data in memory to use when the ISUP information arrives */
@ -1513,14 +1513,14 @@ static const e_guid_t guid_allzero = {0, 0, 0, { 0, 0, 0, 0, 0, 0, 0, 0 } };
static gboolean
q931_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *q931_info)
{
GList *list,*list2;
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_q931_);
h323_calls_info_t *tmp_h323info,*tmp2_h323info;
GList *list,*list2;
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_q931_);
h323_calls_info_t *tmp_h323info,*tmp2_h323info;
actrace_isdn_calls_info_t *tmp_actrace_isdn_info;
voip_calls_info_t *tmp_listinfo;
voip_calls_info_t *callsinfo = NULL;
h245_address_t *h245_add = NULL;
gchar *comment, *tmp_str;
voip_calls_info_t *tmp_listinfo;
voip_calls_info_t *callsinfo = NULL;
h245_address_t *h245_add = NULL;
gchar *comment, *tmp_str;
const q931_packet_info *pi = (const q931_packet_info *)q931_info;
@ -1733,7 +1733,7 @@ q931_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt,
if (ADDRESSES_EQUAL(&(callsinfo->initial_speaker), tapinfo->actrace_direction?&pstn_add:&(pinfo->src) )) { /* forward direction */
callsinfo->call_state=VOIP_CANCELLED;
}
else { /* reverse */
else { /* reverse */
callsinfo->call_state=VOIP_REJECTED;
tapinfo->rejected_calls++;
}
@ -1838,14 +1838,14 @@ free_h225_info(gpointer p) {
static gboolean
h225_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *H225info)
{
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_h225_);
voip_calls_info_t *tmp_listinfo;
voip_calls_info_t *callsinfo = NULL;
h323_calls_info_t *tmp_h323info = NULL;
gchar *frame_label;
gchar *comment;
GList *list;
h245_address_t *h245_add = NULL;
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_h225_);
voip_calls_info_t *tmp_listinfo;
voip_calls_info_t *callsinfo = NULL;
h323_calls_info_t *tmp_h323info = NULL;
gchar *frame_label;
gchar *comment;
GList *list;
h245_address_t *h245_add = NULL;
const h225_packet_info *pi = (const h225_packet_info *)H225info;
@ -1987,7 +1987,7 @@ h225_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt,
if (ADDRESSES_EQUAL(&(tmp_h323info->h225SetupAddr),&(pinfo->src))) { /* forward direction */
callsinfo->call_state=VOIP_CANCELLED;
}
else { /* reverse */
else { /* reverse */
callsinfo->call_state=VOIP_REJECTED;
tapinfo->rejected_calls++;
}
@ -2140,13 +2140,13 @@ h245_add_label(voip_calls_tapinfo_t *tapinfo, guint32 new_frame_num, const gchar
static gboolean
h245dg_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *H245info)
{
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_h245dg_);
voip_calls_info_t *tmp_listinfo;
voip_calls_info_t *callsinfo = NULL;
h323_calls_info_t *tmp_h323info;
GList *list;
GList *list2;
h245_address_t *h245_add = NULL;
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_h245dg_);
voip_calls_info_t *tmp_listinfo;
voip_calls_info_t *callsinfo = NULL;
h323_calls_info_t *tmp_h323info;
GList *list;
GList *list2;
h245_address_t *h245_add = NULL;
const h245_packet_info *pi = (const h245_packet_info *)H245info;
@ -2239,8 +2239,8 @@ remove_tap_listener_h245dg_calls(voip_calls_tapinfo_t *tap_id_base)
static gboolean
sdp_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *SDPinfo)
{
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_sdp_);
const sdp_packet_info *pi = (const sdp_packet_info *)SDPinfo;
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_sdp_);
const sdp_packet_info *pi = (const sdp_packet_info *)SDPinfo;
/* There are protocols like MGCP/SIP where the SDP is called before the tap for the
MGCP/SIP packet, in those cases we assign the SPD summary to global lastSDPsummary
@ -2298,7 +2298,7 @@ remove_tap_listener_sdp_calls(voip_calls_tapinfo_t *tap_id_base)
static gboolean
is_mgcp_signal(const gchar *signal_str_p, const gchar *signalStr)
{
gint i;
gint i;
gchar **resultArray;
/* if there is no signalStr, just return false */
@ -2352,7 +2352,7 @@ mgcp_dialed_digits(gchar *signalStr, gchar **dialedDigits)
{
gchar *tmpStr;
gchar *resultStr;
gint i,j;
gint i,j;
/* start with 1 for the null-terminator */
guint resultStrLen = 1;
@ -2403,19 +2403,18 @@ mgcp_dialed_digits(gchar *signalStr, gchar **dialedDigits)
static gboolean
mgcp_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *MGCPinfo)
{
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_mgcp_);
voip_calls_info_t *tmp_listinfo;
voip_calls_info_t *callsinfo = NULL;
mgcp_calls_info_t *tmp_mgcpinfo = NULL;
GList *list;
GList *listGraph = NULL;
gchar *frame_label = NULL;
gchar *comment = NULL;
seq_analysis_item_t *gai = NULL;
gboolean newcall = FALSE;
gboolean fromEndpoint = FALSE; /* true for calls originated in Endpoints, false for calls from MGC */
gdouble diff_time;
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_mgcp_);
voip_calls_info_t *tmp_listinfo;
voip_calls_info_t *callsinfo = NULL;
mgcp_calls_info_t *tmp_mgcpinfo = NULL;
GList *list;
GList *listGraph = NULL;
gchar *frame_label = NULL;
gchar *comment = NULL;
seq_analysis_item_t *gai = NULL;
gboolean newcall = FALSE;
gboolean fromEndpoint = FALSE; /* true for calls originated in Endpoints, false for calls from MGC */
gdouble diff_time;
const mgcp_info_t *pi = (const mgcp_info_t *)MGCPinfo;
@ -2666,12 +2665,12 @@ remove_tap_listener_mgcp_calls(voip_calls_tapinfo_t *tap_id_base)
static gboolean
actrace_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *ACTRACEinfo)
{
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_actrace_);
const actrace_info_t *pi = (const actrace_info_t *)ACTRACEinfo;
GList *list;
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_actrace_);
const actrace_info_t *pi = (const actrace_info_t *)ACTRACEinfo;
GList *list;
actrace_cas_calls_info_t *tmp_actrace_cas_info;
voip_calls_info_t *tmp_listinfo;
voip_calls_info_t *callsinfo = NULL;
voip_calls_info_t *tmp_listinfo;
voip_calls_info_t *callsinfo = NULL;
tapinfo->actrace_frame_num = pinfo->fd->num;
tapinfo->actrace_trunk = pi->trunk;
@ -2779,19 +2778,19 @@ remove_tap_listener_actrace_calls(voip_calls_tapinfo_t *tap_id_base)
/****************************************************************************/
#define gcp_is_req(type) ( type == GCP_CMD_ADD_REQ || type == GCP_CMD_MOVE_REQ || type == GCP_CMD_MOD_REQ || \
type == GCP_CMD_SUB_REQ || type == GCP_CMD_AUDITCAP_REQ || type == GCP_CMD_AUDITVAL_REQ || \
type == GCP_CMD_NOTIFY_REQ || type == GCP_CMD_SVCCHG_REQ || type == GCP_CMD_TOPOLOGY_REQ || \
type == GCP_CMD_CTX_ATTR_AUDIT_REQ )
type == GCP_CMD_SUB_REQ || type == GCP_CMD_AUDITCAP_REQ || type == GCP_CMD_AUDITVAL_REQ || \
type == GCP_CMD_NOTIFY_REQ || type == GCP_CMD_SVCCHG_REQ || type == GCP_CMD_TOPOLOGY_REQ || \
type == GCP_CMD_CTX_ATTR_AUDIT_REQ )
static gboolean
h248_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *prot_info) {
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_h248_);
const gcp_cmd_t *cmd = (const gcp_cmd_t *)prot_info;
GList *list;
voip_calls_info_t *callsinfo = NULL;
address *mgw;
address *mgc;
gchar mgw_addr[128];
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_h248_);
const gcp_cmd_t *cmd = (const gcp_cmd_t *)prot_info;
GList *list;
voip_calls_info_t *callsinfo = NULL;
address *mgw;
address *mgc;
gchar mgw_addr[128];
if (cmd->ctx->id == NULL_CONTEXT || cmd->ctx->id == ALL_CONTEXTS ) {
return FALSE;
@ -2936,12 +2935,12 @@ const value_string* sccp_payload_values;
static gboolean
sccp_calls(voip_calls_tapinfo_t *tapinfo, packet_info *pinfo, epan_dissect_t *edt, const void *prot_info) {
const sccp_msg_info_t* msg = (const sccp_msg_info_t *)prot_info;
sccp_assoc_info_t* assoc = msg->data.co.assoc;
GList *list;
voip_calls_info_t *callsinfo = NULL;
gchar *label = NULL;
const gchar *comment = NULL;
const sccp_msg_info_t* msg = (const sccp_msg_info_t *)prot_info;
sccp_assoc_info_t* assoc = msg->data.co.assoc;
GList *list;
voip_calls_info_t *callsinfo = NULL;
gchar *label = NULL;
const gchar *comment = NULL;
/* check whether we already have this assoc in the list */
for(list = g_queue_peek_nth_link(tapinfo->callsinfos, 0) ; list ; list = g_list_next (list) ) {
@ -3101,14 +3100,14 @@ remove_tap_listener_sccp_calls(voip_calls_tapinfo_t *tap_id_base)
static gboolean
unistim_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *unistim_info)
{
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_unistim_);
voip_calls_info_t *tmp_listinfo;
voip_calls_info_t *callsinfo = NULL;
unistim_info_t *tmp_unistim_info = NULL;
GList *list = NULL;
GString *g_tmp = NULL;
const gchar *frame_label = NULL;
gchar *comment = NULL;
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_unistim_);
voip_calls_info_t *tmp_listinfo;
voip_calls_info_t *callsinfo = NULL;
unistim_info_t *tmp_unistim_info = NULL;
GList *list = NULL;
GString *g_tmp = NULL;
const gchar *frame_label = NULL;
gchar *comment = NULL;
/* Fetch specific packet infos */
const unistim_info_t *pi = (const unistim_info_t *)unistim_info;
@ -3762,12 +3761,12 @@ static void free_iax2_info(gpointer p) {
static gboolean
iax2_calls_packet( void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *iax2_info)
{
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_iax2_);
GList* list;
voip_calls_info_t *callsinfo = NULL;
address* phone;
const iax2_info_t *ii = (const iax2_info_t *)iax2_info;
iax2_info_t *tmp_iax2info;
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_iax2_);
GList* list;
voip_calls_info_t *callsinfo = NULL;
address *phone;
const iax2_info_t *ii = (const iax2_info_t *)iax2_info;
iax2_info_t *tmp_iax2info;
if (ii == NULL || ii->ptype != IAX2_FULL_PACKET || (ii->scallno == 0 && ii->dcallno == 0))
return FALSE;
@ -3883,8 +3882,8 @@ static gboolean
voip_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *VoIPinfo)
{
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_voip_);
voip_calls_info_t *callsinfo = NULL;
voip_calls_info_t *tmp_listinfo;
voip_calls_info_t *callsinfo = NULL;
voip_calls_info_t *tmp_listinfo;
GList *list = NULL;
const voip_packet_info_t *pi = (const voip_packet_info_t *)VoIPinfo;
@ -3980,55 +3979,56 @@ remove_tap_listener_voip_calls(voip_calls_tapinfo_t *tap_id_base)
/****************************************************************************/
/* whenever a prot_ packet is seen by the tap listener */
/*
#if 0
static gboolean
prot_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prot_info _U_)
{
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_prot_);
if (callsinfo!=NULL) {
callsinfo->stop_abs = pinfo->fd->abs_ts;
callsinfo->stop_rel = pinfo->rel_ts;
callsinfo->last_frame_num=pinfo->fd->num;
++(callsinfo->npackets);
++(tapinfo->npackets);
}
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_prot_);
if (callsinfo!=NULL) {
callsinfo->stop_abs = pinfo->fd->abs_ts;
callsinfo->stop_rel = pinfo->rel_ts;
callsinfo->last_frame_num=pinfo->fd->num;
++(callsinfo->npackets);
++(tapinfo->npackets);
}
tapinfo->redraw = TRUE;
tapinfo->redraw = TRUE;
return TRUE;
}
*/
/****************************************************************************/
/*
#endif
/****************************************************************************/
#if 0
void
prot_calls_init_tap(voip_calls_tapinfo_t *tap_id_base)
{
GString *error_string;
GString *error_string;
error_string = register_tap_listener("prot_", tap_base_to_id(tap_id_base, tap_id_offset_prot_),
NULL,
0,
NULL,
prot__calls_packet,
NULL
);
error_string = register_tap_listener("prot_", tap_base_to_id(tap_id_base, tap_id_offset_prot_),
NULL,
0,
NULL,
prot__calls_packet,
NULL
);
if (error_string != NULL) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
"%s", error_string->str);
g_string_free(error_string, TRUE);
}
if (error_string != NULL) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
"%s", error_string->str);
g_string_free(error_string, TRUE);
}
}
*/
#endif
/****************************************************************************/
/*
#if 0
void
remove_tap_listener_prot__calls(voip_calls_tapinfo_t *tap_id_base)
{
remove_tap_listener(tap_base_to_id(tap_id_base, tap_id_offset_prot_));
remove_tap_listener(tap_base_to_id(tap_id_base, tap_id_offset_prot_));
}
*/
#endif
/*
* Editor modelines - https://www.wireshark.org/tools/modelines.html

142
ui/voip_calls.h
View File

@ -103,9 +103,9 @@ typedef struct _sip_calls_info {
/** defines specific ISUP data */
typedef struct _isup_calls_info {
guint16 cic;
guint32 opc, dpc;
guint8 ni;
guint16 cic;
guint32 opc, dpc;
guint8 ni;
} isup_calls_info_t;
/* defines specific H245 data */
@ -116,16 +116,16 @@ typedef struct _h245_address {
/** defines specific H323 data */
typedef struct _h323_calls_info {
e_guid_t *guid; /* Call ID to identify a H225 */
GList* h245_list; /**< list of H245 Address and ports for tunneling off calls*/
address h225SetupAddr; /**< we use the SETUP H225 IP to determine if packets are forward or reverse */
gboolean is_h245;
gboolean is_faststart_Setup; /**< if faststart field is included in Setup*/
gboolean is_faststart_Proc; /**< if faststart field is included in Proce, Alerting, Progress or Connect*/
gboolean is_h245Tunneling;
gint32 q931_crv;
gint32 q931_crv2;
guint requestSeqNum;
e_guid_t *guid; /* Call ID to identify a H225 */
GList* h245_list; /**< list of H245 Address and ports for tunneling off calls*/
address h225SetupAddr; /**< we use the SETUP H225 IP to determine if packets are forward or reverse */
gboolean is_h245;
gboolean is_faststart_Setup; /**< if faststart field is included in Setup*/
gboolean is_faststart_Proc; /**< if faststart field is included in Proce, Alerting, Progress or Connect*/
gboolean is_h245Tunneling;
gint32 q931_crv;
gint32 q931_crv2;
guint requestSeqNum;
} h323_calls_info_t;
/**< defines specific MGCP data */
@ -153,25 +153,25 @@ typedef struct _skinny_calls_info {
/** defines a voip call */
typedef struct _voip_calls_info {
voip_call_state call_state;
voip_call_active_state call_active_state;
gchar *call_id;
gchar *from_identity;
gchar *to_identity;
gpointer prot_info;
void(*free_prot_info)(gpointer);
address initial_speaker;
guint32 npackets;
voip_protocol protocol;
gchar *protocol_name;
gchar *call_comment;
guint16 call_num;
voip_call_state call_state;
voip_call_active_state call_active_state;
gchar *call_id;
gchar *from_identity;
gchar *to_identity;
gpointer prot_info;
void (*free_prot_info)(gpointer);
address initial_speaker;
guint32 npackets;
voip_protocol protocol;
gchar *protocol_name;
gchar *call_comment;
guint16 call_num;
/**> The frame_data struct holds the frame number and timing information needed. */
frame_data *start_fd;
nstime_t start_rel_ts;
frame_data *stop_fd;
nstime_t stop_rel_ts;
gboolean selected; /* GTK+ only */
frame_data *start_fd;
nstime_t start_rel_ts;
frame_data *stop_fd;
nstime_t stop_rel_ts;
gboolean selected; /* GTK+ only */
} voip_calls_info_t;
@ -184,46 +184,46 @@ typedef struct _voip_calls_info {
*/
struct _h245_labels;
typedef struct _voip_calls_tapinfo {
tap_reset_cb tap_reset; /**< tap reset callback */
tap_packet_cb tap_packet; /**< tap per-packet callback */
tap_draw_cb tap_draw; /**< tap draw callback */
void *tap_data; /**< data for tap callbacks */
int ncalls; /**< number of call */
GQueue* callsinfos; /**< queue with all calls */
GHashTable* callsinfo_hashtable[1]; /**< array of hashes per voip protocol; currently only the one for SIP is used */
int npackets; /**< total number of packets of all calls */
voip_calls_info_t* filter_calls_fwd; /**< used as filter in some tap modes */
int start_packets;
int completed_calls;
int rejected_calls;
seq_analysis_info_t* graph_analysis;
epan_t *session; /**< epan session */
int nrtp_streams; /**< number of rtp streams */
GList* rtp_stream_list; /**< list of rtp_stream_info_t */
guint32 rtp_evt_frame_num;
guint8 rtp_evt;
gboolean rtp_evt_end;
gchar *sdp_summary;
guint32 sdp_frame_num;
guint32 mtp3_opc;
guint32 mtp3_dpc;
guint8 mtp3_ni;
guint32 mtp3_frame_num;
struct _h245_labels *h245_labels; /**< H.245 labels */
gchar *q931_calling_number;
gchar *q931_called_number;
guint8 q931_cause_value;
gint32 q931_crv;
guint32 q931_frame_num;
guint32 h225_frame_num;
guint16 h225_call_num;
int h225_cstype; /* XXX actually an enum */
gboolean h225_is_faststart;
guint32 actrace_frame_num;
gint32 actrace_trunk;
gint32 actrace_direction;
flow_show_options fs_option;
gboolean redraw;
tap_reset_cb tap_reset; /**< tap reset callback */
tap_packet_cb tap_packet; /**< tap per-packet callback */
tap_draw_cb tap_draw; /**< tap draw callback */
void *tap_data; /**< data for tap callbacks */
int ncalls; /**< number of call */
GQueue* callsinfos; /**< queue with all calls */
GHashTable* callsinfo_hashtable[1]; /**< array of hashes per voip protocol; currently only the one for SIP is used */
int npackets; /**< total number of packets of all calls */
voip_calls_info_t *filter_calls_fwd; /**< used as filter in some tap modes */
int start_packets;
int completed_calls;
int rejected_calls;
seq_analysis_info_t *graph_analysis;
epan_t *session; /**< epan session */
int nrtp_streams; /**< number of rtp streams */
GList* rtp_stream_list; /**< list of rtp_stream_info_t */
guint32 rtp_evt_frame_num;
guint8 rtp_evt;
gboolean rtp_evt_end;
gchar *sdp_summary;
guint32 sdp_frame_num;
guint32 mtp3_opc;
guint32 mtp3_dpc;
guint8 mtp3_ni;
guint32 mtp3_frame_num;
struct _h245_labels *h245_labels; /**< H.245 labels */
gchar *q931_calling_number;
gchar *q931_called_number;
guint8 q931_cause_value;
gint32 q931_crv;
guint32 q931_frame_num;
guint32 h225_frame_num;
guint16 h225_call_num;
int h225_cstype; /* XXX actually an enum */
gboolean h225_is_faststart;
guint32 actrace_frame_num;
gint32 actrace_trunk;
gint32 actrace_direction;
flow_show_options fs_option;
gboolean redraw;
} voip_calls_tapinfo_t;
/****************************************************************************/

6
wiretap/csids.c
View File

@ -43,11 +43,11 @@ typedef struct {
} csids_t;
static gboolean csids_read(wtap *wth, int *err, gchar **err_info,
gint64 *data_offset);
gint64 *data_offset);
static gboolean csids_seek_read(wtap *wth, gint64 seek_off,
struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info);
struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info);
static gboolean csids_read_packet(FILE_T fh, csids_t *csids,
struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info);
struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info);
struct csids_header {
guint32 seconds; /* seconds since epoch */

64
wiretap/lanalyzer.c
View File

@ -28,14 +28,14 @@
/* The LANalyzer format is documented (at least in part) in Novell document
TID022037, which can be found at, among other places:
http://www.windowsecurity.com/whitepapers/Description_of_the_LANalysers_output_file.html
http://www.windowsecurity.com/whitepapers/Description_of_the_LANalysers_output_file.html
*/
/* Record header format */
typedef struct {
guint8 record_type[2];
guint8 record_length[2];
guint8 record_type[2];
guint8 record_length[2];
} LA_RecordHeader;
#define LA_RecordHeaderSize 4
@ -121,8 +121,8 @@ typedef guint16 TimeStamp[3]; /* 0.5 microseconds since start of trace */
/* LANalyzer board types (which indicate the type of network on which
the capture was done). */
#define BOARD_325 226 /* LANalyzer 325 (Ethernet) */
#define BOARD_325TR 227 /* LANalyzer 325TR (Token-ring) */
#define BOARD_325 226 /* LANalyzer 325 (Ethernet) */
#define BOARD_325TR 227 /* LANalyzer 325TR (Token-ring) */
/*
@ -266,7 +266,7 @@ static const guint8 z64[64] = {
};
typedef struct {
time_t start;
time_t start;
} lanalyzer_t;
static gboolean lanalyzer_read(wtap *wth, int *err, gchar **err_info,
@ -405,7 +405,7 @@ wtap_open_return_val lanalyzer_open(wtap *wth, int *err, gchar **err_info)
default:
*err = WTAP_ERR_UNSUPPORTED;
*err_info = g_strdup_printf("lanalyzer: board type %u unknown",
board_type);
board_type);
return WTAP_OPEN_ERROR;
}
break;
@ -428,21 +428,21 @@ wtap_open_return_val lanalyzer_open(wtap *wth, int *err, gchar **err_info)
}
}
#define DESCRIPTOR_LEN 32
#define DESCRIPTOR_LEN 32
static gboolean lanalyzer_read_trace_record(wtap *wth, FILE_T fh,
struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info)
{
char LE_record_type[2];
char LE_record_length[2];
guint16 record_type, record_length;
int record_data_size;
int packet_size;
gchar descriptor[DESCRIPTOR_LEN];
lanalyzer_t *lanalyzer;
guint16 time_low, time_med, time_high, true_size;
guint64 t;
time_t tsecs;
char LE_record_type[2];
char LE_record_length[2];
guint16 record_type, record_length;
int record_data_size;
int packet_size;
gchar descriptor[DESCRIPTOR_LEN];
lanalyzer_t *lanalyzer;
guint16 time_low, time_med, time_high, true_size;
guint64 t;
time_t tsecs;
/* read the record type and length. */
if (!wtap_read_bytes_or_eof(fh, LE_record_type, 2, err, err_info))
@ -502,7 +502,7 @@ static gboolean lanalyzer_read_trace_record(wtap *wth, FILE_T fh,
time_med = pletoh16(&descriptor[10]);
time_high = pletoh16(&descriptor[12]);
t = (((guint64)time_low) << 0) + (((guint64)time_med) << 16) +
(((guint64)time_high) << 32);
(((guint64)time_high) << 32);
tsecs = (time_t) (t/2000000);
lanalyzer = (lanalyzer_t *)wth->priv;
phdr->ts.secs = tsecs + lanalyzer->start;
@ -623,8 +623,8 @@ static void my_timersub(const struct timeval *a,
* Returns TRUE on success, FALSE on failure.
*---------------------------------------------------*/
static gboolean lanalyzer_dump(wtap_dumper *wdh,
const struct wtap_pkthdr *phdr,
const guint8 *pd, int *err, gchar **err_info _U_)
const struct wtap_pkthdr *phdr,
const guint8 *pd, int *err, gchar **err_info _U_)
{
double x;
int i;
@ -667,7 +667,7 @@ static gboolean lanalyzer_dump(wtap_dumper *wdh,
/* collect some information for the
* finally written header
*/
/* XXX - this conversion could probably improved, if the start uses ns */
/* XXX - this conversion could probably improved, if the start uses ns */
itmp->start = tv;
itmp->pkts = 0;
itmp->init = TRUE;
@ -743,8 +743,8 @@ gboolean lanalyzer_dump_open(wtap_dumper *wdh, int *err)
tmp = g_malloc(sizeof(LA_TmpInfo));
if (!tmp) {
*err = errno;
return FALSE;
*err = errno;
return FALSE;
}
((LA_TmpInfo*)tmp)->init = FALSE;
@ -768,7 +768,7 @@ gboolean lanalyzer_dump_open(wtap_dumper *wdh, int *err)
+ LA_IndexRecordSize;
if (wtap_dump_file_seek(wdh, jump, SEEK_SET, err) == -1)
return FALSE;
return FALSE;
wdh->bytes_dumped = jump;
return TRUE;
@ -798,26 +798,26 @@ static gboolean lanalyzer_dump_header(wtap_dumper *wdh, int *err)
return FALSE;
if (wtap_dump_file_seek(wdh, 0, SEEK_SET, err) == -1)
return FALSE;
return FALSE;
if (!wtap_dump_file_write(wdh, &LA_HeaderRegularFake,
sizeof LA_HeaderRegularFake, err))
return FALSE;
return FALSE;
if (!wtap_dump_file_write(wdh, &LA_RxChannelNameFake,
sizeof LA_RxChannelNameFake, err))
return FALSE;
return FALSE;
if (!wtap_dump_file_write(wdh, &LA_TxChannelNameFake,
sizeof LA_TxChannelNameFake, err))
return FALSE;
return FALSE;
if (!wtap_dump_file_write(wdh, &LA_RxTemplateNameFake,
sizeof LA_RxTemplateNameFake, err))
return FALSE;
return FALSE;
if (!wtap_dump_file_write(wdh, &LA_TxTemplateNameFake,
sizeof LA_TxTemplateNameFake, err))
return FALSE;
return FALSE;
if (!wtap_dump_file_write(wdh, &LA_DisplayOptionsFake,
sizeof LA_DisplayOptionsFake, err))
return FALSE;
return FALSE;
/*-----------------------------------------------------------------*/
if (!s16write(wdh, GUINT16_TO_LE(RT_Summary), err)) /* rid */
return FALSE;

10
wiretap/wtap.h
View File

@ -1317,9 +1317,9 @@ struct file_extension_info {
* and will likely just overwrite the pointer.
*/
typedef enum {
WTAP_OPEN_NOT_MINE = 0,
WTAP_OPEN_MINE = 1,
WTAP_OPEN_ERROR = -1
WTAP_OPEN_NOT_MINE = 0,
WTAP_OPEN_MINE = 1,
WTAP_OPEN_ERROR = -1
} wtap_open_return_val;
typedef wtap_open_return_val (*wtap_open_routine_t)(struct wtap*, int *,
@ -1345,8 +1345,8 @@ typedef wtap_open_return_val (*wtap_open_routine_t)(struct wtap*, int *,
*/
typedef enum {
OPEN_INFO_MAGIC = 0,
OPEN_INFO_HEURISTIC = 1
OPEN_INFO_MAGIC = 0,
OPEN_INFO_HEURISTIC = 1
} wtap_open_type;
WS_DLL_PUBLIC void init_open_routines(void);

2
wsutil/strptime.c
View File

@ -27,7 +27,7 @@
#include "config.h"
#include <ctype.h>
#include <string.h>
#include <string.h>
#include <glib.h>
#ifdef _LIBC