osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

RRC: Use PINFO_FD_VISITED macro 

Change-Id: Ica32ffc5f150451dba42a531d1661df4325b5c02
Reviewed-on: https://code.wireshark.org/review/27983
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
This commit is contained in:
Darien Spencer 2018-06-02 13:00:55 +03:00 committed by Peter Wu
parent 79a024337d
commit f6e3ed7e87
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
epan/dissectors/asn1/rrc/rrc.cnf
View File

@ -230,7 +230,7 @@ HandoverFromUTRANCommand-GSM-r6-IEs/gsm-message/single-GSM-Message single-GSM-Me
guint32 u_rnti;
col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdateConfirm-CCCH");
%(DEFAULT_BODY)s
if(actx->pinfo->fd->flags.visited) {
if(PINFO_FD_VISITED(actx->pinfo)) {
return offset;
}
@ -254,7 +254,7 @@ HandoverFromUTRANCommand-GSM-r6-IEs/gsm-message/single-GSM-Message single-GSM-Me
guint32 u_rnti;
col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdateConfirm");
%(DEFAULT_BODY)s
if(actx->pinfo->fd->flags.visited) {
if(PINFO_FD_VISITED(actx->pinfo)) {
return offset;
}
@ -382,7 +382,7 @@ HandoverFromUTRANCommand-GSM-r6-IEs/gsm-message/single-GSM-Message single-GSM-Me
guint32 u_rnti;
col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfiguration");
%(DEFAULT_BODY)s
if(actx->pinfo->fd->flags.visited) {
if(PINFO_FD_VISITED(actx->pinfo)) {
return offset;
}
@ -423,7 +423,7 @@ HandoverFromUTRANCommand-GSM-r6-IEs/gsm-message/single-GSM-Message single-GSM-Me
guint32 u_rnti;
col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfiguration");
%(DEFAULT_BODY)s
if(actx->pinfo->fd->flags.visited) {
if(PINFO_FD_VISITED(actx->pinfo)) {
return offset;
}
@ -498,7 +498,7 @@ HandoverFromUTRANCommand-GSM-r6-IEs/gsm-message/single-GSM-Message single-GSM-Me
guint32 new_u_rnti;
col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetup");
%(DEFAULT_BODY)s
if (actx->pinfo->fd->flags.visited) {
if (PINFO_FD_VISITED(actx->pinfo)) {
return offset;
}
@ -588,7 +588,7 @@ HandoverFromUTRANCommand-GSM-r6-IEs/gsm-message/single-GSM-Message single-GSM-Me
guint32 u_rnti;
col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfiguration");
%(DEFAULT_BODY)s
if(actx->pinfo->fd->flags.visited) {
if(PINFO_FD_VISITED(actx->pinfo)) {
return offset;
}
@ -1179,7 +1179,7 @@ HNBName TYPE=FT_STRING DISPLAY=STR_UNICODE
c_rnti = tvb_get_ntohs(c_rnti_tvb,0);
}
if(actx->pinfo->fd->flags.visited) /* Frame was already checked*/
if(PINFO_FD_VISITED(actx->pinfo)) /* Frame was already checked*/
return offset;
/* Trying to figure where to get the U-RNTI from Either from an ASN.1 field (if this is CCCH) or RLC's attached info (if this is DCCH) */

14
epan/dissectors/packet-rrc.c
View File

@ -39174,7 +39174,7 @@ dissect_rrc_C_RNTI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot
c_rnti = tvb_get_ntohs(c_rnti_tvb,0);
}
if(actx->pinfo->fd->flags.visited) /* Frame was already checked*/
if(PINFO_FD_VISITED(actx->pinfo)) /* Frame was already checked*/
return offset;
/* Trying to figure where to get the U-RNTI from Either from an ASN.1 field (if this is CCCH) or RLC's attached info (if this is DCCH) */
@ -63646,7 +63646,7 @@ dissect_rrc_CellUpdateConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
ett_rrc_CellUpdateConfirm, CellUpdateConfirm_choice,
NULL);
if(actx->pinfo->fd->flags.visited) {
if(PINFO_FD_VISITED(actx->pinfo)) {
return offset;
}
@ -80215,7 +80215,7 @@ dissect_rrc_PhysicalChannelReconfiguration(tvbuff_t *tvb _U_, int offset _U_, as
ett_rrc_PhysicalChannelReconfiguration, PhysicalChannelReconfiguration_choice,
NULL);
if(actx->pinfo->fd->flags.visited) {
if(PINFO_FD_VISITED(actx->pinfo)) {
return offset;
}
@ -85730,7 +85730,7 @@ dissect_rrc_RadioBearerReconfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_c
ett_rrc_RadioBearerReconfiguration, RadioBearerReconfiguration_choice,
NULL);
if(actx->pinfo->fd->flags.visited) {
if(PINFO_FD_VISITED(actx->pinfo)) {
return offset;
}
@ -94333,7 +94333,7 @@ dissect_rrc_TransportChannelReconfiguration(tvbuff_t *tvb _U_, int offset _U_, a
ett_rrc_TransportChannelReconfiguration, TransportChannelReconfiguration_choice,
NULL);
if(actx->pinfo->fd->flags.visited) {
if(PINFO_FD_VISITED(actx->pinfo)) {
return offset;
}
@ -115724,7 +115724,7 @@ dissect_rrc_CellUpdateConfirm_CCCH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
ett_rrc_CellUpdateConfirm_CCCH, CellUpdateConfirm_CCCH_choice,
NULL);
if(actx->pinfo->fd->flags.visited) {
if(PINFO_FD_VISITED(actx->pinfo)) {
return offset;
}
@ -119090,7 +119090,7 @@ dissect_rrc_RRCConnectionSetup(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
ett_rrc_RRCConnectionSetup, RRCConnectionSetup_choice,
NULL);
if (actx->pinfo->fd->flags.visited) {
if (PINFO_FD_VISITED(actx->pinfo)) {
return offset;
}