Commit graph

48254 commits

Author SHA1 Message Date
Evan Huus
0ea379e46d Be sure to forward BIN_DIR to the valgrind script, probably also needed on the
fuzz-but.

svn path=/trunk/; revision=51391
2013-08-16 13:45:00 +00:00
Anders Broman
c5ae1bbbca packet-dcerpc-pn-io.c: In function 'dissect_PNIO_C_SDU':
packet-dcerpc-pn-io.c:9220: warning: unused parameter 'drep'

svn path=/trunk/; revision=51390
2013-08-16 05:24:09 +00:00
Anders Broman
3e69184794 From Wido Kelling:
wrong interpretation of first byte in userdata of profinet data.

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

svn path=/trunk/; revision=51389
2013-08-16 04:57:48 +00:00
Anders Broman
1e8f7d9224 From Chris Pane:
More bug fixes and feature additions to IEEE1722.1 dissector.

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

svn path=/trunk/; revision=51388
2013-08-16 04:49:13 +00:00
Evan Huus
5d8b79cff5 Try to use smarter path resolution and detection in order to work in
environments that are not the build tree (namely the fuzz-bot, but this might
make normal out-of-tree builds easier too).

svn path=/trunk/; revision=51387
2013-08-16 01:52:51 +00:00
Evan Huus
6538787c92 Add one 'volatile' keyword to fix a -Wclobbered and change the tree used in one
proto_tree call to fix a -Wunused-but-set-variable, both of which show up in GCC
4.8.

svn path=/trunk/; revision=51386
2013-08-16 01:35:56 +00:00
Michael Mann
e2bf819eaf Use convert_proto_tree_add_text.pl to make many filterable items.
Also some cleanup since the filterable items remove the need for tvb_memcpy of static structures.

svn path=/trunk/; revision=51385
2013-08-16 00:08:25 +00:00
Chris Maynard
618c6eeb3c Fix Coverity CID 1062616: Unused pointer value.
svn path=/trunk/; revision=51384
2013-08-15 17:37:14 +00:00
Chris Maynard
543e05b1ec Group all "Seconds elapsed appears to be encoded as little-endian" expert info messages together, regardless of the computed value of the seconds field. This adds a single expandable entry instead of multiple entries (up to 255 potentially) and makes the expert info generally nicer to view (IMO).
svn path=/trunk/; revision=51383
2013-08-15 15:26:12 +00:00
Jakub Zawadzki
ba0edfeed2 Original ERF file format documentation is still 404, link to bugzilla.
svn path=/trunk/; revision=51382
2013-08-15 10:44:19 +00:00
Jakub Zawadzki
68d8cad8f5 [trivial] Use g_stpcpy()
svn path=/trunk/; revision=51381
2013-08-15 09:33:52 +00:00
Guy Harris
e4c4c6fbfb Get rid of set-but-not-used variable. Link to the tools.ietf.org HTML
version of RFC 5050.

svn path=/trunk/; revision=51380
2013-08-15 09:09:49 +00:00
Guy Harris
456d1f14a4 Add $Id$, arrange that it's expanded, use native line endings.
svn path=/trunk/; revision=51379
2013-08-15 04:09:18 +00:00
Guy Harris
ad0fbb4a20 Add $Id$, arrange that it's expanded, use native line endings.
svn path=/trunk/; revision=51378
2013-08-15 04:05:49 +00:00
Guy Harris
778e736ad6 Add $Id$.
svn path=/trunk/; revision=51376
2013-08-15 04:01:23 +00:00
Guy Harris
64f079430b Fix $Id$.
svn path=/trunk/; revision=51373
2013-08-15 03:55:09 +00:00
Guy Harris
76d868285b Fix $Id$
svn path=/trunk/; revision=51372
2013-08-15 03:54:23 +00:00
Guy Harris
7a3791cc43 Expand $Id$, use native line endings.
svn path=/trunk/; revision=51369
2013-08-15 03:50:36 +00:00
Guy Harris
63fb123d7e Expand $Id$, use native line endings, get rid of CRs (they belong on
Windows, but not on UN*X).

svn path=/trunk/; revision=51368
2013-08-15 03:47:37 +00:00
Guy Harris
b6b0269020 Add SVN properties to expand $Id$ and use native line endings.
svn path=/trunk/; revision=51366
2013-08-15 03:37:51 +00:00
Michael Mann
7eb98fe481 A few more improvements:
1. Make a "dissect_dictionary" function for the common dissection of the different primary header versions.
2. Remove some of the "dissection aborts" if sdnv values are bad.  Detecting malformed packets can be a good thing.
3. Make fields that use a sdnv value filterable, with expert info if the value is bad.


