Add IAX2 and Skinny calls to VoIP calls window

Bug: 12254
Change-Id: Ibaddfaf8018be673d8f2cf642b1127062d7d507d
Reviewed-on: https://code.wireshark.org/review/14423
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2016-03-11 17:36:11 +01:00
parent 0345b8d853
commit d9c274bebf
1 changed files with 28 additions and 2 deletions

View File

@ -3907,9 +3907,22 @@ skinny_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *ed
callsinfo->call_num, &(pinfo->src), &(pinfo->dst), 1);
g_free(comment);
tapinfo->redraw |= REDRAW_SKINNY;
return TRUE;
}
/****************************************************************************/
static void
skinny_calls_draw(void *tap_offset_ptr)
{
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_skinny_);
if (tapinfo->tap_draw && (tapinfo->redraw & REDRAW_SKINNY)) {
tapinfo->tap_draw(tapinfo);
tapinfo->redraw &= ~REDRAW_SKINNY;
}
}
/****************************************************************************/
/* TAP INTERFACE */
@ -3931,7 +3944,7 @@ skinny_calls_init_tap(voip_calls_tapinfo_t *tap_id_base)
TL_REQUIRES_PROTO_TREE,
NULL,
skinny_calls_packet,
NULL
skinny_calls_draw
);
if (error_string != NULL) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
@ -4032,10 +4045,23 @@ iax2_calls_packet( void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt
add_to_graph(tapinfo, pinfo, edt, ii->messageName, "",
callsinfo->call_num, &(pinfo->src), &(pinfo->dst), 1);
tapinfo->redraw |= REDRAW_IAX2;
return TRUE;
}
/****************************************************************************/
static void
iax2_calls_draw(void *tap_offset_ptr)
{
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_iax2_);
if (tapinfo->tap_draw && (tapinfo->redraw & REDRAW_IAX2)) {
tapinfo->tap_draw(tapinfo);
tapinfo->redraw &= ~REDRAW_IAX2;
}
}
/****************************************************************************/
/* TAP INTERFACE */
@ -4060,7 +4086,7 @@ iax2_calls_init_tap(voip_calls_tapinfo_t *tap_id_base)
TL_REQUIRES_PROTO_TREE,
NULL,
iax2_calls_packet,
NULL
iax2_calls_draw
);
if (error_string != NULL) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s",