X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=tap-megaco-common.c;h=55bc5338ab83e1a4fa8225c08a987b0bb73aa9ae;hb=6acf01801a2e8f066d79312d64ada603ea04f15c;hp=f3ba4d46731204fd9bd7ffa4facaadab8db109b3;hpb=f33c99ba414afaef58312b8c3d619f90db8058f0;p=obnox%2Fwireshark%2Fwip.git

diff --git a/tap-megaco-common.c b/tap-megaco-common.c
index f3ba4d4673..55bc5338ab 100644
--- a/tap-megaco-common.c
+++ b/tap-megaco-common.c
@@ -41,7 +41,6 @@
 #include <epan/tap.h>
 #include "epan/gcp.h"
 
-#include "../register.h"
 #include "../timestats.h"
 #include "../simple_dialog.h"
 #include "../file.h"
@@ -64,7 +63,7 @@ megacostat_is_duplicate_reply(const gcp_cmd_t* cmd)
 				if (cmd_msg->cmd->type == cmd->type)
 					return TRUE;
 			}
-				
+
 			return FALSE;
 		}
 		break;
@@ -73,7 +72,7 @@ megacostat_is_duplicate_reply(const gcp_cmd_t* cmd)
 		break;
 	}
 
-	
+
 }
 
 static gboolean
@@ -87,7 +86,7 @@ megacostat_had_request(const gcp_cmd_t* cmd)
 			/* cycle through commands to find a request in the transaction */
 			for (cmd_msg = cmd->trx->cmds; cmd_msg->cmd->msg->framenum != cmd->msg->framenum &&
 					cmd_msg != NULL; cmd_msg = cmd_msg->next) {
-				
+
 				switch (cmd_msg->cmd->type) {
 
         			GCP_CMD_REQ_CASE
@@ -98,7 +97,7 @@ megacostat_had_request(const gcp_cmd_t* cmd)
 					break;
 				}
 			}
-				
+
 			return FALSE;
 		}
 		break;
@@ -112,14 +111,20 @@ int
 megacostat_packet(void *pms, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pmi)
 {
 	megacostat_t *ms=(megacostat_t *)pms;
-	const gcp_cmd_t *mi=(gcp_cmd_t*)pmi;
+	const gcp_cmd_t *mi=(const gcp_cmd_t*)pmi;
 	nstime_t delta;
 	int ret = 0;
 
 	switch (mi->type) {
 
         GCP_CMD_REQ_CASE
-		if(mi->trx->initial->framenum != mi->msg->framenum){
+		if(!mi->trx->initial) {
+			/* Track Context is probably disabled, we cannot
+			 * measure service response time */
+			return 0;
+		}
+
+		else if(mi->trx->initial->framenum != mi->msg->framenum){
 			/* Duplicate is ignored */
 			ms->req_dup_num++;
 		}
@@ -143,7 +148,7 @@ megacostat_packet(void *pms, packet_info *pinfo, epan_dissect_t *edt _U_, const
 			nstime_delta(&delta, &pinfo->fd->abs_ts, &mi->trx->initial->time);
 
 			switch(mi->type) {
-			
+
 			case GCP_CMD_ADD_REPLY:
 				time_stat_update(&(ms->rtd[0]),&delta, pinfo);
 				break;