Commit Graph

16021 Commits

Author SHA1 Message Date
Anders Broman f06a499b83 Dissect more Japanese ISUP parameters.
svn path=/trunk/; revision=46405
2012-12-05 16:21:09 +00:00
Bill Meier 7cd0417af5 Fix numerous instances of a variable/parameter name "shadowing" a library function name;
(At least some (gcc ?) compilers give a "shadow" warning for these).

svn path=/trunk/; revision=46402
2012-12-05 15:56:36 +00:00
Jeff Morriss f8ba6b5a07 Reduce the level of the warning about the padding on the final parameter from
PI_ERROR to PI_NOTE.  (If FreeBSD's been living with the wrong behavior for
years then apparently it doesn't cause interop problems.)

svn path=/trunk/; revision=46401
2012-12-05 15:27:30 +00:00
Jeff Morriss 0dc1b8b4b2 Run checkAPIs on DISSECTOR_SUPPORT_SRC too. This means we check register.c
(not very useful) but it means we'll also check the IPMI subparsers and
usb.c .  (Yes, register.c could be split out into Yet Another Variable but
I'm not sure it's worth it...)

svn path=/trunk/; revision=46399
2012-12-05 15:11:08 +00:00
Pascal Quantin 57f7171c87 Update USB vendor and product ids and escape non ASCII characters
svn path=/trunk/; revision=46398
2012-12-05 12:56:41 +00:00
Alexis La Goutte da700a93b6 From François-Xavier Le Bail via https://www.wireshark.org/lists/wireshark-dev/201212/msg00027.html
Add some missing RFC references in DHCPv6 dissector

svn path=/trunk/; revision=46397
2012-12-05 09:38:28 +00:00
Anders Broman ca4bb77022 From Patrik Lundquist:
Improvements to BitTorrent DHT dissector

Fixed filtering on protocol "bt-dht".

Improved heuristics. Can probably be enabled by default now (but I'll let someone else make that decision).

Unexpected IP address (first packet in capture file) and binary "tokens" (packet 17) were incorrectly printed as UTF-8 strings.

Moved duplicate code into bencoded_string_length().

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

svn path=/trunk/; revision=46396
2012-12-05 09:27:58 +00:00
Anders Broman a4e26f6600 From Mike Morrin:
fix handling of some EGPRS Coding and Puncturing Schemes.

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

svn path=/trunk/; revision=46394
2012-12-05 09:10:18 +00:00
Anders Broman 4d1a788872 From Martin Kaiser:
Looking at RFC 6424, the whole approach is unclear to me. We seem to read subtlv_type and _length only once and then do the while loop. Section 3.3 of RFC6424 says that there's a list of subtlvs, I'd expect type and length to be read in the while loop...

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

svn path=/trunk/; revision=46391
2012-12-05 09:04:37 +00:00
Bill Meier fbbe7cb97f Fix [-Wshadow] warning.
svn path=/trunk/; revision=46379
2012-12-04 19:52:01 +00:00
Bill Meier 7b69816cbb Fix 2 [-Wshadow] warnings
svn path=/trunk/; revision=46377
2012-12-04 19:24:28 +00:00
Anders Broman 9ca3f30f75 From Patrik Lundquist Updated V1 header description to reflect corrected specification (BEP 0029). Removed if(tree) in dissect. New style dissector, right? Added heuristics for V0 header. Removed length checking in heuristics since uTP packets can have any lenght, even odd ones, and they do. Fixed Extensions looping over whole packets and added a Data field for the trailing payload. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8048
svn path=/trunk/; revision=46373
2012-12-04 17:47:07 +00:00
Bill Meier 9f5ae02ed7 Fix 2 [-Wshadow] warnings.
svn path=/trunk/; revision=46372
2012-12-04 17:38:05 +00:00
Bill Meier 4ab1b84a89 Fix 2 [-Wshadow] warnings.
svn path=/trunk/; revision=46369
2012-12-04 16:31:10 +00:00
Anders Broman c9622178cf Add more dissection for Japan ISUP.
svn path=/trunk/; revision=46368
2012-12-04 16:22:00 +00:00
Bill Meier ddb2a90dd0 Fix [-Wshadow] warning.
svn path=/trunk/; revision=46367
2012-12-04 14:38:38 +00:00
Anders Broman 362dd1dcb5 Add more Japan ISUP parameters to value sting, dissection remains to be done.
svn path=/trunk/; revision=46364
2012-12-04 09:15:21 +00:00
Bill Meier 5f9077232e Declare a value_string as static.
svn path=/trunk/; revision=46360
2012-12-03 23:06:30 +00:00
Bill Meier 7316a50499 Declare a value_string as static.
svn path=/trunk/; revision=46359
2012-12-03 23:05:08 +00:00
Bill Meier be99fcad4d Minor cleanup:
- prefs callback not needed;
- move proto_reg_handoff...() to the end of the file as per convention;
- reformat some log lines.

svn path=/trunk/; revision=46358
2012-12-03 22:42:56 +00:00
Bill Meier 52e47754f1 Fix [-Wshadow] warnings.
svn path=/trunk/; revision=46357
2012-12-03 22:27:46 +00:00
Bill Meier 727ed68381 Fix [-Wshadow] warning for purported variable shadowing another.
svn path=/trunk/; revision=46356
2012-12-03 22:26:34 +00:00
Bill Meier cef4af718c Fix SVN #46348 (iow, do it properly).
(Fixes compile warning)

svn path=/trunk/; revision=46349
2012-12-03 18:38:16 +00:00
Bill Meier f5ecb42c8e Remove duplicated code added as part of SVN #44777;
Move the SVN #44777 new (unduplicated) code to the correct place.
Also: fixes [-Wshadow] warning.

svn path=/trunk/; revision=46348
2012-12-03 18:11:30 +00:00
Bill Meier 3c0d6b8260 General minor cleanup:
- create/use several extended value strings;
- remove unneeded #includes;
- remove unneeded code & variable initializers;
- convert "4 space tabs" to spaces;
- do some reformatting to use a consistent whitespace style.

svn path=/trunk/; revision=46347
2012-12-03 17:28:43 +00:00
Anders Broman 52a4bd4644 Try to fix packet-sdp.c:1542: warning: 'parameter_item' may be used uninitialized in this function.
svn path=/trunk/; revision=46346
2012-12-03 15:04:24 +00:00
Pascal Quantin d2c32e27ed Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8038 :
Prevent a counter overflow in while loops

svn path=/trunk/; revision=46345
2012-12-03 14:44:12 +00:00
Anders Broman a07cfc3b50 Protect against malformed crypto-suite parameters.
Fixes SDP infinite loop.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8041

svn path=/trunk/; revision=46344
2012-12-03 13:55:03 +00:00
Anders Broman e23327c0bb From Michal Labedzki:
Bluetooth: AVDTP: Dissect RFA bits in header compression

Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893

svn path=/trunk/; revision=46343
2012-12-03 11:39:22 +00:00
Anders Broman 4fdcd47001 From Michal Labedzki:
Bluetooth: AVDTP: Fix initialization of codec and some
 compiler warnings

If cannot obtain codec information by SetConfiguration/Reconfigure
use value "-1" to ensure that there will be no any stream dissected.


Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893

svn path=/trunk/; revision=46342
2012-12-03 11:36:06 +00:00
Anders Broman ccb3fb14e2 From Michal Labedzki:
Bluetooth: Fix uninitialized fields on the USB side

Also make indentation/spaces cleanup in hci_usb dissector.

Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5032

svn path=/trunk/; revision=46341
2012-12-03 11:26:36 +00:00
Anders Broman 191aaba217 Wrong check for quote_offset.
Fixes  Bug 8042 - SIP infinite loop.

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

svn path=/trunk/; revision=46340
2012-12-03 09:49:52 +00:00
Martin Mathieson 09a694823f Use tvb_get_const_stringz() when I know the tvb will be contiguous.
svn path=/trunk/; revision=46339
2012-12-03 01:45:00 +00:00
Bill Meier 020df2e24c Fix 2 bugs in heuristic tests which resulted in various false positives;
I believe this fix addresses the remaining issues for Bug #6047.
  https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6047

Also:
- Fix {-Wshadow] warning;
- Use tvb_get_ntoh24() in 2 places;
- Add ToDo comment about a TCP reassembly issue.

svn path=/trunk/; revision=46338
2012-12-03 01:41:32 +00:00
Pascal Quantin e52313959b Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8036 :
Check length of Slow Protocol OAM Vendor Specific Event Notification and add an expert info if it is not at least 2 bytes long

svn path=/trunk/; revision=46336
2012-12-02 22:19:37 +00:00
Pascal Quantin 8b5aa91371 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8037 :
Fix an infinite loop in CSN.1 dissector when having more than 255 padding bits

svn path=/trunk/; revision=46335
2012-12-02 21:37:34 +00:00
Pascal Quantin 51323635aa From Ojab via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8035 :
Wrong packet bytes are selected for ISUP CUG binary code

svn path=/trunk/; revision=46334
2012-12-02 20:49:19 +00:00
Evan Huus b9c6f71fe4 Create a wmem pool in pinfo and use it for some address allocations.
A (better?) fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8030

See also thread starting at:
http://www.wireshark.org/lists/wireshark-dev/201212/msg00001.html

svn path=/trunk/; revision=46331
2012-12-02 17:01:04 +00:00
Evan Huus 2461373edd Remove unneeded variable initializers.
svn path=/trunk/; revision=46328
2012-12-02 15:21:53 +00:00
Jeff Morriss e429065d4e Replace ip_to_str(tvb_get_ptr(...)) with tvb_ip_to_str(...).
svn path=/trunk/; revision=46325
2012-12-02 05:02:11 +00:00
Jeff Morriss 49466f95bc Introduce, and start using, TVB_SET_ADDRESS() and TVB_SET_ADDRESS_HF(). They
are like the non-TVB versions except that they take a TVB and an offset
instead of (frequently) a pointer into the TVB.

Calling tvb_get_ptr() before modifying the rest of the fields should help fix
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7960 (though I can't
reproduce that problem).


Replace a bunch of calls like:

SET_ADDRESS(..., AT_XXX, length, tvb_get_ptr(tvb, offset, length));

with:

TVB_SET_ADDRESS(..., AT_XXX, tvb, offset, length);

svn path=/trunk/; revision=46324
2012-12-02 04:49:13 +00:00
Jeff Morriss 2403ef591d Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8033 :
Register hf_btavdtp_number_of_signal_packets.

Remove (unused) hf_btavdtp_header_compression_rfa.

svn path=/trunk/; revision=46322
2012-12-02 03:25:38 +00:00
Jeff Morriss a92bbbcd5c Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8030 :
Don't store an AT_STRINGZ address in ep_ allocated memory: that memory is
freed before the addresses may be used.  Use se_ memory instead (no, that's
not really ideal either).

It would appear that several other dissectors have the same problem.

svn path=/trunk/; revision=46320
2012-12-02 02:46:12 +00:00
Evan Huus 400cb55a10 Remove unneeded include.
svn path=/trunk/; revision=46314
2012-12-01 17:48:01 +00:00
Evan Huus b14c53a2a9 Fix some checkAPI warnings and remove some unnecessary variable
initializations.

Also add an $Id$ tag which I somehow missed despite adding the actual
SVN property.

svn path=/trunk/; revision=46313
2012-12-01 17:44:51 +00:00
Evan Huus 99d5535cb1 From Krishnamurthy Mayya and Nikitha Malgi via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8019

Dissection support for PW-OAM messages (RFC 6478).

svn path=/trunk/; revision=46311
2012-12-01 15:39:14 +00:00
Jeff Morriss 3a0a1d49ea Fix an unitialized-read detected by Valgrind while processing:
https://www.wireshark.org/download/automated/captures/fuzz-2012-11-30-20336.pcap

(I can't reproduce the actual fuzz failure and this uninitialized-read
shouldn't have caused an out-of-memory condition--which is what the buildbot
said the problem with that capture was.)

Also stop marking a variable that is used as unused.

svn path=/trunk/; revision=46309
2012-11-30 20:25:21 +00:00
Anders Broman 962aaf121f From Michal Labedzki:
PATCH] USB: Add support for vendor_id/product_id,
 bus_id/device_address and class/subclass/protocol tables

USB subdissectors can be decoded by class/subclass/protocol. If fail try vendor_id/product_id.
bus_id/device_address is intented to use by DecodeBy, so user can decode specified device as need.

Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5032

svn path=/trunk/; revision=46306
2012-11-30 12:33:37 +00:00
Anders Broman 1a79540fdc From Michal Labedzki:
Bluetooth: Add support for HCI USB transport dissector

Based on Bluetooth Core 4.0 specification

Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5032

svn path=/trunk/; revision=46305
2012-11-30 11:58:37 +00:00
Anders Broman d67f89f45b From Michal Labedzki:
Couple of coding style changes and fixes for:
warning: declaration of ‘k_frame_number’ shadows a previous local
warning: assignment discards qualifiers from pointer target type

Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5032

svn path=/trunk/; revision=46304
2012-11-30 11:31:28 +00:00
Anders Broman 79d8f9f5f9 From Mike Morrin:
The gsm rlcmac dissector truncates the 12 bit BSNs to 8 bits when storing them.

Fix this and the handling of BSN2 is refactored to clarify the difference between BSN2 (the stored value) and BSN2_offset (the value transferred at the air interface).

svn path=/trunk/; revision=46301
2012-11-30 09:42:58 +00:00
Pascal Quantin 91576e1f70 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8023 :
Fix typo in LPPa protocol name

svn path=/trunk/; revision=46300
2012-11-30 08:34:50 +00:00
Martin Mathieson 5e90582d54 Add versions of a function that doesn't need do substitute specifiers.
svn path=/trunk/; revision=46298
2012-11-29 22:25:18 +00:00
Jeff Morriss 04c9d29799 Make an enum_val_t static.
svn path=/trunk/; revision=46293
2012-11-29 20:21:30 +00:00
Jeff Morriss 0266cceef3 Make all enum_val_t's const.
svn path=/trunk/; revision=46292
2012-11-29 20:15:37 +00:00
Gerald Combs c33b0ad215 Add version info to the top of the SSL debug log.
svn path=/trunk/; revision=46291
2012-11-29 19:20:29 +00:00
Michael Tüxen 749e52d996 The padding of the last parameter is not included in the length of the chunk
as described in RFC 4960, section 3.2.

svn path=/trunk/; revision=46290
2012-11-29 18:09:51 +00:00
Pascal Quantin 6f3c7f1f99 Add missing newline at end of file
svn path=/trunk/; revision=46289
2012-11-29 16:46:41 +00:00
Jeff Morriss 5063663377 Another couple size_t-to-int warning fixes (I hope).
svn path=/trunk/; revision=46288
2012-11-29 16:26:12 +00:00
Jeff Morriss 79d3e696a8 (Try to) fix some size_t-to-int warnings.
svn path=/trunk/; revision=46286
2012-11-29 15:39:34 +00:00
Anders Broman 21abe5567c From Michal Labedzki:
USB: Add support for vendor_id/product_id,
 bus_id/device_address and class/subclass/protocol
 tables

USB subdissectors can be decoded by class/subclass/protocol. If fail try vendor_id/product_id.
bus_id/device_address is intented to use by DecodeBy, so user can decode specified device as need.

Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5032

svn path=/trunk/; revision=46283
2012-11-29 13:59:36 +00:00
Jeff Morriss 910097ffb6 Remove the second definition of a variable. Define an undefined variable.
svn path=/trunk/; revision=46282
2012-11-29 13:54:07 +00:00
Anders Broman d19d4f9c5f Fix a typo.
svn path=/trunk/; revision=46281
2012-11-29 13:45:35 +00:00
Anders Broman 5a61f202d4 From Michal Labedzki:
USB: Add support for vendor and product names from
 usb.ids database

Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5032

svn path=/trunk/; revision=46280
2012-11-29 13:39:08 +00:00
Anders Broman a8b7b8b86c From Michal Labedzki:
USB: Update some descriptions found in USB 3.0
 specification

Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5032

svn path=/trunk/; revision=46279
2012-11-29 13:29:50 +00:00
Anders Broman 900b884f55 From Michal Labedzki:
Bluetooth: Add support for source/destination addresses

Within resolving devices names. Also make header file more generic,
packet-hci_h4.h renamed to packet-bluetooth-hci.h.

Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5032

svn path=/trunk/; revision=46278
2012-11-29 13:21:10 +00:00
Anders Broman f4de95f1e3 From Michal Labedzki:
Bluetooth: Fix length issue described in XXX comment

Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5032

svn path=/trunk/; revision=46276
2012-11-29 12:05:55 +00:00
Anders Broman 11c4c6d4f3 Use qui_tree.
svn path=/trunk/; revision=46275
2012-11-29 12:04:11 +00:00
Anders Broman 2b8b65ee68 - Fix a typo; Authentication Quadruplets not dissected correctly.
- Add RSFP index IE dissection.

svn path=/trunk/; revision=46274
2012-11-29 10:57:33 +00:00
Guy Harris f208489b56 Slightly less hacky way to arrange that dictionary_load() be called
before hf_base[] is initialized.

svn path=/trunk/; revision=46271
2012-11-28 23:11:08 +00:00
Jeff Morriss 3029a76dc3 Fix pretty-printing of the application ID in the protocol-details pane by
putting an "unused" variable (which was taken out in r24377) back in.  This
time add a (bogus) "use" of the variable and explain why we're doing what
we're doing.

Use VALS() (in one case anyway) and PINFO_FD_NUM.

svn path=/trunk/; revision=46266
2012-11-28 22:45:31 +00:00
Bill Meier a8112e6529 Fix [-Wshadow] warnings;
Also (for one or more of the files):
 - create/use one or more extended variable strings;
 - remove some uneeded variable initializers;
 - reformat some long lines;
 - reformat hf[] entries;
 - convert apparent 4-space tabs to spaces;
 - do some whitespace and formatting changes to use a consistent style.

svn path=/trunk/; revision=46265
2012-11-28 22:41:07 +00:00
Guy Harris 84afa22969 It's not going to pass the
if (protocol_version_identifier >= 4 && version_1_length == 0
          && tvb_reported_length(tvb) >= 106) {

test if it doesn't pass the

    if (protocol_version_identifier >= 3 && version_1_length == 0 &&
        tvb_reported_length(tvb) >= 102) {

test.

svn path=/trunk/; revision=46258
2012-11-28 21:24:32 +00:00
Guy Harris 33b1d3abd9 Redo the MSTI stuff a bit, making a copy of total_msti_length at the
time we start processing the MSTI messages and decrementing the copy;
it's a bit clearer, and may make it easier to avoid the "uninitialized
variable" problem.

svn path=/trunk/; revision=46257
2012-11-28 21:08:28 +00:00
Guy Harris 1ce0f9234d "??" introduces a trigraph in C; escape "???" to avoid that.
svn path=/trunk/; revision=46256
2012-11-28 21:05:17 +00:00
Guy Harris fe9fe6b6e9 Squelch a "may be uninitialized" warning.
svn path=/trunk/; revision=46255
2012-11-28 20:31:13 +00:00
Guy Harris bab056d43c Clean up indentation.
svn path=/trunk/; revision=46254
2012-11-28 20:29:24 +00:00
Bill Meier c1b6433dcf Fix a [-Wshadow] warning;
Also:
 - create/use several extended variable strings;
 - remove some uneeded variable initializers;
 - reformat some long lines;
 - reformat hf[] entries;
 - do some whitespace and formatting changes to use a consistent style.


svn path=/trunk/; revision=46253
2012-11-28 20:03:10 +00:00
Anders Broman 70b35e6583 Remove an unused variable
svn path=/trunk/; revision=46252
2012-11-28 19:59:32 +00:00
Jeff Morriss c1c964db17 There's a macro for the Request bit. Use it instead of hard-coded 0x80.
svn path=/trunk/; revision=46249
2012-11-28 16:29:31 +00:00
Anders Broman ff85ba42ac From gyanesh:
BPDU dissector enhancement to recognize Shortest Path Bridging(SPB) BPDUs version 4 .

- Got rid of a couple of tvb_get_ptr().
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7970

svn path=/trunk/; revision=46248
2012-11-28 15:59:53 +00:00
Michael Tüxen 99d406059f Add native SCTP encapsulation.
svn path=/trunk/; revision=46244
2012-11-28 12:16:12 +00:00
Bill Meier 629f6d3291 Fix typo which cased compile error ...
svn path=/trunk/; revision=46242
2012-11-28 00:36:09 +00:00
Bill Meier 4297992b02 General cleanup:
- fix extensive use of expert...() under 'if(tree)'
- fix  a [-Wshadow] warning;
- create/use several extended variable strings;
- "localize" some variable definitions;
- remove some uneeded variable initializers;
- do some whitespace and formatting changes to use a consistent style.

svn path=/trunk/; revision=46240
2012-11-28 00:10:50 +00:00
Jeff Morriss 4da68e75e0 Warn about non-final parameters that aren't padded correctly. I'm not sure
that final parameters *with* padding is all that important (maybe it should
be there but not PI_ERROR?).

svn path=/trunk/; revision=46239
2012-11-27 23:13:56 +00:00
Bill Meier 3a40f4d2a0 Fix [-Wuninitialized] warning.
svn path=/trunk/; revision=46237
2012-11-27 21:54:10 +00:00
Bill Meier 3617c83076 General cleanup:
- create/use extended variable string;
- #if 0 unused value_string arrays (instead of marking with _U_);
- "localize" some variable definitions;
- remove some uneeded variable initializers;
- reformat hf[] entries;
- do some whitespace and formatting changes to use a consistent style.


svn path=/trunk/; revision=46236
2012-11-27 21:48:15 +00:00
Bill Meier e5e3373e9d Fix several [-Wshadow] warnings;
Also:
 - Create/use several extended value strings;
 - Reformat hf[] array;
 - Do various whitespace and formatting changes to use a consistent style.

svn path=/trunk/; revision=46222
2012-11-27 14:34:27 +00:00
Anders Broman 6408671bad Add more parameters for Japanese ISUP.
svn path=/trunk/; revision=46220
2012-11-27 13:36:18 +00:00
Bill Meier c4e5b4745a Uh, it's BASE_EXT_STRING, not BASE_RANGE_STRING.
svn path=/trunk/; revision=46214
2012-11-27 00:11:43 +00:00
Bill Meier 56e910299a Fix several [-Wshadow] warnings;
Also:
 - Create/use several extended value strings;
 - Reformat hf[] array;
 - Do various whitespace and formatting changes to use a consistent style.


svn path=/trunk/; revision=46210
2012-11-26 21:19:44 +00:00
Bill Meier 0520b62b44 tvb_find_line_end() arg should be FALSE not ENC_BIG_ENDIAN.
svn path=/trunk/; revision=46209
2012-11-26 21:16:40 +00:00
Gerald Combs 1ffc96d153 From Dirk Jagdmann: Fix a comment in the DCERPC dissector header.
svn path=/trunk/; revision=46208
2012-11-26 21:16:09 +00:00
Anders Broman 45769c7975 Update MSG value string and add commented out info
svn path=/trunk/; revision=46207
2012-11-26 19:53:30 +00:00
Bill Meier 044514edbd Fix several [-Wshadow] warnings;
Also:
- Create/use several extended value strings;
- Do various whitespace and formatting changes to use a consistent style.


svn path=/trunk/; revision=46205
2012-11-26 16:50:13 +00:00
Pascal Quantin 17781b66bf Add missing OPTIONAL keyword in RRCConnectionRequest message
svn path=/trunk/; revision=46202
2012-11-26 13:21:18 +00:00
Anders Broman 82e67826b4 Back out the SDP part of r46165 "Set up BFCP conversations".
svn path=/trunk/; revision=46201
2012-11-26 09:30:00 +00:00
Guy Harris 8b3de820ee Fix uninitialized-variable bug.
svn path=/trunk/; revision=46199
2012-11-26 03:45:55 +00:00
Guy Harris 83da3483cd If TSO support is enabled and, as a result, we assume an IP packet with
zero as the total length is the result of TSO, report that specially, so
that it's clearer why the we're reporting the length as non-zero when
it's zero in the packet data.

See

	http://ask.wireshark.org/questions/16279/why-are-the-bytes-00-00-but-wireshark-shows-an-ip-total-length-of-2016

svn path=/trunk/; revision=46198
2012-11-26 03:14:02 +00:00
Bill Meier 7c11289535 Fix several [-Wshadow] warnings;
Also: Do some minor whitespace and formatting changes.

svn path=/trunk/; revision=46197
2012-11-26 02:24:48 +00:00
Bill Meier f815eb4969 Fix two purported [-Wshadow] warnings;
Also: Do some minor whitespace and formatting changes.

svn path=/trunk/; revision=46196
2012-11-26 02:17:50 +00:00
Bill Meier c2596fb5c7 Fix a purported [-Wshadow] warning;
Also: Do some minor whitespace and formatting changes.

svn path=/trunk/; revision=46195
2012-11-26 01:53:21 +00:00
Bill Meier aa882d5a47 Fix several [-Wshadow] warnings;
Also: Do some minor whitespace and formatting changes.

svn path=/trunk/; revision=46192
2012-11-25 23:33:11 +00:00
Bill Meier c230713b57 Fix several [-Wshadow] warnings;
Also: Do some minor whitespace and formatting changes.
-This line, and those below, will be ignored--

M    dissectors/packet-bootp.c
M    dissectors/packet-bssgp.c
M    dissectors/packet-babel.c

svn path=/trunk/; revision=46191
2012-11-25 23:16:30 +00:00
Bill Meier d7aa7c2a62 Fix several [-Wshadow] warnings;
Also:
  - Add XXX comment about a line of code which does differently than apparently expected;
  - Do some minor whitespace and formatting changes.

svn path=/trunk/; revision=46190
2012-11-25 23:15:10 +00:00
Bill Meier cd859fd85f Fix several purported [-Wshadow] warnings;
svn path=/trunk/; revision=46189
2012-11-25 22:16:22 +00:00
Anders Broman ade0083237 From Andy Karch: L2TP filtering on AVPs 'Called Number' and 'Calling Number' https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8015
svn path=/trunk/; revision=46181
2012-11-25 16:19:19 +00:00
Anders Broman dff339dd1e Set up BFCP conversations
svn path=/trunk/; revision=46165
2012-11-24 17:06:08 +00:00
Bill Meier 6b97dfbfa7 Improve dissection;
- Properly handle DataBlocks with optional fields at end;
- Fix a few field dissections;
General code cleanup;
- Remove almost all tests using tvb_length_remaining():
   If there's not enough data available, just let an
   exception be thrown.
- Fix a memory leak;
- Simplify code in various places.
- Add a reference to the (a ?) Microsoft spec for RDP.

Fixes Bug #7862 in a more complete manner than SVN #45566.

svn path=/trunk/; revision=46158
2012-11-23 21:11:47 +00:00
Anders Broman a1ea2f91d8 Error: the name for hf_bfcp_queue_pos ("bfcp.queue_pos") has trailing space in packet-bfcp.c
svn path=/trunk/; revision=46157
2012-11-23 16:04:20 +00:00
Anders Broman 84582b0429 Update dissetion of the header flags.
svn path=/trunk/; revision=46156
2012-11-23 14:02:12 +00:00
Anders Broman a05cf8c4d2 Add dissection of attributes.
svn path=/trunk/; revision=46154
2012-11-23 13:44:31 +00:00
Anders Broman 0fa05b7d2d Cell Identity (CI) is 2 octets.
svn path=/trunk/; revision=46152
2012-11-23 12:00:21 +00:00
Michael Tüxen eb41468008 Fix the expert info dealing with parameter padding. The final parameter
in a chunk is not padded, but the padding bytes are considered padding
of the chunk.

svn path=/trunk/; revision=46143
2012-11-22 16:03:19 +00:00
Bill Meier 07c4d6ef7f Fix potential buffer overflow crash; (Bug #7880).
Rework code logic slightly so same code path (and tests)
 used whether or not 'if(tree)'.

svn path=/trunk/; revision=46128
2012-11-22 02:27:40 +00:00
Martin Kaiser 6b3bfa5507 fix
/home/wireshark/builders/trunk/ubuntu1204x64/build/epan/dissectors/packet-bssgp.c: In function de_bssgp_son_transfer_app_id:
/home/wireshark/builders/trunk/ubuntu1204x64/build/epan/dissectors/packet-bssgp.c:3173:12: error: variable next_tvb set but not used
[-Werror=unused-but-set-variable]
cc1: all warnings being treated as errors


svn path=/trunk/; revision=46125
2012-11-21 22:20:22 +00:00
Martin Kaiser bf0fede1eb display the content of cc status fields in the info colum
svn path=/trunk/; revision=46124
2012-11-21 21:55:29 +00:00
Martin Kaiser ff9f439c9a all CI+ SAC messages are encrypted
there's no point in displaying this fact in the info column

svn path=/trunk/; revision=46123
2012-11-21 21:42:50 +00:00
Martin Kaiser 8a8956552f dissect config and cftable tuples in the Card Information Structure
svn path=/trunk/; revision=46122
2012-11-21 21:37:22 +00:00
Martin Kaiser 149880291e fix copy&paste error
svn path=/trunk/; revision=46121
2012-11-21 21:21:07 +00:00
Guy Harris 715065609b Clean up white space (no tabs).
svn path=/trunk/; revision=46120
2012-11-21 21:09:32 +00:00
Martin Kaiser 52f1565bd4 cc status 0x03 means either "authentication failed" or "no srm required"
svn path=/trunk/; revision=46119
2012-11-21 21:08:43 +00:00
Guy Harris 6c6b37cada The previous change means the "len" argument is now being used.
svn path=/trunk/; revision=46113
2012-11-21 18:13:51 +00:00
Anders Broman 66c80c0f60 From l.wachowski:
Allign the tables for dissection.
From me try to fix the dissection of SONtransferApplicationIdentity_PDU.

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

svn path=/trunk/; revision=46111
2012-11-21 17:59:19 +00:00
Bill Meier 303ce49ecd From Stephen Tarr: Fix 'misspelling (typo) in display filter field name'.
ipv6.framgent --> ipv6.fragment
#BACKPORT

svn path=/trunk/; revision=46098
2012-11-21 00:41:32 +00:00
Ronnie Sahlberg 323100545d SCSI: Sense buffers come in two flavors. Start decoding the descriptor format.
svn path=/trunk/; revision=46097
2012-11-20 03:17:46 +00:00
Anders Broman c9e72f9241 From Roland Knall:
Allow for specific enabling and disabling of heuristic dissectors.

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

svn path=/trunk/; revision=46085
2012-11-19 20:20:34 +00:00
Anders Broman 1c22a075a8 From Krishnamurthy Mayya:
Enhancement to support MPLS-TP FM and LI payloads as per RFC 6427 and RFC 6435

Fixed some errors found by checkapi, changed filter names to use
proto abbr.

svn path=/trunk/; revision=46084
2012-11-19 20:13:57 +00:00
Anders Broman 66c34f3c7b From l.wachowski:
- In de_bssgp_pdu_in_error() use current_offset isof 0.
- in function de_bssgp_ran_inf_error_rim_cont. Error rim
container doesn't have field rim sequence number. This field exists in the rest
of containers but not in this one. So I have removed this field. 
In this function we have field pdu in error and this field is mandatory, not
optional

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

svn path=/trunk/; revision=46081
2012-11-19 18:59:09 +00:00
Martin Kaiser 0e2f874a24 From Wido Kelling
updated Port3 status values to conform to IEC 61158
added decoding of some more values

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

svn path=/trunk/; revision=46075
2012-11-18 17:52:55 +00:00
Guy Harris 5788ca7c88 Fix some blurbs that matched the field tag.
De-RTMP-ize more AMF-related names and move more of the AMF stuff
together.

svn path=/trunk/; revision=46069
2012-11-18 08:03:05 +00:00
Guy Harris 2f9292c1ea Move all the AMF stuff under the AMF protocol, as AMF, while it's used
with RTMP, can be sent over HTTP, for example, as well.

svn path=/trunk/; revision=46068
2012-11-18 04:30:10 +00:00
Guy Harris 06ce5d1571 More TODOs:
We hand the user data in a CR or CC packet to the subdissectors,
	but don't tell the subdissectors that - do we need to?

	We don't hand the data in an ED packet to the subdissectors -
	should we, and do we need to tell them that it's an ED packet?

svn path=/trunk/; revision=46067
2012-11-18 01:59:05 +00:00
Guy Harris e5c2f19eab You can't return from inside a TRY/CATCH/ENDTRY block (see
epan/exceptions.h; it crashes).

Try BER first, including both the test dissection and the check of the
results.  If that fails due to an exception being thrown, or due to the
results not indicating that it's a BER-encoded T.125 packet, try PER, so
that if the BER dissection doesn't work we don't just give up.

Get rid of some _U_s attached to parameters that are, in fact, used.

svn path=/trunk/; revision=46066
2012-11-18 01:39:32 +00:00
Martin Mathieson de2aa05555 Support the older format of SR failure for a while longer.
svn path=/trunk/; revision=46065
2012-11-18 01:33:43 +00:00
Guy Harris 2254dcaa00 In the heuristic T.124 dissector, catch BoundsError and
ReportedBoundsError exceptions when attempting to dissect the first bit
of the packet and, if either is thrown, assume the packet isn't a packet
for what we were trying to dissect, rather than just completely failing.

Return TRUE if the heuristic T.124 dissector recognizes the packet.

Get rid of some _U_s attached to parameters that are, in fact, used.

svn path=/trunk/; revision=46064
2012-11-18 01:32:31 +00:00
Martin Mathieson ae41031fa4 Add channel type & ID to sequence analysis expert item strings.
Also simplify a hash function - haven't measured collisions, but before
change sometimes wrong results would get attached.  Don't think I fixed
it, and don't understand how equality function could have matched even
if hash function were colliding...

svn path=/trunk/; revision=46063
2012-11-17 23:41:07 +00:00
Guy Harris bdb30c63bf Squelch another warning.
svn path=/trunk/; revision=46062
2012-11-17 23:05:03 +00:00
Guy Harris 8b2de024bf Squelch a warning (not enough data flow analysis is done to know that
cotp_tree actually never will be used uninitialized).

svn path=/trunk/; revision=46061
2012-11-17 22:35:13 +00:00
Guy Harris 7ef91b394d Handle the pseudo-trailer for the ATN extended checksums by passing in
the source and destination address lengths and data, and adding them in,
rather than by copying those fields to a fixed-size static buffer - that
gets rid of a global variable (global variables considered harmful), and
also means that we don't try to copy 24 bytes of length+address from
packets that don't *have* 24 bytes of length+address (which caused
exceptions to be thrown on some OSI captures I have).

Construct some LI #defines out of other LI #defines, to make it a bit
clearer why they have the values they do.

Support the "additional information related to the clearing of the
connection" variable part parameter of the COTP DR packet (which just
means giving it a name, as its contents are user-defined - some HP-UX
OSI stack appears to just stick in a string saying that it's said
stack).

Make the code that decodes the variable part of a DR packet look like
the code that decodes the variable part of most other packets.

For COTP CR packets, determine the class up front by checking whether
the length is > 2.  (At some point we might want to associate a class
indication with the COTP connection, if we see the connection setup,
and, if we have that indication, use it in preference to the
heuristics.)

Make the code to handle various length indicator values in the ATN case
more like the code in the non-ATN case.

Dissect the variable part of COTP ER packets.

Fix tpyos (TDPU->TPDU, tdpu->tpdu) and typpoes (accross->across).

Clean up white space.

svn path=/trunk/; revision=46060
2012-11-17 22:12:37 +00:00
Guy Harris 9aaa01039b Fix tpyoes.
svn path=/trunk/; revision=46059
2012-11-17 19:46:33 +00:00
Evan Huus 0d46c5a82b There's no point in initializing variables to 0 when we unconditionally assign
a new value to them on the very next line. Caught by cppcheck.

svn path=/trunk/; revision=46058
2012-11-17 13:58:02 +00:00
Jaap Keuter a803419321 From Stephen Wall:
This patch allows one to specify telnet or syslog as the protocol in an SSL Decrypt profile.

svn path=/trunk/; revision=46057
2012-11-17 12:16:05 +00:00
Guy Harris 9e2c7a6aa9 Default to *not* decoding the ATN flavor of COTP, so that, for example,
we don't, by default, break the dissection of RDP (or anything else that
happens to run atop class 0 or 1).

