To ease troubleshooting of bug #2017 and for code clarity in the future, use

two different variables for types voip_rtp_stream_info_t (strinfo) and
voip_calls_info_t (callsinfo) instead of using strinfo for both.


svn path=/trunk/; revision=24038
This commit is contained in:
Stephen Fisher 2008-01-09 08:34:58 +00:00
parent 196fcc1932
commit 430866e511
4 changed files with 473 additions and 473 deletions

View File

@ -434,7 +434,7 @@ mark_rtp_stream_to_play(gchar *key _U_ , rtp_stream_info_t *rsi, gpointer ptr _U
if (rsi->first_frame_number == graph_item->frame_num) {
rsi->call_num = graph_item->conv_num;
/* if it is in the graph list, then check if the voip_call is selected */
voip_calls_list = g_list_first(voip_calls->strinfo_list);
voip_calls_list = g_list_first(voip_calls->callsinfo_list);
while (voip_calls_list)
{
tmp_voip_call = voip_calls_list->data;

File diff suppressed because it is too large Load Diff

View File

@ -149,7 +149,7 @@ typedef struct _voip_calls_info {
typedef struct _voip_calls_tapinfo {
int ncalls; /* number of call */
GList* strinfo_list; /* list with all calls */
GList* callsinfo_list; /* list with all calls */
int npackets; /* total number of packets of all calls */
voip_calls_info_t* filter_calls_fwd; /* used as filter in some tap modes */
guint32 launch_count; /* number of times the tap has been run */

View File

@ -194,7 +194,7 @@ static void add_to_clist(voip_calls_info_t* strinfo)
/* Update the status label with the number of total messages */
g_snprintf(label_text, 256,
"Total: Calls: %d Start packets: %d Completed calls: %d Rejected calls: %d",
g_list_length(voip_calls_get_info()->strinfo_list),
g_list_length(voip_calls_get_info()->callsinfo_list),
voip_calls_get_info()->start_packets,
voip_calls_get_info()->completed_calls,
voip_calls_get_info()->rejected_calls);
@ -420,7 +420,7 @@ on_graph_bt_clicked (GtkButton *button _U_,
/* set the display for selected calls */
list = g_list_first(voip_calls_get_info()->strinfo_list);
list = g_list_first(voip_calls_get_info()->callsinfo_list);
while (list){
tmp_listinfo=list->data;
if (tmp_listinfo->selected){
@ -478,7 +478,7 @@ voip_calls_on_select_row(GtkCList *clist,
/* count the selected calls */
calls_ns = 0;
list = g_list_first(voip_calls_get_info()->strinfo_list);
list = g_list_first(voip_calls_get_info()->callsinfo_list);
while (list){
listinfo=list->data;
if (listinfo->selected){
@ -540,7 +540,7 @@ voip_calls_on_unselect_row(GtkCList *clist,
/* count the selected calls */
calls_ns = 0;
list = g_list_first(voip_calls_get_info()->strinfo_list);
list = g_list_first(voip_calls_get_info()->callsinfo_list);
while (list){
listinfo=list->data;
if (listinfo->selected){
@ -849,7 +849,7 @@ void voip_calls_dlg_update(GList *list)
g_snprintf(label_text, 256,
"Total: Calls: %d Start packets: %d Completed calls: %d Rejected calls: %d",
g_list_length(voip_calls_get_info()->strinfo_list),
g_list_length(voip_calls_get_info()->callsinfo_list),
voip_calls_get_info()->start_packets,
voip_calls_get_info()->completed_calls,
voip_calls_get_info()->rejected_calls);
@ -883,7 +883,7 @@ void voip_calls_dlg_update(GList *list)
void voip_calls_dlg_draw(void *ptr _U_)
{
if (voip_calls_get_info()->redraw) {
voip_calls_dlg_update(voip_calls_get_info()->strinfo_list);
voip_calls_dlg_update(voip_calls_get_info()->callsinfo_list);
voip_calls_get_info()->redraw = FALSE;
}
}