diff options
| author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-24 20:00:21 +0000 |
|---|---|---|
| committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-24 20:00:21 +0000 |
| commit | 1e66be7623925864a57d00c97b52f88708cf6b54 (patch) | |
| tree | 38f6f77786d5869ee199e3e8fd80f0968be1b575 | |
| parent | 8d3dd59976ca5a8851a57f28e8c7d6a0f22062e0 (diff) | |
Don't guard col_append_str with check_col
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30125 f5534014-38df-0310-8fa8-9805f1628bb7
45 files changed, 286 insertions, 893 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; } } diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c index 6380144d79..ba23017d10 100644 --- a/epan/dissectors/packet-ansi_a.c +++ b/epan/dissectors/packet-ansi_a.c @@ -11607,10 +11607,7 @@ dissect_bsmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) const gchar *msg_str; - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_append_str(pinfo->cinfo, COL_INFO, "(BSMAP) "); - } + col_append_str(pinfo->cinfo, COL_INFO, "(BSMAP) "); /* * set tap record pointer @@ -11727,10 +11724,7 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return; } - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_append_str(pinfo->cinfo, COL_INFO, "(DTAP) "); - } + col_append_str(pinfo->cinfo, COL_INFO, "(DTAP) "); /* * set tap record pointer diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index 81ef42a43c..d3bbbb6d25 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -798,9 +798,7 @@ static void dissect_b_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvbuff_t *next_tvb; next_tvb = tvb_new_subset(tvb, offset, tvb_length_remaining(tvb, offset), length); - if(check_col(pinfo->cinfo, COL_INFO)){ - col_append_str(pinfo->cinfo, COL_INFO, "Connection oriented channel"); - } + col_append_str(pinfo->cinfo, COL_INFO, "Connection oriented channel"); if(psm){ proto_item *psm_item; @@ -1212,9 +1210,7 @@ static void dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } } else if (cid == BTL2CAP_FIXED_CID_CONNLESS) { /* Connectionless reception channel */ - if(check_col(pinfo->cinfo, COL_INFO)){ - col_append_str(pinfo->cinfo, COL_INFO, "Connectionless reception channel"); - } + col_append_str(pinfo->cinfo, COL_INFO, "Connectionless reception channel"); psm = tvb_get_letohs(tvb, offset); proto_tree_add_item(btl2cap_tree, hf_btl2cap_psm, tvb, offset, 2, TRUE); diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index 147575f2d0..e8607f4d95 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -2195,9 +2195,7 @@ static const ber_sequence_t CMIPAbortInfo_sequence[] = { int dissect_cmip_CMIPAbortInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 222 "cmip.cnf" - 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"); offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, CMIPAbortInfo_sequence, hf_index, ett_cmip_CMIPAbortInfo); @@ -2252,9 +2250,7 @@ static const ber_sequence_t CMIPUserInfo_sequence[] = { int dissect_cmip_CMIPUserInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 228 "cmip.cnf" - 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"); offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, CMIPUserInfo_sequence, hf_index, ett_cmip_CMIPUserInfo); diff --git a/epan/dissectors/packet-ctdb.c b/epan/dissectors/packet-ctdb.c index 35fd516a5c..cd713cd91c 100644 --- a/epan/dissectors/packet-ctdb.c +++ b/epan/dissectors/packet-ctdb.c @@ -902,9 +902,7 @@ dissect_ctdb_req_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree flags=tvb_get_ntohl(tvb, offset); } if(flags&0x00000001){ - if(check_col(pinfo->cinfo, COL_INFO)){ - col_append_str(pinfo->cinfo, COL_INFO, " IMMEDIATE"); - } + col_append_str(pinfo->cinfo, COL_INFO, " IMMEDIATE"); } offset+=4; diff --git a/epan/dissectors/packet-dcerpc-rs_acct.c b/epan/dissectors/packet-dcerpc-rs_acct.c index f5c0a737a4..b42abd3d55 100644 --- a/epan/dissectors/packet-dcerpc-rs_acct.c +++ b/epan/dissectors/packet-dcerpc-rs_acct.c @@ -82,10 +82,8 @@ rs_acct_dissect_lookup_rqst (tvbuff_t *tvb, int offset, " Request for: %s ", keyx_t); } } else { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, " Request (other)"); - } } return offset; diff --git a/epan/dissectors/packet-dcerpc-rs_misc.c b/epan/dissectors/packet-dcerpc-rs_misc.c index bcf5b9911e..3675612f62 100644 --- a/epan/dissectors/packet-dcerpc-rs_misc.c +++ b/epan/dissectors/packet-dcerpc-rs_misc.c @@ -80,10 +80,8 @@ rs_misc_dissect_login_get_info_rqst (tvbuff_t *tvb, int offset, "rs_login_get_info Request for: %s ", key_t1); } } else { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "rs_login_get_info Request (other)"); - } } return offset; diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 3e6d7a6d9d..cddfdf87a5 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -3701,10 +3701,8 @@ dissect_dcerpc_cn_fault (tvbuff_t *tvb, gint offset, packet_info *pinfo, } } else { /* PDU is fragmented and this isn't the first fragment */ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, " [DCE/RPC fragment]"); - } if (dcerpc_tree) { if (stub_length > 0) { tvb_ensure_bytes_exist(tvb, offset, stub_length); @@ -3736,10 +3734,8 @@ dissect_dcerpc_cn_fault (tvbuff_t *tvb, gint offset, packet_info *pinfo, stub_length, TRUE); } - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, " [DCE/RPC fragment]"); - } } else if(hdr->flags&PFC_LAST_FRAG){ /* LAST fragment */ if( value->rep_frame ){ fragment_data *fd_head; @@ -3782,10 +3778,8 @@ dissect_dcerpc_cn_fault (tvbuff_t *tvb, gint offset, packet_info *pinfo, } else { /* Reassembly not complete - some fragments are missing */ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, " [DCE/RPC fragment]"); - } } } } else { /* MIDDLE fragment(s) */ @@ -3795,10 +3789,8 @@ dissect_dcerpc_cn_fault (tvbuff_t *tvb, gint offset, packet_info *pinfo, stub_length, TRUE); } - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, " [DCE/RPC fragment]"); - } } } } @@ -4426,9 +4418,7 @@ dissect_dcerpc_dg_stub (tvbuff_t *tvb, int offset, packet_info *pinfo, next_tvb, hdr->drep, di, NULL); } else { /* PDU is fragmented and this isn't the first fragment */ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, " [DCE/RPC fragment]"); - } + col_append_str(pinfo->cinfo, COL_INFO, " [DCE/RPC fragment]"); if (dcerpc_tree) { if (length > 0) { tvb_ensure_bytes_exist(tvb, offset, stub_length); @@ -4488,9 +4478,7 @@ dissect_dcerpc_dg_stub (tvbuff_t *tvb, int offset, packet_info *pinfo, } } else { /* Reassembly isn't completed yet */ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, " [DCE/RPC fragment]"); - } + col_append_str(pinfo->cinfo, COL_INFO, " [DCE/RPC fragment]"); } } pinfo->fragmented = save_fragmented; diff --git a/epan/dissectors/packet-dcom-dispatch.c b/epan/dissectors/packet-dcom-dispatch.c index 9e37a3bf9b..ad4f44f69e 100644 --- a/epan/dissectors/packet-dcom-dispatch.c +++ b/epan/dissectors/packet-dcom-dispatch.c @@ -316,27 +316,19 @@ dissect_IDispatch_Invoke_rqst(tvbuff_t *tvb, int offset, if (u32Flags & DISPATCH_FLAGS_METHOD) { proto_item_append_text(feature_item, ", Method"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, " Method"); - } + col_append_str(pinfo->cinfo, COL_INFO, " Method"); } if (u32Flags & DISPATCH_FLAGS_PROPGET) { proto_item_append_text(feature_item, ", PropertyGet"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, " PropertyGet"); - } + col_append_str(pinfo->cinfo, COL_INFO, " PropertyGet"); } if (u32Flags & DISPATCH_FLAGS_PROPPUT) { proto_item_append_text(feature_item, ", PropertyPut"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, " PropertyPut"); - } + col_append_str(pinfo->cinfo, COL_INFO, " PropertyPut"); } if (u32Flags & DISPATCH_FLAGS_PROPPUTREF) { proto_item_append_text(feature_item, ", PropertyPutRef"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, " PropertyPutRef"); - } + col_append_str(pinfo->cinfo, COL_INFO, " PropertyPutRef"); } offset = u32TmpOffset; diff --git a/epan/dissectors/packet-distcc.c b/epan/dissectors/packet-distcc.c index 8146ef15a8..08c8b3ee50 100644 --- a/epan/dissectors/packet-distcc.c +++ b/epan/dissectors/packet-distcc.c @@ -247,9 +247,7 @@ dissect_distcc_doti(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off /* see if we need to desegment the PDU */ DESEGMENT_TCP("DOTI"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, "DOTI source "); - } + col_append_str(pinfo->cinfo, COL_INFO, "DOTI source "); proto_tree_add_item(tree, hf_distcc_doti_source, tvb, offset, len, FALSE); if(len!=parameter){ @@ -269,9 +267,7 @@ dissect_distcc_doto(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off /* see if we need to desegment the PDU */ DESEGMENT_TCP("DOTO"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, "DOTO object "); - } + col_append_str(pinfo->cinfo, COL_INFO, "DOTO object "); proto_tree_add_item(tree, hf_distcc_doto_object, tvb, offset, len, FALSE); if(len!=parameter){ diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index dd34ec4020..e714a18f54 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -1026,10 +1026,7 @@ dissect_epl_asnd_sdo(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, gi { offset = dissect_epl_sdo_command(epl_tree, tvb, pinfo, offset); } - else if (check_col(pinfo->cinfo, COL_INFO)) - { - col_append_str(pinfo->cinfo, COL_INFO, "Empty CommandLayer"); - } + else col_append_str(pinfo->cinfo, COL_INFO, "Empty CommandLayer"); return offset; } @@ -1237,10 +1234,7 @@ dissect_epl_sdo_command_write_by_index(proto_tree *epl_tree, tvbuff_t *tvb, pack else { /* response, no payload */ - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_append_str(pinfo->cinfo, COL_INFO, "Response"); - } + col_append_str(pinfo->cinfo, COL_INFO, "Response"); } return offset; } diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 52f492e9d2..9280734567 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -1125,9 +1125,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean if (!is_lastframe_inseq) { /* Show this only as a fragmented FC frame */ - if (check_col (pinfo->cinfo, COL_INFO)) { - col_append_str (pinfo->cinfo, COL_INFO, " (Fragmented)"); - } + col_append_str (pinfo->cinfo, COL_INFO, " (Fragmented)"); } /* If this is a fragment, attempt to check if fully reassembled frame is @@ -1183,9 +1181,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean * 0. This is a bogus frame, don't attempt to reassemble it. */ next_tvb = tvb_new_subset_remaining (tvb, next_offset); - if (check_col (pinfo->cinfo, COL_INFO)) { - col_append_str (pinfo->cinfo, COL_INFO, " (Bogus Fragment)"); - } + col_append_str (pinfo->cinfo, COL_INFO, " (Bogus Fragment)"); } else { frag_id = ((pinfo->oxid << 16) ^ seq_id) | is_exchg_resp ; diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c index e7ea11e1f0..fe6c4b515e 100644 --- a/epan/dissectors/packet-fcels.c +++ b/epan/dissectors/packet-fcels.c @@ -1746,14 +1746,10 @@ dissect_fcels_cbind (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, switch(tvb_reported_length(tvb)){ case 32: /* 28 byte Request + 4 bytes FC CRC */ - if (check_col (pinfo->cinfo, COL_INFO)) { - col_append_str (pinfo->cinfo, COL_INFO, "Request"); - } + col_append_str (pinfo->cinfo, COL_INFO, "Request"); break; case 40: /* 36 byte Response + 4 bytes FC CRC */ - if (check_col (pinfo->cinfo, COL_INFO)) { - col_append_str (pinfo->cinfo, COL_INFO, "Response"); - } + col_append_str (pinfo->cinfo, COL_INFO, "Response"); proto_tree_add_item (cbind_tree, hf_fcels_cbind_status, tvb, offset+30, 2, FALSE); proto_tree_add_item (cbind_tree, hf_fcels_chandle, tvb, offset+34, 2, FALSE); break; @@ -1781,14 +1777,10 @@ dissect_fcels_unbind (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, switch(tvb_reported_length(tvb)){ case 24: /* 20 byte Request + 4 bytes FC CRC */ - if (check_col (pinfo->cinfo, COL_INFO)) { - col_append_str (pinfo->cinfo, COL_INFO, "Request"); - } + col_append_str (pinfo->cinfo, COL_INFO, "Request"); break; case 28: /* 24 byte Response + 4 bytes FC CRC */ - if (check_col (pinfo->cinfo, COL_INFO)) { - col_append_str (pinfo->cinfo, COL_INFO, "Response"); - } + col_append_str (pinfo->cinfo, COL_INFO, "Response"); proto_tree_add_item (cbind_tree, hf_fcels_unbind_status, tvb, offset+22, 2, FALSE); break; } diff --git a/epan/dissectors/packet-fcsb3.c b/epan/dissectors/packet-fcsb3.c index 8ebf393a11..d4e1dd4569 100644 --- a/epan/dissectors/packet-fcsb3.c +++ b/epan/dissectors/packet-fcsb3.c @@ -627,72 +627,56 @@ dissect_status (packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int proto_tree_add_boolean(tree, hf_sbccs_dib_status_attention, tvb, offset, 1, flags); if (flags&0x80){ proto_item_append_text(item, " Attention"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, " Attention"); - } + col_append_str(pinfo->cinfo, COL_INFO, " Attention"); } flags&=(~( 0x80 )); proto_tree_add_boolean(tree, hf_sbccs_dib_status_modifier, tvb, offset, 1, flags); if (flags&0x40){ proto_item_append_text(item, " Status Modifier"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, " Status Modifier"); - } + col_append_str(pinfo->cinfo, COL_INFO, " Status Modifier"); } flags&=(~( 0x40 )); proto_tree_add_boolean(tree, hf_sbccs_dib_status_cue, tvb, offset, 1, flags); if (flags&0x20){ proto_item_append_text(item, " Control-Unit End"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, " Control-Unit End"); - } + col_append_str(pinfo->cinfo, COL_INFO, " Control-Unit End"); } flags&=(~( 0x20 )); proto_tree_add_boolean(tree, hf_sbccs_dib_status_busy, tvb, offset, 1, flags); if (flags&0x10){ proto_item_append_text(item, " Busy"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, " Busy"); - } + col_append_str(pinfo->cinfo, COL_INFO, " Busy"); } flags&=(~( 0x10 )); proto_tree_add_boolean(tree, hf_sbccs_dib_status_channelend, tvb, offset, 1, flags); if (flags&0x08){ proto_item_append_text(item, " Channel End"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, " Channel End"); - } + col_append_str(pinfo->cinfo, COL_INFO, " Channel End"); } flags&=(~( 0x08 )); proto_tree_add_boolean(tree, hf_sbccs_dib_status_deviceend, tvb, offset, 1, flags); if (flags&0x04){ proto_item_append_text(item, " Device End"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, " Device End"); - } + col_append_str(pinfo->cinfo, COL_INFO, " Device End"); } flags&=(~( 0x04 )); proto_tree_add_boolean(tree, hf_sbccs_dib_status_unit_check, tvb, offset, 1, flags); if (flags&0x02){ proto_item_append_text(item, " Unit Check"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, " Unit Check"); - } + col_append_str(pinfo->cinfo, COL_INFO, " Unit Check"); } flags&=(~( 0x02 )); proto_tree_add_boolean(tree, hf_sbccs_dib_status_unit_exception, tvb, offset, 1, flags); if (flags&0x01){ proto_item_append_text(item, " Unit Exception"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, " Unit Exception"); - } + col_append_str(pinfo->cinfo, COL_INFO, " Unit Exception"); } flags&=(~( 0x01 )); diff --git a/epan/dissectors/packet-gprs-llc.c b/epan/dissectors/packet-gprs-llc.c index d8c1786076..a70d49e419 100644 --- a/epan/dissectors/packet-gprs-llc.c +++ b/epan/dissectors/packet-gprs-llc.c @@ -626,10 +626,7 @@ dissect_llcgprs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (frame_format) { case I_FORMAT: - if (check_col(pinfo->cinfo,COL_INFO)) - { - col_append_str(pinfo->cinfo,COL_INFO, ", I, "); - } + col_append_str(pinfo->cinfo,COL_INFO, ", I, "); /* MLT CHANGES - additional parsing code */ ns = tvb_get_ntohs(tvb, offset); diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c index 26f1d317b1..de4b45f951 100644 --- a/epan/dissectors/packet-gsm_a_bssmap.c +++ b/epan/dissectors/packet-gsm_a_bssmap.c @@ -5758,10 +5758,7 @@ dissect_bssmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sccp_msg = NULL; } - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_append_str(pinfo->cinfo, COL_INFO, "(BSSMAP) "); - } + col_append_str(pinfo->cinfo, COL_INFO, "(BSSMAP) "); /* * set tap record pointer diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c index 5ebb821e82..6127591cd8 100644 --- a/epan/dissectors/packet-gsm_a_dtap.c +++ b/epan/dissectors/packet-gsm_a_dtap.c @@ -5691,10 +5691,7 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return; } - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_append_str(pinfo->cinfo, COL_INFO, "(DTAP) "); - } + col_append_str(pinfo->cinfo, COL_INFO, "(DTAP) "); /* * set tap record pointer diff --git a/epan/dissectors/packet-gsm_a_rp.c b/epan/dissectors/packet-gsm_a_rp.c index 0056fa69f4..73ec7be265 100644 --- a/epan/dissectors/packet-gsm_a_rp.c +++ b/epan/dissectors/packet-gsm_a_rp.c @@ -451,10 +451,7 @@ dissect_rp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *rp_tree = NULL; const gchar *str; - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_append_str(pinfo->cinfo, COL_INFO, "(RP) "); - } + col_append_str(pinfo->cinfo, COL_INFO, "(RP) "); /* * In the interest of speed, if "tree" is NULL, don't do any work diff --git a/epan/dissectors/packet-gsm_bssmap_le.c b/epan/dissectors/packet-gsm_bssmap_le.c index f100c4c86b..270ec0db0a 100644 --- a/epan/dissectors/packet-gsm_bssmap_le.c +++ b/epan/dissectors/packet-gsm_bssmap_le.c @@ -873,10 +873,7 @@ dissect_bssmap_le(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sccp_msg = NULL; } - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_append_str(pinfo->cinfo, COL_INFO, "(BSSMAP LE) "); - } + col_append_str(pinfo->cinfo, COL_INFO, "(BSSMAP LE) "); /* * set tap record pointer diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index d952b5497b..589c0a16b0 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -4720,10 +4720,7 @@ dissect_h225_T_h323_message_body(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * if (contains_faststart == TRUE ) { - if (check_col(actx->pinfo->cinfo, COL_INFO)) - { - col_append_str(actx->pinfo->cinfo, COL_INFO, "OpenLogicalChannel " ); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, "OpenLogicalChannel " ); } col_set_fence(actx->pinfo->cinfo,COL_INFO); diff --git a/epan/dissectors/packet-h263.c b/epan/dissectors/packet-h263.c index 02001e8ad1..64bd7cd68c 100644 --- a/epan/dissectors/packet-h263.c +++ b/epan/dissectors/packet-h263.c @@ -642,9 +642,7 @@ static void dissect_h263_data( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr guint32 data; guint8 startcode; - if ( check_col( pinfo->cinfo, COL_INFO) ) { - col_append_str( pinfo->cinfo, COL_INFO, "H263 payload "); - } + col_append_str( pinfo->cinfo, COL_INFO, "H263 payload "); if( tree ) { h263_payload_item = proto_tree_add_item( tree, proto_h263_data, tvb, offset, -1, FALSE ); diff --git a/epan/dissectors/packet-icep.c b/epan/dissectors/packet-icep.c index 788eb897b4..7af576cc60 100644 --- a/epan/dissectors/packet-icep.c +++ b/epan/dissectors/packet-icep.c @@ -184,10 +184,8 @@ static void dissect_ice_string(proto_tree *tree, int hf_icep, proto_tree_add_text(tree, tvb, offset, -1, "1st byte of Size missing"); - if ( check_col(mypinfo->cinfo, COL_INFO) ) { - col_append_str(mypinfo->cinfo, COL_INFO, + col_append_str(mypinfo->cinfo, COL_INFO, " (1st byte of Size missing)"); - } (*consumed) = -1; return; @@ -207,10 +205,8 @@ static void dissect_ice_string(proto_tree *tree, int hf_icep, proto_tree_add_text(tree, tvb, offset, -1, "second field of Size missing"); - if ( check_col(mypinfo->cinfo, COL_INFO) ) { - col_append_str(mypinfo->cinfo, COL_INFO, + col_append_str(mypinfo->cinfo, COL_INFO, " (second field of Size missing)"); - } (*consumed) = -1; return; @@ -231,10 +227,8 @@ static void dissect_ice_string(proto_tree *tree, int hf_icep, proto_tree_add_text(tree, tvb, offset, -1, "missing or truncated string"); - if ( check_col(mypinfo->cinfo, COL_INFO) ) { - col_append_str(mypinfo->cinfo, COL_INFO, + col_append_str(mypinfo->cinfo, COL_INFO, " (missing or truncated string)"); - } (*consumed) = -1; return; @@ -245,10 +239,8 @@ static void dissect_ice_string(proto_tree *tree, int hf_icep, if (tree) proto_tree_add_text(tree, tvb, offset, -1, "string too long"); - if ( check_col(mypinfo->cinfo, COL_INFO) ) { - col_append_str(mypinfo->cinfo, COL_INFO, + col_append_str(mypinfo->cinfo, COL_INFO, " (string too long)"); - } (*consumed) = -1; return; @@ -310,10 +302,8 @@ static void dissect_ice_facet(proto_tree *tree, int hf_icep, if (tree) proto_tree_add_text(tree, tvb, offset, -1, "facet field missing"); - if ( check_col(mypinfo->cinfo, COL_INFO) ) { - col_append_str(mypinfo->cinfo, COL_INFO, + col_append_str(mypinfo->cinfo, COL_INFO, " (facet field missing)"); - } (*consumed) = -1; return; @@ -357,10 +347,8 @@ static void dissect_ice_facet(proto_tree *tree, int hf_icep, proto_tree_add_text(tree, tvb, offset - 1, 1, "facet can be max one element"); - if ( check_col(mypinfo->cinfo, COL_INFO) ) { - col_append_str(mypinfo->cinfo, COL_INFO, + col_append_str(mypinfo->cinfo, COL_INFO, " (facet can be max one element)"); - } (*consumed) = -1; return; @@ -395,10 +383,8 @@ static void dissect_ice_context(proto_tree *tree, tvbuff_t *tvb, guint32 offset, if (tree) proto_tree_add_text(tree, tvb, offset, -1, "context missing"); - if ( check_col(mypinfo->cinfo, COL_INFO) ) { - col_append_str(mypinfo->cinfo, COL_INFO, + col_append_str(mypinfo->cinfo, COL_INFO, " (context missing)"); - } (*consumed) = -1; return; @@ -418,10 +404,8 @@ static void dissect_ice_context(proto_tree *tree, tvbuff_t *tvb, guint32 offset, proto_tree_add_text(tree, tvb, offset, -1, "second field of Size missing"); - if ( check_col(mypinfo->cinfo, COL_INFO) ) { - col_append_str(mypinfo->cinfo, COL_INFO, + col_append_str(mypinfo->cinfo, COL_INFO, " (second field of Size missing)"); - } (*consumed) = -1; return; @@ -441,10 +425,8 @@ static void dissect_ice_context(proto_tree *tree, tvbuff_t *tvb, guint32 offset, /* display the XX Size byte when click here */ proto_tree_add_text(tree, tvb, offset - 1, 1, "too long context"); - if ( check_col(mypinfo->cinfo, COL_INFO) ) { - col_append_str(mypinfo->cinfo, COL_INFO, + col_append_str(mypinfo->cinfo, COL_INFO, " (too long context)"); - } (*consumed) = -1; return; @@ -534,10 +516,8 @@ static void dissect_ice_params(proto_tree *tree, tvbuff_t *tvb, if (tree) proto_tree_add_text(tree, tvb, offset, -1, "params missing"); - if ( check_col(mypinfo->cinfo, COL_INFO) ) { - col_append_str(mypinfo->cinfo, COL_INFO, + col_append_str(mypinfo->cinfo, COL_INFO, " (params missing)"); - } (*consumed) = -1; return; @@ -554,10 +534,8 @@ static void dissect_ice_params(proto_tree *tree, tvbuff_t *tvb, proto_tree_add_text(tree, tvb, offset, 4, "params size too small"); - if ( check_col(mypinfo->cinfo, COL_INFO) ) { - col_append_str(mypinfo->cinfo, COL_INFO, + col_append_str(mypinfo->cinfo, COL_INFO, " (params size too small)"); - } (*consumed) = -1; return; @@ -650,10 +628,8 @@ static void dissect_icep_request_common(tvbuff_t *tvb, guint32 offset, proto_tree_add_text(icep_sub_tree, tvb, offset, -1, "too short header"); - if ( check_col(mypinfo->cinfo, COL_INFO) ) { - col_append_str(mypinfo->cinfo, COL_INFO, + col_append_str(mypinfo->cinfo, COL_INFO, " (too short header)"); - } goto error; } @@ -731,10 +707,8 @@ static void dissect_icep_request_common(tvbuff_t *tvb, guint32 offset, proto_tree_add_text(icep_sub_tree, tvb, offset, -1, "mode field missing"); - if ( check_col(mypinfo->cinfo, COL_INFO) ) { - col_append_str(mypinfo->cinfo, COL_INFO, + col_append_str(mypinfo->cinfo, COL_INFO, " (mode field missing)"); - } goto error; } @@ -806,10 +780,8 @@ static void dissect_icep_request(tvbuff_t *tvb, guint32 offset, proto_tree *icep proto_tree_add_text(icep_tree, tvb, offset, -1, "too short header"); - if ( check_col(mypinfo->cinfo, COL_INFO) ) { - col_append_str(mypinfo->cinfo, COL_INFO, + col_append_str(mypinfo->cinfo, COL_INFO, " (too short header)"); - } return; } @@ -838,9 +810,7 @@ static void dissect_icep_request(tvbuff_t *tvb, guint32 offset, proto_tree *icep tvb_get_letohl(tvb, offset)); } } else - if ( check_col(mypinfo->cinfo, COL_INFO) ) { - col_append_str(mypinfo->cinfo, COL_INFO, "(oneway):"); - } + col_append_str(mypinfo->cinfo, COL_INFO, "(oneway):"); offset += 4; @@ -894,10 +864,8 @@ static void dissect_icep_batch_request(tvbuff_t *tvb, guint32 offset, proto_tree_add_text(icep_tree, tvb, offset, -1, "counter of batch requests missing"); - if ( check_col(mypinfo->cinfo, COL_INFO) ) { - col_append_str(mypinfo->cinfo, COL_INFO, + col_append_str(mypinfo->cinfo, COL_INFO, " (counter of batch requests missing)"); - } return; } @@ -927,19 +895,15 @@ static void dissect_icep_batch_request(tvbuff_t *tvb, guint32 offset, if (icep_tree) proto_tree_add_text(icep_tree, tvb, offset, -1, "empty batch requests sequence"); - if ( check_col(mypinfo->cinfo, COL_INFO) ) { - col_append_str(mypinfo->cinfo, COL_INFO, + col_append_str(mypinfo->cinfo, COL_INFO, " (empty batch requests sequence)"); - } return; } - if ( check_col(mypinfo->cinfo, COL_INFO) ) { - col_append_str(mypinfo->cinfo, COL_INFO, + col_append_str(mypinfo->cinfo, COL_INFO, ":"); - } /* * process requests @@ -1005,10 +969,8 @@ static void dissect_icep_reply(tvbuff_t *tvb, guint32 offset, proto_tree *icep_t proto_tree_add_text(icep_tree, tvb, offset, -1, "too short header"); - if ( check_col(mypinfo->cinfo, COL_INFO) ) { - col_append_str(mypinfo->cinfo, COL_INFO, + col_append_str(mypinfo->cinfo, COL_INFO, " (too short header)"); - } return; } diff --git a/epan/dissectors/packet-ismacryp.c b/epan/dissectors/packet-ismacryp.c index 461996b64f..f505e8dc64 100644 --- a/epan/dissectors/packet-ismacryp.c +++ b/epan/dissectors/packet-ismacryp.c @@ -265,9 +265,7 @@ static void dissect_ismacryp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tre /* select and display ISMACryp version */ if ((ismacryp_version!=version_type) && override_flag){ /* override -> use manual preference setting */ - if (check_col(pinfo->cinfo, COL_INFO)){ - col_append_str(pinfo->cinfo, COL_INFO, " Manual version"); - } + col_append_str(pinfo->cinfo, COL_INFO, " Manual version"); set_version = version_type; /* set to preference value */ } else { diff --git a/epan/dissectors/packet-lapdm.c b/epan/dissectors/packet-lapdm.c index 385f7873d3..1081268f50 100644 --- a/epan/dissectors/packet-lapdm.c +++ b/epan/dissectors/packet-lapdm.c @@ -313,9 +313,7 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) call_dissector(data_handle, reassembled, pinfo, tree); } else { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, " (Fragment)"); - } + col_append_str(pinfo->cinfo, COL_INFO, " (Fragment)"); if (tree) { proto_tree_add_text(lapdm_tree, payload, 0, -1, "Fragment Data"); } diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c index 4a035c2f05..4bb161546e 100644 --- a/epan/dissectors/packet-llc.c +++ b/epan/dissectors/packet-llc.c @@ -429,10 +429,8 @@ dissect_basicxid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 1, format); } else xid_tree = NULL; - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Basic Format"); - } types = tvb_get_guint8(tvb, 1); if (tree) { diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c index 7dbfa0182e..bbd215a515 100644 --- a/epan/dissectors/packet-mysql.c +++ b/epan/dissectors/packet-mysql.c @@ -1825,9 +1825,7 @@ mysql_dissect_ok_packet(tvbuff_t *tvb, packet_info *pinfo, int offset, guint64 insert_id; int fle; - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, " OK" ); - } + col_append_str(pinfo->cinfo, COL_INFO, " OK" ); fle= tvb_get_fle(tvb, offset, &affected_rows, NULL); proto_tree_add_uint64(tree, hf_mysql_affected_rows, @@ -1963,9 +1961,7 @@ mysql_dissect_result_header(tvbuff_t *tvb, packet_info *pinfo, int offset, gint fle; guint64 num_fields, extra; - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, " TABULAR" ); - } + col_append_str(pinfo->cinfo, COL_INFO, " TABULAR" ); fle= tvb_get_fle(tvb, offset, &num_fields, NULL); proto_tree_add_uint64(tree, hf_mysql_num_fields, diff --git a/epan/dissectors/packet-portmap.c b/epan/dissectors/packet-portmap.c index 84bcfb3e77..21712f21f8 100644 --- a/epan/dissectors/packet-portmap.c +++ b/epan/dissectors/packet-portmap.c @@ -166,9 +166,7 @@ dissect_getport_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, } proto_item_append_text(tree, " Port:%d", port); } else { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, " PROGRAM_NOT_AVAILABLE"); - } + col_append_str(pinfo->cinfo, COL_INFO, " PROGRAM_NOT_AVAILABLE"); proto_item_append_text(tree, " PROGRAM_NOT_AVAILABLE"); } diff --git a/epan/dissectors/packet-quake2.c b/epan/dissectors/packet-quake2.c index 943a01d338..836fe009d9 100644 --- a/epan/dissectors/packet-quake2.c +++ b/epan/dissectors/packet-quake2.c @@ -734,9 +734,7 @@ dissect_quake2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tvb_get_ntohl(tvb, 0) == 0xffffffff) { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, " Connectionless"); - } + col_append_str(pinfo->cinfo, COL_INFO, " Connectionless"); if (quake2_tree) proto_tree_add_uint_format(quake2_tree, hf_quake2_connectionless, @@ -746,9 +744,7 @@ dissect_quake2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, pinfo, quake2_tree, direction); } else { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, " Game"); - } + col_append_str(pinfo->cinfo, COL_INFO, " Game"); if (quake2_tree) proto_tree_add_uint_format(quake2_tree, hf_quake2_game, diff --git a/epan/dissectors/packet-quakeworld.c b/epan/dissectors/packet-quakeworld.c index 9040490a00..da22170bd4 100644 --- a/epan/dissectors/packet-quakeworld.c +++ b/epan/dissectors/packet-quakeworld.c @@ -743,9 +743,7 @@ dissect_quakeworld(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tvb_get_ntohl(tvb, 0) == 0xffffffff) { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, " Connectionless"); - } + col_append_str(pinfo->cinfo, COL_INFO, " Connectionless"); if (quakeworld_tree) proto_tree_add_uint_format(quakeworld_tree, hf_quakeworld_connectionless, @@ -755,9 +753,7 @@ dissect_quakeworld(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, pinfo, quakeworld_tree, direction); } else { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, " Game"); - } + col_append_str(pinfo->cinfo, COL_INFO, " Game"); if (quakeworld_tree) proto_tree_add_uint_format(quakeworld_tree, hf_quakeworld_game, diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c index 9d56ee89b5..35befe734f 100644 --- a/epan/dissectors/packet-rdt.c +++ b/epan/dissectors/packet-rdt.c @@ -682,10 +682,7 @@ guint dissect_rdt_bandwidth_report_packet(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tree, hf_rdt_brpt_sequence, tvb, offset, 1, FALSE); offset += 1; - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_append_str(pinfo->cinfo, COL_INFO, "BANDWIDTH-REPORT: "); - } + col_append_str(pinfo->cinfo, COL_INFO, "BANDWIDTH-REPORT: "); if (packet_length < (offset - start_offset) || packet_length > tvb_length_remaining(tvb, start_offset)) @@ -778,10 +775,7 @@ guint dissect_rdt_rtt_request_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tr proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, FALSE); offset += 2; - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_append_str(pinfo->cinfo, COL_INFO, "RTT-REQUEST: "); - } + col_append_str(pinfo->cinfo, COL_INFO, "RTT-REQUEST: "); return offset; } @@ -804,10 +798,7 @@ guint dissect_rdt_rtt_response_packet(tvbuff_t *tvb, packet_info *pinfo, proto_t proto_tree_add_item(tree, hf_rdt_rtrp_ts_usec, tvb, offset, 4, FALSE); offset += 4; - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_append_str(pinfo->cinfo, COL_INFO, "RTT-RESPONSE: "); - } + col_append_str(pinfo->cinfo, COL_INFO, "RTT-RESPONSE: "); return offset; } @@ -830,10 +821,7 @@ guint dissect_rdt_congestion_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tre proto_tree_add_item(tree, hf_rdt_cong_recv_mult, tvb, offset, 4, FALSE); offset += 4; - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_append_str(pinfo->cinfo, COL_INFO, "CONGESTION: "); - } + col_append_str(pinfo->cinfo, COL_INFO, "CONGESTION: "); return offset; } @@ -965,10 +953,7 @@ guint dissect_rdt_report_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t packet_length = tvb_length_remaining(tvb, start_offset); } - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_append_str(pinfo->cinfo, COL_INFO, "REPORT: "); - } + col_append_str(pinfo->cinfo, COL_INFO, "REPORT: "); /* The remaining data is unparsed. */ proto_tree_add_item(tree, hf_rdt_data, tvb, offset, -1, FALSE); @@ -1090,10 +1075,7 @@ guint dissect_rdt_transport_info_request_packet(tvbuff_t *tvb, packet_info *pinf offset += 4; } - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_append_str(pinfo->cinfo, COL_INFO, "TRANSPORT-INFO-REQUEST: "); - } + col_append_str(pinfo->cinfo, COL_INFO, "TRANSPORT-INFO-REQUEST: "); return offset; } @@ -1189,10 +1171,7 @@ guint dissect_rdt_transport_info_response_packet(tvbuff_t *tvb, packet_info *pin /* Report what is left */ offset += tvb_length_remaining(tvb, offset); - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_append_str(pinfo->cinfo, COL_INFO, "RESPONSE: "); - } + col_append_str(pinfo->cinfo, COL_INFO, "RESPONSE: "); return offset; } @@ -1248,10 +1227,7 @@ guint dissect_rdt_bw_probing_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tre proto_tree_add_item(tree, hf_rdt_timestamp, tvb, offset, 1, FALSE); offset += 4; - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_append_str(pinfo->cinfo, COL_INFO, "BW-PROBING: "); - } + col_append_str(pinfo->cinfo, COL_INFO, "BW-PROBING: "); if (packet_length < (offset - start_offset) || packet_length > tvb_length_remaining(tvb, start_offset)) @@ -1281,10 +1257,7 @@ guint dissect_rdt_unknown_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree proto_tree_add_item(tree, hf_rdt_data, tvb, offset, -1, FALSE); offset += tvb_length_remaining(tvb, offset); - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_append_str(pinfo->cinfo, COL_INFO, "UNKNOWN-CTL: "); - } + col_append_str(pinfo->cinfo, COL_INFO, "UNKNOWN-CTL: "); return offset; } diff --git a/epan/dissectors/packet-rfc2190.c b/epan/dissectors/packet-rfc2190.c index ea41569335..dceb695a4c 100644 --- a/epan/dissectors/packet-rfc2190.c +++ b/epan/dissectors/packet-rfc2190.c @@ -94,19 +94,13 @@ dissect_rfc2190( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) col_set_str(pinfo->cinfo, COL_PROTOCOL, "H.263 "); if( rfc2190_version == 0x00) { - if ( check_col( pinfo->cinfo, COL_INFO) ) { - col_append_str( pinfo->cinfo, COL_INFO, "MODE A "); - } + col_append_str( pinfo->cinfo, COL_INFO, "MODE A "); } else if( rfc2190_version == 0x02) { - if ( check_col( pinfo->cinfo, COL_INFO) ) { - col_append_str( pinfo->cinfo, COL_INFO, "MODE B "); - } + col_append_str( pinfo->cinfo, COL_INFO, "MODE B "); } else if( rfc2190_version == 0x03) { - if ( check_col( pinfo->cinfo, COL_INFO) ) { - col_append_str( pinfo->cinfo, COL_INFO, "MODE C "); - } + col_append_str( pinfo->cinfo, COL_INFO, "MODE C "); } if ( tree ) { diff --git a/epan/dissectors/packet-rlogin.c b/epan/dissectors/packet-rlogin.c index 124d303da0..d416e91835 100644 --- a/epan/dissectors/packet-rlogin.c +++ b/epan/dissectors/packet-rlogin.c @@ -173,10 +173,7 @@ rlogin_state_machine(rlogin_hash_entry_t *hash_info, tvbuff_t *tvb, packet_info tvb_memcpy(tvb, (guint8 *)hash_info->user_name, 0, stringlen); hash_info->user_name[stringlen] = '\0'; - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_append_str(pinfo->cinfo, COL_INFO, ", (User information)"); - } + col_append_str(pinfo->cinfo, COL_INFO, ", (User information)"); } } diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 8baa456502..9998ce64fc 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -18808,9 +18808,7 @@ static const per_choice_t ActiveSetUpdate_choice[] = { static int dissect_rrc_ActiveSetUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 107 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_ActiveSetUpdate, ActiveSetUpdate_choice, NULL); @@ -21975,9 +21973,7 @@ static const per_choice_t AssistanceDataDelivery_choice[] = { static int dissect_rrc_AssistanceDataDelivery(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 125 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_AssistanceDataDelivery, AssistanceDataDelivery_choice, NULL); @@ -22375,9 +22371,7 @@ static const per_choice_t CellChangeOrderFromUTRAN_choice[] = { static int dissect_rrc_CellChangeOrderFromUTRAN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 131 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_CellChangeOrderFromUTRAN, CellChangeOrderFromUTRAN_choice, NULL); @@ -39599,9 +39593,7 @@ static const per_choice_t CellUpdateConfirm_choice[] = { static int dissect_rrc_CellUpdateConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 155 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_CellUpdateConfirm, CellUpdateConfirm_choice, NULL); @@ -39754,9 +39746,7 @@ static const per_choice_t CounterCheck_choice[] = { static int dissect_rrc_CounterCheck(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 161 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_CounterCheck, CounterCheck_choice, NULL); @@ -39889,9 +39879,7 @@ static const per_choice_t DownlinkDirectTransfer_choice[] = { static int dissect_rrc_DownlinkDirectTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 173 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_DownlinkDirectTransfer, DownlinkDirectTransfer_choice, NULL); @@ -40352,9 +40340,7 @@ static const per_choice_t HandoverFromUTRANCommand_GSM_choice[] = { static int dissect_rrc_HandoverFromUTRANCommand_GSM(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 191 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_HandoverFromUTRANCommand_GSM, HandoverFromUTRANCommand_GSM_choice, NULL); @@ -40508,9 +40494,7 @@ static const per_choice_t HandoverFromUTRANCommand_CDMA2000_choice[] = { static int dissect_rrc_HandoverFromUTRANCommand_CDMA2000(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 197 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_HandoverFromUTRANCommand_CDMA2000, HandoverFromUTRANCommand_CDMA2000_choice, NULL); @@ -47668,9 +47652,7 @@ static const per_choice_t MeasurementControl_choice[] = { static int dissect_rrc_MeasurementControl(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 275 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_MeasurementControl, MeasurementControl_choice, NULL); @@ -47762,9 +47744,7 @@ static const per_sequence_t PagingType2_sequence[] = { static int dissect_rrc_PagingType2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 299 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_PagingType2, PagingType2_sequence); @@ -48793,9 +48773,7 @@ static const per_choice_t PhysicalChannelReconfiguration_choice[] = { static int dissect_rrc_PhysicalChannelReconfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 305 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_PhysicalChannelReconfiguration, PhysicalChannelReconfiguration_choice, NULL); @@ -50099,9 +50077,7 @@ static const per_choice_t PhysicalSharedChannelAllocation_choice[] = { static int dissect_rrc_PhysicalSharedChannelAllocation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 323 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_PhysicalSharedChannelAllocation, PhysicalSharedChannelAllocation_choice, NULL); @@ -51969,9 +51945,7 @@ static const per_choice_t RadioBearerReconfiguration_choice[] = { static int dissect_rrc_RadioBearerReconfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 335 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerReconfiguration, RadioBearerReconfiguration_choice, NULL); @@ -53153,9 +53127,7 @@ static const per_choice_t RadioBearerRelease_choice[] = { static int dissect_rrc_RadioBearerRelease(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 353 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerRelease, RadioBearerRelease_choice, NULL); @@ -55360,9 +55332,7 @@ static const per_choice_t RadioBearerSetup_choice[] = { static int dissect_rrc_RadioBearerSetup(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 371 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerSetup, RadioBearerSetup_choice, NULL); @@ -55881,9 +55851,7 @@ static const per_choice_t RRCConnectionRelease_choice[] = { static int dissect_rrc_RRCConnectionRelease(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 395 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionRelease, RRCConnectionRelease_choice, NULL); @@ -56162,9 +56130,7 @@ static const per_choice_t SecurityModeCommand_choice[] = { static int dissect_rrc_SecurityModeCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 437 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_SecurityModeCommand, SecurityModeCommand_choice, NULL); @@ -56277,9 +56243,7 @@ static const per_choice_t SignallingConnectionRelease_choice[] = { static int dissect_rrc_SignallingConnectionRelease(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 455 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_SignallingConnectionRelease, SignallingConnectionRelease_choice, NULL); @@ -57454,9 +57418,7 @@ static const per_choice_t TransportChannelReconfiguration_choice[] = { static int dissect_rrc_TransportChannelReconfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 485 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_TransportChannelReconfiguration, TransportChannelReconfiguration_choice, NULL); @@ -57601,9 +57563,7 @@ static const per_sequence_t TransportFormatCombinationControl_sequence[] = { static int dissect_rrc_TransportFormatCombinationControl(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 503 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_TransportFormatCombinationControl, TransportFormatCombinationControl_sequence); @@ -57890,9 +57850,7 @@ static const per_choice_t UECapabilityEnquiry_choice[] = { static int dissect_rrc_UECapabilityEnquiry(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 515 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_UECapabilityEnquiry, UECapabilityEnquiry_choice, NULL); @@ -58050,9 +58008,7 @@ static const per_choice_t UECapabilityInformationConfirm_choice[] = { static int dissect_rrc_UECapabilityInformationConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 527 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_UECapabilityInformationConfirm, UECapabilityInformationConfirm_choice, NULL); @@ -58816,9 +58772,7 @@ static const per_choice_t UplinkPhysicalChannelControl_choice[] = { static int dissect_rrc_UplinkPhysicalChannelControl(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 539 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_UplinkPhysicalChannelControl, UplinkPhysicalChannelControl_choice, NULL); @@ -59130,9 +59084,7 @@ static const per_choice_t URAUpdateConfirm_choice[] = { static int dissect_rrc_URAUpdateConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 551 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_URAUpdateConfirm, URAUpdateConfirm_choice, NULL); @@ -60126,9 +60078,7 @@ static const per_choice_t UTRANMobilityInformation_choice[] = { static int dissect_rrc_UTRANMobilityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 563 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_UTRANMobilityInformation, UTRANMobilityInformation_choice, NULL); @@ -60315,9 +60265,7 @@ static const per_sequence_t HandoverFromUTRANCommand_GERANIu_sequence[] = { static int dissect_rrc_HandoverFromUTRANCommand_GERANIu(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 185 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_HandoverFromUTRANCommand_GERANIu, HandoverFromUTRANCommand_GERANIu_sequence); @@ -60686,9 +60634,7 @@ static const per_sequence_t MBMSModifiedServicesInformation_sequence[] = { static int dissect_rrc_MBMSModifiedServicesInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 251 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSModifiedServicesInformation, MBMSModifiedServicesInformation_sequence); @@ -60890,9 +60836,7 @@ static const per_sequence_t ActiveSetUpdateComplete_sequence[] = { static int dissect_rrc_ActiveSetUpdateComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 113 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_ActiveSetUpdateComplete, ActiveSetUpdateComplete_sequence); @@ -61063,9 +61007,7 @@ static const per_sequence_t ActiveSetUpdateFailure_sequence[] = { static int dissect_rrc_ActiveSetUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 119 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_ActiveSetUpdateFailure, ActiveSetUpdateFailure_sequence); @@ -61212,9 +61154,7 @@ static const per_choice_t CellChangeOrderFromUTRANFailure_choice[] = { static int dissect_rrc_CellChangeOrderFromUTRANFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 137 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_CellChangeOrderFromUTRANFailure, CellChangeOrderFromUTRANFailure_choice, NULL); @@ -61304,9 +61244,7 @@ static const per_sequence_t CounterCheckResponse_sequence[] = { static int dissect_rrc_CounterCheckResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 167 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_CounterCheckResponse, CounterCheckResponse_sequence); @@ -61355,9 +61293,7 @@ static const per_sequence_t HandoverToUTRANComplete_sequence[] = { static int dissect_rrc_HandoverToUTRANComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 179 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_HandoverToUTRANComplete, HandoverToUTRANComplete_sequence); @@ -62240,9 +62176,7 @@ static const per_sequence_t InitialDirectTransfer_sequence[] = { static int dissect_rrc_InitialDirectTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 209 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_InitialDirectTransfer, InitialDirectTransfer_sequence); @@ -62421,9 +62355,7 @@ static const per_sequence_t HandoverFromUTRANFailure_sequence[] = { static int dissect_rrc_HandoverFromUTRANFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 203 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_HandoverFromUTRANFailure, HandoverFromUTRANFailure_sequence); @@ -62501,9 +62433,7 @@ static const per_sequence_t MeasurementControlFailure_sequence[] = { static int dissect_rrc_MeasurementControlFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 281 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MeasurementControlFailure, MeasurementControlFailure_sequence); @@ -65852,9 +65782,7 @@ static const per_sequence_t MeasurementReport_sequence[] = { static int dissect_rrc_MeasurementReport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 287 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MeasurementReport, MeasurementReport_sequence); @@ -65952,9 +65880,7 @@ static const per_sequence_t PhysicalChannelReconfigurationComplete_sequence[] = static int dissect_rrc_PhysicalChannelReconfigurationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 311 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_PhysicalChannelReconfigurationComplete, PhysicalChannelReconfigurationComplete_sequence); @@ -66003,9 +65929,7 @@ static const per_sequence_t PhysicalChannelReconfigurationFailure_sequence[] = { static int dissect_rrc_PhysicalChannelReconfigurationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 317 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_PhysicalChannelReconfigurationFailure, PhysicalChannelReconfigurationFailure_sequence); @@ -66103,9 +66027,7 @@ static const per_sequence_t RadioBearerReconfigurationComplete_sequence[] = { static int dissect_rrc_RadioBearerReconfigurationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 341 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerReconfigurationComplete, RadioBearerReconfigurationComplete_sequence); @@ -66169,9 +66091,7 @@ static const per_sequence_t RadioBearerReconfigurationFailure_sequence[] = { static int dissect_rrc_RadioBearerReconfigurationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 347 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerReconfigurationFailure, RadioBearerReconfigurationFailure_sequence); @@ -66269,9 +66189,7 @@ static const per_sequence_t RadioBearerReleaseComplete_sequence[] = { static int dissect_rrc_RadioBearerReleaseComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 359 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerReleaseComplete, RadioBearerReleaseComplete_sequence); @@ -66321,9 +66239,7 @@ static const per_sequence_t RadioBearerReleaseFailure_sequence[] = { static int dissect_rrc_RadioBearerReleaseFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 365 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerReleaseFailure, RadioBearerReleaseFailure_sequence); @@ -66422,9 +66338,7 @@ static const per_sequence_t RadioBearerSetupComplete_sequence[] = { static int dissect_rrc_RadioBearerSetupComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 377 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerSetupComplete, RadioBearerSetupComplete_sequence); @@ -66474,9 +66388,7 @@ static const per_sequence_t RadioBearerSetupFailure_sequence[] = { static int dissect_rrc_RadioBearerSetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 383 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerSetupFailure, RadioBearerSetupFailure_sequence); @@ -66525,9 +66437,7 @@ static const per_sequence_t RRCConnectionReleaseComplete_sequence[] = { static int dissect_rrc_RRCConnectionReleaseComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 407 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionReleaseComplete, RRCConnectionReleaseComplete_sequence); @@ -68953,9 +68863,7 @@ static const per_sequence_t RRCConnectionSetupComplete_sequence[] = { static int dissect_rrc_RRCConnectionSetupComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 425 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionSetupComplete, RRCConnectionSetupComplete_sequence); @@ -69134,9 +69042,7 @@ static const per_sequence_t RRCStatus_sequence[] = { static int dissect_rrc_RRCStatus(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 431 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RRCStatus, RRCStatus_sequence); @@ -69186,9 +69092,7 @@ static const per_sequence_t SecurityModeComplete_sequence[] = { static int dissect_rrc_SecurityModeComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 443 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SecurityModeComplete, SecurityModeComplete_sequence); @@ -69237,9 +69141,7 @@ static const per_sequence_t SecurityModeFailure_sequence[] = { static int dissect_rrc_SecurityModeFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 449 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SecurityModeFailure, SecurityModeFailure_sequence); @@ -69287,9 +69189,7 @@ static const per_sequence_t SignallingConnectionReleaseIndication_sequence[] = { static int dissect_rrc_SignallingConnectionReleaseIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 461 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SignallingConnectionReleaseIndication, SignallingConnectionReleaseIndication_sequence); @@ -69387,9 +69287,7 @@ static const per_sequence_t TransportChannelReconfigurationComplete_sequence[] = static int dissect_rrc_TransportChannelReconfigurationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 491 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_TransportChannelReconfigurationComplete, TransportChannelReconfigurationComplete_sequence); @@ -69438,9 +69336,7 @@ static const per_sequence_t TransportChannelReconfigurationFailure_sequence[] = static int dissect_rrc_TransportChannelReconfigurationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 497 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_TransportChannelReconfigurationFailure, TransportChannelReconfigurationFailure_sequence); @@ -69489,9 +69385,7 @@ static const per_sequence_t TransportFormatCombinationControlFailure_sequence[] static int dissect_rrc_TransportFormatCombinationControlFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 509 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_TransportFormatCombinationControlFailure, TransportFormatCombinationControlFailure_sequence); @@ -69767,9 +69661,7 @@ static const per_sequence_t UECapabilityInformation_sequence[] = { static int dissect_rrc_UECapabilityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 521 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_UECapabilityInformation, UECapabilityInformation_sequence); @@ -69848,9 +69740,7 @@ static const per_sequence_t UplinkDirectTransfer_sequence[] = { static int dissect_rrc_UplinkDirectTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 533 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_UplinkDirectTransfer, UplinkDirectTransfer_sequence); @@ -69946,9 +69836,7 @@ static const per_sequence_t UTRANMobilityInformationConfirm_sequence[] = { static int dissect_rrc_UTRANMobilityInformationConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 569 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_UTRANMobilityInformationConfirm, UTRANMobilityInformationConfirm_sequence); @@ -69997,9 +69885,7 @@ static const per_sequence_t UTRANMobilityInformationFailure_sequence[] = { static int dissect_rrc_UTRANMobilityInformationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 575 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_UTRANMobilityInformationFailure, UTRANMobilityInformationFailure_sequence); @@ -70156,9 +70042,7 @@ static const per_sequence_t MBMSModificationRequest_sequence[] = { static int dissect_rrc_MBMSModificationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 245 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSModificationRequest, MBMSModificationRequest_sequence); @@ -70802,9 +70686,7 @@ static const per_choice_t CellUpdateConfirm_CCCH_choice[] = { static int dissect_rrc_CellUpdateConfirm_CCCH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 149 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_CellUpdateConfirm_CCCH, CellUpdateConfirm_CCCH_choice, NULL); @@ -71229,9 +71111,7 @@ static const per_choice_t RRCConnectionReject_choice[] = { static int dissect_rrc_RRCConnectionReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 389 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionReject, RRCConnectionReject_choice, NULL); @@ -71773,9 +71653,7 @@ static const per_choice_t RRCConnectionRelease_CCCH_choice[] = { static int dissect_rrc_RRCConnectionRelease_CCCH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 401 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionRelease_CCCH, RRCConnectionRelease_CCCH_choice, NULL); @@ -73108,9 +72986,7 @@ static const per_choice_t RRCConnectionSetup_choice[] = { static int dissect_rrc_RRCConnectionSetup(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 419 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionSetup, RRCConnectionSetup_choice, NULL); @@ -73239,9 +73115,7 @@ static const per_choice_t URAUpdateConfirm_CCCH_choice[] = { static int dissect_rrc_URAUpdateConfirm_CCCH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 557 "rrc.cnf" - 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"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_URAUpdateConfirm_CCCH, URAUpdateConfirm_CCCH_choice, NULL); @@ -73655,9 +73529,7 @@ static const per_sequence_t CellUpdate_sequence[] = { static int dissect_rrc_CellUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 143 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_CellUpdate, CellUpdate_sequence); @@ -74057,9 +73929,7 @@ static const per_sequence_t RRCConnectionRequest_sequence[] = { static int dissect_rrc_RRCConnectionRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 413 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionRequest, RRCConnectionRequest_sequence); @@ -74224,9 +74094,7 @@ static const per_sequence_t URAUpdate_sequence[] = { static int dissect_rrc_URAUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 545 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_URAUpdate, URAUpdate_sequence); @@ -74620,9 +74488,7 @@ static const per_sequence_t PagingType1_sequence[] = { static int dissect_rrc_PagingType1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 293 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_PagingType1, PagingType1_sequence); @@ -74827,9 +74693,7 @@ static const per_sequence_t PUSCHCapacityRequest_sequence[] = { static int dissect_rrc_PUSCHCapacityRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 329 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_PUSCHCapacityRequest, PUSCHCapacityRequest_sequence); @@ -75205,9 +75069,7 @@ static const per_sequence_t SystemInformation_FACH_sequence[] = { static int dissect_rrc_SystemInformation_FACH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 473 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SystemInformation_FACH, SystemInformation_FACH_sequence); @@ -75255,9 +75117,7 @@ static const per_sequence_t SystemInformationChangeIndication_sequence[] = { static int dissect_rrc_SystemInformationChangeIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 479 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SystemInformationChangeIndication, SystemInformationChangeIndication_sequence); @@ -75438,9 +75298,7 @@ static const per_sequence_t SystemInformation_BCH_sequence[] = { static int dissect_rrc_SystemInformation_BCH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 467 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SystemInformation_BCH, SystemInformation_BCH_sequence); @@ -75580,9 +75438,7 @@ static const per_sequence_t MBMSAccessInformation_sequence[] = { static int dissect_rrc_MBMSAccessInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 215 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSAccessInformation, MBMSAccessInformation_sequence); @@ -76316,9 +76172,7 @@ static const per_sequence_t MBMSCommonPTMRBInformation_sequence[] = { static int dissect_rrc_MBMSCommonPTMRBInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 221 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSCommonPTMRBInformation, MBMSCommonPTMRBInformation_sequence); @@ -76706,16 +76560,12 @@ static const per_sequence_t MBMSCurrentCellPTMRBInformation_sequence[] = { static int dissect_rrc_MBMSCurrentCellPTMRBInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 227 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSCurrentCellPTMRBInformation, MBMSCurrentCellPTMRBInformation_sequence); - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSCurrentCellPTMRBInformation, MBMSCurrentCellPTMRBInformation_sequence); @@ -77294,9 +77144,7 @@ static const per_sequence_t MBMSGeneralInformation_sequence[] = { static int dissect_rrc_MBMSGeneralInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 239 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSGeneralInformation, MBMSGeneralInformation_sequence); @@ -77970,9 +77818,7 @@ static const per_sequence_t MBMSNeighbouringCellPTMRBInformation_sequence[] = { static int dissect_rrc_MBMSNeighbouringCellPTMRBInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 257 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSNeighbouringCellPTMRBInformation, MBMSNeighbouringCellPTMRBInformation_sequence); @@ -78109,9 +77955,7 @@ static const per_sequence_t MBMSUnmodifiedServicesInformation_sequence[] = { static int dissect_rrc_MBMSUnmodifiedServicesInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 269 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSUnmodifiedServicesInformation, MBMSUnmodifiedServicesInformation_sequence); @@ -78267,9 +78111,7 @@ static const per_sequence_t MBMSSchedulingInformation_sequence[] = { static int dissect_rrc_MBMSSchedulingInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 263 "rrc.cnf" - 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"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSSchedulingInformation, MBMSSchedulingInformation_sequence); diff --git a/epan/dissectors/packet-rsync.c b/epan/dissectors/packet-rsync.c index ea6de5e2ce..1432b8c2f5 100644 --- a/epan/dissectors/packet-rsync.c +++ b/epan/dissectors/packet-rsync.c @@ -177,9 +177,7 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case RSYNC_CLIENT_QUERY: proto_tree_add_item(rsync_tree, hf_rsync_query_string, tvb, offset, -1, TRUE); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, "Client Query"); - } + col_append_str(pinfo->cinfo, COL_INFO, "Client Query"); conversation_data->state = RSYNC_SERV_MOTD; conversation_add_proto_data(conversation, proto_rsync, conversation_data); @@ -188,9 +186,7 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case RSYNC_SERV_MOTD: proto_tree_add_item(rsync_tree, hf_rsync_motd_string, tvb, offset, -1, TRUE); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, "Server MOTD"); - } + col_append_str(pinfo->cinfo, COL_INFO, "Server MOTD"); conversation_data->state = RSYNC_SERV_RESPONSE; conversation_add_proto_data(conversation, proto_rsync, conversation_data); @@ -204,18 +200,14 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* needs to handle the AUTHREQD case, but doesn't - FIXME */ proto_tree_add_item(rsync_tree, hf_rsync_rsyncdok_string, tvb, offset, -1, TRUE); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, "Authentication"); - } + col_append_str(pinfo->cinfo, COL_INFO, "Authentication"); conversation_data->state = RSYNC_COMMAND; } else { /* it didn't match, so it is probably a module list */ proto_tree_add_item(rsync_tree, hf_rsync_response_string, tvb, offset, -1, TRUE); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, "Module list"); - } + col_append_str(pinfo->cinfo, COL_INFO, "Module list"); /* we need to check the end of the buffer for magic string */ buff_length = tvb_length_remaining(tvb, offset); @@ -237,9 +229,7 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* then we are still sending commands */ proto_tree_add_item(rsync_tree, hf_rsync_command_string, tvb, offset, -1, TRUE); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, "Command"); - } + col_append_str(pinfo->cinfo, COL_INFO, "Command"); conversation_data->state = RSYNC_COMMAND; conversation_add_proto_data(conversation, proto_rsync, conversation_data); @@ -251,9 +241,7 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* then we are still sending commands */ proto_tree_add_item(rsync_tree, hf_rsync_data, tvb, offset, -1, TRUE); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, "Data"); - } + col_append_str(pinfo->cinfo, COL_INFO, "Data"); conversation_data->state = RSYNC_DATA; conversation_add_proto_data(conversation, proto_rsync, conversation_data); diff --git a/epan/dissectors/packet-sipfrag.c b/epan/dissectors/packet-sipfrag.c index b81e0ee25f..65b3824668 100644 --- a/epan/dissectors/packet-sipfrag.c +++ b/epan/dissectors/packet-sipfrag.c @@ -62,9 +62,7 @@ static void dissect_sipfrag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_append_str(pinfo->cinfo, COL_PROTOCOL, "/sipfrag"); /* Add mention of this protocol to info column */ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, ", with Sipfrag"); - } + col_append_str(pinfo->cinfo, COL_INFO, ", with Sipfrag"); /* Create sipfrag tree. */ ti = proto_tree_add_item(tree, proto_sipfrag, tvb, offset, -1, FALSE); diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 6ea6793c7f..5e3eecab30 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -8664,9 +8664,7 @@ dissect_nt_transaction_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree } } else { /* secondary request */ - if(check_col(pinfo->cinfo, COL_INFO)){ - col_append_str(pinfo->cinfo, COL_INFO, " (secondary request)"); - } + col_append_str(pinfo->cinfo, COL_INFO, " (secondary request)"); } offset += 2; @@ -9125,9 +9123,7 @@ dissect_nt_transaction_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre } else { proto_tree_add_text(tree, tvb, offset, 0, "Function: <unknown function - could not find matching request>"); - if(check_col(pinfo->cinfo, COL_INFO)){ - col_append_str(pinfo->cinfo, COL_INFO, ", <unknown>"); - } + col_append_str(pinfo->cinfo, COL_INFO, ", <unknown>"); } WORD_COUNT; @@ -13343,10 +13339,8 @@ dissect_transaction_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (!dissected_trans) dissect_trans_data(s_tvb, p_tvb, d_tvb, tree); } else { - if(check_col(pinfo->cinfo, COL_INFO)){ - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "[transact continuation]"); - } } } @@ -15125,9 +15119,7 @@ dissect_transaction_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * */ proto_tree_add_text(tree, tvb, 0, 0, "Subcommand: <UNKNOWN> since request packet wasn't seen"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, "<unknown>"); - } + col_append_str(pinfo->cinfo, COL_INFO, "<unknown>"); } else { si->info_level = t2i->info_level; if (t2i->subcmd == -1) { @@ -15139,9 +15131,7 @@ dissect_transaction_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * */ proto_tree_add_text(tree, tvb, 0, 0, "Subcommand: <UNKNOWN> since transaction code wasn't found in request packet"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, "<unknown>"); - } + col_append_str(pinfo->cinfo, COL_INFO, "<unknown>"); } else { proto_tree_add_uint(tree, hf_smb_trans2_subcmd, tvb, 0, 0, t2i->subcmd); /* FIND_FIRST2 */ @@ -15432,10 +15422,8 @@ dissect_transaction_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * if( (p_tvb==0) && (d_tvb==0) ){ - if(check_col(pinfo->cinfo, COL_INFO)){ - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "[transact continuation]"); - } } pinfo->fragmented = save_fragmented; diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index cbae408b2a..42f5170488 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -614,9 +614,7 @@ dissect_smb2_olb_string(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *t proto_tree_add_text(tree, tvb, offset, tvb_length_remaining(tvb, offset), "Invalid offset/length. Malformed packet"); - if (check_col(pinfo->cinfo, COL_INFO)){ - col_append_str(pinfo->cinfo, COL_INFO, " [Malformed packet]"); - } + col_append_str(pinfo->cinfo, COL_INFO, " [Malformed packet]"); return NULL; } @@ -693,9 +691,7 @@ dissect_smb2_olb_buffer(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *t proto_tree_add_text(parent_tree, tvb, offset, tvb_length_remaining(tvb, offset), "Invalid offset/length. Malformed packet"); - if (check_col(pinfo->cinfo, COL_INFO)){ - col_append_str(pinfo->cinfo, COL_INFO, " [Malformed packet]"); - } + col_append_str(pinfo->cinfo, COL_INFO, " [Malformed packet]"); return; } diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index 8885c7ea92..4eafdfacd3 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -650,9 +650,7 @@ dissect_t38_T_field_type(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ 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; } } @@ -1112,9 +1110,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); @@ -1123,9 +1119,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?]"); } } @@ -1157,9 +1151,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) { @@ -1173,9 +1165,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/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c index 5e2b7b8eda..bafc2fd098 100644 --- a/epan/dissectors/packet-tns.c +++ b/epan/dissectors/packet-tns.c @@ -336,10 +336,7 @@ static void dissect_tns_connect(tvbuff_t *tvb, int offset, packet_info *pinfo, PROTO_ITEM_SET_HIDDEN(hidden_item); } - if ( check_col(pinfo->cinfo, COL_INFO) ) - { - col_append_str(pinfo->cinfo, COL_INFO, ", Connect"); - } + col_append_str(pinfo->cinfo, COL_INFO, ", Connect"); if ( connect_tree ) { @@ -531,10 +528,7 @@ static void dissect_tns_accept(tvbuff_t *tvb, int offset, packet_info *pinfo, PROTO_ITEM_SET_HIDDEN(hidden_item); } - if ( check_col(pinfo->cinfo, COL_INFO) ) - { - col_append_str(pinfo->cinfo, COL_INFO, ", Accept"); - } + col_append_str(pinfo->cinfo, COL_INFO, ", Accept"); if ( accept_tree ) { @@ -648,10 +642,7 @@ static void dissect_tns_refuse(tvbuff_t *tvb, int offset, packet_info *pinfo, PROTO_ITEM_SET_HIDDEN(hidden_item); } - if ( check_col(pinfo->cinfo, COL_INFO) ) - { - col_append_str(pinfo->cinfo, COL_INFO, ", Refuse"); - } + col_append_str(pinfo->cinfo, COL_INFO, ", Refuse"); if ( refuse_tree ) { @@ -700,10 +691,7 @@ static void dissect_tns_abort(tvbuff_t *tvb, int offset, packet_info *pinfo, PROTO_ITEM_SET_HIDDEN(hidden_item); } - if ( check_col(pinfo->cinfo, COL_INFO) ) - { - col_append_str(pinfo->cinfo, COL_INFO, ", Abort"); - } + col_append_str(pinfo->cinfo, COL_INFO, ", Abort"); if ( abort_tree ) { @@ -806,10 +794,7 @@ static void dissect_tns_redirect(tvbuff_t *tvb, int offset, packet_info *pinfo, PROTO_ITEM_SET_HIDDEN(hidden_item); } - if ( check_col(pinfo->cinfo, COL_INFO) ) - { - col_append_str(pinfo->cinfo, COL_INFO, ", Redirect"); - } + col_append_str(pinfo->cinfo, COL_INFO, ", Redirect"); if ( redirect_tree ) { @@ -843,10 +828,7 @@ static void dissect_tns_control(tvbuff_t *tvb, int offset, packet_info *pinfo, PROTO_ITEM_SET_HIDDEN(hidden_item); } - if ( check_col(pinfo->cinfo, COL_INFO) ) - { - col_append_str(pinfo->cinfo, COL_INFO, ", Control"); - } + col_append_str(pinfo->cinfo, COL_INFO, ", Control"); if ( control_tree ) { diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index 6e40d6f28a..da289d2a57 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -2756,10 +2756,7 @@ void dissect_hsdsch_type_2_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto /********************************/ /* HS-DCH type 2 data here */ - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_append_str(pinfo->cinfo, COL_INFO, "(ehs)"); - } + col_append_str(pinfo->cinfo, COL_INFO, "(ehs)"); /* Frame Seq Nr (4 bits) */ if ((p_fp_info->release == 6) || diff --git a/plugins/m2m/packet-m2m.c b/plugins/m2m/packet-m2m.c index dc8a540d14..a5ecd14d4c 100644 --- a/plugins/m2m/packet-m2m.c +++ b/plugins/m2m/packet-m2m.c @@ -401,10 +401,7 @@ static void fch_burst_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint } else /* display FCH info */ { /* update the info column */ - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_append_str(pinfo->cinfo, COL_INFO, "FCH Burst: DL Frame Prefix"); - } + col_append_str(pinfo->cinfo, COL_INFO, "FCH Burst: DL Frame Prefix"); } } @@ -417,10 +414,7 @@ static void cdma_code_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint } else /* display CDMA Code Attribute info */ { /* update the info column */ - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_append_str(pinfo->cinfo, COL_INFO, "CDMA Code Attribute"); - } + col_append_str(pinfo->cinfo, COL_INFO, "CDMA Code Attribute"); } } @@ -482,10 +476,7 @@ static void pdu_burst_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint } else /* display PDU Burst info */ { /* update the info column */ - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_append_str(pinfo->cinfo, COL_INFO, "PDU Burst"); - } + col_append_str(pinfo->cinfo, COL_INFO, "PDU Burst"); } } } @@ -499,10 +490,7 @@ static void fast_feedback_burst_decoder(proto_tree *tree, tvbuff_t *tvb, gint of } else /* display the Fast Feedback Burst info */ { /* update the info column */ - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_append_str(pinfo->cinfo, COL_INFO, "Fast Feedback Burst"); - } + col_append_str(pinfo->cinfo, COL_INFO, "Fast Feedback Burst"); } } @@ -514,10 +502,7 @@ static void harq_ack_bursts_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset } else /* display the TLV HARQ ACK Bursts info */ { /* update the info column */ - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_append_str(pinfo->cinfo, COL_INFO, "HARQ ACK Bursts"); - } + col_append_str(pinfo->cinfo, COL_INFO, "HARQ ACK Bursts"); } } @@ -529,10 +514,7 @@ static void physical_attributes_decoder(proto_tree *tree, tvbuff_t *tvb, gint of } else /* display the TLV PDU Burst Physical Attributes info */ { /* update the info column */ - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_append_str(pinfo->cinfo, COL_INFO, "PHY-attr"); - } + col_append_str(pinfo->cinfo, COL_INFO, "PHY-attr"); } } @@ -540,10 +522,7 @@ static void extended_tlv_decoder(packet_info *pinfo) { /* display the Extended TLV info */ /* update the info column */ - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_append_str(pinfo->cinfo, COL_INFO, "Extended TLV"); - } + col_append_str(pinfo->cinfo, COL_INFO, "Extended TLV"); } /* Display the raw WiMax TLV */ |