Commit Graph

48254 Commits

Author SHA1 Message Date
Jakub Zawadzki c27481b03c Fix for bug #9034: Composite TVBs aren't supported by tvb_find_guint8()
Add generic tvb_find_guint8, tvb_pbrk_guint8

svn path=/trunk/; revision=51445
2013-08-20 19:56:57 +00:00
Jakub Zawadzki 8ade8c4750 Composite tvb (tvb_memcpy/tvb_get_ptr): don't assert with offset == tvb->length, and 0 length
svn path=/trunk/; revision=51444
2013-08-20 19:54:42 +00:00
Jakub Zawadzki 39122c4ec8 If packet was modified fallback to generic clone
svn path=/trunk/; revision=51443
2013-08-20 19:53:24 +00:00
Chris Maynard b0adfae289 Fix clang warnings: Value stored to '[offset|length]' is never read.
svn path=/trunk/; revision=51442
2013-08-20 18:50:40 +00:00
Chris Maynard 2cb65291c1 Fix clang warnings: Value stored to '[decrypted_]offset' is never read.
svn path=/trunk/; revision=51441
2013-08-20 18:46:46 +00:00
Chris Maynard e37aa2ab5b Fix clang warning: Value stored to 'netl' is never read.
Other misc. whitespace changes.

svn path=/trunk/; revision=51440
2013-08-20 18:30:46 +00:00
Chris Maynard e7242f0f3e Fix several instances of clang warnings: Value stored to 'length' is never read
Also, whitespace changes (tabs ->spaces, indentation) and add modelines.

svn path=/trunk/; revision=51439
2013-08-20 17:25:17 +00:00
Jörg Mayer 0f74dff2f9 Fix for
[  6%] Building C object epan/CMakeFiles/epan.dir/addr_resolv.c.o
/home/jmayer/work/wireshark/svn/trunk/epan/addr_resolv.c:1927:1: error: unused function
      'get_ipxnetbyname' [-Werror,-Wunused-function]
get_ipxnetbyname(const gchar *name)
^
/home/jmayer/work/wireshark/svn/trunk/epan/addr_resolv.c:2009:1: error: unused function
      'add_ipxnet_name' [-Werror,-Wunused-function]

by #if 0/#endif the functions. If they really are not needed any more
they should be removed.

svn path=/trunk/; revision=51438
2013-08-20 06:35:45 +00:00
Anders Broman cb1bd182f2 Mark an unused parameter.
svn path=/trunk/; revision=51437
2013-08-20 05:27:48 +00:00
Anders Broman 4e63bb5ec5 Use g_hash_table() for ipxnet name resolution.
svn path=/trunk/; revision=51436
2013-08-20 05:06:26 +00:00
Anders Broman ce6a604f07 From Tommy Wu:
Update Octet 7 of Indication IE.

svn path=/trunk/; revision=51435
2013-08-20 05:04:45 +00:00
Evan Huus 1a884bf191 Add a valgrind suppressions file set to suppress the zlib error which otherwise
pops up immediately on the fuzzbot. Hopefully there won't be too many more of
these.

svn path=/trunk/; revision=51434
2013-08-20 03:21:06 +00:00
Chris Maynard f0a66b2e3e Another acknowledgment number tweak: If the ACK flag wasn't set such that the base_seq wasn't subtracted from it, then if we need to recover absolute values later on, don't add the base_seq value back either.
svn path=/trunk/; revision=51433
2013-08-19 22:06:48 +00:00
Chris Maynard d0722af6f7 When using relative sequence numbers, don't scale acknowledgment numbers unless the ACK bit is actually set; otherwise doing so results in many erroneous packets matching a filter such as, "(tcp.ack > 0) && (tcp.flags.ack == 0)". With this change, the number of expert infos noting non-zero acknowledgment numbers when the ACK bit is not set is the same as the number of packets that are displayed when applying the above display filter regardless of whether using relative or absolute sequence numbers. (Tested using the menagerie's mond.pcap file)
svn path=/trunk/; revision=51432
2013-08-19 21:41:49 +00:00
Chris Maynard e20e338a9e Someone is bound to miss these expert info items, so add back expert info items for ack and urgent pointer when their respective flags are not set; however, don't indicate "Broken TCP" and only add them as Notes rather than as Warnings as was previously the case prior to r51356 since nowhere does it indicate these fields must be zero when their respective bits aren't set.
Speaking of r51356, a clarification to its commit message is in order: Initially my intention was to only add the urgent pointer field when the URG bit was set; however, I then noticed that the acknowledgment number field was always being added irrespective of the ACK bit.  Had I made the change as I originally intended, it would have introduced an inconsistency.  After some deliberation, I opted for consistency, but botched the commit message.

