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

Get the build going again on non-Windows compilers. 

svn path=/trunk/; revision=27697
This commit is contained in:
Jaap Keuter 2009-03-11 07:35:43 +00:00
parent 564846935a
commit 6acffc2357
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
epan/dissectors/packet-iax2.c
View File

@ -73,7 +73,7 @@ static int proto_iax2 = -1;
static int iax2_tap = -1;
/* protocol tap info */
static iax2_info_t ii_arr[1] = {0};
static iax2_info_t ii_arr[1];
static iax2_info_t *iax2_info = ii_arr;
/* The following hf_* variables are used to hold the wireshark IDs of
@ -1062,15 +1062,18 @@ dissect_iax2 (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
proto_tree_add_item (full_mini_subtree, hf_iax2_scallno, tvb, offset-2, 2, FALSE);
}
iax2_info->ptype = type;
iax2_info->scallno = 0;
iax2_info->dcallno = 0;
iax2_info->ftype = 0;
iax2_info->csub = 0;
iax2_info->callState = VOIP_NO_STATE;
iax2_info->payload_len = 0;
iax2_info->timestamp = 0;
iax2_info->payload_data = NULL;
iax2_info->ptype = type;
iax2_info->scallno = 0;
iax2_info->dcallno = 0;
iax2_info->ftype = 0;
iax2_info->csub = 0;
iax2_info->payload_len = 0;
iax2_info->timestamp = 0;
iax2_info->callState = VOIP_NO_STATE;
iax2_info->messageName = NULL;
iax2_info->callingParty = NULL;
iax2_info->calledParty = NULL;
iax2_info->payload_data = NULL;
switch( type ) {
case IAX2_FULL_PACKET:

10
gtk/iax2_analysis.c
View File

@ -608,7 +608,7 @@ static const GdkColor COLOR_FOREGROUND = {0, 0x0000, 0x0000, 0x0000};
/* adds statistics information from the packet to the list */
static int iax2_packet_add_info(GtkWidget *list, user_data_t * user_data,
tap_iax2_stat_t *statinfo, packet_info *pinfo,
const struct _iax2_info_t *iax2info)
const struct _iax2_info_t *iax2info _U_)
{
guint16 msecs;
gchar timeStr[32];
@ -1833,7 +1833,7 @@ static void on_refresh_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data _U_)
error_string = register_tap_listener("IAX2", user_data, NULL,
iax2_reset, iax2_packet, iax2_draw);
if (error_string != NULL) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str);
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str);
g_string_free(error_string, TRUE);
return;
}
@ -3245,7 +3245,7 @@ static void create_iax2_dialog(user_data_t* user_data)
gtk_widget_grab_focus(list_fwd);
}
#if 0
/****************************************************************************/
static gboolean process_node(proto_node *ptree_node, header_field_info *hfinformation,
const gchar* proto_field, guint32* p_result)
@ -3315,7 +3315,7 @@ static gboolean get_int_value_from_proto_tree(proto_tree *protocol_tree,
}
return process_node(ptree_node, hfinformation, proto_field, p_result);
}
#endif
/****************************************************************************/
void iax2_analysis(
@ -3436,7 +3436,7 @@ static void iax2_analysis_cb(GtkWidget *w _U_, gpointer data _U_)
/* Try to compile the filter. */
g_strlcpy(filter_text,"iax2 && (ip || ipv6)",256);
if (!dfilter_compile(filter_text, &sfcode)) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, dfilter_error_msg);
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", dfilter_error_msg);
return;
}
/* we load the current file into cf variable */

4
gtk/voip_calls.c
View File

@ -124,7 +124,7 @@ static h245_labels_t h245_labels;
/****************************************************************************/
/* the one and only global voip_calls_tapinfo_t structure */
static voip_calls_tapinfo_t the_tapinfo_struct =
{0, NULL, 0, NULL, 0, 0, 0, 0, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
{0, NULL, 0, NULL, 0, 0, 0, 0, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
/* the one and only global voip_rtp_tapinfo_t structure */
static voip_rtp_tapinfo_t the_tapinfo_rtp_struct =
@ -3888,7 +3888,7 @@ iax2_calls_init_tap(void)
voip_calls_dlg_draw
);
if (error_string != NULL) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s",
error_string->str);
g_string_free(error_string, TRUE);
exit(1);