Commit Graph

13681 Commits

Author SHA1 Message Date
Jeff Morriss 33f116a46d Restore pinfo->private_data after an exception was thrown by a subdissector.
This is necessary in case a subdissector had changed it but was unable to
restore it (due to the exception).

Remove check_col().

svn path=/trunk/; revision=34436
2010-10-08 17:48:22 +00:00
Jeff Morriss 7321549932 Don't use a TRY/CATCH block just to ignore any exceptions thrown by
tvb_get_ntohs(): check the remaining tvb length instead.

svn path=/trunk/; revision=34435
2010-10-08 17:37:19 +00:00
Martin Mathieson f6ee7d8d4f From Tobias Witek (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5283)
epan/dissectors/packet-umts_fp.c
* Added mac subdissector (MAC) call to HSDSCH TYPE2 frames

epan/dissectors/packet-umts_mac.c
* Added support for HSDSCH TYPE2 frames by means of
        not nibble-shifting (4 bits) the SDU if MAC-ehs is used

epan/dissectors/packet-rlc.c
* Added support for "Use special value of the HE field" (3gpp 25.332-7a0 
9.2.2.7) commonly used for Release 7 HSDPA.
        REMARK: although the specification mandates that the
        special value is only allowed when activated by higher
        layers (RRC), it is interpreted unconditionally. We assume
        this is OK, because a different use in future specifications
        is very unlikely.

epan/dissectors/packet-fp_hint.c
* Added decoding of MAC-ehs indicator for HSDSCH frames
* Bumped fpi->release from 6 to 7 to enable proper
        HSDSCH TYPE2 frame decoding in the UTMS MAC parser.
        In general, this appears not to affect decoding
        of (conformant) FP frames of pevious releases.

svn path=/trunk/; revision=34433
2010-10-08 11:03:08 +00:00
Jeff Morriss fae45ea6a1 Remove check_col()
svn path=/trunk/; revision=34426
2010-10-08 01:50:50 +00:00
Jeff Morriss 8d9ed7f963 Restore private_data even if there was an exception
svn path=/trunk/; revision=34424
2010-10-08 01:36:20 +00:00
Jeff Morriss f8402031c5 Don't use a TRY/CATCH block just to ignore any exceptions thrown by
tvb_get_ntohs(): check the remaining tvb length instead.

svn path=/trunk/; revision=34421
2010-10-08 01:17:04 +00:00
Jeff Morriss a179cfb90a Catch exceptions from subdissectors, even when we're not handing the
subdissector the first fragment of a fragmented message so that an exception
in the first chunk doesn't abort dissection of subsquent chunks in the frame.

Restore pinfo->private_data after an exception was thrown by a subdissector.
This is necessary in case a subdissector had changed it but was unable to
restore it (due to the exception).

svn path=/trunk/; revision=34420
2010-10-08 01:05:33 +00:00
Bill Meier 695aff26f9 (Minor) Rename a few variables in the global namespace to be a bit more unique;
Also: rename additional (static) variables to be consistent with the above renames.

svn path=/trunk/; revision=34412
2010-10-07 21:23:36 +00:00
Bill Meier 54ed1b0bc7 Define a few global variables as static.
svn path=/trunk/; revision=34411
2010-10-07 21:16:52 +00:00
Bill Meier c41f229fdd Define 3 global variables as static; Whitespace cleanup.
svn path=/trunk/; revision=34410
2010-10-07 21:13:36 +00:00
Bill Meier 49c9059157 Define a global variable as static.
svn path=/trunk/; revision=34409
2010-10-07 21:11:18 +00:00
Jeff Morriss 96164ee15f Restore pinfo->private_data after an exception was thrown by a subdissector.
This is necessary in case a subdissector had changed it but was unable to
restore it (due to the exception).

svn path=/trunk/; revision=34408
2010-10-07 21:10:51 +00:00
Bill Meier 626b802ba3 Define global variables ROWS, COLS, MAXROWS, MAXCOLS as static;
Also: Define a few functions as static.

