Commit Graph

10120 Commits

Author SHA1 Message Date
Stig Bjørlykke 6aba36dcc2 Add the missing packet-s1ap.h
svn path=/trunk/; revision=33356
2010-06-28 21:04:56 +00:00
Stig Bjørlykke 1c81c60477 Search in user defined oid syntax table before built-in oid table in
call_ber_oid_callback(), so the user can override the defaults in the
"OID Tables".

svn path=/trunk/; revision=33355
2010-06-28 19:06:16 +00:00
Gerald Combs e2c79ddfd0 It looks like dissect_ber_octet_string() is called with the expectation
that out_tvb will always be set (the H.248 dissector does this, at
least). Make sure we do so. Do the same for
dissect_ber_constrained_octet_string().

svn path=/trunk/; revision=33354
2010-06-28 17:26:07 +00:00
Martin Mathieson a8aeaf6986 Change a couple of format specifiers: %-nu looks better than %0nu here
svn path=/trunk/; revision=33353
2010-06-28 17:25:58 +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 9c20c7b510 From Hitoshi Irino via bug 4942:
1. fix the bug in dissect_v9_pdu.
(The bug is introduced in r32627, It's my fault, I'm sorry.)
When option data record is decoded, unpatched dissect_v9_pdu decode only scope
fields, it does not decode following data fields. And it runs in endless loop
when length of a scope filed is 0. This patch solve these problem.
2. defines some value_strings for some fields.
3. updates URLs in comment.

svn path=/trunk/; revision=33348
2010-06-28 12:42:40 +00:00
Martin Mathieson f95aed808a Further improvements to UM sequence analysis.
svn path=/trunk/; revision=33346
2010-06-28 10:50:03 +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 342fc4cfb4 After a nudge from Stig (thanks Stig), convert the OID configuration from
GKeyFile (which is not available on Sparc Solaris) to a User Accessible 
Table(UAT). 
This also allows the user to manage the configuration from the Wireshark GUI 
and select the associated syntax from a drop down list.


svn path=/trunk/; revision=33344
2010-06-28 09:33:04 +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
Gerald Combs 01568c1709 Make sure some variables are initialized.
svn path=/trunk/; revision=33340
2010-06-27 21:47:06 +00:00
Anders Broman dfc1f80e70 From KATAOKA Toshihiro:
MIPv6 Heartbeat

svn path=/trunk/; revision=33335
2010-06-27 08:22:50 +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
Martin Mathieson b040f1ac8c Improve UM analysis - make it more like AM.
svn path=/trunk/; revision=33328
2010-06-25 23:04:16 +00:00
Stig Bjørlykke 8aaa5b8ec7 Added description of ECT and ECN-CE, added TFS for the bit values
and some item cleanup.

svn path=/trunk/; revision=33313
2010-06-24 11:37:03 +00:00
Anders Broman f9d6b18de7 from Sylvain Munaut:
SDCCH8 subchannel decoding error in GSM RR dissector 
Summary:  SDCCH8 subchannel decoding error in GSM RR dissector  

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

svn path=/trunk/; revision=33312
2010-06-24 10:42:13 +00:00
Anders Broman 1b390de1dc Try to fix the build.
svn path=/trunk/; revision=33310
2010-06-24 06:37:31 +00:00
Anders Broman 8396802773 From "wiresharkbugzilla@jdkbx.cjb.net":
Support for RFC4279 Pre-Shared Key Ciphersuites for Transport Layer Security (TLS)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4853

svn path=/trunk/; revision=33309
2010-06-24 06:01:11 +00:00
Bill Meier 5a7cd67ec7 Use ENC_NA rather than FALSE.
svn path=/trunk/; revision=33308
2010-06-23 20:17:33 +00:00
Bill Meier d7b4bbc98a From Haakon Nessjoen: New dissector for Digiums TDMoE protocol
From me: A few minor changes:
- col-clear() not req'd;
- Use 'gint32 length' rather than 'guint8 length';
- Use ENC_NA instead of FALSE/TRUE in two cases;
- Move global tdmoe_handle to be local to proto_reg_handoff...

svn path=/trunk/; revision=33307
2010-06-23 20:08:11 +00:00
Stig Bjørlykke 800a4fff2d Use correct data type for port number.
svn path=/trunk/; revision=33306
2010-06-23 19:59:35 +00:00
Graeme Lunt 14d5a86ee5 The version of glib on Solaris 10 (2.4?) does not support GKeyFile which was
introduced in 2.6. Disable oid table if GKeyFile is not available. 


svn path=/trunk/; revision=33303
2010-06-23 14:26:19 +00:00
Bill Meier d0d5de6d1e - Use tvb_reported_length() instead of tvb_length() in a few cases;
- col_clear() not req'd;
- Use guint32 for offset;
- Minor whitespace/indentation cleanup.

svn path=/trunk/; revision=33302
2010-06-23 14:24:09 +00:00
Graeme Lunt 1fce0a0ac2 Configuration to allow the definition of an OID name and associated syntax.
It allows the user to:
* Add names and/or syntaxes for OIDs that Wireshark doesn't natively understand
* Override the built-in OID names (e.g. change 'id-at-organization' to 'o')
* Use a special syntax, "ASN.1", that allows a value associated with an OID 
  to be dissected as "unknown ber". (This is a effectively a selective 
  version of the "Decode unexpected tags as BER encoded data" BER option.)

