Commit Graph

2082 Commits

Author SHA1 Message Date
Bill Meier 71a74c2f3a Regenerate packet-nbap.c now that asn2wrs sorts value_string arrays used with value_string_ext fcns;
Change nbap.cnf to use val_to_str_ext to access protocolIE_ID value_string array.
Also: Minor whitespace cleanup in nbap.cnf.

svn path=/trunk/; revision=34876
2010-11-15 16:46:14 +00:00
Anders Broman 760d2a5cdc Update Camel to TS 29.078 9.2.0 (2010-06)
svn path=/trunk/; revision=34849
2010-11-12 14:50:58 +00:00
Anders Broman 92d5c09ac6 Use value_string_ext.
svn path=/trunk/; revision=34844
2010-11-11 17:24:11 +00:00
Anders Broman 2fb8971136 Update to 3GPP TS 29.002 V9.3.0 (2010-09)
svn path=/trunk/; revision=34814
2010-11-08 23:15:16 +00:00
Anders Broman ae7d471ebe Make the changes from:
Use value_string_ext fcns to access certain value_string arrays;
Sort certain value_string arrays so the values are in ascending order;
Use val_to_str_ext() instead of for loops to do value_string array lookups (voip_calls.c).
Minor whitespace cleanup.
In the source files of the as2wrs generated dissectors.

svn path=/trunk/; revision=34803
2010-11-07 20:51:16 +00:00
Stig Bjørlykke b9f01a15db Initialize dummy_me to avoid garbage or undefined values.
svn path=/trunk/; revision=34788
2010-11-05 08:28:34 +00:00
Stig Bjørlykke 8c1b03ef8e Don't generate packet-ns_cert_exts.h, it's not used.
svn path=/trunk/; revision=34736
2010-10-31 12:37:46 +00:00
Stig Bjørlykke f3f13f36b5 Added a "all" target to rebuild all asn1 dissectors.
Currently this fails for kerberos and x721, because they shall not be build.
Maybe we should add some sort of disable build for them.

svn path=/trunk/; revision=34734
2010-10-31 12:26:15 +00:00
Stig Bjørlykke c5bebaa771 One more:
Make the third argument to a UAT copy callback a size_t.

svn path=/trunk/; revision=34696
2010-10-29 21:55:04 +00:00
Stig Bjørlykke 340d64e780 Make the third argument to a UAT copy callback a size_t.
svn path=/trunk/; revision=34695
2010-10-29 21:51:59 +00:00
Guy Harris 17d4d51b7d Make the third argument to a UAT copy callback a size_t (not that any of
the callbacks we have use that argument - is it really needed?).