svn path=/trunk/; revision=51431
2013-08-19 21:17:04 +00:00
Chris Maynard 5dee89a18a Fix Coverity CID 1063335: Unused pointer value.
svn path=/trunk/; revision=51430
2013-08-19 19:59:52 +00:00
Martin Mathieson 641032ea44 Gather together dedicated DRX configuration, and make sure that it
is internally consistent.

TODO: include r11 sequence that can overwrite some of these values.
TODO: actx->private_data gets reused for several purposes, need to
separate these uses out and avoid possible conflicts...

svn path=/trunk/; revision=51429
2013-08-19 17:06:42 +00:00
Pascal Quantin 85667447f1 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9053 :
Update DDS RTPS Vendor and Product Ids based on http://portals.omg.org/dds/content/page/dds-rtps-vendor-and-product-ids

svn path=/trunk/; revision=51428
2013-08-19 16:56:05 +00:00
Pascal Quantin b46f9bebe2 Change some dissectors to use pinfo memory pool instead of malloc if it can trigger an exception between between buffer allocation and tvb_set_free_cb call
svn path=/trunk/; revision=51427
2013-08-19 14:55:41 +00:00
Pascal Quantin 02cae558f9 Do not use ephemeral memory when adding a new data source
svn path=/trunk/; revision=51424
2013-08-19 11:11:11 +00:00
Pascal Quantin 81b6d6aab3 Do not use ephemeral memory when adding a new data source
svn path=/trunk/; revision=51423
2013-08-19 10:39:43 +00:00
Michael Mann b38ec03858 Bugfix SGI Nsym disambiguation is unconditionally displayed when dissecting VHT, bug 8989 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8989)
From Karl Beldan

BACKPORT(1.8,1.10)

svn path=/trunk/; revision=51422
2013-08-19 00:11:50 +00:00
Evan Huus bf9d434e56 One more 64/32-conversion fix for rtpproxy
svn path=/trunk/; revision=51421
2013-08-18 21:31:07 +00:00
Evan Huus 4dfcdcfba5 Take another stab at
packet-rtpproxy.c:226: warning: implicit conversion shortens 64-bit value into a
32-bit value

svn path=/trunk/; revision=51420
2013-08-18 20:09:05 +00:00
Evan Huus 8d7d5fb4de Add a cast to try and fix
packet-rtpproxy.c:226: warning: implicit conversion shortens 64-bit value into
a 32-bit value

I'm not quite sure what's going on here, all the values in use are either gint
or guint so they should all be the same size?

svn path=/trunk/; revision=51419
2013-08-18 20:04:52 +00:00
Evan Huus 6dd6ed8559 Use epan scope for one XML DTD string to fix a small leak.
svn path=/trunk/; revision=51418
2013-08-18 19:59:28 +00:00
Evan Huus 0a23ac400a From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8326
Dissector for the Sippy RTPproxy controlling protocol. RTPproxy is a well-known
(among SIP-engineers) application and it operates using its own simple
text-based protocol. There are several competing products but all of them
implements it (sometimes slightly extending).

svn path=/trunk/; revision=51417
2013-08-18 19:49:08 +00:00
Anders Broman 4fd2487e7d addr_resolution_dlg.c: In function 'ipv6_hash_table_to_texbuff':
addr_resolution_dlg.c:185: warning: unused parameter 'key'

svn path=/trunk/; revision=51416
2013-08-18 19:18:20 +00:00
Anders Broman ccb96fd73a Use g_hastable() for IPv6 name reslution.
svn path=/trunk/; revision=51415
2013-08-18 19:02:48 +00:00
Gerald Combs 2cbe777516 [Automatic manuf, services and enterprise-numbers update for 2013-08-18]
svn path=/trunk/; revision=51412
2013-08-18 14:03:49 +00:00
Michael Mann edf1436360 Bluetooth: HCI: Synchronize and update Voice command. Bug 9050 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9050)
From Michal Labedzki.

svn path=/trunk/; revision=51411
2013-08-18 02:32:23 +00:00
Michael Mann 3ffb8e29b9 HCI: Full dissection of EIR/AD and little improve filtering, bug 9050 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9050)
From Michal Labedzki.

From me:
1. Have boolean filters use tfs_true_false instead of NULL (because it appears previous functionality had "TRUE" and "FALSE").  Perhaps other tfs_ values could be used, but tfs_true_false makes a good placeholder.
2. Add FT_ETHER field as a proto_tree_add_item.

svn path=/trunk/; revision=51410
2013-08-18 02:11:36 +00:00
Michael Mann 46192881d9 Create individual filters for HCI LMP features. Bug 9050 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9050)
From Michal Labedzki

