Commit graph

15710 commits

Author SHA1 Message Date
Pascal Quantin
bbadc4134e Add missing newline at end of file
svn path=/trunk/; revision=45716
2012-10-22 16:12:37 +00:00
Anders Broman
3ae4bcd596 Extend value_strings with entries from IANA.
svn path=/trunk/; revision=45713
2012-10-22 14:47:44 +00:00
Jörg Mayer
c0d20887f0 Fix
wireshark/svn/trunk/epan/dissectors/packet-bthci_cmd.c:2611:13: error: format ‘%g’ expects argument of type ‘double’, but argument 3 has type ‘int’ [-Werror=format]
wireshark/svn/trunk/epan/dissectors/packet-bthci_cmd.c:2617:13: error: format ‘%g’ expects argument of type ‘double’, but argument 3 has type ‘int’ [-Werror=format]


svn path=/trunk/; revision=45711
2012-10-22 14:02:10 +00:00
Anders Broman
0eefbb4b09 Fix
../../../epan/dissectors/packet-btatt.c:299:25: error: too many arguments for format [-Werror=format-extra-args]
../../../epan/dissectors/packet-btatt.c:254:12: error: unused variable 'col_info' [-Werror=unused-variable]

svn path=/trunk/; revision=45710
2012-10-22 13:23:42 +00:00
Anders Broman
576b37ddd8 from Allan M. Madsen:
Add support for HCI 3.0+HS and v4.0, Bluetooth Low Energy. This includes
dissection of additional HCI commands and events, Attribute Protocol and
Security Manager Protocol.

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

svn path=/trunk/; revision=45709
2012-10-22 12:49:04 +00:00
Anders Broman
007a0b28ae From Matthias St. Pierre:
Add full rfc4868 support to both dissectors.

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

svn path=/trunk/; revision=45708
2012-10-22 12:34:01 +00:00
Michael Mann
ca6eea0923 Bug 7884 - replace proto_tree_add_text with expert_info for packet-mpls-echo.c (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7884)
svn path=/trunk/; revision=45703
2012-10-22 02:41:19 +00:00
Pascal Quantin
b5bc45b118 From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7675 :
Fix improper use of negative value in AVCTP

svn path=/trunk/; revision=45699
2012-10-21 21:44:57 +00:00
Pascal Quantin
392a956822 Fix a few errors found by checkhf.pl and fix-encoding-args.pl
svn path=/trunk/; revision=45698
2012-10-21 21:32:58 +00:00
Pascal Quantin
89e9dde138 From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7740 :
Fix deadcode areas and improper use of negative value in AVRCP

svn path=/trunk/; revision=45697
2012-10-21 21:17:27 +00:00
Pascal Quantin
ccc0d6bd2a From Sho Amano via https://www.wireshark.org/lists/wireshark-dev/201210/msg00186.html:
Fix WLAN decryption when using a WPA PSK key

svn path=/trunk/; revision=45696
2012-10-21 20:52:39 +00:00
Alexis La Goutte
1d4bd1cb33 Make Windows Buildbot happy
svn path=/trunk/; revision=45691
2012-10-21 16:37:45 +00:00
Anders Broman
8d178187e3 AddressString can have a size of 1, fixes Bug 7882 -GSM_MAP show malformed Packets when two IMSI https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7882
svn path=/trunk/; revision=45687
2012-10-21 15:01:23 +00:00
Alexis La Goutte
1ae6c353e7 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45686
2012-10-21 14:54:11 +00:00
Alexis La Goutte
5d448950f8 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45685
2012-10-21 14:54:01 +00:00
Alexis La Goutte
55356782db Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45684
2012-10-21 14:53:51 +00:00
Alexis La Goutte
732a735429 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45683
2012-10-21 14:53:38 +00:00
Alexis La Goutte
0baa7413a9 Fix Passed-by-value struct argument contains uninitialized data Warning found by Clang
svn path=/trunk/; revision=45682
2012-10-21 14:53:29 +00:00
Alexis La Goutte
2ce9037866 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45681
2012-10-21 14:53:20 +00:00
Alexis La Goutte
523417a5ca Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45680
2012-10-21 14:53:10 +00:00
Alexis La Goutte
8e0fc436f9 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45679
2012-10-21 14:53:01 +00:00
Chris Maynard
43ebecad9a 1) Use tvb_reported_length_remaining instead of tvb_reported_length_remaining.
2) Use proto_item_append_text instead of proto_item_set_text, since this is
   called within a loop.
3) Increment the offset correctly using blocklen-4 instead of
   tvb_length_remaining, which makes no sense.

svn path=/trunk/; revision=45657
2012-10-19 13:50:23 +00:00
Bill Meier
8f8775800b Minor Updates:
- #if 0 unused typedef (found by cppcheck);
- create/use extended value strings as appropriate;
- reformat hf[] entries;
- whitespace.

svn path=/trunk/; revision=45652
2012-10-18 23:01:47 +00:00
Bill Meier
8e9db03197 Minor cleanup:
- revert incorrect replacement of FALSE by ENC_BIG_ENDIAN
  done a while back;
  [The incorrect use of ENC_BIG_ENDIAN was benign since
   ENC_BIG_ENDIAN is currently defined as 0x0000000];

