diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2006-05-15 20:21:33 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2006-05-15 20:21:33 +0000 |
| commit | 7f033bd485c98edb8eb1a1ab4a2b504a5d958e18 (patch) | |
| tree | 7e4957b57665c5e37698cc4f84cb452d455317ab | |
| parent | aa4b59de6f32ed9708d6d54b64404d257a06279e (diff) | |
PER Enumerated is working now.
svn path=/trunk/; revision=18165
| -rw-r--r-- | asn1/ranap/ranap.cnf | 11 | ||||
| -rw-r--r-- | epan/dissectors/packet-ranap.c | 11 | ||||
| -rw-r--r-- | epan/dissectors/packet-ranap.h | 2 |
3 files changed, 3 insertions, 21 deletions
diff --git a/asn1/ranap/ranap.cnf b/asn1/ranap/ranap.cnf index e0576883e3..6b7087e822 100644 --- a/asn1/ranap/ranap.cnf +++ b/asn1/ranap/ranap.cnf @@ -82,17 +82,6 @@ tvbuff_t *nas_pdu_tvb=NULL; return offset; dissect_e212_mcc_mnc(parameter_tvb, tree, 0); -#.FN_BODY PagingCause -# Remove once asn2eth is fixed to handle PER Enummeration extensions - offset = dissect_per_enumerated(tvb, offset, pinfo, tree, hf_index, - 5, NULL, NULL, TRUE, 1, NULL); - -#.FN_BODY Event -# Remove once asn2eth is fixed to handle PER Enummeration extensions - offset = dissect_per_enumerated(tvb, offset, pinfo, tree, hf_index, - 3, NULL, NULL, TRUE, 1, NULL); - - #.END #.TYPE_ATTR ProtocolExtensionID TYPE = FT_UINT8 DISPLAY = BASE_DEC STRINGS = VALS(ranap_ProtocolIE_ID_vals)
\ No newline at end of file diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c index 582ec96caa..76d97dd24a 100644 --- a/epan/dissectors/packet-ranap.c +++ b/epan/dissectors/packet-ranap.c @@ -6455,11 +6455,8 @@ static const value_string ranap_PagingCause_vals[] = { static int dissect_ranap_PagingCause(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 87 "ranap.cnf" offset = dissect_per_enumerated(tvb, offset, pinfo, tree, hf_index, - 5, NULL, NULL, TRUE, 1, NULL); - - + 5, NULL, NULL, TRUE, 1, NULL); return offset; } @@ -8466,12 +8463,8 @@ static const value_string ranap_Event_vals[] = { static int dissect_ranap_Event(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 92 "ranap.cnf" offset = dissect_per_enumerated(tvb, offset, pinfo, tree, hf_index, - 3, NULL, NULL, TRUE, 1, NULL); - - - + 3, NULL, NULL, TRUE, 1, NULL); return offset; } diff --git a/epan/dissectors/packet-ranap.h b/epan/dissectors/packet-ranap.h index 84f09c2299..95373a4904 100644 --- a/epan/dissectors/packet-ranap.h +++ b/epan/dissectors/packet-ranap.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ /* .\packet-ranap.h */ -/* ../../tools/asn2eth.py -X -e -p ranap -c ranap.cnf -s packet-ranap-template ranap.asn */ +/* ../../tools/asn2eth.py -e -p ranap -c ranap.cnf -s packet-ranap-template ranap.asn */ /* Input file: packet-ranap-template.h */ |