diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2006-05-16 22:00:18 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2006-05-16 22:00:18 +0000 |
| commit | 622f6d89221740f1ddc0059e009c698b76f830cb (patch) | |
| tree | 5f2069d8424da67286ccce86bf9c96636e80dad4 /asn1/ulp | |
| parent | 4b6b84d5159fca33c99707f32ca0964d4f8c52fa (diff) | |
| download | wireshark-622f6d89221740f1ddc0059e009c698b76f830cb.tar.gz wireshark-622f6d89221740f1ddc0059e009c698b76f830cb.tar.bz2 wireshark-622f6d89221740f1ddc0059e009c698b76f830cb.zip | |
PER:
Adapt dissect_per_octet_string to unaligned PER.
Call rrlp dissector from ulp dissector.
svn path=/trunk/; revision=18176
Diffstat (limited to 'asn1/ulp')
| -rw-r--r-- | asn1/ulp/ULP.asn | 4 | ||||
| -rw-r--r-- | asn1/ulp/packet-ulp-template.c | 3 | ||||
| -rw-r--r-- | asn1/ulp/ulp.cnf | 11 |
3 files changed, 14 insertions, 4 deletions
diff --git a/asn1/ulp/ULP.asn b/asn1/ulp/ULP.asn index 35cb1d647b..22ea6fc460 100644 --- a/asn1/ulp/ULP.asn +++ b/asn1/ulp/ULP.asn @@ -471,9 +471,11 @@ SUPLPOS ::= SEQUENCE { PosPayLoad ::= CHOICE { tia801payload OCTET STRING(SIZE (1..8192)), rrcPayload OCTET STRING(SIZE (1..8192)), - rrlpPayload OCTET STRING(SIZE (1..8192)), + rrlpPayload RRLPPayload, ...} +RRLPPayload ::= OCTET STRING(SIZE (1..8192)) + --END --SUPL-POS-INIT DEFINITIONS AUTOMATIC TAGS ::= --BEGIN diff --git a/asn1/ulp/packet-ulp-template.c b/asn1/ulp/packet-ulp-template.c index 5efc728e6b..45ccb32bc9 100644 --- a/asn1/ulp/packet-ulp-template.c +++ b/asn1/ulp/packet-ulp-template.c @@ -48,6 +48,7 @@ #define PFNAME "ulp" static dissector_handle_t ulp_handle=NULL; +static dissector_handle_t rrlp_handle; /* IANA Registered Ports * oma-ulp 7275/tcp OMA UserPlane Location @@ -82,6 +83,8 @@ proto_reg_handoff_ulp(void) /* application/oma-supl-ulp */ dissector_add_string("media_type","application/oma-supl-ulp", ulp_handle); + rrlp_handle = find_dissector("rrlp"); + } diff --git a/asn1/ulp/ulp.cnf b/asn1/ulp/ulp.cnf index 500f854146..b014583c8e 100644 --- a/asn1/ulp/ulp.cnf +++ b/asn1/ulp/ulp.cnf @@ -29,7 +29,12 @@ guint32 UlpMessage; } #.END -#.TYPE_ATTR -IPv4Address TYPE = FT_IPv4 DISPLAY = BASE_NONE STRINGS = NULL -IPv6Address TYPE = FT_IPv6 DISPLAY = BASE_NONE STRINGS = NULL +#.FN_BODY RRLPPayload VAL_PTR = &rrlp_tvb + tvbuff_t *rrlp_tvb; +%(DEFAULT_BODY)s + + if (rrlp_tvb){ + call_dissector(rrlp_handle, rrlp_tvb, pinfo, tree); + + }
\ No newline at end of file |