svn path=/trunk/; revision=45651
2012-10-18 22:22:25 +00:00
Martin Kaiser
05c1e47f68 (try to) fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7871
increment offset to point to the first byte after the options
(the code used to set an absolute position, if that was 0, we were stuck
 in an endless loop)

svn path=/trunk/; revision=45646
2012-10-18 20:57:02 +00:00
Martin Kaiser
8bf29e8efe minor cleanup of packet-wtp.c
- replace TABs with spaces
- add modelines
- reformat some parts
- use glib data types

svn path=/trunk/; revision=45645
2012-10-18 20:37:10 +00:00
Bill Meier
2c0019b9b5 (Trivial)
-  1 --> TRUE;
-  whitespace and formatting changes.

svn path=/trunk/; revision=45644
2012-10-18 20:27:53 +00:00
Martin Kaiser
93343248cb add CC datatype IDs for the SRM protocol
svn path=/trunk/; revision=45643
2012-10-18 20:12:46 +00:00
Bill Meier
727844442e Minor cleanup:
- revert incorrect replacement of FALSE by ENC_BIG_ENDIAN
  done a while back (9 instances);
  [The incorrect use of ENC_BIG_ENDIAN was benign since
   ENC_BIG_ENDIAN is currently defined as 0x0000000];
- remove some unneeded initializers;
- unsigned --> guint;
- remove unneeded #includes.
- whitespace changes.

svn path=/trunk/; revision=45642
2012-10-18 20:10:53 +00:00
Bill Meier
e7ccdde01e Minor cleanup:
- revert incorrect replacement of FALSE by ENC_BIG_ENDIAN
  done a while back (10 instances);
  [The incorrect use of ENC_BIG_ENDIAN was benign since
   ENC_BIG_ENDIAN is currently defined as 0x0000000];
- Remove unneeded #includes;
- whitespace (e.g., use consistent indentation).

svn path=/trunk/; revision=45641
2012-10-18 19:05:45 +00:00
Bill Meier
2b1f1e611d Minor cleanup:
- Fix incorrect use of ENC_BIG_ENDIAN instead
  of FALSE (3 instances);
  [The incorrect use of ENC_BIG_ENDIAN was benign since
   ENC_BIG_ENDIAN is currently defined as 0x0000000];
- use proper ENC arg for a proto_tree_add_item();
- whitespace.

svn path=/trunk/; revision=45640
2012-10-18 18:11:56 +00:00
Chris Maynard
bbfa21cc02 Don't mark used arguments with _U_. Whitespace: tabs -> spaces.
svn path=/trunk/; revision=45639
2012-10-18 18:03:04 +00:00
Bill Meier
93d3fa2257 Minor cleanup:
- revert incorrect replacement of FALSE by ENC_BIG_ENDIAN
  done a while back (10 instances);
  [The incorrect use of ENC_BIG_ENDIAN was benign since
   ENC_BIG_ENDIAN is currently defined ad 0x0000000];
- create/use extended value strings as appropriate;
- remove unneeded initializers;
- reformat hf[] entries;
- whitespace.

svn path=/trunk/; revision=45638
2012-10-18 17:39:45 +00:00
Chris Maynard
b29f57e4e0 Fix Coverity CID 739070: Unused pointer value.
svn path=/trunk/; revision=45636
2012-10-18 16:50:49 +00:00
Bill Meier
3da84159eb Minor cleanup:
- revert incorrect replacement of FALSE by ENC_BIG_ENDIAN
  done a while back (3 cases);
  [The incorrect use of ENC_BIG_ENDIAN was benign since
   ENC_BIG_ENDIAN is currently defined ad 0x0000000];
- Remove 'if(tree)' around calls to subdissector;
- whitespace & formatting.

svn path=/trunk/; revision=45635
2012-10-18 16:32:56 +00:00
Bill Meier
9193e7a8b1 Minor cleanup:
- create/use extended value strings as appropriate;
- unsigned --> guint;
- whitespace;

svn path=/trunk/; revision=45634
2012-10-18 16:27:11 +00:00
Pascal Quantin
83c9334e37 Dissect additional information parameters for Result object
svn path=/trunk/; revision=45633
2012-10-18 16:14:13 +00:00
Chris Maynard
559c54ea37 tvb_reported_length_remaining() can return -1, so don't assign the return value to a guint16. Fixes Coverity CID 728017: Negative loop bound.
svn path=/trunk/; revision=45632
2012-10-18 15:55:52 +00:00
Bill Meier
ed11d058a1 General cleanup:
- revert incorrect replacement of FALSE by ENC_BIG_ENDIAN
   done a while back (2 cases);
   [The incorrect use of ENC_BIG_ENDIAN was benign since
   ENC_BIG_ENDIAN is currently defined ad 0x0000000];
- use proto_tree_add_item() instead of proto_tree_add_uint() when appropriate;
- move proto_register...() to just before proto_reg_handoff..()
   as per convention;
- proto_reg_handoff...() doesn't need 'if (!initialized)'
- remove unneeded #includes;
- remove some "boilerplate" comments;
- remove unneeded forward declaration;
- whitespace.