The configuration file is a glib key-value file, with the dotted OID used as
the group, and two keys defined, "name" and "syntax".

A configuration option is added to the BER preferences page. A single 
configuration file may be specified, or a directory may be specified. If a 
directory is specified, then the files with a ".oid" extension will be loaded.

An example configuration file:

[2.5.21.5]
name=attributeTypes
syntax=ASN.1
[2.5.21.6]
name=objectClasses
[2.5.21.7]
name=nameForms
[1.2.840.10040.4.3]
name=id-dsa-with-sha1
[2.5.4.6]
name=c
[2.5.4.10]
name=o
[2.5.4.11]
name=ou
[2.5.4.3]
name=cn
[1.3.32.0.2.0.4.66]
name=Unknown OID
syntax=PrintableString
[0.9.2342.19200300.100.1.10]
name=unknown dn
syntax=DistinguishedName

----

The list of known syntaxes is shown in the "Decode As ..." dialog when 
examining a BER file.


svn path=/trunk/; revision=33300
2010-06-23 11:28:59 +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
Stig Bjørlykke 2b829eaebb Added link to a protocol description.
Show the control packet magic number.
Set correct length on the control packet item.
Corrected some blurbs.

svn path=/trunk/; revision=33295
2010-06-23 07:26:50 +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
Bill Meier c3f91fd021 Strengthen test for Gigamon trailer;
Change some indentation/spacing.

svn path=/trunk/; revision=33293
2010-06-23 00:04:37 +00:00
Stig Bjørlykke 86abd88b20 From Håkon Nessjøen:
Added configurability of port number.

From me:
Removed some unneeded variable inits.

svn path=/trunk/; revision=33292
2010-06-22 16:56:07 +00:00
Bill Meier 875223e53e Ensure no exceptions thrown while checking for Gigamon trailer.
(Builds upon the previous commit by Anders).

svn path=/trunk/; revision=33291
2010-06-22 15:33:27 +00:00
Stig Bjørlykke babe65cbab From Håkon Nessjøen via bug 4899:
Dissector for Mikrotik RouterOS protocol for telneting without using IP
addresses.

From me:
Code cleanup.

svn path=/trunk/; revision=33289
2010-06-22 15:12:20 +00:00
Anders Broman 017e4d0dc0 If the trailer is less than 4 bytes it's not a Gigamon hdr.
svn path=/trunk/; revision=33287
2010-06-22 13:29:33 +00:00
Jaap Keuter 19bd423fe9 Fix for bug 4852:
Don't short circuit dissection if tree==NULL when column values are to be set.

svn path=/trunk/; revision=33282
2010-06-22 07:52:06 +00:00
Bill Meier e79dddc257 Add an if-test to fix a fuzz-test crash;
See Bug #4897: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4897

svn path=/trunk/; revision=33280
2010-06-21 14:24:34 +00:00
Stig Bjørlykke 61cc66770a Removed leading empty line.
svn path=/trunk/; revision=33278
2010-06-21 11:30:27 +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
Stig Bjørlykke a0e759ca9b Corrected copyright header.
svn path=/trunk/; revision=33276
2010-06-21 11:28:52 +00:00
Martin Mathieson e530123963 Added volatile to 'offset' (needed by my version of gcc).
svn path=/trunk/; revision=33275
2010-06-21 09:41:57 +00:00
Anders Broman 0ec3d19ef7 The length of the dot11CurrentChannelNumber parameter is 1 octet.
Fixes bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4894

svn path=/trunk/; revision=33274
2010-06-21 03:01:41 +00:00
Guy Harris 0b50e9c953 Properly terminate gmhdr_ftype_timestamp[].
svn path=/trunk/; revision=33273
2010-06-20 22:36:32 +00:00
Guy Harris 15f156c680 Mark pinfo as unused.
svn path=/trunk/; revision=33272
2010-06-20 21:43:52 +00:00
Bill Meier b9d5679284 More rework of the code:
- Refactor to use a separate function for common code;
 - Prefs callback not required;
 - Use val_to_str(...);
 - Fix issues relating to incorrect bytes highlighted in the hex view;

svn path=/trunk/; revision=33271
2010-06-20 21:18:48 +00:00
Jaap Keuter 8bba8bf460 Fix for bug 4888:
Restore setting DSCP column value, when relevant.

svn path=/trunk/; revision=33270
2010-06-20 18:24:25 +00:00
Stig Bjørlykke 1069c8dccf Added an expert info for "4 NOP in a row" in IP and TCP.
svn path=/trunk/; revision=33265
2010-06-20 16:22:51 +00:00
Stig Bjørlykke d051e79a81 Revert back to the old Flags entry.
Add number of bits used for Flags in the description.

svn path=/trunk/; revision=33264
2010-06-20 16:17:10 +00:00
Jaap Keuter e1ea2b1ed0 From Holger Freyther:
The current implementation assumes that the IPA protocol header is three byte.
This is true for TCP but not for packets sent over UDP, which uses four bytes.

From me:
Improve heuristic and offset tracking.

svn path=/trunk/; revision=33259
2010-06-20 14:37:34 +00:00
Jaap Keuter a712e58a94 From KATAOKA Toshihiro:
The sequence number in 3GPP NAS EPS(TS24.301) cyphered PDU is outside of ciphered text.

svn path=/trunk/; revision=33258
2010-06-20 12:21:45 +00:00