osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

VoIP calls: Fixup whitespace. 

Set modelines and reindent to match the files in the top-level ui
directory.

Change-Id: I7ea221e76a4b0ad3b6bcf7a3c8b4645c16aecbba
Reviewed-on: https://code.wireshark.org/review/5325
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2014-11-15 10:36:16 -08:00 committed by Gerald Combs
parent 51c5b7a937
commit 4960171c3a
2 changed files with 2906 additions and 2895 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ui/gtk/voip_calls.c
View File

@ -349,7 +349,6 @@ static int change_frame_graph(voip_calls_tapinfo_t *tapinfo _U_, guint32 frame_n
gchar *frame_label = NULL;
gchar *comment = NULL;
if(tapinfo->graph_analysis && NULL!=tapinfo->graph_analysis->ht)
gai=(seq_analysis_item_t *)g_hash_table_lookup(tapinfo->graph_analysis->ht, &frame_num);
if(gai) {
@ -659,13 +658,13 @@ static void rtp_packet_draw(void *tap_offset_ptr)
conv_num = gai->conv_num;
/* if RTP was already in the Graph, just update the comment information */
gai = (seq_analysis_item_t *)g_hash_table_lookup(tapinfo->graph_analysis->ht, &rtp_listinfo->start_fd->num);
if(gai != NULL) {
if (gai != NULL) {
duration = (guint32)(nstime_to_msec(&rtp_listinfo->stop_rel_ts) - nstime_to_msec(&rtp_listinfo->start_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);
}else {
} else {
new_gai = (seq_analysis_item_t *)g_malloc(sizeof(seq_analysis_item_t));
new_gai->fd = rtp_listinfo->start_fd;
COPY_ADDRESS(&(new_gai->src_addr),&(rtp_listinfo->src_addr));
@ -1099,7 +1098,7 @@ sip_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt ,
/* UPDATE comment in conversation list dialog with response code and reason.
Multiple code(+reason) may be appended, so skip over intermediate codes (100 trying, 183 ringing, e.t.c.)
TODO: is useful but not perfect, what is appended is truncated when displayed in dialog window */
TODO: is useful but not perfect, what is appended is truncated when displayed in dialog window */
if (pi->response_code >= 200) {
old_comment = callsinfo->call_comment;
callsinfo->call_comment=g_strdup_printf("%s %u",
@ -1292,7 +1291,6 @@ isup_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt,
/* not in the list? then create a new entry if the message is IAM
-i.e. if this session is a call*/
if ((callsinfo==NULL) &&(pi->message_type==1)) {
callsinfo = (voip_calls_info_t *)g_malloc0(sizeof(voip_calls_info_t));
callsinfo->call_active_state = VOIP_ACTIVE;
@ -1451,7 +1449,6 @@ mtp3_calls_init_tap(voip_calls_tapinfo_t *tap_id_base)
{
GString *error_string;
error_string = register_tap_listener("mtp3", tap_base_to_id(tap_id_base, tap_id_offset_mtp3_),
NULL,
0,
@ -2287,7 +2284,6 @@ remove_tap_listener_sdp_calls(voip_calls_tapinfo_t *tap_id_base)
}
/****************************************************************************/
/* ***************************TAP for MGCP **********************************/
/****************************************************************************/
@ -4043,14 +4039,15 @@ remove_tap_listener_prot__calls(voip_calls_tapinfo_t *tap_id_base)
/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
* Editor modelines - https://www.wireshark.org/tools/modelines.html
*
* Local variables:
* c-basic-offset: 8
* Local Variables:
* c-basic-offset: 4
* tab-width: 8
* indent-tabs-mode: t
* indent-tabs-mode: nil
* End:
*
* vi: set shiftwidth=8 tabstop=8 noexpandtab:
* :indentSize=8:tabSize=8:noTabs=false:
* ex: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true:
*/

14
ui/gtk/voip_calls.h
View File

@ -261,3 +261,17 @@ void voip_calls_reset(voip_calls_tapinfo_t *tapinfo);
void graph_analysis_data_init(void);
#endif /* __VOIP_CALLS_H__ */
/*
* Editor modelines - https://www.wireshark.org/tools/modelines.html
*
* Local Variables:
* c-basic-offset: 4
* tab-width: 8
* indent-tabs-mode: nil
* End:
*
* ex: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true:
*/