diff options
author | Anders Broman <anders.broman@ericsson.com> | 2005-10-03 18:18:38 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2005-10-03 18:18:38 +0000 |
commit | f11ef4b7a01d3182e140bd58c51bed349f28e2df (patch) | |
tree | 87c76dca27c9b5bfd775167d8cb6e3799e846549 /asn1/gnm | |
parent | 2ee44b840922c1306289196eb81c749a4c10e875 (diff) |
Add dissection of some more OID's and use the #.REGISTER function.
svn path=/trunk/; revision=16081
Diffstat (limited to 'asn1/gnm')
-rw-r--r-- | asn1/gnm/gnm.cnf | 85 | ||||
-rw-r--r-- | asn1/gnm/packet-gnm-template.c | 224 |
2 files changed, 86 insertions, 223 deletions
diff --git a/asn1/gnm/gnm.cnf b/asn1/gnm/gnm.cnf index 646fc59d8a..f3fb76c1e3 100644 --- a/asn1/gnm/gnm.cnf +++ b/asn1/gnm/gnm.cnf @@ -12,7 +12,6 @@ CMIP-1 cmip #.INCLUDE ../cmip/cmip-exp.cnf #.EXPORTS - #.PDU @@ -26,4 +25,88 @@ CMIP-1 cmip #.FN_BODY ManagementExtension/information /* FIX ME */ + +#.REGISTER +RelatedObjectInstance B "0.0.13.3100.0.7.1" "a-TPInstance(1)" +ObjectList B "0.0.13.3100.0.7.2" "affectedObjectList(2)" +AlarmSeverityAssignmentList B "0.0.13.3100.0.7.3" "alarmSeverityAssignmentList(3)" +NameType B "0.0.13.3100.0.7.4" "alarmSeverityAssignmentProfileId(4)" +PointerOrNull B "0.0.13.3100.0.7.5" "alarmSeverityAssignmentProfilePointer(5)" +AlarmStatus B "0.0.13.3100.0.7.6" "alarmStatus(6)" +ChannelNumber B "0.0.13.3100.0.7.7" "channelNumber(7)" +CharacteristicInformation B "0.0.13.3100.0.7.8" "characteristicInformation(8)" +# ObjectInstance B "0.0.13.3100.0.7.9" "clientConnection(9)" CMIP + +# ClientConnection B "0.0.13.3100.0.7.10" "clientTrail(10)" +Count B "0.0.13.3100.0.7.11" "connectedTpCount(11)" +NameType B "0.0.13.3100.0.7.12" "connectionId(12)" +NameType B "0.0.13.3100.0.7.13" "cTPId(13)" +NameType B "0.0.13.3100.0.7.14" "crossConnectionId(14)" +CrossConnectionName B "0.0.13.3100.0.7.15" "crossConnectionName(15)" +CrossConnectionObjectPointer B "0.0.13.3100.0.7.16" "crossConnectionObjectPointer(16)" +CurrentProblemList B "0.0.13.3100.0.7.17" "currentProblemList(17)" +Directionality B "0.0.13.3100.0.7.18" "directionality(18)" +DownstreamConnectivityPointer B "0.0.13.3100.0.7.19" "downstreamConnectivityPointer(19)" + +NameType B "0.0.13.3100.0.7.20" "equipmentId(20)" +ExternalTime B "0.0.13.3100.0.7.21" "externalTime(21)" +NameType B "0.0.13.3100.0.7.22" "fabricId(22)" +PointerOrNull B "0.0.13.3100.0.7.23" "fromTermination(23)" +NameType B "0.0.13.3100.0.7.24" "gtpId(24)" +Count B "0.0.13.3100.0.7.25" "idleTpCount(25)" +ListOfCharacteristicInformation B "0.0.13.3100.0.7.26" "listOfCharacteristicInfo(26)" +Replaceable B "0.0.13.3100.0.7.27" "locationName(27)" +NameType B "0.0.13.3100.0.7.28" "managedElementId(28)" +NameType B "0.0.13.3100.0.7.29" "mpCrossConnectionId(29)" + +NameType B "0.0.13.3100.0.7.30" "networkId(30)" +#ObjectInstance B "0.0.13.3100.0.7.31" "networkLevelPointer(31)" +Boolean B "0.0.13.3100.0.7.32" "protected(32)" +Boolean B "0.0.13.3100.0.7.33" "redline(33)" +Replaceable B "0.0.13.3100.0.7.34" "replaceable(34)" +SequenceOfObjectInstance B "0.0.13.3100.0.7.35" "serverConnectionList(35)" +ObjectList B "0.0.13.3100.0.7.36" "serverTrailList(36)" +SignalType B "0.0.13.3100.0.7.37" "signalType(37)" +NameType B "0.0.13.3100.0.7.38" "softwareId(38)" +SupportableClientList B "0.0.13.3100.0.7.39" "supportableClientList(39)" + +ObjectList B "0.0.13.3100.0.7.40" "supportedByObjectList(40)" +SystemTimingSource B "0.0.13.3100.0.7.41" "systemTimingSource(41)" +Count B "0.0.13.3100.0.7.42" "totalTpCount(42)" +Pointer B "0.0.13.3100.0.7.43" "toTermination(43)" +NameType B "0.0.13.3100.0.7.44" "tpPoolId(44)" +TpsInGtpList B "0.0.13.3100.0.7.45" "tpsInGtpList(45)" +#ObjectInstance B "0.0.13.3100.0.7.46" "tpsInTpPoolList(46)" +NameType B "0.0.13.3100.0.7.47" "trailId(47)" +NameType B "0.0.13.3100.0.7.48" "tTPId(48)" +ConnectivityPointer B "0.0.13.3100.0.7.49" "upstreamConnectivityPointer(49)" + +UserLabel B "0.0.13.3100.0.7.50" "userLabel(50)" +VendorName B "0.0.13.3100.0.7.51" "vendorName(51)" +Version B "0.0.13.3100.0.7.52" "version(52)" +ObjectList B "0.0.13.3100.0.7.53" "clientConnectionList(53)" +CircuitPackType B "0.0.13.3100.0.7.54" "circuitPackType(54)" +RelatedObjectInstance B "0.0.13.3100.0.7.55" "z-TPInstance(55)" +EquipmentHolderAddress B "0.0.13.3100.0.7.56" "equipmentHolderAddress(56)" +EquipmentHolderType B "0.0.13.3100.0.7.57" "equipmentHolderType(57)" +AcceptableCircuitPackTypeList B "0.0.13.3100.0.7.58" "acceptableCircuitPackTypeList(58)" +HolderStatus B "0.0.13.3100.0.7.59" "holderStatus(59)" + +SubordinateCircuitPackSoftwareLoad B "0.0.13.3100.0.7.60" "subordinateCircuitPackSoftwareLoad(60)" +NameType B "0.0.13.3100.0.7.61" "circuitEndPointSubgroupId(61)" +NumberOfCircuits B "0.0.13.3100.0.7.62" "numberOfCircuits(62)" +UserLabel B "0.0.13.3100.0.7.63" "labelOfFarEndExchange(63)" +SignallingCapabilities B "0.0.13.3100.0.7.64" "signallingCapabilities(64)" +InformationTransferCapabilities B "0.0.13.3100.0.7.65" "informationTransferCapabilities(65)" +CircuitDirectionality B "0.0.13.3100.0.7.66" "circuitDirectionality(66)" +TransmissionCharacteristics B "0.0.13.3100.0.7.67" "transmissionCharacteristics(67)" +NameType B "0.0.13.3100.0.7.68" "managedElementComplexId(68)" +SerialNumber B "0.0.13.3100.0.7.69" "serialNumber(69)" + +AdministrativeState B "2.9.3.2.7.31" "administrativeState(31)" +ControlStatus B "2.9.3.2.7.34" "controlStatus(34)" +Packages B "2.9.3.2.7.66" "packages(66)" + +SupportedTOClasses B "2.9.2.12.7.7" "supportedTOClasses(7)" + #.END diff --git a/asn1/gnm/packet-gnm-template.c b/asn1/gnm/packet-gnm-template.c index c32f98dea1..2194feadd4 100644 --- a/asn1/gnm/packet-gnm-template.c +++ b/asn1/gnm/packet-gnm-template.c @@ -59,191 +59,12 @@ static int hf_gnm_AdministrativeState = -1; static void -dissect_gnm_attribute_1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) -{ - - dissect_gnm_RelatedObjectInstance(FALSE, tvb, 0, pinfo, parent_tree, -1); - -} - -static void -dissect_gnm_attribute_ObjectList(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) -{ - - dissect_gnm_ObjectList(FALSE, tvb, 0, pinfo, parent_tree, -1); - -} - -static void -dissect_gnm_attribute_3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) -{ - - dissect_gnm_AlarmSeverityAssignmentList(FALSE, tvb, 0, pinfo, parent_tree, -1); - -} - -static void -dissect_gnm_attribute_6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) -{ - - dissect_gnm_AlarmStatus(FALSE, tvb, 0, pinfo, parent_tree, hf_gnm_alarmStatus); - -} - -static void -dissect_gnm_attribute_7(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) -{ - - dissect_gnm_ChannelNumber(FALSE, tvb, 0, pinfo, parent_tree, hf_gnm_alarmStatus); - -} -static void -dissect_gnm_attribute_8(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) -{ - - dissect_gnm_CharacteristicInformation(FALSE, tvb, 0, pinfo, parent_tree, hf_gnm_alarmStatus); - -} -static void -dissect_gnm_attribute_15(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) -{ - - dissect_gnm_CrossConnectionName(FALSE, tvb, 0, pinfo, parent_tree, -1); - -} -static void -dissect_gnm_attribute_16(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) -{ - - dissect_gnm_CrossConnectionObjectPointer(FALSE, tvb, 0, pinfo, parent_tree, -1); - -} -static void -dissect_gnm_attribute_17(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) -{ - - dissect_gnm_CurrentProblemList(FALSE, tvb, 0, pinfo, parent_tree, -1); - -} -static void -dissect_gnm_attribute_18(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) -{ - - dissect_gnm_Directionality(FALSE, tvb, 0, pinfo, parent_tree, -1); - -} -static void -dissect_gnm_attribute_19(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) -{ - - dissect_gnm_DownstreamConnectivityPointer(FALSE, tvb, 0, pinfo, parent_tree, -1); - -} -static void -dissect_gnm_attribute_21(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) -{ - - dissect_gnm_ExternalTime(FALSE, tvb, 0, pinfo, parent_tree, -1); - -} - -static void -dissect_gnm_attribute_26(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) -{ - - dissect_gnm_ListOfCharacteristicInformation(FALSE, tvb, 0, pinfo, parent_tree, -1); - -} -static void -dissect_gnm_attribute_27(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) -{ - - dissect_gnm_LocationName(FALSE, tvb, 0, pinfo, parent_tree, -1); - -} -static void -dissect_gnm_attribute_34(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) -{ - - dissect_gnm_Replaceable(FALSE, tvb, 0, pinfo, parent_tree, -1); - -} -static void -dissect_gnm_attribute_SequenceOfObjectInstance(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) -{ - - dissect_gnm_SequenceOfObjectInstance(FALSE, tvb, 0, pinfo, parent_tree, -1); - -} -static void -dissect_gnm_attribute_PointerOrNull(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) -{ - - dissect_gnm_PointerOrNull(FALSE, tvb, 0, pinfo, parent_tree, -1); - -} - -static void -dissect_gnm_attribute_NameType(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) -{ - - dissect_gnm_NameType(FALSE, tvb, 0, pinfo, parent_tree, -1); - -} - -static void dissect_gnm_attribute_ObjectInstance(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) { dissect_cmip_ObjectInstance(FALSE, tvb, 0, pinfo, parent_tree, -1); } -static void -dissect_gnm_attribute_Count(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) -{ - - dissect_gnm_Count(FALSE, tvb, 0, pinfo, parent_tree, -1); - -} -static void -dissect_gnm_attribute_Boolean(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) -{ - - dissect_gnm_Boolean(FALSE, tvb, 0, pinfo, parent_tree, -1); - -} -static void -dissect_smi_attribute_31(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) -{ - - dissect_gnm_AdministrativeState(FALSE, tvb, 0, pinfo, parent_tree, hf_gnm_AdministrativeState); - -} - -static void -dissect_smi_attribute_34(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) -{ - - dissect_gnm_ControlStatus(FALSE, tvb, 0, pinfo, parent_tree, -1); - -} - -static void -dissect_smi_attribute_66(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) -{ - - dissect_gnm_Packages(FALSE, tvb, 0, pinfo, parent_tree, -1); - -} - -static void -dissect_part12AttributeId_7(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) -{ - - dissect_gnm_SupportedTOClasses(FALSE, tvb, 0, pinfo, parent_tree, -1); - -} - void dissect_gnm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) @@ -281,51 +102,10 @@ void proto_register_gnm(void) { /*--- proto_reg_handoff_gnm ---------------------------------------*/ void proto_reg_handoff_gnm(void) { - register_ber_oid_dissector("0.0.13.3100.0.7.1", dissect_gnm_attribute_1, proto_gnm, "a-TPInstance(1)"); - register_ber_oid_dissector("0.0.13.3100.0.7.2", dissect_gnm_attribute_ObjectList, proto_gnm, "affectedObjectList(2)"); - register_ber_oid_dissector("0.0.13.3100.0.7.3", dissect_gnm_attribute_3, proto_gnm, "alarmSeverityAssignmentList(3)"); - register_ber_oid_dissector("0.0.13.3100.0.7.4", dissect_gnm_attribute_NameType, proto_gnm, "alarmSeverityAssignmentProfileId(4)"); - register_ber_oid_dissector("0.0.13.3100.0.7.5", dissect_gnm_attribute_PointerOrNull, proto_gnm, "alarmSeverityAssignmentProfilePointer(5)"); - register_ber_oid_dissector("0.0.13.3100.0.7.6", dissect_gnm_attribute_6, proto_gnm, "alarmStatus(6)"); - register_ber_oid_dissector("0.0.13.3100.0.7.7", dissect_gnm_attribute_7, proto_gnm, "channelNumber(7)"); - register_ber_oid_dissector("0.0.13.3100.0.7.8", dissect_gnm_attribute_8, proto_gnm, "characteristicInformation(8)"); +#include "packet-gnm-dis-tab.c" register_ber_oid_dissector("0.0.13.3100.0.7.9", dissect_gnm_attribute_ObjectInstance, proto_gnm, "clientConnection(9)"); register_ber_oid_dissector("0.0.13.3100.0.7.10", dissect_gnm_attribute_ObjectInstance, proto_gnm, "clientTrail(10)"); - - register_ber_oid_dissector("0.0.13.3100.0.7.11", dissect_gnm_attribute_Count, proto_gnm, "connectedTpCount(11)"); - register_ber_oid_dissector("0.0.13.3100.0.7.12", dissect_gnm_attribute_NameType, proto_gnm, "connectionId(12)"); - register_ber_oid_dissector("0.0.13.3100.0.7.13", dissect_gnm_attribute_NameType, proto_gnm, "cTPId(13)"); - register_ber_oid_dissector("0.0.13.3100.0.7.14", dissect_gnm_attribute_NameType, proto_gnm, "crossConnectionId(14)"); - register_ber_oid_dissector("0.0.13.3100.0.7.15", dissect_gnm_attribute_15, proto_gnm, "crossConnectionName(15)"); - register_ber_oid_dissector("0.0.13.3100.0.7.16", dissect_gnm_attribute_16, proto_gnm, "crossConnectionObjectPointer(16)"); - register_ber_oid_dissector("0.0.13.3100.0.7.17", dissect_gnm_attribute_17, proto_gnm, "currentProblemList(17)"); - register_ber_oid_dissector("0.0.13.3100.0.7.18", dissect_gnm_attribute_18, proto_gnm, "directionality(18)"); - register_ber_oid_dissector("0.0.13.3100.0.7.19", dissect_gnm_attribute_19, proto_gnm, "downstreamConnectivityPointer(19)"); - - register_ber_oid_dissector("0.0.13.3100.0.7.20", dissect_gnm_attribute_NameType, proto_gnm, "equipmentId(20)"); - register_ber_oid_dissector("0.0.13.3100.0.7.21", dissect_gnm_attribute_19, proto_gnm, "externalTime(21)"); - register_ber_oid_dissector("0.0.13.3100.0.7.22", dissect_gnm_attribute_NameType, proto_gnm, "fabricId(22)"); - register_ber_oid_dissector("0.0.13.3100.0.7.23", dissect_gnm_attribute_PointerOrNull, proto_gnm, "fromTermination(23)"); - register_ber_oid_dissector("0.0.13.3100.0.7.24", dissect_gnm_attribute_NameType, proto_gnm, "gtpId(24)"); - register_ber_oid_dissector("0.0.13.3100.0.7.25", dissect_gnm_attribute_Count, proto_gnm, "idleTpCount(25)"); - register_ber_oid_dissector("0.0.13.3100.0.7.26", dissect_gnm_attribute_26, proto_gnm, "listOfCharacteristicInfo(26)"); - register_ber_oid_dissector("0.0.13.3100.0.7.27", dissect_gnm_attribute_27, proto_gnm, "locationName(27)"); - register_ber_oid_dissector("0.0.13.3100.0.7.28", dissect_gnm_attribute_NameType, proto_gnm, "managedElementId(28)"); - register_ber_oid_dissector("0.0.13.3100.0.7.29", dissect_gnm_attribute_NameType, proto_gnm, "mpCrossConnectionId(29)"); - register_ber_oid_dissector("0.0.13.3100.0.7.30", dissect_gnm_attribute_NameType, proto_gnm, "networkId(30)"); - register_ber_oid_dissector("0.0.13.3100.0.7.31", dissect_gnm_attribute_ObjectInstance, proto_gnm, "networkLevelPointer(31)"); - register_ber_oid_dissector("0.0.13.3100.0.7.32", dissect_gnm_attribute_Boolean, proto_gnm, "protected(32)"); - register_ber_oid_dissector("0.0.13.3100.0.7.33", dissect_gnm_attribute_Boolean, proto_gnm, "redline(33)"); - register_ber_oid_dissector("0.0.13.3100.0.7.34", dissect_gnm_attribute_34, proto_gnm, "replaceable(34)"); - register_ber_oid_dissector("0.0.13.3100.0.7.35", dissect_gnm_attribute_SequenceOfObjectInstance, proto_gnm, "serverConnectionList(35)"); - register_ber_oid_dissector("0.0.13.3100.0.7.36", dissect_gnm_attribute_ObjectList, proto_gnm, "serverTrailList(36)"); - - register_ber_oid_dissector("2.9.3.2.7.31", dissect_smi_attribute_31, proto_gnm, "smi2AttributeID (7) administrativeState(31)"); - register_ber_oid_dissector("2.9.3.2.7.34", dissect_smi_attribute_34, proto_gnm, "smi2AttributeID (7) controlStatus(34)"); - register_ber_oid_dissector("2.9.3.2.7.66", dissect_smi_attribute_66, proto_gnm, "smi2AttributeID (7) packages(66)"); - - register_ber_oid_dissector("2.9.2.12.7.7", dissect_part12AttributeId_7, proto_gnm, "part12AttributeId (7) supportedTOClasses(7)"); - + register_ber_oid_dissector("0.0.13.3100.0.7.46", dissect_gnm_attribute_ObjectInstance, proto_gnm, "networkLevelPointer(31)"); } |