X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=tap-mgcpstat.c;h=745dbd64e9cedd1ad3e978357df0cc30327f4561;hb=4ce68c634fd11f9ddf1eb3b037700ce1c96fca1a;hp=5d5d96236f3941bd5c11b6c5991d80de280807a5;hpb=06c9d7a21a8254bda633c6ee13b85f4c9165c491;p=obnox%2Fwireshark%2Fwip.git diff --git a/tap-mgcpstat.c b/tap-mgcpstat.c index 5d5d96236f..745dbd64e9 100644 --- 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; + int ret = 0; 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++; - return 0; } else { ms->open_req_num++; - return 0; } - break; + break; 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++; - return 0; } 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); } - return 1; + ret = 1; } - break; + break; default: - return 0; - break; + break; } + + return ret; } static void @@ -195,8 +193,7 @@ mgcpstat_init(const char *optarg, void* userdata _U_) } 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;irtd[i].num=0;