svn path=/trunk/; revision=45631
2012-10-18 15:17:25 +00:00
Anders Broman
5b80615885 From Matthias St. Pierre:
Add authentication methods HMAC-SHA2-256-96 and HMAC-SHA2-256-128 to isakmp dissector

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

svn path=/trunk/; revision=45630
2012-10-18 14:43:42 +00:00
Pascal Quantin
19f194813f Add a few EUTRAN related elementary files and reorder some value_string arrays
svn path=/trunk/; revision=45629
2012-10-18 11:01:44 +00:00
Bill Meier
f498c3a172 Reformat for readability:
indentation, whitespace, long-lines, etc.
Also;
- replace two usages of fprintf(stderr,...) by g_warning();
- revert incorrect replacement of FALSE by ENC_BIG_ENDIAN
  done a while back (2 cases);
  [The incorrect use of ENC_BIG_ENDIAN was benign since
   ENC_BIG_ENDIAN is currently defined ad 0x0000000]

svn path=/trunk/; revision=45625
2012-10-18 02:33:11 +00:00
Bill Meier
e2956a39a2 Cleanup:
- Revmove 'if (tree...)'; col_...() shouldn't be called under same;
- Add an XXX comment;
- Remove not req'd #include <epan/prefs.h>;
- Address cppcheck msg: "Clarify calculation precedence for >> and ?";
- Localize certain variables & remove unneeded initializers;
- Do some whitespace changes.

svn path=/trunk/; revision=45617
2012-10-17 17:16:56 +00:00
Martin Kaiser
0b4e3b9936 fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7869
make tpiLen a guint such that it can store 2 + tvb_get_guint8(...)
without overflow

svn path=/trunk/; revision=45614
2012-10-17 07:44:33 +00:00
Martin Mathieson
bfdfd004cb Fix some UM sequence analysis issues.
svn path=/trunk/; revision=45613
2012-10-17 04:01:01 +00:00
Guy Harris
a060ba4973 The first 4 bytes of the Prism header are, apparently, a "message code",
and it apparently either has the value 0x00000044 or 0x00000041.  If
those bytes aren't the magic number for an AVS header and aren't one of
those "message code" values, assume there's no Prism header, just an
802.11 frame - that fixes at least one capture where some packets have
AVS radio headers and other packets have no radio header.

Note that this might also let us handle big-endian Prism headers (see
which byte order the message code is in, and assume everything else is
in the same byte order).

Display the message code in hex, not decimal.

svn path=/trunk/; revision=45609
2012-10-17 01:23:13 +00:00
Pascal Quantin
d7ae273d7a Add dissection of ENVELOPE event download and timer expiration
svn path=/trunk/; revision=45600
2012-10-16 21:30:24 +00:00
Martin Kaiser
304639682f fix some more cases where tvb_length_remaining() is assigned
to an unsigned int

svn path=/trunk/; revision=45599
2012-10-16 21:19:58 +00:00
Martin Kaiser
4cd75a3ce9 make the variable that holds tvb_length_remaining() a signed integer
svn path=/trunk/; revision=45598
2012-10-16 21:07:59 +00:00
Pascal Quantin
442e486442 Dissect a few more command qualifiers
svn path=/trunk/; revision=45597
2012-10-16 20:44:02 +00:00
Pascal Quantin
16bb2a67ba Fix dissection of BER-TLV and COMPREHENSION-TLV length and COMPREHENSION-TLV tag
svn path=/trunk/; revision=45595
2012-10-16 20:25:46 +00:00
Bill Meier
52b516cfa9 General cleanup:
- Calls to expert...() and col_...() should not be under 'if (tree)'
- Move proto_reg_handoff...() to the end of the file as per convention;
- Localize a few variables
- Fix some whitespace (e.g., convert what appear to be '4 space tabs' to spaces)

svn path=/trunk/; revision=45591
2012-10-16 19:05:49 +00:00
Pascal Quantin
5bcb56b21c Fix a copy/paste error
svn path=/trunk/; revision=45588
2012-10-16 17:36:22 +00:00
Pascal Quantin
8edaf50408 Add value_string for PDP Type
svn path=/trunk/; revision=45587
2012-10-16 14:54:08 +00:00
Anders Broman
13c9bcad82 From "msp":
'*' wildcard in the 'Src IP' or 'Dest IP' field of the ESP SA dialog does not work

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

svn path=/trunk/; revision=45585
2012-10-16 14:31:14 +00:00
Michael Mann
0d5d45cf9f Enhancements to DNP3.0 Control Code Dissection (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7865)
minor updates to checked in patch (from rev 45583)

svn path=/trunk/; revision=45584
2012-10-16 14:21:05 +00:00
Anders Broman
3134b7d7f8 From Benjamin Stocks:
Enhancements to DNP3.0 Control Code Dissection.

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

