diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2005-11-02 07:51:55 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2005-11-02 07:51:55 +0000 |
| commit | 6eb18470f8c2b2b2a69d33673d0858fb28145411 (patch) | |
| tree | 25c399cc642fc084a48d1daec7cbbbb5c03cc047 /epan/dissectors/packet-inap.c | |
| parent | c5ff846c22c7db302f23e5c81146fffb6053a077 (diff) | |
| download | wireshark-6eb18470f8c2b2b2a69d33673d0858fb28145411.tar.gz wireshark-6eb18470f8c2b2b2a69d33673d0858fb28145411.tar.bz2 wireshark-6eb18470f8c2b2b2a69d33673d0858fb28145411.zip | |
From Tim
A small patch for camel and inap, where the linkedid doesn't get dissected correctly in camel or inap
and some tidy up in the camel asn.1 which now compiles with no warnings.
also fix the copy_file target (/y)
svn path=/trunk/; revision=16376
Diffstat (limited to 'epan/dissectors/packet-inap.c')
| -rw-r--r-- | epan/dissectors/packet-inap.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c index 1869f6f81c..3cf7f4f790 100644 --- a/epan/dissectors/packet-inap.c +++ b/epan/dissectors/packet-inap.c @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* ./packet-inap.c */ +/* .\packet-inap.c */ /* ../../tools/asn2eth.py -X -b -e -p inap -c inap.cnf -s packet-inap-template inap.asn */ /* Input file: packet-inap-template.c */ @@ -56,6 +56,7 @@ int proto_inap = -1; static int hf_inap_invokeCmd = -1; /* Opcode */ static int hf_inap_invokeid = -1; /* INTEGER */ +static int hf_inap_linkedid = -1; /* INTEGER */ static int hf_inap_absent = -1; /* NULL */ static int hf_inap_invokeId = -1; /* InvokeId */ static int hf_inap_invoke = -1; /* InvokePDU */ @@ -4530,9 +4531,14 @@ dissect_inap_InvokeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pack static int dissect_invokeId(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_inap_InvokeId(FALSE, tvb, offset, pinfo, tree, hf_inap_invokeId); } +static int dissect_linkedID_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_ber_integer(TRUE, pinfo, tree, tvb, offset, hf_inap_linkedid, NULL); +} + static const ber_sequence_t InvokePDU_sequence[] = { { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId }, + { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_linkedID_impl }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeCmd }, { BER_CLASS_UNI, -1/*depends on Cmd*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeData }, { 0, 0, 0, NULL } @@ -4705,6 +4711,11 @@ void proto_register_inap(void) { { "invokeid", "inap.invokeid", FT_INT32, BASE_DEC, NULL, 0, "InvokeId/invokeid", HFILL }}, + { &hf_inap_linkedid, + { "linkedid", "inap.linkedid", + FT_INT32, BASE_DEC, NULL, 0, + "LinkedId/linkedid", HFILL }}, + { &hf_inap_absent, { "absent", "inap.absent", FT_NONE, BASE_NONE, NULL, 0, |