svn path=/trunk/; revision=34694
2010-10-29 21:11:33 +00:00
Stig Bjørlykke 8b9c15d68f Added info column descriptions for AARQ and AARE.
svn path=/trunk/; revision=34519
2010-10-15 08:39:48 +00:00
Jeff Morriss ebc190645f From Fulko Hew via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4615 :
The attached patch adds the missing decoded fields
by moving the proto_tree_add_item() call so that it
is no longer within an error handler and will be
called under normal circumstances (as well as error conditions.


From me: Apply the change to the ASN.1 source.  Also some white space
indentation cleanup.

svn path=/trunk/; revision=34505
2010-10-14 01:44:27 +00:00
Anders Broman 6dc9a19a91 Update to V9.4.0 (2010-09), no change in the asn1 def's.
svn path=/trunk/; revision=34362
2010-10-04 10:48:42 +00:00
Stig Bjørlykke e7a8e117fc Cleanup reassembly hf entries.
svn path=/trunk/; revision=34292
2010-09-30 19:40:02 +00:00
Stig Bjørlykke f5a210b2e8 Cleanup reassembly hf entries.
svn path=/trunk/; revision=34291
2010-09-30 19:35:51 +00:00
Jeff Morriss 0ff5638f37 Replace blurbs that match the name (case insensitive) with NULL.
svn path=/trunk/; revision=34227
2010-09-23 21:46:31 +00:00
Stig Bjørlykke 907cfc535a Corrected check for attribute flag bits.
svn path=/trunk/; revision=34203
2010-09-23 07:42:20 +00:00
Stig Bjørlykke c403378c36 Show Abort source in info column.
svn path=/trunk/; revision=34202
2010-09-23 07:39:38 +00:00
Anders Broman 6dc449e99c The CLDAP attribute value on a CLDAP reply is no longer being decoded
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5239

It got broken in Revision 33390 I think, if attr_type is unset at this point it should be set in the calling function.
http://anonsvn.wireshark.org/viewvc/trunk/asn1/ldap/ldap.cnf?r1=33388&r2=33390

svn path=/trunk/; revision=34176
2010-09-21 14:56:55 +00:00
Jeff Morriss 381664535b As suggested by Kovarththanan Rajaratnam in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3548 :
Clean up hf fields some more: mostly removing leading and trailing spaces from names and blurbs.

svn path=/trunk/; revision=34165
2010-09-21 03:14:49 +00:00
Stig Bjørlykke e6dac92931 Put Abort reason in info column.
svn path=/trunk/; revision=34159
2010-09-20 12:49:52 +00:00
Jeff Morriss 9ac49c557d Copy the rev 34143 changes to packet-snmp.c over to the asn1 source.
hf_snmp_engineid_enterprise is now a BASE_EXT_STRING, not BASE_RANGE_STRING.  This fixes
the fuzz failure in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5233 

svn path=/trunk/; revision=34151
2010-09-17 14:03:05 +00:00
Stig Bjørlykke 633e4e324b From Martin Peylo via bug 5198:
Added missing OIDs in CRMF (RFC 4211) dissector.

svn path=/trunk/; revision=34099
2010-09-10 21:22:29 +00:00
Tomas Kukosa eb503df011 Do not report undecoded message to expert info for ReturnResult without result filed
svn path=/trunk/; revision=34076
2010-09-08 09:02:16 +00:00
Anders Broman 136dec3980 From Pascal Quantin:
Patch that allows the dissection of the Feature Group Indicators bit string. I tested it with our UE and it works fine.

svn path=/trunk/; revision=34035
2010-08-31 20:03:46 +00:00
Anders Broman fc87f4a4c1 Add stub code for future dissection of featureGroupIndicators.
svn path=/trunk/; revision=34032
2010-08-31 10:50:54 +00:00
Anders Broman 687eb5a2a6 Fix for Bug Packet details have errors when decode MAP V2 PRN_ACK msg
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5076

Use:
/*
 * Dissect Multiple Choice Message
 * This function is used to decode a message, when several encoding may be used.
 * For exemple, in the last MAP version, the Cancel Location is defined like this:
 * CancelLocationArg ::= [3] IMPLICIT SEQUENCE
 * But in the previous MAP version, it was a CHOICE between a SEQUENCE and an IMSI
 * As ASN1 encoders (or software) still uses the old encoding, this function allows
 * the decoding of both versions.
 * Moreover, some optimizations (or bad practice ?) in ASN1 encoder, removes the
 * SEQUENCE tag, when only one parameter is present in the SEQUENCE.
 * This explain why the function expects 3 parameters:
 * - a [3] SEQUENCE corresponding the recent ASN1 MAP encoding
 * - a SEQUENCE for old style
 * - and a single parameter, for old version or optimizations
 *
 * The analyze of the first ASN1 tag, indicate what kind of decoding should be used,
 * if the decoding function is provided (so not a NULL function)
 */

svn path=/trunk/; revision=34001
2010-08-29 17:34:44 +00:00
Jeff Morriss 9d96012b57 From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5150 : remove Makefile.in from the asn1 directories when doing a maintainer-clean
svn path=/trunk/; revision=33955
2010-08-27 18:36:01 +00:00
Stig Bjørlykke ce99177a00 Display content entry (with length) in tree.
svn path=/trunk/; revision=33914
2010-08-24 15:47:10 +00:00
Stig Bjørlykke 38a7ac0910 Fix modifier in .cnf file.
svn path=/trunk/; revision=33913
2010-08-24 15:46:33 +00:00
Stig Bjørlykke 98493ff110 Rewrote to fetch content_tvb from dissect_ber_octet_string().
Display eContent entry (with length) in tree.

svn path=/trunk/; revision=33912
2010-08-24 15:43:32 +00:00
Stig Bjørlykke 1a5f73299e Display octet string fragments for RTSE segment data.
svn path=/trunk/; revision=33911
2010-08-24 15:09:11 +00:00
Stig Bjørlykke f3f59dbf95 Indicate abort and abort-reason in info column.
svn path=/trunk/; revision=33908
2010-08-24 11:36:10 +00:00
Anders Broman 02ffdfea34 Add Id.
svn path=/trunk/; revision=33907
2010-08-24 07:44:36 +00:00
Stig Bjørlykke 8f4b929469 Added Info for RTTPapdu.
svn path=/trunk/; revision=33809
2010-08-16 09:11:01 +00:00
Stig Bjørlykke ea7db26373 Added some missing elements from MS Certificate:
- Previous Cert Hash
- Virtual Base
- Next Publisher

svn path=/trunk/; revision=33695
2010-08-03 08:55:07 +00:00
Stig Bjørlykke f3d2b22899 Mark encryptedData as unused, to avoid warnings when not HAVE_LIBGCRYPT.
svn path=/trunk/; revision=33691
2010-08-02 08:52:39 +00:00
Stig Bjørlykke 33099036fe Added missing include <string.h>.
svn path=/trunk/; revision=33690
2010-08-02 08:46:36 +00:00
Guy Harris 63a0810874 oid_encoded2string() returns a const char *; don't assign it to a char
*.

Don't declare variables in the middle of a block; not all the compilers
we use support that.

svn path=/trunk/; revision=33409
2010-07-02 03:50:30 +00:00
Gerald Combs ad7b7cc679 Don't add raw bytes to the tree.
svn path=/trunk/; revision=33403
2010-07-01 17:57:53 +00:00
Gerald Combs 622f07b95e Initialize MechType_oid in the right place.
svn path=/trunk/; revision=33396
2010-07-01 00:44:21 +00:00
Gerald Combs 6aaa5874c6 Initialize more variables.
svn path=/trunk/; revision=33392
2010-07-01 00:11:14 +00:00
Gerald Combs caff9b5513 Initialize a variable.
svn path=/trunk/; revision=33390
2010-06-30 23:45:24 +00:00
Gerald Combs 47c6bf912f Initialize a variable.
svn path=/trunk/; revision=33388
2010-06-30 23:36:24 +00:00
Kovarththanan Rajaratnam ffc3be50ef Sort filename expansion
svn path=/trunk/; revision=33381
2010-06-30 05:37:34 +00:00
Graeme Lunt 6fc0e7cb8c Interpret single-ASN1-type as ASN.1 and not as an OCTET STRING.
svn path=/trunk/; revision=33375
2010-06-29 18:09:03 +00:00
Graeme Lunt 4095079e1c Decode parameters as ASN.1 directly and avoid interpreting as an OCTET STRING.
svn path=/trunk/; revision=33374
2010-06-29 18:07:33 +00:00
Graeme Lunt 5aa05c8559 New "#.SYNTAX" section for the asn2wrs conformance file.
This allows syntaxes to be registered separately from PDUs.
Within the new section, the ASN.1 types to be used as syntaxes should be iterated. 
An optional second parameter on each line may be provided to provide an alternative name for the syntax (that the user will see). This name must be in double quotes.



svn path=/trunk/; revision=33370
2010-06-29 12:16:10 +00:00
Anders Broman 6644f9da35 Update to V9.3.0 (2010-06)
Export ENB-StatusTransfer-TransparentContainer

svn path=/trunk/; revision=33369
2010-06-29 10:46:54 +00:00
Stig Bjørlykke 6aba36dcc2 Add the missing packet-s1ap.h
svn path=/trunk/; revision=33356
2010-06-28 21:04:56 +00:00
Anders Broman 7ba4ce1983 Dissect more GTPV2 IE's
svn path=/trunk/; revision=33351
2010-06-28 15:31:41 +00:00
Graeme Lunt 1d8014fab4 Removal of various warnings, mainly by not emitting functions for ASN.1 types that are only used for COMPONENTS OF.
svn path=/trunk/; revision=33350
2010-06-28 14:24:32 +00:00
Stig Bjørlykke 8246e87432 Moved register_ber_syntax_dissector() and register_ber_oid_syntax() from
proto_reg_handoff_* to proto_register_*.

svn path=/trunk/; revision=33345
2010-06-28 10:34:15 +00:00
Graeme Lunt 0d9ad5016e Remove the -R flag (used to generate syntax registrations) and replace with a
packet-<proto>-syn-reg.c output file. This is more generic and allows the 
syntax registrations to the directed from the template file.


svn path=/trunk/; revision=33342
2010-06-28 09:26:41 +00:00
Gerald Combs 6d60493b8a Initialize attributedesc_string in a couple of places so that we
don't end up trying to use an invalid pointer.

svn path=/trunk/; revision=33341
2010-06-27 22:38:28 +00:00
Anders Broman f4c87595c9 From KATAOKA Toshihiro:
3GPP S1AP Transparent Container.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4913

svn path=/trunk/; revision=33330
2010-06-26 16:39:18 +00:00
Stig Bjørlykke 3f9a94d773 Avoid crash when adding SNMP Users.
This fixes bug 4926.

svn path=/trunk/; revision=33329
2010-06-26 12:00:08 +00:00
Stig Bjørlykke 7a44c166ba Build dependency to x411.
svn path=/trunk/; revision=33314
2010-06-24 13:40:47 +00:00
Graeme Lunt 1392185eba Update to register basic ASN.1 syntaxes.
svn path=/trunk/; revision=33299
2010-06-23 11:07:08 +00:00
Anders Broman 6f754a1f1b FromToshihiro Kataoka:
Dissect 3GPP S1AP UE Capability Info Indication.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4904

svn path=/trunk/; revision=33294
2010-06-23 04:50:52 +00:00
Stig Bjørlykke 4bb2c88694 Corrected printed name for id-permissiveAttributes.
svn path=/trunk/; revision=33277
2010-06-21 11:29:54 +00:00
Martin Mathieson 97df849b98 Add new strings/dissector function for signalling RRC messages that will add
lte_rrc root to the protocol tree. Makes filtering on call signalling easier.

TODO: same for other RRC entry points...

svn path=/trunk/; revision=33251
2010-06-18 07:07:55 +00:00
Stig Bjørlykke 1a0c847c8c Display RefuseReason in Info column.
svn path=/trunk/; revision=33206
2010-06-10 13:06:08 +00:00
Jeff Morriss 6cf930a724 Add idmp.
svn path=/trunk/; revision=33193
2010-06-09 17:36:49 +00:00
Stig Bjørlykke f38e41b5c1 Initialize dst_ref.
svn path=/trunk/; revision=33189
2010-06-09 16:02:34 +00:00
Graeme Lunt d78f97da2e Removal of unused global variable.
svn path=/trunk/; revision=33188
2010-06-09 15:51:02 +00:00
Graeme Lunt 7a29877cc2 Removal of (hopefully!) the final warning.
svn path=/trunk/; revision=33187
2010-06-09 15:35:08 +00:00
Graeme Lunt aae93d19d4 Update for missing const for object identifier string and marking tree as unused.
svn path=/trunk/; revision=33186
2010-06-09 15:20:48 +00:00
Stig Bjørlykke 89d2aab10f Build dependency x509ce.
svn path=/trunk/; revision=33184
2010-06-09 14:59:02 +00:00
Graeme Lunt cfdd4788cf Updates to the ROS dissector to support IDMP and fix to IDMP for implicit declaration of return value of call_ros_oid_callback().
svn path=/trunk/; revision=33182
2010-06-09 14:45:38 +00:00
Stig Bjørlykke a2be950c5a Print correct RLRE reason in Info column.
Dump RLRQ/RLRE text in Info column even when having no reason code.

svn path=/trunk/; revision=33178
2010-06-09 14:27:09 +00:00
Graeme Lunt 1b1ee3ca3e Support for X.519 (section 9) Internet Directly Mapped Protocol (IDMP).
IDMP provides a mapping of request-response service elements directly onto the Internet TCP/IP protocol, bypassing the ACSE, Presentation, Session and Transport layers of the OSI model. It also supports the use of TLS services.

The DAP dissector has been updated to use the IDMP protocol.



svn path=/trunk/; revision=33177
2010-06-09 14:17:51 +00:00
Jeff Morriss 2efec6f8c5 tcaphash_context_t.oid is of size LENGTH_OID+1, not LENGTH_OID. Just use sizeof(tcaphash_context_t.oid) instead of LENGTH_OID so we can use that last byte. This allows us to retrieve the whole ACN when the ACN is LENGTH_OID bytes long.
svn path=/trunk/; revision=33089
2010-06-04 19:28:39 +00:00
Graeme Lunt 397f576de2 Description for netscape-cert-type bit 4 (e.g. see http://docs.sun.com/source/816-5531-10/poli_ext.htm#1078885)
svn path=/trunk/; revision=33084
2010-06-04 15:07:17 +00:00
Graeme Lunt d6bd39b51f RCS 3280, which obsoletes RFC 2459, allows an IA5String CHOICE in the DisplayText of a UserNotice.
svn path=/trunk/; revision=33083
2010-06-04 14:36:53 +00:00
Jaap Keuter 0829787c21 Set Subversion properties right.
svn path=/trunk/; revision=33058
2010-06-02 19:01:16 +00:00
Graeme Lunt f3248dac71 Definition of certificatePolicies certificate extension and removal of warnings
svn path=/trunk/; revision=33050
2010-06-02 15:09:11 +00:00
Graeme Lunt e4fbebc044 CA Version certificate extension
svn path=/trunk/; revision=33049
2010-06-02 14:58:42 +00:00
Graeme Lunt eef8c02bd7 Bug 3597 - implicit octet string that is constructed causes PRES/FTAM dissect failure
Introduced some state to remember last dissected Tag/Length so that they can be recalled if an IMPLICIT tag is encountered and stripped. This allows its to be determined if the value has a constructed value - and so can be reassembled.

In this case, it is a IMPLICIT constructed OCTET STRING at the presentation layer.

Many thanks to Fred Gruman for identifying - and apologies for the delay in commiting.


svn path=/trunk/; revision=33048
2010-06-02 14:42:57 +00:00
Graeme Lunt 2edbeadfc4 Minor change to remember the object identifier.
svn path=/trunk/; revision=33047
2010-06-02 13:36:10 +00:00
Gerald Combs ad273c35b6 From Michael Bernhard via bug 3398 with minor fixups:
I've created a ASN.1 dissector for the IEC 61850 Sampled Values protocol. It
dissects ethernet frames of the IEC 61850-9-2LE specification form the UCA
International User Group.

There is also a new TAP for tshark (-R sv) which extracts the important
information of the frame and allows to create plots (with external tools) of
the sampled values.

I've developed under Linux (Ubuntu 8.10) but everything should be in place for
successful compilation under Windows.

It would be great if this dissector could be included in wireshark. I'm looking
forward for your comments.


svn path=/trunk/; revision=33039
2010-06-01 23:27:16 +00:00
Graeme Lunt f1216dd205 The Permitted-Actions-Attribute is exported from ftam-exp.cnf as DISPLAY = BASE_HEX. This causes a runtime error and so we override the definition here until we can find the correct fix.
svn path=/trunk/; revision=33032
2010-06-01 09:25:51 +00:00
Tomas Kukosa 2f0c4dde50 Support of value_string_ext in the asn2wrs using new directive #.USE_VALS_EXT
Example usage in NBAP

svn path=/trunk/; revision=32944
2010-05-25 09:07:12 +00:00
Guy Harris 927b7da346 Have abs_time_to_str() and abs_time_to_str_secs() take an additional
argument indicating whether to include the time zone in the string.  If
we're constructing a display filter, don't include the time zone,
otherwise do.  Fixes bug 4756.

svn path=/trunk/; revision=32913
2010-05-21 06:33:25 +00:00
Anders Broman 2de348060c Update to V9.2.0 (2010-03)
svn path=/trunk/; revision=32819
2010-05-15 10:27:45 +00:00
Anders Broman ef9129b5e6 Update to V9.1.0 (2010-03).
svn path=/trunk/; revision=32818
2010-05-15 09:04:28 +00:00
Anders Broman 874a518ed6 Update to V9.2.0 (2010-03).
svn path=/trunk/; revision=32817
2010-05-15 08:49:39 +00:00
Anders Broman f270451b3c Update to V9.2.3 (2010-03)
svn path=/trunk/; revision=32814
2010-05-14 21:50:23 +00:00
Jeff Morriss 81da8e0b6b Use find_or_create_conversation() in some ASN.1 dissectors
svn path=/trunk/; revision=32791
2010-05-13 18:55:31 +00:00
Anders Broman 2fcc6996c9 Update to V9.2.1 (2010-04)
svn path=/trunk/; revision=32784
2010-05-13 13:29:31 +00:00
Tomas Kukosa e32b9b9062 ASN.1 compiler accepts version brackets in SEQUENCE and CHOICE extensions
svn path=/trunk/; revision=32781
2010-05-13 10:00:37 +00:00
Anders Broman 8a74657b14 Update to V9.2.0 (2010-03)
svn path=/trunk/; revision=32780
2010-05-13 08:03:04 +00:00
Anders Broman d693d37904 Update to V9.1.0 (2010-03)
svn path=/trunk/; revision=32779
2010-05-13 07:41:35 +00:00
Anders Broman 30ebf4af24 Update to V9.1.0 (2010-03)
svn path=/trunk/; revision=32778
2010-05-13 07:40:31 +00:00
Anders Broman 0798092b03 Update to V9.2.0 (2010-03)
svn path=/trunk/; revision=32769
2010-05-12 05:51:54 +00:00
Bill Meier 7006db1e01 Reflect changes made in SVN #32752
svn path=/trunk/; revision=32753
2010-05-11 15:12:13 +00:00
Anders Broman 7ff0da2933 Calculate correct PDU lenght if the per_length_determinant is one byte long.
svn path=/trunk/; revision=32680
2010-05-05 19:22:28 +00:00
Tomas Kukosa 05d418eba8 H.225.0 updated to version 7 (2009-12)
svn path=/trunk/; revision=32672
2010-05-05 13:14:41 +00:00
Tomas Kukosa 95a3efc434 File updated from ASN.1 database where the bug in ASN.1 definition has been fixed on request
svn path=/trunk/; revision=32671
2010-05-05 10:29:23 +00:00