diff options
| author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2006-05-15 06:36:17 +0000 |
|---|---|---|
| committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2006-05-15 06:36:17 +0000 |
| commit | 31547dee95f50787b8da24231d1c715589b444e4 (patch) | |
| tree | d57c667807243447009d71a611a7afd6f1d00295 /asn1/ranap | |
| parent | 726820fd03ae031586a41e39984b8e9013060f4a (diff) | |
| download | wireshark-31547dee95f50787b8da24231d1c715589b444e4.tar.gz wireshark-31547dee95f50787b8da24231d1c715589b444e4.tar.bz2 wireshark-31547dee95f50787b8da24231d1c715589b444e4.zip | |
regenerated with new asn2eth
svn path=/trunk/; revision=18158
Diffstat (limited to 'asn1/ranap')
| -rw-r--r-- | asn1/ranap/Makefile.nmake | 2 | ||||
| -rw-r--r-- | asn1/ranap/packet-ranap-template.c | 8 | ||||
| -rw-r--r-- | asn1/ranap/ranap.cnf | 16 |
3 files changed, 6 insertions, 20 deletions
diff --git a/asn1/ranap/Makefile.nmake b/asn1/ranap/Makefile.nmake index 0019ab978b..f781cd5f8c 100644 --- a/asn1/ranap/Makefile.nmake +++ b/asn1/ranap/Makefile.nmake @@ -15,7 +15,7 @@ generate_dissector: $(DISSECTOR_FILES) $(DISSECTOR_FILES): ../../tools/asn2eth.py ranap.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h ranap.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -e -p $(PROTOCOL_NAME) -c ranap.cnf -s packet-$(PROTOCOL_NAME)-template ranap.asn + $(PYTHON) ../../tools/asn2eth.py -e -p $(PROTOCOL_NAME) -c ranap.cnf -s packet-$(PROTOCOL_NAME)-template ranap.asn !ELSE @echo Error: You need Python to use asn2eth.py @exit 1 diff --git a/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c index f5ace88f1f..5a20f740c4 100644 --- a/asn1/ranap/packet-ranap-template.c +++ b/asn1/ranap/packet-ranap-template.c @@ -60,7 +60,6 @@ int proto_ranap = -1; static dissector_table_t nas_pdu_dissector_table; -static int hf_ranap_RANAP_PDU = -1; static int hf_ranap_pdu_length = -1; static int hf_ranap_IE_length = -1; @@ -1075,8 +1074,7 @@ dissect_ranap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ranap_item = proto_tree_add_item(tree, proto_ranap, tvb, 0, -1, FALSE); ranap_tree = proto_item_add_subtree(ranap_item, ett_ranap); - per_aligment_type_callback(TRUE); - offset = dissect_ranap_RANAP_PDU(tvb, offset, pinfo, ranap_tree, hf_ranap_RANAP_PDU); + offset = dissect_RANAP_PDU_PDU(tvb, pinfo, ranap_tree); } @@ -1135,10 +1133,6 @@ void proto_register_ranap(void) { /* List of fields */ static hf_register_info hf[] = { - { &hf_ranap_RANAP_PDU, - { "RANAP_PDU", "ranap.ranap_pdu", - FT_UINT32, BASE_DEC, VALS(ranap_RANAP_PDU_vals), 0, - "RANAP_PDU", HFILL }}, { &hf_ranap_pdu_length, { "PDU Length", "ranap.pdu_length", FT_UINT32, BASE_DEC, NULL, 0, "Number of octets in the PDU", HFILL }}, diff --git a/asn1/ranap/ranap.cnf b/asn1/ranap/ranap.cnf index 145e1d9287..e0576883e3 100644 --- a/asn1/ranap/ranap.cnf +++ b/asn1/ranap/ranap.cnf @@ -3,7 +3,8 @@ # $Id$ -#.PDU +#.PDU_NEW +RANAP-PDU #.NO_EMIT @@ -49,11 +50,7 @@ VAL_PTR = &ProtocolIE_ID offset = dissect_ranap_ies(tvb, offset, pinfo, tree); -#.FN_PARS NAS-PDU - -VAL_PTR = &nas_pdu_tvb - -#.FN_BODY NAS-PDU +#.FN_BODY NAS-PDU VAL_PTR = &nas_pdu_tvb tvbuff_t *nas_pdu_tvb=NULL; @@ -75,12 +72,7 @@ tvbuff_t *nas_pdu_tvb=NULL; #.FN_BODY RANAP_PRIVATE_IES_Value /* FIX ME */ - -#.FN_PARS PLMNidentity - -VAL_PTR = ¶meter_tvb - -#.FN_BODY PLMNidentity +#.FN_BODY PLMNidentity VAL_PTR = ¶meter_tvb tvbuff_t *parameter_tvb=NULL; |