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

Mark all the items for TCAP statistics as generated 

svn path=/trunk/; revision=21524
This commit is contained in:
Jeff Morriss 2007-04-23 10:45:00 +00:00
parent c84eda3a80
commit 20a3a52951
3 changed files with 218 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asn1/tcap/packet-tcap-template.c
View File

@ -189,6 +189,7 @@ dissect_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
!tcap_subdissector_used ) {
if (gtcap_DisplaySRT && tree) {
stat_item = proto_tree_add_text(tree, tvb, 0, 0, "Stat");
PROTO_ITEM_SET_GENERATED(stat_item);
stat_tree = proto_item_add_subtree(stat_item, ett_tcap_stat);
}
p_tcap_context=tcapsrt_call_matching(tvb, pinfo, stat_tree, gp_tcapsrt_info);
@ -517,6 +518,7 @@ dissect_tcap_TheComponent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
/* Create TCAP context and tree for display */
if (gtcap_DisplaySRT && tree) {
stat_item = proto_tree_add_text(tcap_stat_tree, tvb, offset, -1, "Stat");
PROTO_ITEM_SET_GENERATED(stat_item);
stat_tree = proto_item_add_subtree(stat_item, ett_tcap_stat);
}
p_tcap_context=tcapsrt_call_matching(tvb, pinfo, stat_tree, gp_tcapsrt_info);

8
epan/dissectors/packet-tcap.c
View File

@ -2411,6 +2411,7 @@ dissect_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
!tcap_subdissector_used ) {
if (gtcap_DisplaySRT && tree) {
stat_item = proto_tree_add_text(tree, tvb, 0, 0, "Stat");
PROTO_ITEM_SET_GENERATED(stat_item);
stat_tree = proto_item_add_subtree(stat_item, ett_tcap_stat);
}
p_tcap_context=tcapsrt_call_matching(tvb, pinfo, stat_tree, gp_tcapsrt_info);
@ -2461,7 +2462,7 @@ proto_reg_handoff_tcap(void)
/*--- End of included file: packet-tcap-dis-tab.c ---*/
#line 235 "packet-tcap-template.c"
#line 236 "packet-tcap-template.c"
}
static void init_tcap(void);
@ -3024,7 +3025,7 @@ proto_register_tcap(void)
"", HFILL }},
/*--- End of included file: packet-tcap-hfarr.c ---*/
#line 297 "packet-tcap-template.c"
#line 298 "packet-tcap-template.c"
};
/* Setup protocol subtree array */
@ -3089,7 +3090,7 @@ proto_register_tcap(void)
&ett_tcap_ErrorCode,
/*--- End of included file: packet-tcap-ettarr.c ---*/
#line 307 "packet-tcap-template.c"
#line 308 "packet-tcap-template.c"
};
/*static enum_val_t tcap_options[] = {
@ -3303,6 +3304,7 @@ dissect_tcap_TheComponent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
/* Create TCAP context and tree for display */
if (gtcap_DisplaySRT && tree) {
stat_item = proto_tree_add_text(tcap_stat_tree, tvb, offset, -1, "Stat");
PROTO_ITEM_SET_GENERATED(stat_item);
stat_tree = proto_item_add_subtree(stat_item, ett_tcap_stat);
}
p_tcap_context=tcapsrt_call_matching(tvb, pinfo, stat_tree, gp_tcapsrt_info);

42
epan/tcap-persistentdata.c
View File

