Commit Graph

2335 Commits

Author SHA1 Message Date
Jeff Morriss 454555d42b Don't remove the ASN.1 dissectors when cleaning: we don't (re)build them during the make process yet.
svn path=/trunk/; revision=39335
2011-10-10 12:52:53 +00:00
Jeff Morriss cf012d27b1 Build the ASN.1 dissectors directly into epan/dissectors (rather than building
them and then copying them over).  The "all" target to builds these dissectors
now (instead of "generate_files" and/or "copy_files").

asn2wrs's "-O" option now means "the dissector goes in this directory" (rather
than "all output goes in this directory"); it also means that the "-s" (single
output file) option is now required.

Fix things up so that it's possible to build all of the ASN.1 dissectors in
one shot.

Fix building of conformance files when doing out-of-source-tree builds.


Unfortunately "make all" in the asn1 directory always builds something--I think
because of circular depedencies.

svn path=/trunk/; revision=39333
2011-10-10 02:31:11 +00:00
Bill Meier 6142dd287b Convert 'encoding' parameter of certain proto_tree_add_item() calls in asn1/*:
Specifically:  Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as
  the encoding parameter for proto_tree_add_item() calls which directly reference
  an item in hf[] which has a type of:
     FT_BOOLEAN
     FT_IPv4
     FT_EUI64
     FT_GUID
     FT_UINT_STRING

 Also: For type FT_IPv6 use ENC_NA. (This was missed in SVN #39260)

svn path=/trunk/; revision=39332
2011-10-10 01:38:20 +00:00
Anders Broman 8b18a26764 Typo FT_IPv4 isf FT_IPv6.
Fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6435

svn path=/trunk/; revision=39297
2011-10-06 19:07:26 +00:00
Anders Broman 83b98f5e2c Add exports
svn path=/trunk/; revision=39296
2011-10-06 18:46:47 +00:00
Bill Meier e2996ceabe Convert 'encoding' parameter of certain proto_tree_add_item() calls in asn1 dissectors:
Specifically:  Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as
 the encoding parameter for proto_tree_add_item() calls which directly reference
 an item in hf[] which has a type of:
    FT_UINT8
    FT_UINT16
    FT_UINT24
    FT_UINT32
    FT_UINT64
    FT_INT8
    FT_INT16
    FT_INT24
    FT_INT32
    FT_INT64
    FT_FLOAT
    FT_DOUBLE


svn path=/trunk/; revision=39294
2011-10-06 16:50:13 +00:00
Bill Meier 594f1efcdd Add missing (presumably) entries for credssp,idmp,t124 & x721.
However: t124 & x721 fail to build on Windows so comment them out.

svn path=/trunk/; revision=39293
2011-10-06 16:43:24 +00:00
Anders Broman 121b7d772e Add a couple of OID strings.
svn path=/trunk/; revision=39274
2011-10-05 18:27:48 +00:00
Bill Meier e18e2694c6 Use ENC_NA as encoding for proto_tree_add_item() calls which directly reference an hf item (in hf[] with types:
FT_NONE
     FT_BYTES
     FT_IPV6
     FT_IPXNET
     FT_OID
Note: Encoding field set to ENC_NA only if the field was previously TRUE|FALSE|1|0|ENC_LITTLE_ENDIAN|ENC_BIG_ENDIAN
 

svn path=/trunk/; revision=39263
2011-10-05 02:39:04 +00:00
Anders Broman a17fcee039 From Pascal Quantin:
Add dissection of GERAN related messages.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6427

svn path=/trunk/; revision=39246
2011-10-03 21:15:04 +00:00
Anders Broman 8a324e5737 From Pascal Quantin:
[LTE RRC] Enhance dissection of NeighCellConfig IE.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6412

svn path=/trunk/; revision=39219
2011-10-02 15:08:27 +00:00
Graeme Lunt 5ae8b96dbb Add credssp to subdirs list
svn path=/trunk/; revision=39197
2011-09-30 15:54:32 +00:00
Graeme Lunt 779206012c Microsoft Credential Security Support Provider (CredSSP) support.
Used by direct approach RDP for NTLMSSP authentication under SSL. 



svn path=/trunk/; revision=39196
2011-09-30 15:21:16 +00:00
Anders Broman 0007775464 Make it possible to dissect proprietarry Opcodes.
svn path=/trunk/; revision=39183
2011-09-29 15:23:23 +00:00
Anders Broman 0f2e6c6cc5 Get rid of check_col, while at it set ENC.
svn path=/trunk/; revision=39164
2011-09-27 12:05:32 +00:00
Anders Broman 5f76488f0a Move tvb_new_octet_aligned() to tvbuff.c and use it.
svn path=/trunk/; revision=39150
2011-09-26 15:11:14 +00:00
Gerald Combs 44332d7279 Change the case of "sNMPv2-Trap" to match RFC 3416. Reported by Qiyao.
svn path=/trunk/; revision=39114
2011-09-23 22:44:28 +00:00
Graeme Lunt dc75d97b91 Fix and suppress some warnings
svn path=/trunk/; revision=39072
2011-09-21 10:10:00 +00:00
Stig Bjørlykke 665de07254 Remove Makefile.in
Set default svn:ignore targets.

svn path=/trunk/; revision=39071
2011-09-21 08:44:49 +00:00
Graeme Lunt 947d3c9fa2 Add asn/t124/Makefile to configure.in and remove it from the repository.
svn path=/trunk/; revision=39069
2011-09-21 08:16:33 +00:00
Graeme Lunt 5f332e47e2 Fix for unary minus warning on Windows
svn path=/trunk/; revision=39068
2011-09-21 08:09:04 +00:00
Graeme Lunt 9db6d40656 Basic RDP dissection, which can dissect the connection sequence.
A work in progress.
Can be used with the SSL dissector to decrypt Enhanced RDP Security SSL.
With Standard RDP Security (e.g those on Wiki), the PDUs are all encrypted 
after the SecurityExchange PDU.
Wiki to be updated with an example SSL protected capture and associated
key material.

svn path=/trunk/; revision=39066
2011-09-21 07:35:51 +00:00
Anders Broman e12440d3d0 From Liam Sharp:
In VoIP calls flow/graph display replace GR/GI etc with presentationTokenRequest/Response etc

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6321

svn path=/trunk/; revision=39022
2011-09-16 04:55:58 +00:00
Anders Broman 4d33ad6f6d Fix a typo
svn path=/trunk/; revision=38978
2011-09-12 16:09:36 +00:00
Anders Broman 3aa4c91d03 Update to V10.2.0 (2011-06)
svn path=/trunk/; revision=38972
2011-09-12 13:00:11 +00:00
Anders Broman 98f5d79ee8 Update to V9.6.0 (2011-06)
svn path=/trunk/; revision=38971
2011-09-12 12:48:00 +00:00
Anders Broman 71fc5eca2a From Liam Sharp:
VoIP Calls->Graph TCS and OLC display corruption.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6318

svn path=/trunk/; revision=38970
2011-09-12 08:37:36 +00:00
Anders Broman 7a0cb7ea93 from Liam Sharp:
Info column to show subMessageIdentifier type strings for H245/H.239 packets

With a change to remove "subMessageIdentifer=" as I think that clutters up the Infocol.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6315

svn path=/trunk/; revision=38968
2011-09-12 06:02:43 +00:00
Anders Broman 900484d992 From Pascal Quantin:
Update of 3GPP RRC and LTE RRC dissectors.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6333

svn path=/trunk/; revision=38964
2011-09-11 19:09:02 +00:00
Anders Broman fa889d6d78 From Liam Sharp:
(Standard)H.239 – subMessageIdentifier value strings missing from H245 dissector.
Modified to be filterable.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6312

svn path=/trunk/; revision=38897
2011-09-06 15:05:26 +00:00
Anders Broman 780acd9931 From Fredrik Kuivinen:
Fix a problem with dissection of HandoverRequest.

svn path=/trunk/; revision=38776
2011-08-29 14:47:20 +00:00
Jeff Morriss 339136d1d0 Based on patch from Denis Ovsienko via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6244 :

Fix typo: s/unkown/unknown/

svn path=/trunk/; revision=38561
2011-08-16 13:16:33 +00:00
Chris Maynard 352cc7a410 Fix bug 5848, "https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5848", which was apparently introduced with r27287 (http://anonsvn.wireshark.org/viewvc/trunk/epan/dissectors/packet-h225.c?r1=26698&r2=27287). Regenerate the packet-h225.c dissector. Patch from ericn1234@yahoo.com.
Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5848

svn path=/trunk/; revision=38399
2011-08-07 20:50:31 +00:00
Anders Broman 4b0961fb7a Bug 6146 - Malformed RANAP packets when HandOver procedure on iuh
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6146

svn path=/trunk/; revision=38312
2011-08-02 16:47:37 +00:00
Chris Maynard b25c098e0c From Paul Stath via bug 5731: The check for engineID length should only occur if the engineID has a non-zero length.
Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5731

svn path=/trunk/; revision=38303
2011-08-02 01:54:03 +00:00
Anders Broman 7439bba9dc Try to do a more syntactically correct import.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6150

svn path=/trunk/; revision=38159
2011-07-21 22:46:07 +00:00
Martin Mathieson 7d7f7d870e Register nicer entry points for LTE RRC BCH messages, and use them in RLC, MAC, PDCP.
svn path=/trunk/; revision=38131
2011-07-20 12:19:22 +00:00
Stig Bjørlykke ba2aae0f8e Use ENC_NA as encoding for FT_PROTOCOL, FT_NONE and FT_BYTES.
svn path=/trunk/; revision=38122
2011-07-19 18:48:31 +00:00
Stig Bjørlykke f282154ab0 Use correct encoding for proto_tree_add_item().
svn path=/trunk/; revision=38107
2011-07-19 10:51:12 +00:00
Graeme Lunt 9e4afbfd49 Update the algorithms in line with RFC 5912 including support for eliptic curve algorithms.
svn path=/trunk/; revision=38017
2011-07-14 13:47:13 +00:00
Graeme Lunt f8a7d85e1c Update to correct the definition of the clearance attribute used in certificates.
RFC3281 erroneously defined the Clearance attribute to be different to that defined in X.509. This has been recognised and corrected in RFC5755.
The RFC3281 syntax is retained and registered as the "RFC3281Clearance" syntax, which can be used to override the correct syntax in the BER oidtables if necessary.


svn path=/trunk/; revision=38014
2011-07-14 08:47:05 +00:00
Anders Broman a5839116d3 Pretyfy APN display and make it filterable as a string.
svn path=/trunk/; revision=37731
2011-06-20 10:29:46 +00:00
Anders Broman 2477298026 From Sean Van Gorder:
When Wireshark attempts to read an SNMP packet with a variable-bindings item
with an OID containing an index string which includes an entry of type
"Unsigned32", Wireshark will stop dissecting the packet at this index entry and
end with the error:

[Dissector bug, protocol SNMP: proto.c:2761: failed assertion
"DISSECTOR_ASSERT_NOT_REACHED"]

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5883

svn path=/trunk/; revision=37558
2011-06-05 20:12:44 +00:00
Stig Bjørlykke 51864807b3 Corrected "old-style function definition".
svn path=/trunk/; revision=37433
2011-05-27 11:03:04 +00:00
Stig Bjørlykke 7b5896a179 Corrected "old-style function definition".
svn path=/trunk/; revision=37429
2011-05-27 10:18:17 +00:00
Jeff Morriss f3f9f2697f Make TVBs opaque for most users.
Convert TVB_RAW_OFFSET() and TVB_GET_DS_TVB() into functions.

svn path=/trunk/; revision=37422
2011-05-27 03:06:50 +00:00
Jeff Morriss 7ad71a2d78 Treat TVBs as opaque: use the accessor functions instead of accessing the fields
directly.

svn path=/trunk/; revision=37420
2011-05-27 01:57:33 +00:00
Gerald Combs d16058dd8c Remove a backslash.
svn path=/trunk/; revision=37395
2011-05-25 18:09:04 +00:00
Anders Broman 84a22ed17e Make it easier to add custom asn1 dissectors.
svn path=/trunk/; revision=37393
2011-05-25 14:21:42 +00:00
Jeff Morriss 80c1ef3811 Fix a couple (value) mistakes in value_strings. Found by Martin's patch on the -dev list.
svn path=/trunk/; revision=37259
2011-05-18 20:06:17 +00:00
Stig Bjørlykke a10ffa4ceb Build with S1AP-SonTransfer-IEs.asn
svn path=/trunk/; revision=37117
2011-05-13 07:51:27 +00:00
Stig Bjørlykke 624a041e6f Indicate Signed Receipt in info column.
svn path=/trunk/; revision=37074
2011-05-12 11:06:42 +00:00
Jeff Morriss a80a391b0e From Ed Day via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5890 :
ASN.1 files in trunk/asn1/qsig contain syntax errors that prevent them from
being compiled by a standard ASN.1 compiler.  A patch of modified files is
attached along with General-Error-List.asn which was missing completely.

From me: add the new asn file to the list of source files.  Add SVN Id tag to
the new file.

svn path=/trunk/; revision=37005
2011-05-06 01:47:16 +00:00
Anders Broman 16c0bcbdee From Pascal Quantin:
Add an expert check for the MS Classmark 2 decoding in UE EUTRA Capability message and a few missing message type display in the column text.

svn path=/trunk/; revision=36984
2011-05-04 17:24:48 +00:00
Anders Broman e0c80c4138 From Pascal Quantin:
the dissection of the UE capabilities when the RAT
type is set to geran-cs (the value part of Classmark 2 starts at the third byte). 
Moreover it adds a subtree to enhance the display of Mobile Station Classmark 2 and 3 and MS Radio Access Capability IEs.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5867

svn path=/trunk/; revision=36943
2011-04-28 19:59:14 +00:00
Jeff Morriss 9be16e49c4 From Stefan Metzmacher and Gregor Beck via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5850 :
The smallest LDAP PDU is 7 bytes, not 4.

svn path=/trunk/; revision=36777
2011-04-21 19:51:05 +00:00
Alexis La Goutte ec7709406e Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=36771
2011-04-21 16:00:38 +00:00
Alexis La Goutte 7239db18ec Fix Dead Store (Dead nested assignment) Warning found by Clang
svn path=/trunk/; revision=36760
2011-04-21 13:34:22 +00:00
Stephen Fisher fcfcfa347c Rollback r36614 and change dissect_SMUX_PDUs_PDU() to use previously
unused smux_tree instead of tree.  Per suggestion from Stig on -dev.


svn path=/trunk/; revision=36624
2011-04-13 15:48:24 +00:00
Stephen Fisher 4b416d92d0 Fix Coverity 524: NEGATIVE_RETURNS
Coverity sees that two calls to tvb_length_remaining() with an offset
of 0 may return -1 (for an "out of bounds" condition), which would lead
to an assignment of -1 to an unsigned variable and then passing it
to functions further down that cannot accept negative values.

Use tvb_ensure_length_remaining() to throw an exception in a case of
out of bounds access (though unlikely with an offset of 0) instead of
tvb_length_remaining(), which would return -1.


svn path=/trunk/; revision=36615
2011-04-12 22:23:03 +00:00
Stephen Fisher ce2eea5b95 Fix Coverity 1047: UNUSED_VALUE in dissect_smux
svn path=/trunk/; revision=36614
2011-04-12 22:12:05 +00:00
Gerald Combs ca01b3a876 Add x509if_frame_end() which is passed to register_frame_end_routine()
and which resets our global variables. Remove a boolean which was used
to track a char *; just check if the pointer is NULL instead. Fixes bugs
5754 and 5793, hopefully without breaking anything.

svn path=/trunk/; revision=36608
2011-04-12 20:39:48 +00:00
Stig Bjørlykke b862371815 Removed some unused variables.
svn path=/trunk/; revision=36602
2011-04-12 19:06:51 +00:00
Stig Bjørlykke 42f41ddf0b Corrected switch-case flow.
Coverity 1184.

svn path=/trunk/; revision=36579
2011-04-12 09:05:43 +00:00
Guy Harris 4fdcc5c180 Rename ws_stat to ws_stat64, and make it take a pointer to a ws_statb64
as an argument, along the lines of ws_fstat64, and, on Windows, make it
use _wstati64, to handle 64-bit file sizes.

svn path=/trunk/; revision=36547
2011-04-10 20:59:10 +00:00
Anders Broman 842d4ff53e From Pascal Quantin:
A patch adding the missing hunks (it looks like extract_asn1_from_spec.pl script is mixing Windows and Linux line endings).

svn path=/trunk/; revision=36524
2011-04-08 19:54:07 +00:00
Anders Broman da3f7673db From Pascal Quantin:
Upgrade LTE RRC ASN.1 description to V9.6.0

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5815

svn path=/trunk/; revision=36520
2011-04-08 17:36:53 +00:00
Gerald Combs f989235a87 Use a unique variable name. Fixes Coverity CID 593.
svn path=/trunk/; revision=36512
2011-04-07 23:52:37 +00:00
Anders Broman c039f9f8a8 Add a comment
svn path=/trunk/; revision=36490
2011-04-06 06:24:19 +00:00
Anders Broman cb0e7f80da Missing decoding for CalledPartyBCD number in CAMEL
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5788

svn path=/trunk/; revision=36488
2011-04-06 06:20:32 +00:00
Stig Bjørlykke c13f84b345 Compile fix: camel_obj_id -> obj_id.
svn path=/trunk/; revision=36475
2011-04-05 15:49:56 +00:00
Anders Broman 909a166343 Actually get the oid string ...
svn path=/trunk/; revision=36474
2011-04-05 15:43:15 +00:00
Anders Broman 8d6ca293dc Change the signature of elem_fcn():ns to include pinfo.
svn path=/trunk/; revision=36443
2011-04-04 14:37:25 +00:00
Anders Broman e645e3c4d0 -Whitespace fix in gsm_map-template(no need to regenerate).
- Fix dissection of extensions in INAP it should now be possible to add
an "OID dissector" for extensions.
Should fix BUG
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5799

svn path=/trunk/; revision=36435
2011-04-02 09:18:18 +00:00
Anders Broman 129f07a949 Added FALLTHRU comment to avoid a "missing break" warning.
svn path=/trunk/; revision=36365
2011-03-27 14:02:42 +00:00
Jeff Morriss cc6fc23812 From Didier via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3055 :
Apply rev 25869 to most of the rest of the TCP-desegmenting dissectors.
(The SSL dissector was already updated in one of two spots with bug 4535/rev
32456.)

A couple of the patches had to be manually applied.

From me: Fix the comments to match the change (including in the TCP and SSL
dissectors.)

svn path=/trunk/; revision=36332
2011-03-25 19:02:18 +00:00
Gerald Combs 670d38ec71 Properly initialize our filter counters.
svn path=/trunk/; revision=36190
2011-03-14 16:00:51 +00:00
Anders Broman 675d79871e Export SONtransferRequestContaine, SONtransferResponseContainerand and Global-ENB-ID
svn path=/trunk/; revision=36130
2011-03-03 07:20:34 +00:00
Tomas Kukosa 16bdcb2fbe QSIG: decoding of PSS1InformationElement
svn path=/trunk/; revision=36108
2011-03-01 13:01:26 +00:00
Gerald Combs 91fe31c9b4 If we encounter an excessively long filter string or one with too many
elements, add an expert item and throw a ReportedBoundsError. We may
want to handle this more cleanly in the future but this avoids
allocating a huge amount of memory.

svn path=/trunk/; revision=36101
2011-03-01 00:50:17 +00:00
Anders Broman 8ec8d3fcc3 Export:
SONtransferRequestContainer
SONtransferResponseContainer
SONtransferCause

svn path=/trunk/; revision=36086
2011-02-27 21:55:35 +00:00
Anders Broman 23e6582724 Add miisng file from
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=36079

svn path=/trunk/; revision=36085
2011-02-27 19:41:34 +00:00
Anders Broman da8918838e Add dissection of SonTransfer-IEs.
svn path=/trunk/; revision=36084
2011-02-27 19:40:30 +00:00
Anders Broman a1e94e7e68 Export SourceCellID.
svn path=/trunk/; revision=36083
2011-02-27 19:39:07 +00:00
Anders Broman 527942b05a Add exports.
svn path=/trunk/; revision=36049
2011-02-24 15:06:16 +00:00
Gerald Combs 4783795690 Split get_dns_name() into get_dns_name() and expand_dns_name().
In dissect_ms_compressed_string() dissect_mscldap_string() simply call
expand_dns_name() instead of using duplicate (and insecure) code. This
*might* break CLDAP and SMB dissection. If that's the case we should
probably revert get_dns_name() and simplify expand_dns_name().

Fixes infinite recursion errors found by joernchen of Phenoelit.

svn path=/trunk/; revision=36029
2011-02-23 00:51:02 +00:00
Stig Bjørlykke d9ef8f9ad1 Ensure we always have a valid top_tree for p1.content. This fixes a problem
with other dissectors using p1.content, such as p7.

Reset global content_type_id so this will be correct in more cases.
This is still not a good solution, because ContentType and Content are
generic objects which may occur individual in P7.

Indicate when to report invalid content-type.

svn path=/trunk/; revision=36025
2011-02-22 10:23:44 +00:00
Stig Bjørlykke 5868c7d026 Renamed x411 to p1, x420 to p22 and s4406 to p772 to be consistent
on the naming policy for X.400 protocols.

svn path=/trunk/; revision=36013
2011-02-20 17:03:29 +00:00
Stig Bjørlykke 2025f2e5f5 Add changes in r35546 to template and conformation file.
svn path=/trunk/; revision=36010
2011-02-20 15:05:21 +00:00
Stig Bjørlykke 632dcd0d77 Add changes in r35384 to template file.
svn path=/trunk/; revision=36009
2011-02-20 15:03:09 +00:00
Stig Bjørlykke d3051fa55d Generate correct type (FT_OID) for "x420.compression_algorithm_id".
I suspect this should have been fixed in asn2wrs...

svn path=/trunk/; revision=35965
2011-02-16 11:04:28 +00:00
Jeff Morriss 21cf6ff3ce Remove an unused ett_ variable.
svn path=/trunk/; revision=35927
2011-02-12 03:51:12 +00:00
Chris Maynard 8d47cebd00 Declare ett's as gint, not guint.
svn path=/trunk/; revision=35902
2011-02-10 20:55:26 +00:00
Stig Bjørlykke 1ba57f4c04 Added a dissector table for AttributeId localForm.
Use correct object identifier in ModificationList.

svn path=/trunk/; revision=35894
2011-02-10 10:11:38 +00:00
Anders Broman 553cf70a68 Dissect V1 version , found in trace from:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5637

svn path=/trunk/; revision=35843
2011-02-07 17:44:34 +00:00
Anders Broman 55f45d5266 Add a missing IE found in trace from https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5637
svn path=/trunk/; revision=35842
2011-02-07 17:43:26 +00:00
Anders Broman 01ef9f73ef Remove debug printouts.
svn path=/trunk/; revision=35834
2011-02-05 14:37:52 +00:00
Anders Broman b723ccb30c Introduce preferences to set the strictness of Invoke/response
tracking.

svn path=/trunk/; revision=35822
2011-02-04 16:12:59 +00:00
Anders Broman 06e619bf42 If ENBname is text, append the text.
svn path=/trunk/; revision=35808
2011-02-04 09:38:36 +00:00
Anders Broman 6b38bce9c6 Hope fully this will be the correct set of files - finally.
svn path=/trunk/; revision=35781
2011-02-03 16:17:10 +00:00
Anders Broman 9b0adb69e6 Add a forgotten file
svn path=/trunk/; revision=35778
2011-02-03 08:06:54 +00:00
Anders Broman 77333de278 Start to prettify TimeStamp(to be continued).
svn path=/trunk/; revision=35773
2011-02-02 23:12:34 +00:00
Anders Broman f02c4d6685 Warning: packet-tetra.c does not have an SVN Id tag.
Error: the blurb for field "Carrier Number" ("tetra.carrier") matches the field name in packet-tetra.c
Error: the blurb for field "PDU" ("tetra.pdu") matches the field name in packet-tetra.c
Error: Found deprecated APIs in packet-tetra.c: dissector_add

svn path=/trunk/; revision=35769
2011-02-02 21:06:51 +00:00
Anders Broman 2395973d17 Integrate and build the tetra dissector.
svn path=/trunk/; revision=35766
2011-02-02 20:11:02 +00:00
Anders Broman a5d4b6c73b Add gsmcdr to the makefiles.
svn path=/trunk/; revision=35758
2011-02-02 17:10:31 +00:00
Anders Broman 6d4964bb49 Export more functions.
svn path=/trunk/; revision=35757
2011-02-02 17:09:05 +00:00
Anders Broman 115dfa550c Routines to dissect GPRS CDR's tranported in GTP'
svn path=/trunk/; revision=35756
2011-02-02 17:00:19 +00:00
Anders Broman b52d775061 Add the local makefiles.
svn path=/trunk/; revision=35755
2011-02-02 06:48:58 +00:00
Anders Broman 51fbf86740 From Holger Freyther:
- Code Cleanups and preparation to call code from gsmtap
- Fix a bug in the asn1 file, Bug found with traces from OsmocomTETRA

svn path=/trunk/; revision=35754
2011-02-02 06:41:16 +00:00
Anders Broman c88ad5ccb2 The Beijing Institute of Technology (BIT) and associate professor LI Hai has created a TETRA decoder for wireshark,
they made the decision to use the ASN1 infrastructure for creating the dissector and were kind enough to send the
GPLed sourcecode to us(The Osmocom Group). This group is using a protocol provided by their equipment.

This is an initial checkin of the code from BIT, it is not fit for inclusion in Wireshark in this state. Further patches are expected
before the code can be integrated by being added to the makefiles.

svn path=/trunk/; revision=35753
2011-02-02 06:35:08 +00:00
Stig Bjørlykke 84bc28bd6a Introduce "Fragment count" filter element for all protocols doing reassembly.
svn path=/trunk/; revision=35705
2011-01-30 21:01:07 +00:00
Anders Broman dd3be98aac The attemt to pretify MSISDN and IMSI breaks the dissection.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5593

svn path=/trunk/; revision=35679
2011-01-27 15:43:55 +00:00
Anders Broman ba758b40b0 packet-ocsp-template.c:47: warning: type defaults to 'int' in declaration of 'proto_ocsp'
svn path=/trunk/; revision=35657
2011-01-26 09:07:11 +00:00
Anders Broman b067f1df01 From Kaspar Brand:
(Part II)
SSL/TLS dissector: add support for "Certificate Status" messages (aka OCSP stapling)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5503

svn path=/trunk/; revision=35656
2011-01-26 08:57:26 +00:00
Anders Broman c4fe9a28ca From Kaspar Brand:
SSL/TLS dissector: add support for "Certificate Status" messages (aka OCSP stapling)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5503

svn path=/trunk/; revision=35655
2011-01-26 08:49:06 +00:00
Anders Broman 12c8ede647 Export Global-ENB-ID.
svn path=/trunk/; revision=35645
2011-01-25 13:56:15 +00:00
Anders Broman ec43819592 Export UE-EUTRA-Capability.
svn path=/trunk/; revision=35634
2011-01-23 23:45:36 +00:00
Jaap Keuter 3ff6167958 Allow for expert items to be actually attached somewhere.
svn path=/trunk/; revision=35594
2011-01-20 08:58:03 +00:00
Anders Broman 4a3eda9862 Updated to OMA-TS-ULP-V2_0-20100806-D
with asn1 files from eyimjia.
Files hand edited to pass as2wrs.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5593
(Does not fix the bug)

svn path=/trunk/; revision=35577
2011-01-19 06:27:50 +00:00
Anders Broman b80813a45c From Porus Mehta:
Corrections to ANSI MAP ASN.1 specifications.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5584

svn path=/trunk/; revision=35556
2011-01-16 18:36:17 +00:00
Anders Broman 568605ae13 r35546 Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s to ensure the
return string is NULL terminated.
Make the change also in the .cnf file

svn path=/trunk/; revision=35551
2011-01-16 08:24:11 +00:00
Chris Maynard 116d67e164 Add tvb_get_[n|le]toh[40|48|56]() accessors. Addresses bug 5082.
svn path=/trunk/; revision=35538
2011-01-14 19:02:38 +00:00
Anders Broman 8326aa2db7 Use value_string_ext in a couple of places.
svn path=/trunk/; revision=35501
2011-01-12 07:36:55 +00:00
Anders Broman 5ebd7cb133 TCAP- Application context name not been decoded correctly
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5573

svn path=/trunk/; revision=35498
2011-01-12 07:18:57 +00:00
Anders Broman b2992b2310 ldap.cnf:782: warning: ISO C90 forbids mixed declarations and code
svn path=/trunk/; revision=35476
2011-01-11 11:41:03 +00:00
Ronnie Sahlberg 3079c9c931 From Matthieu Patou <mat@samba.org>
Dissect LDAP DirSyncFlags to show the bits of this bitmap.



svn path=/trunk/; revision=35474
2011-01-11 02:27:41 +00:00
Stephen Fisher 802308ca01 More misc. CLDAP improvements for Active Directory including updating
field names and adding descriptions, changing the Domain GUID in the "LDAP
ping" response to a FT_GUID instead of FT_BYTES, etc.


svn path=/trunk/; revision=35407
2011-01-06 22:24:10 +00:00
Stephen Fisher a9761c53b7 More minor cleanup/fixes for MS Active Directory's use of CLDAP.
svn path=/trunk/; revision=35404
2011-01-06 18:50:39 +00:00
Stephen Fisher 89d9b73e47 Minor corrections to NtVer dissection for NETLOGON_NT_VERSION Options Bits
in MSCLDAP packets per Microsoft's MS-ADTS specification, section 7.3.1.1,
revision 26 (11/19/2010).  Also re-format code a bit.


svn path=/trunk/; revision=35403
2011-01-06 18:08:14 +00:00
Jeff Morriss 9b3eb1ff4b Reset the global pdu_type *before* returning.
svn path=/trunk/; revision=35391
2011-01-05 22:40:47 +00:00
Jeff Morriss fc2b1606cf Remove unreached statement.
svn path=/trunk/; revision=35387
2011-01-05 22:20:39 +00:00
Stig Bjørlykke 011e451449 Only chop the last character (new line) from the error message.
svn path=/trunk/; revision=35310
2010-12-30 20:15:55 +00:00
Gerald Combs cf6df46095 Fix a buffer overflow in the engineId preferences. Fixes bug 5530.
svn path=/trunk/; revision=35298
2010-12-29 20:09:27 +00:00
Anders Broman 735709bee6 Add tvb_bcd_dig_to_ep_str()
/*
 * Given a tvbuff, an offset into the tvbuff, and a length that starts
 * at that offset (which may be -1 for "all the way to the end of the
 * tvbuff"), fetch BCD encoded digits from a tvbuff starting from either 
 * the low or high half byte, formating the digits according to an input digit set, 
 * if NUll a default digit set of 0-9 returning "?" for overdecadic digits will be used.
 * A pointer to the EP allocated string will be returned.
 * Note a tvbuff content of 0xf is considered a 'filler' and will end the conversion.
 */