svn path=/trunk/; revision=34407
2010-10-07 21:09:29 +00:00
Jeff Morriss db75605ffb White space cleanup
svn path=/trunk/; revision=34402
2010-10-07 14:50:45 +00:00
Martin Mathieson 62e6b6aceb Add more CRC failure codes.
svn path=/trunk/; revision=34401
2010-10-07 14:44:00 +00:00
Tomas Kukosa 5fbdb1c378 Generate proper extension flags for empty constructed types SEQUENCE { ... } and CHOICE { ... }
svn path=/trunk/; revision=34400
2010-10-07 14:24:04 +00:00
Martin Mathieson 9f65e2a9c7 From Tobias Witek (bug 5282):
In some cases, the UMTS FP dissector currently calls upper-layer dissectors
(e.g. UMTS MAC) only when a proto-tree is present. Effectively, this causes the
RLC reassembly to fail in certain cases.

The attached patch solves the problem by slightly moving the calls to
'call_dissector()'.

svn path=/trunk/; revision=34399
2010-10-07 10:17:18 +00:00
Jeff Morriss b151952474 Change a couple of hf abbreviations so they're not the name of the hf variable.
Use . as the separator (after PROTOABBREV) in the hf abbreviations.

svn path=/trunk/; revision=34397
2010-10-06 21:51:07 +00:00
Jeff Morriss ccb7996ed1 hf cleanup: delete a whole bunch of unused entries and make up unique names and abbreviations for others. These could undoubtedly be improved by someone who knows the protocol.
svn path=/trunk/; revision=34396
2010-10-06 21:19:34 +00:00
Bill Meier affd5e0207 From Alexis La Goutte: MYSQL: Fix FIELD_PACKET dissection;
From me: Two additional fixes for FIELD_PACKET dissection;
         Revision of the original patch from Alexis to
          properly dissect a SHOW_FIELDS response message.

svn path=/trunk/; revision=34395
2010-10-06 14:59:19 +00:00
Anders Broman c522f01e2b From Pascal Quantin:
[NAS EPS] Add dissection of special conformance testing functions

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

svn path=/trunk/; revision=34394
2010-10-06 14:33:27 +00:00
Gerald Combs fff19c8383 Improve the ND flag display.
svn path=/trunk/; revision=34388
2010-10-05 22:16:29 +00:00
Stig Bjørlykke 710f41b085 Avoid printing double p_mul.pdu_type in custom columns.
svn path=/trunk/; revision=34387
2010-10-05 20:46:34 +00:00
Jeff Morriss 1a322b6955 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5277 :
Don't pass a NULL pointer to a string to ssl_debug_printf() (which eventually
calls vfprintf()): Solaris doesn't like it when you do that.

svn path=/trunk/; revision=34386
2010-10-05 19:53:37 +00:00
Anders Broman 23c4983424 From Pascal Quantin:
[NAS EPS] Fix TFT decoding when having several Packet Filters defined
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5274

svn path=/trunk/; revision=34385
2010-10-05 17:58:58 +00:00
Gerald Combs a0b284c5db Add more information to the Info column for some ICMPv6 messages. Add a
small comment to addr_resolv.c.

svn path=/trunk/; revision=34384
2010-10-05 17:57:23 +00:00
Gerald Combs 0e64b1749c Enable "Support packet-capture from IP TSO-enabled hardware" by default.
Like checksum offloading this seems to be common on modern systems.

svn path=/trunk/; revision=34383
2010-10-05 16:32:12 +00:00
Bill Meier e27e9c5e49 From Giuliano Fabris: Enhanced DVB Simulcrypt protocol dissector:
"Implemented EIS <-> SCS support, (P)SIG <-> MUX support, MUX <-> CiM support
  and (P) <-> CiP support."
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5212

From me: (Trivial) Whitespace/indentation cleanup.

svn path=/trunk/; revision=34376
2010-10-04 22:03:07 +00:00
Bill Meier 32ef48510d From Yasuyuki Tanaka: Fix PANA (RFC 5191) packets are dissected incorrectly.
(AVP length as being interpreted incorrectly).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5183

From me: General dissector code cleanup & bug fixing:
 - Show/dissect AVP "value" for non-vendor-specific AVPs;
 - Tighten & cleanup heuristic;
 - Fix some potential overflow issues;
 - #include <stdio.h>  #include <stdlib.h> not req'd;
 - Fix some whitespace & formatting;

svn path=/trunk/; revision=34366
2010-10-04 16:46:39 +00:00
Bill Meier bd4da13134 #if 0 an used function
svn path=/trunk/; revision=34355
2010-10-03 19:49:15 +00:00
Bill Meier 107e909761 Make a number of functions static;
Rename two g_... functions so as to not be in GLib namespace;
Move proto_register... to just before proto_reg_handoff...
Reformat some lines;
More Whitespace cleanup.