svn path=/trunk/; revision=45583
2012-10-16 14:15:11 +00:00
Pascal Quantin
5e93cf566b Fix dissection of Text String data object
svn path=/trunk/; revision=45577
2012-10-16 08:43:39 +00:00
Anders Broman
3a5c028a0b Remove spurious trailing '%' in format [-Werror=format]
svn path=/trunk/; revision=45573
2012-10-16 05:14:25 +00:00
Michael Mann
7fb78ec5b9 replace proto_tree_add_text with filterable items and expert info to get a few dissectors off of the checkAPIs.pl "naughty" list
svn path=/trunk/; revision=45572
2012-10-16 03:07:06 +00:00
Martin Kaiser
be4c14ff77 (try to) fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7862
tvb_length_remaining() may return -1
if that happens in dissect_rdp_fields(), return an error
the caller that calls dissect_rdp_fields() from a for loop detects the error
 and exits (others should handle the error as well, this is missing for now)

svn path=/trunk/; revision=45566
2012-10-15 22:34:41 +00:00
Martin Kaiser
c44fadc3a8 From Alexander Koeppe
use inet_pton() for address parsing in FTP's EPRT command
support IPv6 addresses

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

svn path=/trunk/; revision=45565
2012-10-15 20:48:22 +00:00
Pascal Quantin
4ee129c341 Dissect more Application Toolkit commands
svn path=/trunk/; revision=45563
2012-10-15 18:13:20 +00:00
Anders Broman
606542f4e7 From Rakesh Kumar:
Error in AUXILIARY SECURITY HEADER Parsing for 802.15.4 in dissect_ieee802154_common function.
Offset should be +8 not +4

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

svn path=/trunk/; revision=45559
2012-10-15 15:59:47 +00:00
Anders Broman
92160cde38 Try to get rid of some of the" pedantic" warnings.
svn path=/trunk/; revision=45553
2012-10-15 08:05:32 +00:00
Guy Harris
85b3da7c63 Clean up the "round up to a multiple of 4" code a bit.
svn path=/trunk/; revision=45548
2012-10-14 22:53:25 +00:00
Guy Harris
26ddc4c04f According to
http://home.martin.cc/linux/prism

there's a set of DID type values different from the ones we were using,
and there are captures out there that use values from both sets. 
Support both sets.

That page also says that a "status" value of 0 means "supplied"; treat
zero as meaning "supplied", and, if it's not zero for a field, don't
include it.

The "Mac Time" is, according to that page, the lower 32 bits of the MAC
timestamp; report it as such.

Fix some field names that were copied-and-pasted but not changed.

The RSSI and signal quality values are numbers, so show them in decimal.

The "signal" and "noise" values appear to be signed numbers, so make
them signed rather than unsigned and show them in decimal.

Show the data rate in the same style as it's shown in the radiotap
dissector.

Show the frame length in decimal; we probably have relatively few users
with 16 fingers.

svn path=/trunk/; revision=45545
2012-10-14 22:38:58 +00:00
Guy Harris
ac6341f361 The strings added to the value_string table for X11 opcodes for
extensions were incorrectly made ephemeral, rather than seasonal, in
r44662.  They need to be seasonal, as they're used for dissecting all
packets in the X session.

Redo a couple of loops as for loops to make it a little clearer what
they're doing.

svn path=/trunk/; revision=45539
2012-10-14 18:18:37 +00:00
Bill Meier
6e135fb693 Fix compile error.
svn path=/trunk/; revision=45538
2012-10-14 16:24:17 +00:00
Bill Meier
be2e4d238f Minor changes:
- Init COL_PROTOCOL before fetching from tvb;
- Remove some unneeded variable initializers;
- Localize some variables;
- Misc including whitespace revisions.


svn path=/trunk/; revision=45537
2012-10-14 16:18:05 +00:00
Bill Meier
301b185cf4 remove unused variable; fixes compile error.
svn path=/trunk/; revision=45536
2012-10-14 15:31:44 +00:00
Michael Mann
8856e1a03a convert proto_tree_add_text to proto_tree_add_item and expert_add_info_format for packet-dhcpv6.c and packet-dhcp-failover.c
"Refactor" value_string in ARP dissector

svn path=/trunk/; revision=45535
2012-10-14 15:27:52 +00:00
Bill Meier
6cf76e38bf From Yaniv Kaul: Spice protocol fixes and enhancements
- Dissection of monitors config message (SPICE_DISPLAY_MONITORS_CONFIG message)
- Better dissection of capabilities (added several more capabilities for main
  and display channels)

From me:
- Remove (now) unused variables.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7859

svn path=/trunk/; revision=45534
2012-10-14 15:12:03 +00:00
Guy Harris
09e4e205c7 Some of the changes claimed to be in the previous checkin weren't there.
Label the data sources for reassembled fragments as "Reassembled
6LoWPAN". 

Fix the capitalization of "6LoWPAN".

Also, label the data sources for decompressed fragments as "Decompressed
6LoWPAN xxx".

svn path=/trunk/; revision=45529
2012-10-14 02:54:25 +00:00
Guy Harris
395dd4a88e *Always* create a new data source when we decompress an IPv6 header.
Label the data sources for them as "6LoWPAN xxx", where "xxx" is the
type of compression, and label the data sources for reassembled
fragments as "Reassembled 6LoWPAN".