svn path=/trunk/; revision=51409
2013-08-18 01:36:26 +00:00
Michael Mann 9eeeb6d5f6 Various fixes for dissection bugs from bug 9045 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9045)
- Expert info for CRC 0x5935 got wrongly attached to Slim SSDO packages 
 - SPDO Data Requests that fit in the last bytes of a frame got missed
 - Slim SSDOs got detected, that actually are not Slim SSDOs, to prevent this in the future, two checks have been added
    - The reported length of a Slim SSDO must be larger than 0 (correct 
      Slim SSDOs always have at least 1 byte)
    - Both crc's must differ from another. There is a very unlikely 
      possibility, that they may collide, but in such a case openSAFETY
      in itself would be flawed by design.

svn path=/trunk/; revision=51408
2013-08-17 23:18:41 +00:00
Jakub Zawadzki 0c0e568cb1 Commit far from being perfect conversation tool from hfindex to hfinfo.
svn path=/trunk/; revision=51407
2013-08-17 19:35:00 +00:00
Guy Harris 8fc0c287f5 Another tv_buff reference.
svn path=/trunk/; revision=51406
2013-08-17 18:27:23 +00:00
Guy Harris ae50596f8a Just call it a tvbuff, with no underscore.
svn path=/trunk/; revision=51405
2013-08-17 18:22:50 +00:00
Martin Mathieson a8766fb356 Squelch a (bogus) warning about next_tvb being unused initialised.
svn path=/trunk/; revision=51404
2013-08-17 17:52:13 +00:00
Jakub Zawadzki 88eaebaedf Convert few more dissectors to new proto API.
svn path=/trunk/; revision=51403
2013-08-17 08:59:19 +00:00
Jakub Zawadzki 74972b2af0 Fix subtree ett value.
svn path=/trunk/; revision=51402
2013-08-17 08:18:59 +00:00
Jakub Zawadzki 4e870dd240 Fix few concept of new api tree:
- (for now) keep ABI, restore prototype of old proto_tree_add_item, add new proto_tree_add_item_new
- add few helpers for boolean, time, string which will do ->id
- don't use HFI_INIT directly, use it by another macro (MSVC has very small limit for section name)

svn path=/trunk/; revision=51401
2013-08-17 07:16:12 +00:00
Guy Harris 68f9abdc87 Move "aggregate" fields containing bit subfields before the bit
subfields.  Rename some of their hf_ variable names to match the hf_
variable names of the subfields, and rename one field to be a prefix of
its subfields.

For the 64-bit UNIX capabilities, use proto_tree_add_item() for the
flags.

Get rid of a #if 0'ed out field that is duplicated by one of the
newly-added fields.

svn path=/trunk/; revision=51400
2013-08-17 06:30:02 +00:00
Guy Harris 36c6e86029 Get rid of an unused variable.
For some routines, instead of having them check for -1 as the hf_index
and using a default hf_index in that case, just pass them the default
hf_index instead of -1 and just use the hf_index unconditionally.

svn path=/trunk/; revision=51399
2013-08-17 00:38:54 +00:00
Guy Harris f0fc3c20df Fix typo (failure to remove a %).
_U_ify some no-longer-used arguments.

Rename all the hf_pipe variables to hf_smb_pipe, and rename the field
names and protocol name to be "smb_pipe.", for consistency.  (Ceci n'est
pas une pipe.)

Treat and label 1-byte parameters as "byte parameters" and multi-byte
opaque parameters as "bytes parameters".

Format machine-added hf[] entries to match other hf[] entries.

Fix indentation.

svn path=/trunk/; revision=51398
2013-08-16 22:22:36 +00:00
Jakub Zawadzki 1356d07e85 Convert my dissectors to new proto API.
svn path=/trunk/; revision=51397
2013-08-16 21:52:35 +00:00
Jakub Zawadzki 9d79b3233a Introduce new proto_tree API required for hf_ variables removal.
svn path=/trunk/; revision=51396
2013-08-16 21:21:52 +00:00
Chris Maynard 67f1d07176 Initialize val_len to avoid Clang warning: The right operand of '-' is a garbage value. While in there, add some protection against tvb_length_remaining() possibly returning -1, or possibly being less than val_len.
#BACKPORT(1.10)

svn path=/trunk/; revision=51395
2013-08-16 20:46:45 +00:00
Michael Mann 9e92781cdb Make more filterable items courtesy of convert_proto_tree_add_text.pl.
Also converted proto_tree_add_xxx_format into proto_tree_add_xxx_format_value so that label doesn't get out of sync with hf.

svn path=/trunk/; revision=51394
2013-08-16 20:38:21 +00:00
Chris Maynard dc105bb11f Fix 5 warnings: Value stored to 'offset' is never read. Also: misc. whitespace changes, add modelines.
svn path=/trunk/; revision=51393
2013-08-16 20:07:25 +00:00
Chris Maynard 365d223fdd Trivial. Fix warning: Value stored to 'str_index' is never read.
svn path=/trunk/; revision=51392
2013-08-16 19:28:24 +00:00