svn path=/trunk/; revision=46056
2012-11-17 11:24:13 +00:00
Martin Kaiser 9310cd0952 dissect ask_release_reply apdu
svn path=/trunk/; revision=46055
2012-11-17 11:19:09 +00:00
Guy Harris 04709b632f Get rid of extra blank lines and trailing white space.
svn path=/trunk/; revision=46054
2012-11-17 10:25:03 +00:00
Guy Harris 1c872788d0 Clean up white space.
Add a comment noting that the value of the length indicator in a DT TPDU
is not as constrained as one might think.

svn path=/trunk/; revision=46053
2012-11-17 09:54:51 +00:00
Guy Harris 9225f22ec5 Get rid of /* FALLTHROUGH */ comments that don't refer to falling
through a clause in a switch statement to the following clause (that's
what /* FALLTHROUGH */ is for - it was originally a comment to tell lint
not to complain about the lack of a break statement).

Use guint8 rather than guchar for an 8-bit binary value.

Add a comment noting the weird stuff Microsoft does with RDP atop ISO
COTP atop TPKT.

svn path=/trunk/; revision=46052
2012-11-17 09:45:11 +00:00
Guy Harris cbd58e5115 Fix checksum handling (using val_to_str() on a Boolean is overkill, and
calc_checksum() doesn't return a Boolean, it returns a cksum_status_t,
which has more values than just "checksum OK" and "checksum not OK",
such as "not enough data available to check the checksum).

Fix typoes (Transport Protocol Data Unit is TPDU/tpdu, not TDPU/tdpu).

svn path=/trunk/; revision=46051
2012-11-17 09:37:04 +00:00
Guy Harris fa031995da Note that:
the OSI connectionless network protocol is both ISO 8473 and
	ITU-T Recommendation X.233;

	the OSI connection-oriented transport protocol is both ISO 8073
	and ITU-T Recommendation X.224;

	the OSI connectionless transport protocol is both ISO 8602 and
	ITU-T Recommendation X.234.

(Yes, this means that the "X.224" dissector we have is redundant, as we
have an OSI transport protocol dissector already.)

svn path=/trunk/; revision=46050
2012-11-17 05:04:26 +00:00