Fix the capitalization of "6LoWPAN".

Note that if reassembly fails, continuing dissection is not the right
thing to do, at least not if it failed because we don't *yet* have all
the fragments.

svn path=/trunk/; revision=45527
2012-10-14 02:33:26 +00:00
Guy Harris
7ac57a8411 The Interface Name field of the Interface Name sub-object of the
Interface Information object for ICMP is *NOT* null-terminated.  Use
tvb_format_text() for now, to properly null-terminate the display string
and to cope with non-ASCII data.  (It should ultimately be a named field
with an encoding of UTF-8.)

svn path=/trunk/; revision=45525
2012-10-13 22:20:34 +00:00
Evan Huus
e2c898959c Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7858
Use a full 32-bit literal instead of just a 16-bit one. Fixes case where
the value we're &-ing with just slips over 2^16, making us get stuck
in an infinite loop.

I'm not sure this matches the iscsi spec anymore, the comment in the code
about padding bytes is ambiguous as to whether they're leading or trailing.

svn path=/trunk/; revision=45524
2012-10-13 22:12:52 +00:00
Pascal Quantin
fa57420e74 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7857 :
Fix an infinite loop in WaveAgent dissector

svn path=/trunk/; revision=45523
2012-10-13 20:59:14 +00:00
Guy Harris
4fdfccd56d Don't add FT_UINTn values with proto_tree_add_int(). (The fields in
question are 4-byte header fields containing bitfields, so "unsigned" is
appropriate here.)

svn path=/trunk/; revision=45521
2012-10-13 17:57:13 +00:00
Pascal Quantin
c5e0d7ce32 Do not use private_data from caller dissector as IKEv2 decryption parameters
svn path=/trunk/; revision=45510
2012-10-12 21:06:27 +00:00
Bill Meier
58c859dd90 Move proto_register...() and proto_reg_handoff...() to the end of the file as per convention;
Do minor whitespace changes.

svn path=/trunk/; revision=45503
2012-10-12 19:59:56 +00:00
Bill Meier
96f708abd5 Fix (what appears to be) a minor "off by one" bug in 'for' loop.
svn path=/trunk/; revision=45500
2012-10-12 18:31:31 +00:00
Anders Broman
8527d3912c From Andrei Emeltchenko:
Register eapol dissector.

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

svn path=/trunk/; revision=45498
2012-10-12 12:52:36 +00:00
Martin Mathieson
fa79b7580a When configuring DRB mappings (from signalling channel), create a
separate table for each UE.