svn path=/trunk/; revision=51365
2013-08-15 03:05:51 +00:00
Evan Huus
2048ac8ae1 Split the code to convert an ethernet address into an int64 into a function
since it's used in several places. Don't allocate a key just to do a hash-table
lookup, we only need to do that if we're actually inserting. Fixes another ~1KB
of leaks.

svn path=/trunk/; revision=51364
2013-08-15 02:45:58 +00:00
Evan Huus
4577d39122 Free the old name before we add the new one in case the services file has
duplicates (it does). Fixes about 2KB of leaks.

svn path=/trunk/; revision=51363
2013-08-15 02:38:00 +00:00
Evan Huus
21d9e011d0 From Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9040
Small fixes and enhancements to SCSI INQUIRY results.

svn path=/trunk/; revision=51362
2013-08-15 02:23:53 +00:00
Evan Huus
bef63735ff From Tyson Key via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9037
Update the heuristics for detecting ISO 14443-A payloads with 4 byte UIDs, and
ATS values to support MTCOS-based cards/tokens (e.g. passports) in PN532
InListPassiveTarget responses.

svn path=/trunk/; revision=51361
2013-08-15 02:17:51 +00:00
Evan Huus
80ea68ad78 As suggested by Volcke Mario, fixing
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9036

Don't change the length *and* the offset when adjusting for the ethercat header,
just the offset is enough (the length is then right).

svn path=/trunk/; revision=51360
2013-08-15 02:06:49 +00:00
Martin Kaiser
d9fd5d6409 use the correct length for the tvbuff of an unknown usb descriptor
svn path=/trunk/; revision=51359
2013-08-14 21:14:21 +00:00
Jakub Zawadzki
6503e928a7 Add some XXX comment.
svn path=/trunk/; revision=51358
2013-08-14 20:14:38 +00:00
Chris Maynard
6730531348 Nowhere in the RFC's (793 or otherwise) does it indicate that if the URG bit is not set that the urgent pointer field must be zero.
References:
http://tools.ietf.org/html/rfc793, http://tools.ietf.org/html/rfc1122, ...
http://www.wireshark.org/lists/ethereal-dev/200307/msg00297.html

Similarly, nowhere does it say that the acknowledgment number field must be zero if the ACK bit is not set.

This patch effectively reverts r37721.  If non-zero urgent pointers are of interest to you when the URG bit is not set, then a filter such as follows can be used:

    (tcp.flags.urg == 0) && !(tcp[18:2] == 00:00)

Similarly, if non-zero acknowledgment numbers are of interest to you when the ACK bit is not set, then use this filter:

    (tcp.flags.ack == 0) && !(tcp.ack == 0)

For consistency, should we avoid adding the ack field in this case as well?  The above filter would then change to:

    (tcp.flags.ack == 0) && !(tcp[8:4] == 00:00:00:00)

This change was prompted by the following question on ask.wireshark.org:
http://ask.wireshark.org/questions/23753/tcp-urgent-pointer-value-not-displayed

svn path=/trunk/; revision=51356
2013-08-14 18:35:36 +00:00
Evan Huus
0da22d4cb5 Pre-emptively create the other two hash tables in packet.c for simplicity's
sake.

svn path=/trunk/; revision=51355
2013-08-14 17:36:47 +00:00
Guy Harris
cbda96d79a Global variables considered harmful.
svn path=/trunk/; revision=51352
2013-08-14 04:14:36 +00:00
Guy Harris
da7c920853 I guess Solaris's getopt_long() "struct option" declaration doesn't have
enough cowbell^wconst; throw in a comment to squelch warnings.

svn path=/trunk/; revision=51351
2013-08-14 01:21:13 +00:00
Guy Harris
ab3aeb63e4 Get rid of -Wshadow warning - I guess we're including something that
gets <getopt.h>, so we get the optarg global.

svn path=/trunk/; revision=51350
2013-08-14 01:18:58 +00:00
Guy Harris
9e47411488 Include config.h first; it defines _FILE_OFFSET_BITS, and if some system
header later causes it to be redefined - as happens on my Solaris 11
virtual machine - we get a redefinition warning, which gets treated as
an error.

svn path=/trunk/; revision=51349
2013-08-14 01:15:59 +00:00
Guy Harris
34108edbd1 Get rid of -Wshadow warning - I guess we're including something that
gets <getopt.h>, so we get the optarg global.

svn path=/trunk/; revision=51348
2013-08-14 00:41:02 +00:00
Guy Harris
b65e9e9618 UN*X pathnames + PL/I's comment syntax = surprises. Yay C++ (and C99).
svn path=/trunk/; revision=51347
2013-08-14 00:37:14 +00:00
Guy Harris
5dcd6daba7 Get rid of -Wshadow warning - I guess we're including something that
gets <getopt.h>, so we get the optarg global.