@ -820,7 +820,7 @@ tcaphash_begin_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
struct tcaphash_context_key_t tcaphash_context_key;
struct tcaphash_begincall_t *p_tcaphash_begincall, *p_new_tcaphash_begincall;
struct tcaphash_begin_info_key_t tcaphash_begin_key;
proto_item *ti;
proto_item *pi;
/* prepare the key data */
tcaphash_begin_key.tid = p_tcapsrt_info->src_tid;
@ -913,8 +913,10 @@ tcaphash_begin_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
#ifdef DEBUG_TCAPSRT
dbg(21,"Display_duplicate ");
#endif
if (gtcap_DisplaySRT)
proto_tree_add_uint_hidden(tree, hf_tcapsrt_Duplicate, tvb, 0,0, p_tcapsrt_info->src_tid);
if (gtcap_DisplaySRT) {
pi = proto_tree_add_uint_hidden(tree, hf_tcapsrt_Duplicate, tvb, 0,0, p_tcapsrt_info->src_tid);
PROTO_ITEM_SET_GENERATED(pi);
}
p_tcaphash_context=p_tcaphash_begincall->context;
} /* test with Timeout */
} /* closed */
@ -944,8 +946,11 @@ tcaphash_begin_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
/* display tcap session, if available */
if ( gtcap_DisplaySRT &&
p_tcaphash_context &&
p_tcaphash_context->session_id)
proto_tree_add_uint(tree, hf_tcapsrt_SessionId, tvb, 0,0, p_tcaphash_context->session_id);
p_tcaphash_context->session_id) {
pi = proto_tree_add_uint(tree, hf_tcapsrt_SessionId, tvb, 0,0, p_tcaphash_context->session_id);
PROTO_ITEM_SET_GENERATED(pi);
}
/* add link to response frame, if available */
if( gtcap_DisplaySRT &&
@ -953,11 +958,11 @@ tcaphash_begin_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
#ifdef DEBUG_TCAPSRT
dbg(20,"Display_frameRsplink %d ",p_tcaphash_begincall->context->last_frame);
#endif
ti = proto_tree_add_uint_format(tree, hf_tcapsrt_BeginSession, tvb, 0, 0,
pi = proto_tree_add_uint_format(tree, hf_tcapsrt_BeginSession, tvb, 0, 0,
p_tcaphash_begincall->context->last_frame,
"End of session in frame %u",
p_tcaphash_begincall->context->last_frame);
PROTO_ITEM_SET_GENERATED(ti);
PROTO_ITEM_SET_GENERATED(pi);
}
return p_tcaphash_context;
}
@ -974,6 +979,7 @@ tcaphash_cont_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
struct tcaphash_context_t *p_tcaphash_context=NULL;
struct tcaphash_contcall_t *p_tcaphash_contcall;
struct tcaphash_cont_info_key_t tcaphash_cont_key;
proto_item *pi;
#ifdef DEBUG_TCAPSRT
dbg(10,"\n Hcont #%u ", pinfo->fd->num);
@ -1060,8 +1066,10 @@ tcaphash_cont_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
/* display tcap session, if available */
if (gtcap_DisplaySRT &&
p_tcaphash_context &&
p_tcaphash_context->session_id)
proto_tree_add_uint(tree, hf_tcapsrt_SessionId, tvb, 0,0, p_tcaphash_context->session_id);
p_tcaphash_context->session_id) {
pi = proto_tree_add_uint(tree, hf_tcapsrt_SessionId, tvb, 0,0, p_tcaphash_context->session_id);
PROTO_ITEM_SET_GENERATED(pi);
}
return p_tcaphash_context;
}
@ -1083,7 +1091,7 @@ tcaphash_end_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
struct tcaphash_begin_info_key_t tcaphash_begin_key;
struct tcaphash_begincall_t *p_tcaphash_begincall=NULL;
proto_item *ti;
proto_item *pi;
nstime_t delta;
@ -1133,25 +1141,27 @@ tcaphash_end_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
#ifdef DEBUG_TCAPSRT
dbg(12,"Found, req=%d ",p_tcaphash_context->first_frame);
#endif
if (gtcap_DisplaySRT)
proto_tree_add_uint(tree, hf_tcapsrt_SessionId, tvb, 0,0, p_tcaphash_context->session_id);
if (gtcap_DisplaySRT) {
pi = proto_tree_add_uint(tree, hf_tcapsrt_SessionId, tvb, 0,0, p_tcaphash_context->session_id);
PROTO_ITEM_SET_GENERATED(pi);
}
#ifdef DEBUG_TCAPSRT
dbg(20,"Display framereqlink %d ",p_tcaphash_context->first_frame);
#endif
/* Indicate the frame to which this is a reply. */
if (gtcap_DisplaySRT) {
ti = proto_tree_add_uint_format(tree, hf_tcapsrt_EndSession, tvb, 0, 0,
pi = proto_tree_add_uint_format(tree, hf_tcapsrt_EndSession, tvb, 0, 0,
p_tcaphash_context->first_frame,
"Begin of session in frame %u",
p_tcaphash_context->first_frame);
PROTO_ITEM_SET_GENERATED(ti);
PROTO_ITEM_SET_GENERATED(pi);
/* Calculate Service Response Time */
nstime_delta(&delta, &pinfo->fd->abs_ts, &p_tcaphash_context->begin_time);
/* display Service Response Time and make it filterable */
ti = proto_tree_add_time(tree, hf_tcapsrt_SessionTime, tvb, 0, 0, &delta);
PROTO_ITEM_SET_GENERATED(ti);
pi = proto_tree_add_time(tree, hf_tcapsrt_SessionTime, tvb, 0, 0, &delta);
PROTO_ITEM_SET_GENERATED(pi);
}
/* Close the context and remove it */
tcapsrt_close(p_tcaphash_context,pinfo);