svn path=/trunk/; revision=35286
2010-12-28 12:36:26 +00:00
Guy Harris a8bc4a0d13 Rename the routines that handle dissector tables with unsigned integer
keys to have _uint in their names, to match the routines that handle
dissector tables with string keys.  (Using _port can confuse people into
thinking they're intended solely for use with TCP/UDP/etc. ports when,
in fact, they work better for things such as Ethernet types, where the
binding of particular values to particular protocols are a lot
stronger.)

svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
Anders Broman 86113c5a8c From Pascal Quantin:
When I coded the decoding of the feature group indicator, I decided to do not display the feature group content when it is not supported. After further thinking I find it more useful to always display the features of a given indicator whether it is supported or not.

svn path=/trunk/; revision=35200
2010-12-16 12:33:36 +00:00
Jeff Morriss f2fc5d42fd Make some prefs callback functions static. (These modules don't use proto_reg_handoff_*() as their prefs callback.)
svn path=/trunk/; revision=35138
2010-12-06 22:08:48 +00:00
Jeff Morriss 99bc06ceff Make some (preference) variables static.
svn path=/trunk/; revision=35134
2010-12-06 19:48:05 +00:00
Bill Meier 03b57df5a0 Fix various typos and spelling errors.
svn path=/trunk/; revision=35126
2010-12-06 01:34:58 +00:00
Anders Broman b4098dfae9 - Update to 3GPP TS 25.413 V9.4.0 (2010-09).
- Fill the value_strings.

svn path=/trunk/; revision=34929
2010-11-17 16:23:10 +00:00
Anders Broman 3ffa66319e - Update to 3GPP TS 25.413 V9.4.0 (2010-09).
- Fill the value_strings.

svn path=/trunk/; revision=34928
2010-11-17 15:36:53 +00:00
Anders Broman 263db68ab6 - Update to 3GPP TS 25.413 V9.4.0 (2010-09).
- Fill the value_strings.

svn path=/trunk/; revision=34925
2010-11-17 11:48:17 +00:00
Anders Broman 1913b3dd3e - Use SABP:s SCTP ppid.
- Use value_string_ext.

svn path=/trunk/; revision=34924
2010-11-17 08:18:30 +00:00
Anders Broman 838a24aaa0 value_string_ext fixes.
svn path=/trunk/; revision=34908
2010-11-16 17:31:29 +00:00
Bill Meier 0db7ad2404 Modify 'compare_files' target: ignore #line changes; compare from epan\dissectors to asn1\...
svn path=/trunk/; revision=34901
2010-11-16 15:24:51 +00:00
Bill Meier 491f05b16e Use value_string_ext fcns to access several value_string arrays;
Minor whitespace cleanup.

svn path=/trunk/; revision=34900
2010-11-16 15:20:33 +00:00
Bill Meier c52500588e Use value_string_ext fcns to access several value_string arrays.
svn path=/trunk/; revision=34894
2010-11-15 23:53:25 +00:00
Bill Meier 3c98cf2ebc Use value_string_ext fcns to access several value_string arrays.
svn path=/trunk/; revision=34891
2010-11-15 22:37:35 +00:00
Bill Meier 37742d97d8 Use value_string_ext fcns to access several value_string arrays.
svn path=/trunk/; revision=34890
2010-11-15 22:00:33 +00:00
Bill Meier 8548e16613 Use value_string_ext fcns to access a value_string array.
svn path=/trunk/; revision=34884
2010-11-15 19:46:07 +00:00
Bill Meier 0f286bbb89 Use value_string_ext fcns to access a value_string array.
svn path=/trunk/; revision=34883
2010-11-15 19:15:34 +00:00
Bill Meier b1554fc198 Use value_string_ext fcns to access certain value_string arrays;
Whitespace cleanup.

svn path=/trunk/; revision=34882
2010-11-15 19:08:12 +00:00
Bill Meier ed7105e21b Update package_name_vals[] value_string array:
- Add new entries based on: http://www.iana.org/assignments/megaco-h248 last updated 2010-10-01;
- Fix a typo (incorrect value for an entry);
- Switch values between two entries to match the IANA list;
- Switch two entries so list is in ascending order by value.

svn path=/trunk/; revision=34881
2010-11-15 19:00:16 +00:00
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