git.samba.org
/
obnox
/
wireshark
/
wip.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From Francesco Fondelli (bug 2349):
[obnox/wireshark/wip.git]
/
tap-mgcpstat.c
diff --git
a/tap-mgcpstat.c
b/tap-mgcpstat.c
index 5d5d96236f3941bd5c11b6c5991d80de280807a5..745dbd64e9cedd1ad3e978357df0cc30327f4561 100644
(file)
--- a/
tap-mgcpstat.c
+++ b/
tap-mgcpstat.c
@@
-76,6
+76,7
@@
mgcpstat_packet(void *pms, packet_info *pinfo, epan_dissect_t *edt _U_, const vo
mgcpstat_t *ms=(mgcpstat_t *)pms;
const mgcp_info_t *mi=pmi;
nstime_t delta;
mgcpstat_t *ms=(mgcpstat_t *)pms;
const mgcp_info_t *mi=pmi;
nstime_t delta;
+ int ret = 0;
switch (mi->mgcp_type) {
switch (mi->mgcp_type) {
@@
-83,24
+84,20
@@
mgcpstat_packet(void *pms, packet_info *pinfo, epan_dissect_t *edt _U_, const vo
if(mi->is_duplicate){
/* Duplicate is ignored */
ms->req_dup_num++;
if(mi->is_duplicate){
/* Duplicate is ignored */
ms->req_dup_num++;
- return 0;
}
else {
ms->open_req_num++;
}
else {
ms->open_req_num++;
- return 0;
}
}
- break;
+
break;
case MGCP_RESPONSE:
if(mi->is_duplicate){
/* Duplicate is ignored */
ms->rsp_dup_num++;
case MGCP_RESPONSE:
if(mi->is_duplicate){
/* Duplicate is ignored */
ms->rsp_dup_num++;
- return 0;
}
else if (!mi->request_available) {
/* no request was seen */
ms->disc_rsp_num++;
}
else if (!mi->request_available) {
/* no request was seen */
ms->disc_rsp_num++;
- return 0;
}
else {
ms->open_req_num--;
}
else {
ms->open_req_num--;
@@
-140,14
+137,15
@@
mgcpstat_packet(void *pms, packet_info *pinfo, epan_dissect_t *edt _U_, const vo
time_stat_update(&(ms->rtd[10]),&delta, pinfo);
}
time_stat_update(&(ms->rtd[10]),&delta, pinfo);
}
- ret
urn
1;
+ ret
=
1;
}
}
- break;
+
break;
default:
default:
- return 0;
- break;
+ break;
}
}
+
+ return ret;
}
static void
}
static void
@@
-195,8
+193,7
@@
mgcpstat_init(const char *optarg, void* userdata _U_)
}
ms=g_malloc(sizeof(mgcpstat_t));
}
ms=g_malloc(sizeof(mgcpstat_t));
- ms->filter=g_malloc(strlen(filter)+1);
- strcpy(ms->filter, filter);
+ ms->filter=g_strdup(filter);
for(i=0;i<NUM_TIMESTATS;i++) {
ms->rtd[i].num=0;
for(i=0;i<NUM_TIMESTATS;i++) {
ms->rtd[i].num=0;