svn path=/trunk/; revision=34354
2010-10-03 19:43:14 +00:00
Bill Meier f5962f094e Whitespace & formatting cleanup;
Use #if 0/#endif instead of /* */ to comment out code in a few places.

svn path=/trunk/; revision=34351
2010-10-03 18:51:38 +00:00
Bill Meier 8af9d02b8c Refactor dissection of CHALLENGE target-info & AUTHENTICATE ntlmv2-response attributes:
- decode all attributes as specified in MS-NLMP;
 - use common code for target-info and ntlmv2 attribute dissection;
Add filter for the "version" field;
Remove some obsolete #if 0'd code.

svn path=/trunk/; revision=34350
2010-10-03 18:23:46 +00:00
Gerald Combs bf32b6df61 [Automatic manuf and enterprise-numbers update for 2010-10-03]
svn path=/trunk/; revision=34341
2010-10-03 15:03:33 +00:00
Bill Meier ea1a3de5fc Minor cleanup:
- packet-cfm.h not used elsewhere: incorporate into packet-cfm.c;
- Move proto_register and proto_reg_handoff to the end of the file;
- Localize some variables;
- Remove some unneeded initializers;
- Cleanu some whitesace.

svn path=/trunk/; revision=34334
2010-10-02 14:54:09 +00:00
Bill Meier a7cc9f5358 Add col_clear; Also: Small reformatting and whitespace changes
svn path=/trunk/; revision=34332
2010-10-02 13:40:43 +00:00
Jeff Morriss 3bdab149af Replace a couple of blurbs (that match the field name) with NULL.
svn path=/trunk/; revision=34322
2010-10-02 01:33:02 +00:00
Jeff Morriss 18444502e8 Remove trailing spaces from a couple of hf names
svn path=/trunk/; revision=34321
2010-10-02 01:27:45 +00:00
Sake Blok 433dcf1f82 Changing the flag bitmasks to their proper values (see http://www.faqs.org/rfcs/rfc2741.html). This fixes part of bug 5269.
svn path=/trunk/; revision=34316
2010-10-01 19:13:56 +00:00
Stig Bjørlykke 371de294df Export is_default_profile().
svn path=/trunk/; revision=34314
2010-10-01 17:06:04 +00:00
Stig Bjørlykke 98f6aa9311 Add a new right-click popup menu for the statusbar profiles for easy functions
to create new, copy, delete and rename configuration profiles.

svn path=/trunk/; revision=34312
2010-10-01 16:29:37 +00:00
Jörg Mayer 34c7218d1a - Reorder how packagetests are run
- Add packet-reload.c
- Make most packages not-required (not tested)
- Does *not* (yet) add an optional/whatever case to enable_


svn path=/trunk/; revision=34307
2010-10-01 08:40:52 +00:00
Anders Broman 5d10ffdef5 Add a couple of casts to make it compile.
svn path=/trunk/; revision=34306
2010-10-01 08:14:03 +00:00
Jaap Keuter 4f8753574b Adding new error code.
svn path=/trunk/; revision=34305
2010-10-01 06:26:58 +00:00
Jaap Keuter 7057b9203a Try to fix the Mac build.
svn path=/trunk/; revision=34304
2010-10-01 06:26:26 +00:00
Guy Harris 6df40b067c From Chris Maynard:
don't add a source address field if it's zero-length (fixes bug
	2519);

	the source address length field is 8 octets long; if the
	purported length is > 8, only include the first 8 octets.

svn path=/trunk/; revision=34303
2010-10-01 01:49:02 +00:00
Stig Bjørlykke d65b82db44 Make it compile.
svn path=/trunk/; revision=34301
2010-09-30 21:38:52 +00:00
Bill Meier 8cd2038a8b Fix some mangled comments (apparently mangled so that code could be commented out by an
enclosing comment). The code is now commented out with #if 0.

svn path=/trunk/; revision=34300
2010-09-30 21:32:42 +00:00
Bill Meier e6eec902f0 Fix compilation error.
svn path=/trunk/; revision=34298
2010-09-30 21:14:44 +00:00
Jaap Keuter d571d1431a From Stéphane Bryant:
New Dissector for the ReLOAD dissector.

svn path=/trunk/; revision=34297
2010-09-30 20:34:12 +00:00