svn path=/trunk/; revision=45494
2012-10-12 03:00:38 +00:00
Alexis La Goutte
29862fd1a1 Reorder 80211 dissector code (put value_string/true_false_string in top of file not in proto_register_...
svn path=/trunk/; revision=45491
2012-10-11 21:37:37 +00:00
Pascal Quantin
5f4f0b2637 Enhance dissection of Terminal Profile
svn path=/trunk/; revision=45490
2012-10-11 21:29:01 +00:00
Alexis La Goutte
969dcb9475 Small enhance following patch about 802.11ac (VHT)
svn path=/trunk/; revision=45489
2012-10-11 21:18:23 +00:00
Bill Meier
d9c189e2d8 Correction to SVN #45476
svn path=/trunk/; revision=45486
2012-10-11 21:01:51 +00:00
Alexis La Goutte
b34abdc943 From Alex Badea via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7849
IPsec ESP: allow filtering by ICV verification result

Add hf_esp_icv_good and hf_esp_icv_bad (similar to IP checksums), to allow
filtering based on the ICV check results.

svn path=/trunk/; revision=45483
2012-10-11 20:38:39 +00:00
Alexis La Goutte
b0b96f7f07 From Richard Sharpe via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7840
packet-smb.c does not handle truncated frames well when dealing with TRANS2 FIND_{FIRST/NEXT} responses

The current code simply throws an exception if any of the expected data is
missing, even though there might be several file's worth of data available.

I will attach a patch that does a better job of handling truncated frames in
such cases.

svn path=/trunk/; revision=45480
2012-10-11 20:09:44 +00:00
Alexis La Goutte
a6c72491e4 From Richard Sharpe via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7838
packet-smb.c does not correctly dissect INFO_QUERY_EAS_FROM_LIST

[MS-CIFS].pdf makes it clear that, contrary to what packet-smb.c says, handling
the response to a TRANS2/FIND_{FIRST,NEXT} with a level of
INFO_QUERY_EAS_FROM_LIST is not the same as handling INFO_QUERY_EA_SIZE.


svn path=/trunk/; revision=45479
2012-10-11 20:01:37 +00:00
Bill Meier
82d40100d2 Change 'for (i=1; i<=n;...' to 'for (i=0; i<n; ...)'
Done on general principles altho upon inspection
none of the cases changed would have actually
resulted in an infinite loop.



svn path=/trunk/; revision=45478
2012-10-11 19:39:32 +00:00
Bill Meier
ad0219d033 Change 'for (i=1; i<=n;...' to 'for (i=0; i<n; ...)
The changes fix definite problems or
are done "just in case" for cases not esily determined
to be a problem by quick inspection.

Note: in some cases for loop index variables have been renamed
      to ensure  all required codes changes detected.

##backport

svn path=/trunk/; revision=45477
2012-10-11 19:20:21 +00:00
Bill Meier
b2cb4007e3 Change 'for (i=1; i<=n;...' to 'for (i=0; i<n; ...)'.
The changes fix possibly problematical cases
 (not clear upon quick inspection).

Also: fix several bugs wherein an inner 'for' loop used
the same index variable name as an outer loop thus
messing up the outerloop.

##backport


svn path=/trunk/; revision=45476
2012-10-11 19:14:29 +00:00
Anders Broman
94374cb6d7 Fix:
../../../epan/dissectors/packet-giop.c: In function 'get_CDR_typeCode':
../../../epan/dissectors/packet-giop.c:3341:15: warning: variable 'ti' set but not used [-Wunused-but-set-variable]
../../../epan/dissectors/packet-giop.c: In function 'decode_ServiceContextList':
../../../epan/dissectors/packet-giop.c:3871:7: warning: variable 'temp_offset' set but not used [-Wunused-but-set-variable]
../../../epan/dissectors/packet-giop.c: In function 'dissect_giop_request_1_2':
../../../epan/dissectors/packet-giop.c:4443:10: warning: variable 'response_flags' set but not used [-Wunused-but-set-variable]
../../../epan/dissectors/packet-giop.c: In function 'get_giop_pdu_len':
../../../epan/dissectors/packet-giop.c:4837:81: error: unused parameter 'offset' [-Werror=unused-parameter]

svn path=/trunk/; revision=45473
2012-10-11 15:04:09 +00:00
Michael Mann
a5d56d30b4 Make idl2wrs dissectors filterable - Part 1
Updated wireshark_gen.py to generate hf_ variables for all of the IDL "types".  The "simple" types use proto_tree_add_* (not text), while the "complex" types use the GIOP dissector API.  checkhf.pl generates some warnings because (some of) the hf_ variables are being generated for the "complex" types, but are not being used.  That will be done in Part 2.

expert_add_info_format now linked to a real item instead of being attached to a duplicative proto_tree_add_text().  This cleaned up literally thousands of unnecessary proto_tree_add_text()s

svn path=/trunk/; revision=45472
2012-10-11 14:42:33 +00:00
Michael Mann
e258b8e353 Should have been part of r45470, changing format of "magic number"
svn path=/trunk/; revision=45471
2012-10-11 14:22:13 +00:00
Michael Mann
756a564fff General cleanup, made more items filterable. Checking in now to get a new baseline for some idl2wrs improvements involving getting more items filterable (see bug 7822)
svn path=/trunk/; revision=45470
2012-10-11 14:16:25 +00:00
Michael Mann
552e411031 Fix infinite loop in HART/IP dissector (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7845)
I also did a small bit of cleanup dissection while I was there, but it could definitely use more.  I just want to fix the fuzztest crash I discovered before the buildbots get a hold of it.

svn path=/trunk/; revision=45469
2012-10-11 14:05:27 +00:00
Anders Broman
d88e1202a5 From Bartosz Brachaczek:
Make the SSL dissector work with GnuTLS compiled with nettle.

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

#BACKPORT

svn path=/trunk/; revision=45465
2012-10-11 08:28:57 +00:00
Guy Harris
dda0e94161 hf_isup_cic is now BASE_DEC, so there's no reason to use
proto_tree_add_uint_format() to make it display in decimal -
proto_tree_add_uint() suffices.

svn path=/trunk/; revision=45464
2012-10-11 08:23:29 +00:00
Anders Broman
f6914a05af "Prepare/Apply a filter" on ISUP CIC should make a filter with decimal CIC number, not hex.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7848

svn path=/trunk/; revision=45463
2012-10-11 08:12:41 +00:00
Bill Meier
38f3198b2b Change 'for (i=1; i<=n;...' to 'for (i=0; i<n; ...)'
Done on general principles altho none of the cases
changed would have actually resulted in an infinite
loop because a Bounds error would eventually occur.

svn path=/trunk/; revision=45462
2012-10-11 03:55:33 +00:00
Guy Harris
f154882eb5 The usual idiom in C for "do this N times" is "for (i = 0; i < N; i++)",
not "for (i = 1; i < N+1; i++)".

Even if it weren't the idiom, it'd be safer, at least for unsigned
values, as, if i and N are the same width, and N has the maximum
possible value for that width, the first of those runs i from 0 to N-1,
all of which fit in a variable of that width, and the second of those
runs i from 1 to N, the latter of which doesn't fit into a variable of
that width, so modulo arithmetic turns it into 0 and the loop keeps
running forever.

Fixes bug 7844.

svn path=/trunk/; revision=45459
2012-10-11 00:02:14 +00:00
Martin Mathieson
dbca2e7d8f Get rid of an outdated format
svn path=/trunk/; revision=45450
2012-10-10 16:39:51 +00:00
Martin Mathieson
d8fa6d9c9a Update to format of string that indicates SR failure.
svn path=/trunk/; revision=45448
2012-10-10 15:18:52 +00:00
Greg Morris
9ea1ab416e Provide ability to find previous request packets in NCP hash table.
svn path=/trunk/; revision=45447
2012-10-10 13:55:18 +00:00
Chris Maynard
a50e1a98ae Apply Ronnie Sahlberg's ICMP request/response tracking improvements from r45343 to ICMPv6. (Tested using captures from bug 5810).
svn path=/trunk/; revision=45439
2012-10-09 22:34:40 +00:00
Jaap Keuter
7a1e74398d From Mark Phillips:
I have added support for the 11ac VHT Capabilities and Operation IEs.

svn path=/trunk/; revision=45438
2012-10-09 21:29:09 +00:00
Pascal Quantin
d0b892f450 Add another check for command APDU dissection
svn path=/trunk/; revision=45435
2012-10-09 20:11:48 +00:00
Pascal Quantin
b126c01738 Fix dissection of more instructions when having only the command APDU
svn path=/trunk/; revision=45433
2012-10-09 17:49:14 +00:00
Alexis La Goutte
635554cc51 From Mark Phillips via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7820
wlan_mgt.ht.capabilities bits 8-15 incorrectly decoded (from wrong packet offset)

The bug is that the code defines the bit fields as 16 bit, but increments the
offset in-between decoding B0-B7 and B8-B15 which causes the wrong bits to be
decoded.

Also fix to change "Capability" to "Capabilities" to match spec

From me : Fix wrong length for A-MPDU


svn path=/trunk/; revision=45431
2012-10-09 17:17:22 +00:00
Anders Broman
9d37b98748 Set fence after finishing writing to the info col in order to show
info from more than one (SIP) message in the frame.

svn path=/trunk/; revision=45429
2012-10-09 15:07:46 +00:00
Anders Broman
cba1bb8278 As ths SDP dissector adds /SDP to the protocol column I think that
col_append_str(pinfo->cinfo, COL_INFO, ", with session description"); is redundant if some one has a different opinion fel free to revert.

svn path=/trunk/; revision=45428
2012-10-09 15:00:39 +00:00
Anders Broman
76c746b16d From Andrew Kampjes:
Correcting a few fields in SDH dissector.

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

svn path=/trunk/; revision=45426
2012-10-09 10:57:04 +00:00
Pascal Quantin
00e6a66e4d Fix dissection of Get Response when not in SIMtrace mode
svn path=/trunk/; revision=45425
2012-10-09 10:48:59 +00:00
Anders Broman
8dec6cccb9 From Michal Labedzki:
[PATCH 17] Bluetooth: Add GNSS services to SDP

Based on https://www.bluetooth.org/Technical/AssignedNumbers/home.htm

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

svn path=/trunk/; revision=45424
2012-10-09 10:45:14 +00:00
Anders Broman
c75bca343a From Michal Labedzki:
[PATCH 16] Bluetooth: Add SYNC and BPP service handles to OBEX
Also fix typo.

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

svn path=/trunk/; revision=45423
2012-10-09 10:41:30 +00:00
Anders Broman
3805f354a4 From Michal Labedzki:
[PATCH 15] Bluetooth: Add modelines 

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

svn path=/trunk/; revision=45422
2012-10-09 10:36:04 +00:00
Anders Broman
4209300f48 Replace non ASCII chars.
svn path=/trunk/; revision=45421
2012-10-09 10:26:43 +00:00
Anders Broman
5f9709ad8c Comment out unused variable remoce C++ style comments etc.
svn path=/trunk/; revision=45420
2012-10-09 10:24:15 +00:00
Anders Broman
de222a1b5a From Chris Wulff:
Minor bugfixes to packet-msrp.c and packet-mrp-mvrp.c

Major updates to packet-ieee17221.c

Changes to ieee17221.c update dissector from draft revision 18 / 19 code to
draft revision 21.

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

svn path=/trunk/; revision=45419
2012-10-09 08:49:40 +00:00
Anders Broman
eb618abad9 From Bill Parker:
Explicitly declare/cast 'unsigned <variable>' as 'unsigned int <variable>'

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

svn path=/trunk/; revision=45418
2012-10-09 08:40:02 +00:00
Pascal Quantin
41ad59d6a7 Fix dissection of Bearer parameters for E-UTRAN / mapped UTRAN packet service
svn path=/trunk/; revision=45417
2012-10-09 07:40:06 +00:00
Jaap Keuter
d08697130f Add initial support for three new RTCP packet types: AVB, RSI and TOKEN.
svn path=/trunk/; revision=45416
2012-10-09 06:41:32 +00:00
Pascal Quantin
f8b81a6f5f Check if Bearer Parameters field is present before displaying it
svn path=/trunk/; revision=45415
2012-10-09 05:34:48 +00:00
Pascal Quantin
924f9663fd Enhance dissection of Open Channel proactive command
svn path=/trunk/; revision=45413
2012-10-08 22:30:47 +00:00
Pascal Quantin
1bed23e6d0 Add "gsm_sim.command" and "gsm_sim.response" dissectors and call them in btsap dissector
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7715

svn path=/trunk/; revision=45411
2012-10-08 21:46:30 +00:00
Martin Kaiser
5ff09963ab fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7800
use correct data types in eigrp dissector to prevent overflow

svn path=/trunk/; revision=45408
2012-10-08 20:43:06 +00:00
Evan Huus
d0183357dc From Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7796
Add summary information to USB isodesc trees to make interesting descriptors
obvious to the user.

svn path=/trunk/; revision=45403
2012-10-08 19:31:17 +00:00
Evan Huus
3c57a48598 From Niels de Vos via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7807
Fix dissection of some GlusterFS procedures.

From me:

Use TRUE/FALSE instead of 1/0 for boolean literals.

svn path=/trunk/; revision=45401
2012-10-08 19:23:50 +00:00
Alexis La Goutte
3e602ee281 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45398
2012-10-08 17:55:12 +00:00
Alexis La Goutte
8d6260628e Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45397
2012-10-08 17:54:39 +00:00
Anders Broman
2c181db864 Fix unused parameters.
svn path=/trunk/; revision=45387
2012-10-08 15:10:24 +00:00
Anders Broman
4856bcfd40 Let ISUP national settings be valid for BICC too.
Extend dissection of Japan ISUP.

svn path=/trunk/; revision=45386
2012-10-08 14:22:24 +00:00
Jakub Zawadzki
bf77a26b3f Patch from Florian Fainelli via bug #7772
Cleans up the mask used for the "High" part of the sub-carrier modulation 
to match (modulus the 4-bits shifting) the one used for the "Low" part.

svn path=/trunk/; revision=45382
2012-10-08 12:06:16 +00:00
Jakub Zawadzki
cef1e32ede Patch from Florian Fainelli
Fix bug #7772: dissect only the number of active HomePlug AV subcarriers

The dissector currently dissects all 1156 sub-carriers available in the Tone
Map Characteristisc Confirmation frame no matter what is the number of active
ones. 

This is not valid, because the frame only contains the number of active
sub-carriers, even though it is padded to 1156 sub-carriers. This is also an
issue for newest HomePlug AV devices with a 500Mbits/sec PHY rate, because
those will have up to 2690 sub-carriers, and we would only dissect the first
1156 active ones.


svn path=/trunk/; revision=45381
2012-10-08 12:05:14 +00:00
Jakub Zawadzki
da00b4089e Continuation of r43335
- ipv6.traffic_class.dscp use ext string so and need BASE_EXT_STRING flag (fix SIGSEGV)
- dscp_vals was removed from .h file, so make it static
- export dscp_vals_ext

svn path=/trunk/; revision=45380
2012-10-08 09:50:47 +00:00
Jakub Zawadzki
d6d3e59660 RFC 4627 allows upper case hex digits as well
svn path=/trunk/; revision=45379
2012-10-08 09:48:38 +00:00
Anders Broman
d0c2bc2232 From Martin Isaksson:
Preparattions for GTP tap.

svn path=/trunk/; revision=45377
2012-10-08 08:41:34 +00:00
Chris Maynard
b44dcac8ba Fix a couple of typos.
svn path=/trunk/; revision=45375
2012-10-07 20:36:12 +00:00
Jakub Zawadzki
9baaa74218 +10 ;|
svn path=/trunk/; revision=45374
2012-10-07 20:13:11 +00:00
Jakub Zawadzki
ac4419071b Unescape JSON strings.
svn path=/trunk/; revision=45373
2012-10-07 19:57:21 +00:00
Jakub Zawadzki
cb12df2ca8 Fix bug #7805: application/json HTTP packets sometimes isn't decoded
tvbparse_quoted() don't support well JSON string escaping, use our own tvbparse rule.

svn path=/trunk/; revision=45372
2012-10-07 19:33:47 +00:00
Evan Huus
c8308c7c40 From Tomofumi Hayashi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7806
Update MPLS-Echo to support part of rfc6425.

svn path=/trunk/; revision=45369
2012-10-07 16:13:40 +00:00
Martin Mathieson
af71608df6 Use GPOINTER_TO_UINT macro.
svn path=/trunk/; revision=45368
2012-10-07 15:59:26 +00:00
Martin Mathieson
96386ec1da Make the channel state key fit into the gpointer to avoid allocations.
Don't fetch the first byte of the payload length multiple times.

svn path=/trunk/; revision=45367
2012-10-07 15:14:44 +00:00
Jaap Keuter
4a502ac864 From Роман Донченко:
Currently, when Wireshark encounters the first entropy-coded segment in a JPEG
file it stops dissection.
However, the design of the JPEG format allows to find the next marker even if
the entropy-coded segment is not decoded. Thus, a better strategy for Wireshark
would be to skip the entropy-coded segment and continue dissection at the next
marker.

svn path=/trunk/; revision=45363
2012-10-07 09:48:30 +00:00
Evan Huus
8bcc1ed05c Add modelines to packet-radius, and fix a bit of indentation.
svn path=/trunk/; revision=45358
2012-10-06 23:52:02 +00:00
Pascal Quantin
fa9484715c Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7802 :
Avoid an infinite loop when number_of_dup_tsns is equal to 65535

svn path=/trunk/; revision=45355
2012-10-06 21:07:34 +00:00