diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-02-20 20:32:53 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-02-20 20:32:53 +0000 |
| commit | b3e893b1d1ef52de4ace0d460066adbd1dee55fb (patch) | |
| tree | 260e75f5aae89981f2e8f6c2f4638a84e3f87e50 /asn1/ulp | |
| parent | 5cbb7a9d4ea94b9a152dab87a8a6ab41d44c1e93 (diff) | |
From e.yimjia Add LPP decoding support in ULP protocol dissector \n https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6851
svn path=/trunk/; revision=41085
Diffstat (limited to 'asn1/ulp')
| -rw-r--r-- | asn1/ulp/packet-ulp-template.c | 2 | ||||
| -rw-r--r-- | asn1/ulp/ulp.cnf | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/asn1/ulp/packet-ulp-template.c b/asn1/ulp/packet-ulp-template.c index cb3558f39f..91dd380cc6 100644 --- a/asn1/ulp/packet-ulp-template.c +++ b/asn1/ulp/packet-ulp-template.c @@ -44,6 +44,7 @@ #define PFNAME "ulp" static dissector_handle_t rrlp_handle; +static dissector_handle_t lpp_handle; /* IANA Registered Ports * oma-ulp 7275/tcp OMA UserPlane Location @@ -144,6 +145,7 @@ proto_reg_handoff_ulp(void) ulp_handle = find_dissector("ulp"); dissector_add_string("media_type","application/oma-supl-ulp", ulp_handle); rrlp_handle = find_dissector("rrlp"); + lpp_handle = find_dissector("lpp"); initialized = TRUE; } else { dissector_delete_uint("tcp.port", local_ulp_port, ulp_handle); diff --git a/asn1/ulp/ulp.cnf b/asn1/ulp/ulp.cnf index 58b39026c1..a287518391 100644 --- a/asn1/ulp/ulp.cnf +++ b/asn1/ulp/ulp.cnf @@ -53,6 +53,14 @@ guint32 UlpMessage; call_dissector(rrlp_handle, rrlp_tvb, %(ACTX)s->pinfo, tree); } +#.FN_BODY Ver2-PosPayLoad-extension/lPPPayload/_item VAL_PTR = &lpp_tvb + tvbuff_t *lpp_tvb; + +%(DEFAULT_BODY)s + + if (lpp_tvb && lpp_handle) { + call_dissector(lpp_handle, lpp_tvb, %(ACTX)s->pinfo, tree); + } #.FN_BODY ThirdPartyID/sip-uri # asn2wrs does not handle '%' in the resticted string ( Has to be there twice) |