diff options
author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-24 20:00:21 +0000 |
---|---|---|
committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-24 20:00:21 +0000 |
commit | 65c53fedb6c2a23295d280d8971f03c05343dc7d (patch) | |
tree | 38f6f77786d5869ee199e3e8fd80f0968be1b575 /asn1 | |
parent | cf8138e19504c72fb7874708442cffe1e84a145f (diff) |
Don't guard col_append_str with check_col
svn path=/trunk/; revision=30125
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/cmip/cmip.cnf | 8 | ||||
-rw-r--r-- | asn1/h225/h225.cnf | 5 | ||||
-rw-r--r-- | asn1/rrc/rrc.cnf | 316 | ||||
-rw-r--r-- | asn1/t38/packet-t38-template.c | 16 | ||||
-rw-r--r-- | asn1/t38/t38.cnf | 4 |
5 files changed, 87 insertions, 262 deletions
diff --git a/asn1/cmip/cmip.cnf b/asn1/cmip/cmip.cnf index 538a4c542c..424e01ad02 100644 --- a/asn1/cmip/cmip.cnf +++ b/asn1/cmip/cmip.cnf @@ -219,15 +219,11 @@ RejectProblem #.FN_HDR CMIPAbortInfo - if(check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "CMIP-A-ABORT"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "CMIP-A-ABORT"); #.END #.FN_HDR CMIPUserInfo - if(check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "CMIP-A-ASSOCIATE"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "CMIP-A-ASSOCIATE"); #.END #.FN_BODY CMIPAbortSource VAL_PTR = &value diff --git a/asn1/h225/h225.cnf b/asn1/h225/h225.cnf index 33c326e40a..b3602a49b2 100644 --- a/asn1/h225/h225.cnf +++ b/asn1/h225/h225.cnf @@ -260,10 +260,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber if (contains_faststart == TRUE ) { - if (check_col(%(ACTX)s->pinfo->cinfo, COL_INFO)) - { - col_append_str(%(ACTX)s->pinfo->cinfo, COL_INFO, "OpenLogicalChannel " ); - } + col_append_str(%(ACTX)s->pinfo->cinfo, COL_INFO, "OpenLogicalChannel " ); } col_set_fence(%(ACTX)s->pinfo->cinfo,COL_INFO); diff --git a/asn1/rrc/rrc.cnf b/asn1/rrc/rrc.cnf index 05b12718b9..786fc7113d 100644 --- a/asn1/rrc/rrc.cnf +++ b/asn1/rrc/rrc.cnf @@ -104,477 +104,319 @@ HandoverFromUTRANCommand-GSM-r6-IEs/gsm-message/single-GSM-Message single-GSM-Me #.END #.FN_BODY ActiveSetUpdate - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "ActiveSetUpdate"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "ActiveSetUpdate"); %(DEFAULT_BODY)s #.FN_BODY ActiveSetUpdateComplete - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "ActiveSetUpdateComplete"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "ActiveSetUpdateComplete"); %(DEFAULT_BODY)s #.FN_BODY ActiveSetUpdateFailure - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "ActiveSetUpdateFailure"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "ActiveSetUpdateFailure"); %(DEFAULT_BODY)s #.FN_BODY AssistanceDataDelivery - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "AssistanceDataDelivery"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "AssistanceDataDelivery"); %(DEFAULT_BODY)s #.FN_BODY CellChangeOrderFromUTRAN - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "CellChangeOrderFromUTRAN"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "CellChangeOrderFromUTRAN"); %(DEFAULT_BODY)s #.FN_BODY CellChangeOrderFromUTRANFailure - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "CellChangeOrderFromUTRANFailure"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "CellChangeOrderFromUTRANFailure"); %(DEFAULT_BODY)s #.FN_BODY CellUpdate - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdate"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdate"); %(DEFAULT_BODY)s #.FN_BODY CellUpdateConfirm-CCCH - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdateConfirm-CCCH"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdateConfirm-CCCH"); %(DEFAULT_BODY)s #.FN_BODY CellUpdateConfirm - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdateConfirm"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdateConfirm"); %(DEFAULT_BODY)s #.FN_BODY CounterCheck - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "CounterCheck"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "CounterCheck"); %(DEFAULT_BODY)s #.FN_BODY CounterCheckResponse - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "CounterCheckResponse"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "CounterCheckResponse"); %(DEFAULT_BODY)s #.FN_BODY DownlinkDirectTransfer - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "DownlinkDirectTransfer"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "DownlinkDirectTransfer"); %(DEFAULT_BODY)s #.FN_BODY HandoverToUTRANComplete - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverToUTRANComplete"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverToUTRANComplete"); %(DEFAULT_BODY)s #.FN_BODY HandoverFromUTRANCommand-GERANIu - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-GERANIu"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-GERANIu"); %(DEFAULT_BODY)s #.FN_BODY HandoverFromUTRANCommand-GSM - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-GSM"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-GSM"); %(DEFAULT_BODY)s #.FN_BODY HandoverFromUTRANCommand-CDMA2000 - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-CDMA2000"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-CDMA2000"); %(DEFAULT_BODY)s #.FN_BODY HandoverFromUTRANFailure - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANFailure"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANFailure"); %(DEFAULT_BODY)s #.FN_BODY InitialDirectTransfer - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "InitialDirectTransfer"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "InitialDirectTransfer"); %(DEFAULT_BODY)s #.FN_BODY MBMSAccessInformation - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSAccessInformation"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSAccessInformation"); %(DEFAULT_BODY)s #.FN_BODY MBMSCommonPTMRBInformation - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSCommonPTMRBInformation"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSCommonPTMRBInformation"); %(DEFAULT_BODY)s #.FN_BODY MBMSCurrentCellPTMRBInformation - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSCurrentCellPTMRBInformation"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSCurrentCellPTMRBInformation"); %(DEFAULT_BODY)s #.FN_BODY MBMSCurrentCellPTMRBInformation - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSCurrentCellPTMRBInformation"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSCurrentCellPTMRBInformation"); %(DEFAULT_BODY)s #.FN_BODY MBMSGeneralInformation - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSGeneralInformation"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSGeneralInformation"); %(DEFAULT_BODY)s #.FN_BODY MBMSModificationRequest - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSModificationRequest"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSModificationRequest"); %(DEFAULT_BODY)s #.FN_BODY MBMSModifiedServicesInformation - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSModifiedServicesInformation"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSModifiedServicesInformation"); %(DEFAULT_BODY)s #.FN_BODY MBMSNeighbouringCellPTMRBInformation - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSNeighbouringCellPTMRBInformation"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSNeighbouringCellPTMRBInformation"); %(DEFAULT_BODY)s #.FN_BODY MBMSSchedulingInformation - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSSchedulingInformation"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSSchedulingInformation"); %(DEFAULT_BODY)s #.FN_BODY MBMSUnmodifiedServicesInformation - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSUnmodifiedServicesInformation"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSUnmodifiedServicesInformation"); %(DEFAULT_BODY)s #.FN_BODY MeasurementControl - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementControl"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementControl"); %(DEFAULT_BODY)s #.FN_BODY MeasurementControlFailure - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementControlFailure"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementControlFailure"); %(DEFAULT_BODY)s #.FN_BODY MeasurementReport - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementReport"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementReport"); %(DEFAULT_BODY)s #.FN_BODY PagingType1 - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "PagingType1"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "PagingType1"); %(DEFAULT_BODY)s #.FN_BODY PagingType2 - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "PagingType2"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "PagingType2"); %(DEFAULT_BODY)s #.FN_BODY PhysicalChannelReconfiguration - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfiguration"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfiguration"); %(DEFAULT_BODY)s #.FN_BODY PhysicalChannelReconfigurationComplete - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfigurationComplete"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfigurationComplete"); %(DEFAULT_BODY)s #.FN_BODY PhysicalChannelReconfigurationFailure - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfigurationFailure"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfigurationFailure"); %(DEFAULT_BODY)s #.FN_BODY PhysicalSharedChannelAllocation - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalSharedChannelAllocation"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalSharedChannelAllocation"); %(DEFAULT_BODY)s #.FN_BODY PUSCHCapacityRequest - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "PUSCHCapacityRequest"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "PUSCHCapacityRequest"); %(DEFAULT_BODY)s #.FN_BODY RadioBearerReconfiguration - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfiguration"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfiguration"); %(DEFAULT_BODY)s #.FN_BODY RadioBearerReconfigurationComplete - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfigurationComplete"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfigurationComplete"); %(DEFAULT_BODY)s #.FN_BODY RadioBearerReconfigurationFailure - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfigurationFailure"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfigurationFailure"); %(DEFAULT_BODY)s #.FN_BODY RadioBearerRelease - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerRelease"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerRelease"); %(DEFAULT_BODY)s #.FN_BODY RadioBearerReleaseComplete - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReleaseComplete"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReleaseComplete"); %(DEFAULT_BODY)s #.FN_BODY RadioBearerReleaseFailure - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReleaseFailure"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReleaseFailure"); %(DEFAULT_BODY)s #.FN_BODY RadioBearerSetup - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetup"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetup"); %(DEFAULT_BODY)s #.FN_BODY RadioBearerSetupComplete - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetupComplete"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetupComplete"); %(DEFAULT_BODY)s #.FN_BODY RadioBearerSetupFailure - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetupFailure"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetupFailure"); %(DEFAULT_BODY)s #.FN_BODY RRCConnectionReject - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReject"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReject"); %(DEFAULT_BODY)s #.FN_BODY RRCConnectionRelease - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRelease"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRelease"); %(DEFAULT_BODY)s #.FN_BODY RRCConnectionRelease-CCCH - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRelease-CCCH"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRelease-CCCH"); %(DEFAULT_BODY)s #.FN_BODY RRCConnectionReleaseComplete - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReleaseComplete"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReleaseComplete"); %(DEFAULT_BODY)s #.FN_BODY RRCConnectionRequest - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRequest"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRequest"); %(DEFAULT_BODY)s #.FN_BODY RRCConnectionSetup - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetup"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetup"); %(DEFAULT_BODY)s #.FN_BODY RRCConnectionSetupComplete - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetupComplete"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetupComplete"); %(DEFAULT_BODY)s #.FN_BODY RRCStatus - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCStatus"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCStatus"); %(DEFAULT_BODY)s #.FN_BODY SecurityModeCommand - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeCommand"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeCommand"); %(DEFAULT_BODY)s #.FN_BODY SecurityModeComplete - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeComplete"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeComplete"); %(DEFAULT_BODY)s #.FN_BODY SecurityModeFailure - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeFailure"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeFailure"); %(DEFAULT_BODY)s #.FN_BODY SignallingConnectionRelease - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "SignallingConnectionRelease"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "SignallingConnectionRelease"); %(DEFAULT_BODY)s #.FN_BODY SignallingConnectionReleaseIndication - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "SignallingConnectionReleaseIndication"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "SignallingConnectionReleaseIndication"); %(DEFAULT_BODY)s #.FN_BODY SystemInformation-BCH - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformation-BCH"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformation-BCH"); %(DEFAULT_BODY)s #.FN_BODY SystemInformation-FACH - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformation-FACH"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformation-FACH"); %(DEFAULT_BODY)s #.FN_BODY SystemInformationChangeIndication - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformationChangeIndication"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformationChangeIndication"); %(DEFAULT_BODY)s #.FN_BODY TransportChannelReconfiguration - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfiguration"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfiguration"); %(DEFAULT_BODY)s #.FN_BODY TransportChannelReconfigurationComplete - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfigurationComplete"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfigurationComplete"); %(DEFAULT_BODY)s #.FN_BODY TransportChannelReconfigurationFailure - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfigurationFailure"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfigurationFailure"); %(DEFAULT_BODY)s #.FN_BODY TransportFormatCombinationControl - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportFormatCombinationControl"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportFormatCombinationControl"); %(DEFAULT_BODY)s #.FN_BODY TransportFormatCombinationControlFailure - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportFormatCombinationControlFailure"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportFormatCombinationControlFailure"); %(DEFAULT_BODY)s #.FN_BODY UECapabilityEnquiry - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityEnquiry"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityEnquiry"); %(DEFAULT_BODY)s #.FN_BODY UECapabilityInformation - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityInformation"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityInformation"); %(DEFAULT_BODY)s #.FN_BODY UECapabilityInformationConfirm - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityInformationConfirm"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityInformationConfirm"); %(DEFAULT_BODY)s #.FN_BODY UplinkDirectTransfer - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "UplinkDirectTransfer"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "UplinkDirectTransfer"); %(DEFAULT_BODY)s #.FN_BODY UplinkPhysicalChannelControl - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "UplinkPhysicalChannelControl"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "UplinkPhysicalChannelControl"); %(DEFAULT_BODY)s #.FN_BODY URAUpdate - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdate"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdate"); %(DEFAULT_BODY)s #.FN_BODY URAUpdateConfirm - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdateConfirm"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdateConfirm"); %(DEFAULT_BODY)s #.FN_BODY URAUpdateConfirm-CCCH - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdateConfirm-CCCH"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdateConfirm-CCCH"); %(DEFAULT_BODY)s #.FN_BODY UTRANMobilityInformation - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformation"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformation"); %(DEFAULT_BODY)s #.FN_BODY UTRANMobilityInformationConfirm - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformationConfirm"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformationConfirm"); %(DEFAULT_BODY)s #.FN_BODY UTRANMobilityInformationFailure - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformationFailure"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformationFailure"); %(DEFAULT_BODY)s #.FN_BODY TargetRNC-ToSourceRNC-Container/dL-DCCHmessage VAL_PTR = &dl_dcch_message_tvb diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c index 5916b7fd22..e7befe26b1 100644 --- a/asn1/t38/packet-t38-template.c +++ b/asn1/t38/packet-t38-template.c @@ -531,9 +531,7 @@ dissect_t38_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) show_setup_info(tvb, tr, p_t38_packet_conv); } - if (check_col(pinfo->cinfo, COL_INFO)){ - col_append_str(pinfo->cinfo, COL_INFO, "UDP: UDPTLPacket "); - } + col_append_str(pinfo->cinfo, COL_INFO, "UDP: UDPTLPacket "); offset = dissect_UDPTLPacket_PDU(tvb, pinfo, tr); @@ -542,9 +540,7 @@ dissect_t38_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(tr, tvb, offset, tvb_reported_length_remaining(tvb, offset), "[MALFORMED PACKET or wrong preference settings]"); } - if (check_col(pinfo->cinfo, COL_INFO)){ - col_append_str(pinfo->cinfo, COL_INFO, " [Malformed?]"); - } + col_append_str(pinfo->cinfo, COL_INFO, " [Malformed?]"); } } @@ -576,9 +572,7 @@ dissect_t38_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) show_setup_info(tvb, tr, p_t38_packet_conv); } - if (check_col(pinfo->cinfo, COL_INFO)){ - col_append_str(pinfo->cinfo, COL_INFO, "TCP: IFPPacket"); - } + col_append_str(pinfo->cinfo, COL_INFO, "TCP: IFPPacket"); while(tvb_length_remaining(tvb,offset)>0) { @@ -592,9 +586,7 @@ dissect_t38_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(tr, tvb, offset, tvb_reported_length_remaining(tvb, offset), "[MALFORMED PACKET or wrong preference settings]"); } - if (check_col(pinfo->cinfo, COL_INFO)){ - col_append_str(pinfo->cinfo, COL_INFO, " [Malformed?]"); - } + col_append_str(pinfo->cinfo, COL_INFO, " [Malformed?]"); break; } else { diff --git a/asn1/t38/t38.cnf b/asn1/t38/t38.cnf index 9e4bf2bae5..273e8b5c8c 100644 --- a/asn1/t38/t38.cnf +++ b/asn1/t38/t38.cnf @@ -135,9 +135,7 @@ VAL_PTR=&Data_Field_field_type_value proto_tree_add_text(tree, tvb, offset, tvb_reported_length_remaining(tvb, offset), "[RECEIVED END OF FRAGMENT W/OUT ANY FRAGMENT DATA]"); } - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, " [Malformed?]"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, " [Malformed?]"); actx->pinfo->fragmented = save_fragmented; } } |