svn path=/trunk/; revision=51346
2013-08-14 00:35:27 +00:00
Guy Harris
14fe8951b7 Use 4-space indentation consistently.
svn path=/trunk/; revision=51345
2013-08-14 00:33:36 +00:00
Guy Harris
e8f42c6b48 Include config.h first; it defines _FILE_OFFSET_BITS, and if some system
header later causes it to be redefined - as happens on my Solaris 11
virtual machine - we get a redefinition warning, which gets treated as
an error.

svn path=/trunk/; revision=51344
2013-08-14 00:31:14 +00:00
Guy Harris
cfa2dc5f6e Add in more comments on the whole "get the path of the executable from
the kernel" thing, and add the NetBSD and DragonFly BSD /proc links (if
they don't mount /proc, that doesn't work, but it doesn't get in the
way).

On Solaris, check for getexecname, just in case somebody tries to build
on an old Solaris that doesn't support it (that could well end up being
the least of their problems, but at least they won't ask us to diagnose
that one).

svn path=/trunk/; revision=51343
2013-08-13 23:37:32 +00:00
Evan Huus
d8f00e22e1 As suggested in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9033
Make epan_free a no-op if the pointer is NULL. This fixes 99% of the cases
causing problems for wmem_leave_file_scope() - remove that XXX comment and add
back the assertion.

Remove the cleanup_dissection call from epan_cleanup, it doesn't make sense
there. init_dissection is only called from epan_new, so cleanup_dissection
should only be called from epan_free.

Add one missing epan_free call to tshark revealed by the above changes.

svn path=/trunk/; revision=51342
2013-08-13 22:41:34 +00:00
Evan Huus
1eab806d9b Make what appear to be the intended changes so that all variables are used or
removed and it compiles.

svn path=/trunk/; revision=51341
2013-08-13 22:24:59 +00:00
Guy Harris
4771fdbb7e Fix intended proto_tree_add_item() call that mistakenly called
proto_tree_add_uint(); caught by the checkAPI script run in a Windows
build.

svn path=/trunk/; revision=51340
2013-08-13 18:03:17 +00:00
Alexis La Goutte
02462c7310 From Mark Phillips via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9038
802.11 HT Extended Capabilities B10 decode incorrect

#Backport 1.10 and 1.8

Within the 802.11 HT Capabilities IE the "HT Extended Capabilities" B10's name is incorrect.

It is currently titled "High Throughput". This is incorrect/missleading. It should be something like "High Throughput Control (+HTC)". The field indicates if the "High Throughput Control (HTC)" field is supported - not if HT itself is supported.

svn path=/trunk/; revision=51339
2013-08-13 17:50:22 +00:00
Evan Huus
69e9d50a23 Use start_offset to set the item length in the usual pattern (assuming this was
intended). Fixes the unused variable warning on start_offset.

svn path=/trunk/; revision=51338
2013-08-13 13:28:14 +00:00
Michael Mann
0776754488 Some improvements to the bundle protocol:
1. Cleanly break out Convergence Layer Protocol (TCPCL) into its own (new-style) pure dissector.
2. Make Bundle dissection into a new style dissector and clean so that it can be called using call_disssector.
3. Use tcp_dissect_pdus for TCPCL protocol instead of "manual" while loop.  This allows contact header to benefit from TCP fragmentation.
4. Make time fields use time field types so they can be filterable.
5. A few functions were move to remove need for static declaration at top of file.
6. Remove pri_hdr_procflags global variable.

Next up - making more fields filterable.

svn path=/trunk/; revision=51337
2013-08-13 11:37:27 +00:00
Martin Mathieson
ab8f63d76c Add missing return (reported as missing break by coverity)
svn path=/trunk/; revision=51336
2013-08-13 10:40:06 +00:00
Stig Bjørlykke
a31a88b142 Show the Lua plugin being loaded in the splash screen.
svn path=/trunk/; revision=51335
2013-08-13 10:38:30 +00:00
Jörg Mayer
bae2eee028 Implement in cmake:
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=51322

> User: guy
> Date: 2013/08/12 01:01 PM
>
> Log:
>  Just check whether dladdr() is available; we check in the code whether
>  it succeeds, so there's no point in checking whether it succeeds in a
>  sample program.

svn path=/trunk/; revision=51334
2013-08-13 09:58:09 +00:00
Pascal Quantin
9ef54f5ea2 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9035 :
Indicate the right direction in info column

svn path=/trunk/; revision=51333
2013-08-13 08:19:41 +00:00