etxrab [Thu, 28 Apr 2011 05:36:26 +0000 (05:36 +0000)]
From Hans-Christoph Schemmel:
A variant of 3GPP TS 27.010 multiplexing protocol dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5829
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36927
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 28 Apr 2011 05:11:53 +0000 (05:11 +0000)]
Fix warnings:
packet-radiotap.c(240) : error C2220: warning treated as error - no 'object' file generated
packet-radiotap.c(240) : warning C4305: 'initializing' : truncation from 'double' to 'const float'
packet-radiotap.c(310) : warning C4305: 'initializing' : truncation from 'double' to 'const float'
packet-radiotap.c(315) : warning C4305: 'initializing' : truncation from 'double' to 'const float'
packet-radiotap.c(370) : warning C4305: 'initializing' : truncation from 'double' to 'const float'
packet-radiotap.c(380) : warning C4305: 'initializing' : truncation from 'double' to 'const float'
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36926
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Thu, 28 Apr 2011 03:01:54 +0000 (03:01 +0000)]
From Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5786 :
This patch registers a dissector table to allow other dissectors to register as
subdissectors for modbus/tcp data.
Additionally it registers the dissector, so it can be invoked by another
dissector by name.
Additionally this version of the patch adds the Data field not as a text field,
but rather as a field which can be selected and tested for by name.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36925
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Thu, 28 Apr 2011 02:24:46 +0000 (02:24 +0000)]
After testing for the presence of python-config, fix typo so that we actually
test whether we found it or not.
If the user asked for Python support, error out if we find we can't use it.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36924
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Thu, 28 Apr 2011 01:53:40 +0000 (01:53 +0000)]
Fix one of the complaints in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5818 :
Create the wspy_dissectors data directory (by installing the one example
dissector). This dissector won't be loaded (its name doesn't match the regexp)
but it forces the presence of the directory (so people will know where to put
their dissectors).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36923
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Thu, 28 Apr 2011 01:45:23 +0000 (01:45 +0000)]
Don't dump core if Python was not able to load the dissector registration file
(e.g., due to a syntax error).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36922
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 28 Apr 2011 01:07:43 +0000 (01:07 +0000)]
#include <stdlib.h> not needed;
use consistent indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36921
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Wed, 27 Apr 2011 23:20:15 +0000 (23:20 +0000)]
From Juliusz Chroboczek via bug 5812:
This should not trigger with any Babel packets generated by the current
version of babeld, but could potentially do so with a future version
that performs more aggressive compression for IPv4 addresses.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36920
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 27 Apr 2011 23:06:23 +0000 (23:06 +0000)]
Picky, picky....
While we're at it, catch invalid MCS/channel width/GI combinations.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36919
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 27 Apr 2011 22:18:00 +0000 (22:18 +0000)]
From Pascal Quantin:
Enhance the dissection of MM, GMM, SM, EPS EMM and EPS ESM
protocols according to 3GPP 24.008 V9.6.0 and 24.301 V9.6.0.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5866
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36918
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Wed, 27 Apr 2011 22:15:42 +0000 (22:15 +0000)]
My version of Python (2.5.2) core dumps if PySequence_Check is called with a
NULL pointer (because no dissectors were registered). Don't call that function
with a NULL pointer.
Also update the output when no dissectors are registered. Not sure if we
should be printing *anything* in this situation, but for now make the output
interesting.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36917
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 27 Apr 2011 21:59:47 +0000 (21:59 +0000)]
Put the rate in for the MCS field, if all the information needed to
calculate the rate is present.
Don't put the rate in for MCS indices in the Rate field - we need not
only the MCS index but the bandwidth (20 MHz vs. 40 MHz) and the length
of the guard interval. Note in a comment that those other items *might*
be available from some other radiotap fields.
Expand a comment on the hack to try to figure out whether a Rate field
with the 0x80 bit set is a FreeBSD MCS index or a high data rate.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36916
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Wed, 27 Apr 2011 21:26:38 +0000 (21:26 +0000)]
Fix part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4878 :
Put our one python example in the source distribution.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36915
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 19:40:20 +0000 (19:40 +0000)]
Comment out some unused code;
Use #if 0/#endif to comment out some code instead of using /* */;
Use consistent indentation & do some whitespace cleanup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36914
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 19:24:32 +0000 (19:24 +0000)]
Remove unneeded #include <stdlib.h>;
Use consistent indentation;
Add editor modelines;
Use #if 0/#endif to comment out code instead of /* */.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36913
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 18:13:31 +0000 (18:13 +0000)]
From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36912
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 18:09:39 +0000 (18:09 +0000)]
From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36911
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 17:58:22 +0000 (17:58 +0000)]
From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36910
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 17:39:25 +0000 (17:39 +0000)]
From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.
From me:
Do some (minor) indentation cleanup..
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36909
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 17:30:39 +0000 (17:30 +0000)]
From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.
From me:
Do some (minor) whitespace cleanup and re-formatting.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36908
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 17:22:20 +0000 (17:22 +0000)]
From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.
From me:
#include <string.h> not req'd.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36907
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 17:15:57 +0000 (17:15 +0000)]
From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.
From me:
#include <stdlib.h> not req'd;
Do some whitespace cleanup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36906
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 17:06:54 +0000 (17:06 +0000)]
From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.
From me:
#include <stdlib.h> not req'd.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36905
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 17:00:04 +0000 (17:00 +0000)]
#include <stdlib.h> not required;
Whitespace cleanup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36904
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 16:34:37 +0000 (16:34 +0000)]
From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36903
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 16:29:09 +0000 (16:29 +0000)]
From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.
From me:
Remove uneeded #include <stdlib.h>, <gmodule.h>;
Do some whitespace cleanup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36902
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 16:25:05 +0000 (16:25 +0000)]
From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36901
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Wed, 27 Apr 2011 15:23:20 +0000 (15:23 +0000)]
From Mathieu Parent via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5826 :
Attached patch fixes dissection of ServiceURLStatMessage.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36900
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Wed, 27 Apr 2011 14:10:55 +0000 (14:10 +0000)]
From Anand Thakur via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5843 :
This diff files includes some AVPs from Ericsson GGSN documentation used for Gx
messaging between a GGSN and a PCRF.
From me: correct one spelling mistake.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36899
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Wed, 27 Apr 2011 13:32:28 +0000 (13:32 +0000)]
Put the length of the country code in parenthesis (for readability).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36898
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Wed, 27 Apr 2011 12:53:57 +0000 (12:53 +0000)]
Packet editor: add support for FT_BOOLEAN, and integer bitmasks.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36897
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Wed, 27 Apr 2011 09:20:02 +0000 (09:20 +0000)]
Restore updating packet bar while loading file (removed in r36851)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36896
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 27 Apr 2011 06:02:16 +0000 (06:02 +0000)]
From Yaniv Kaul:
Fix 'set but not used' errors that GCC 4.6 emits.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36895
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 27 Apr 2011 05:55:54 +0000 (05:55 +0000)]
Remove check_col().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36894
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 27 Apr 2011 05:32:09 +0000 (05:32 +0000)]
From Yaniv Kaul:
Fix 'set but not used' errors that GCC 4.6 emits.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36893
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 27 Apr 2011 05:24:31 +0000 (05:24 +0000)]
From Yaniv Kaul:
Fix 'set but not used' errors that GCC 4.6 emits.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36892
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 05:18:58 +0000 (05:18 +0000)]
From Yaniv Kaul: some 'set but not used' compilation fixes.
From me:
- remove unneeded #include <stdlib.h> and <ctype.h>;
- Fix some indentation in the file.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36891
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 05:09:00 +0000 (05:09 +0000)]
From Yaniv Kaul: some 'set but not used' compilation fixes;
From me:
- Remove unneeded #include <stdlib.h> and <ctype.h>;
- Indentation cleanup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36890
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 05:02:47 +0000 (05:02 +0000)]
From Yaniv Kaul: some 'set but not used' compilation fixes.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36889
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 04:27:38 +0000 (04:27 +0000)]
From Yaniv Kaul: some 'set but not used' compilation fixes.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36888
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 04:24:44 +0000 (04:24 +0000)]
From Yaniv Kaul: some 'set but not used' compilation fixes;
From me:
Use consistent indentation in the source file.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36887
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 27 Apr 2011 04:11:37 +0000 (04:11 +0000)]
Make the frame_data_sequence structure opaque, and move some other
implementation details into frame_data_sequence.c as well.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36886
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 27 Apr 2011 03:57:21 +0000 (03:57 +0000)]
Add frame_data_sequence.c.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36885
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 03:45:19 +0000 (03:45 +0000)]
From Yaniv Kaul: some 'set but not used' compilation fixes;
From me:
- #include <stdlib.h> not needed;
- Use consistent indentation;
- use #if 0/#endif to comment out code rather than /* */
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36884
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 27 Apr 2011 03:13:08 +0000 (03:13 +0000)]
Based upon a patch from Yaniv Kaul: Comment out unused assignmeent/variables;
From me:
- remove unneeded #include <stdlib.h>;
- fix some indentation;
- use #if 0/#endif rather that /* */ to comment out some code
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36883
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 27 Apr 2011 03:13:03 +0000 (03:13 +0000)]
Don't free the frame_data_sequence unless we have one.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36882
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 27 Apr 2011 02:54:44 +0000 (02:54 +0000)]
Create a new frame_data_sequence data type; it represents a dense
sequence of frame_data structures, indexed by the frame number. Extract
the relevant bits of the capture_file data structure and move them to
the frame_data_sequence, and move the relevant code from cfile.c and
tweak it to handle frame_data_sequence structures.
Have a possibly-null pointer to a frame_data_sequence structure in the
capture_file structure; if it's null, we aren't keeping a sequence of
frame_data structures (we don't keep that sequence when we're doing
one-pass processing in TShark).
Nothing in libwireshark should care about a capture_file structure; get
rid of some unnecessary includes of cfile.h.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36881
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 27 Apr 2011 00:43:31 +0000 (00:43 +0000)]
Another hack to handle the one-pass case.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36880
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 26 Apr 2011 23:17:47 +0000 (23:17 +0000)]
Short-term hack to fix bug 5855 - don't try to process all the
frame_data structures for all the packets if we don't actually *have*
any frame_data structures for any packets, e.g. in TShark in one-pass
mode.
Also:
Use #if 0/#endif instead of commenting out.
Consistently use 4-space indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36879
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 26 Apr 2011 23:07:40 +0000 (23:07 +0000)]
If HAVE_LIBGNUTLS isn't defined, don't build functions that are used
only if HAVE_LIBGNUTLS is defined.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36878
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 26 Apr 2011 22:56:22 +0000 (22:56 +0000)]
If HAVE_LIBGNUTLS isn't defined, don't build functions that are used
only if HAVE_LIBGNUTLS is defined.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36877
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 26 Apr 2011 22:51:35 +0000 (22:51 +0000)]
From Adam Langley via bug 4349:
This patch adds support for getting the pre-master secret of a TLS
connection from a log file. Currently Wireshark can decrypt and TLS
connection only if it has the server's private key.
I commonly have a use case where I control the TLS client, but not the
server. In order to decrypt in this case, I've added support to NSS
(used by Chrome and Firefox) to log the keys to a file on disk:
https://bugzilla.mozilla.org/show_bug.cgi?id=536474
Given this file, Wireshark can then decrypt the resulting TLS connections.
The format is such that Wireshark opens and linearly scans the file each
time it sees a ClientKeyExchange. If the key log grows too large, this
is pretty inefficient. However, it's simple and the number of
interesting TLS connections when debugging is usually very small.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36876
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 26 Apr 2011 21:59:11 +0000 (21:59 +0000)]
From Ivan Sy via bug 3343:
- Support for DTLS and SSL RSA keys list using User Accessible Table
- Support for IPv6 SSL as posted by bug#3343 comment#1
- 'any' and 'anyipv4' for IPv4 wildcard
- 'anyipv6' for IPv6 wildcard
- UAT fields validation.
From me:
- Update paramaters to match UAT API changes.
- Change the UAT filename.
- Fix buffer overflow for IPv6 addresses.
- Allow the use of hostnames along with numeric addresses.
- Don't convert strings to addresses twice.
- Don't use the same variable name for different data types.
- Make "any" mean "any IPv4 or any IPv6".
- Bend the concept of obsolete preferences slightly so that we can convert
and old-style key list to a UAT.
- Clean up whitespace.
- Don't point to a User's Guide section for now; it may make more sense to
keep using the wiki page.
SSL dissector changes have been tested. DTLS dissector changes have not.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36875
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 26 Apr 2011 20:24:53 +0000 (20:24 +0000)]
From Yaniv Kaul:
Fix 'set but not used' errors that GCC 4.6 emits.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36874
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 26 Apr 2011 17:13:37 +0000 (17:13 +0000)]
get_host_ipaddr() was returning numeric addresses in host byte order
and hostnames in network byte order. Have it return everything in
network byte order.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36873
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Tue, 26 Apr 2011 14:43:00 +0000 (14:43 +0000)]
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36872
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Tue, 26 Apr 2011 14:42:41 +0000 (14:42 +0000)]
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36871
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Tue, 26 Apr 2011 14:41:49 +0000 (14:41 +0000)]
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36870
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Tue, 26 Apr 2011 14:41:33 +0000 (14:41 +0000)]
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36869
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Tue, 26 Apr 2011 14:40:19 +0000 (14:40 +0000)]
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36868
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Tue, 26 Apr 2011 10:10:22 +0000 (10:10 +0000)]
- Synchronize gtk/Makefile.am checkapi with gtk/Makefile.nmake
- fix: Found deprecated-gtk APIs in packet_win.c: gtk_entry_new_with_max_length
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36867
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Tue, 26 Apr 2011 08:51:25 +0000 (08:51 +0000)]
Add new function packet_hex_editor_print.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36866
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Tue, 26 Apr 2011 07:12:42 +0000 (07:12 +0000)]
Packet editing for single field_info:
- Support FT_STRING and FT_STRINGZ types.
- hex editor (mainly for unsupported types)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36865
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 26 Apr 2011 02:55:59 +0000 (02:55 +0000)]
Cast away warnings about "struct sockaddr" -> "struct sockaddr_XXX"
casts that are actually safe.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36864
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 26 Apr 2011 02:53:58 +0000 (02:53 +0000)]
Get rid of a cast that was causing alignment warnings and that was bogus
anyway (the second argument to g_slist_find_custom is a gconstpointer,
not a gpointer * or a gconstpointer *).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36863
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 26 Apr 2011 02:51:10 +0000 (02:51 +0000)]
Get rid of some code that's no longer relevant with the new tree
structure for frame_data items.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36862
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 26 Apr 2011 02:47:52 +0000 (02:47 +0000)]
Cast away warnings about "struct sockaddr" -> "struct sockaddr_XXX"
casts that are actually safe.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36861
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Tue, 26 Apr 2011 01:06:25 +0000 (01:06 +0000)]
Remove const qualifier to name, abbrev and blurb to pacify the buildbots.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36860
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Tue, 26 Apr 2011 00:41:08 +0000 (00:41 +0000)]
Plug a memory leak.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36859
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Mon, 25 Apr 2011 22:55:31 +0000 (22:55 +0000)]
Take out extra pair of parenthesis
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36858
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Mon, 25 Apr 2011 21:26:52 +0000 (21:26 +0000)]
Make checkapi happy
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36857
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 25 Apr 2011 21:20:47 +0000 (21:20 +0000)]
Get rid of some unnecessary casts that just provoke uninteresting
warnings.
More fun with GArrays: cast away some warnings that don't report real
alignment problems and that wouldn't even happen if the "data" member of
a GArray were a "void *".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36856
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 25 Apr 2011 21:19:54 +0000 (21:19 +0000)]
More fun with GArrays: cast away some warnings that don't report real
alignment problems and that wouldn't even happen if the "data" member of
a GArray were a "void *".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36855
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 25 Apr 2011 21:19:22 +0000 (21:19 +0000)]
More fun with GArrays: cast away some warnings that don't report real
alignment problems and that wouldn't even happen if the "data" member of
a GArray were a "void *".
Clean up indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36854
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 25 Apr 2011 21:07:01 +0000 (21:07 +0000)]
Get rid of some extra parentheses that cause clang to warn that you
might have meant to do an assignment rather than a comparison.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36853
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Mon, 25 Apr 2011 19:57:45 +0000 (19:57 +0000)]
Fix compilation warning:
packet_win.c:230: warning: 'u_val' may be used uninitialized in this function
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36852
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Mon, 25 Apr 2011 19:36:13 +0000 (19:36 +0000)]
from Jakub Zawadzki:
Don't thaw the packet list during file loading to speed up file loading.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36851
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Mon, 25 Apr 2011 19:28:00 +0000 (19:28 +0000)]
- Experimental support to edit single field_info.
Note: For now only integers (without bitmask), I'm afraid other fields require more work.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36850
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 25 Apr 2011 19:01:05 +0000 (19:01 +0000)]
Store the frame_data structures in a tree, rather than a linked list.
This lets us get rid of the per-frame_data-structure prev and next
pointers, saving memory (at least according to Activity Monitor's report
of the virtual address space size on my Snow Leopard machine, it's a
noticeable saving), and lets us look up frame_data structures by frame
number in O(log2(number of frames)) time rather than O(number of frames)
time. It seems to take more CPU time when reading in the file, but
seems to go from "finished reading in all the packets" to "displaying
the packets" faster and seems to free up the frame_data structures
faster when closing the file.
It *is* doing more copying, currently, as we now don't allocate the
frame_data structure until after the packet has passed the read filter,
so that might account for the additional CPU time.
(Oh, and, for what it's worth, on an LP64 platform, a frame_data
structure is exactly 128 bytes long. However, there's more stuff to
remove, so the power-of-2 size is not guaranteed to remain, and it's not
a power-of-2 size on an ILP32 platform.)
It also means we don't need GLib 2.10 or later for the two-pass mode in
TShark.
It also means some code in the TCP dissector that was checking
pinfo->fd->next to see if it's NULL, in order to see if this is the last
packet in the file, no longer works, but that wasn't guaranteed to work
anyway:
we might be doing a one-pass read through the capture in TShark;
we might be dissecting the frame while we're reading in the
packets for the first time in Wireshark;
we might be doing a live capture in Wireshark;
in which case packets might be prematurely considered "the last packet".
#if 0 the no-longer-working tests, pending figuring out a better way of
doing it.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36849
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Mon, 25 Apr 2011 16:29:16 +0000 (16:29 +0000)]
Cast away some clang errors about cast alignments that appear safe.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36848
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Mon, 25 Apr 2011 16:19:07 +0000 (16:19 +0000)]
Fix clang error ("increases requird alignment from 1 to 8") by removing
unnecessary VALS() cast
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36847
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 25 Apr 2011 05:33:07 +0000 (05:33 +0000)]
Make the packet count an unsigned value, as frame numbers are unsigned.
Make the loops that scan through all the packets do so by frame number,
to abstract away the "next" and "previous" pointers in the frame_data
structure. Add a routine to cfile.c to map frame numbers to frame_data
structures, and put in some special case handling so scanning forward or
backward through the packets is O(N) rather than O(N^2).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36846
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Mon, 25 Apr 2011 02:06:17 +0000 (02:06 +0000)]
From Loránd Jakab via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5854 :
The Locator/ID Separation Protocol [1] is being standardized within the IETF,
and it is nearing RFC status (pending security review). I have been maintaining
a dissector patch for about a year, see [2]. Feedback received indicates that,
among others, it is widely used by the developers of a large router vendor,
without issues.
In January I submitted the dissector for data plane packets as bug #5602, which
was committed as r35615. The patch attached to this bug adds support for
dissection of control plane packets.
[1] http://tools.ietf.org/html/draft-ietf-lisp
[2] http://lisp.ccaba.upc.edu/wireshark/
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36845
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Mon, 25 Apr 2011 01:37:19 +0000 (01:37 +0000)]
From Joakim Wiberg via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5801 :
The attached patch replaces most of the proto_tree_add_text() with
proto_tree_add_item(). That resulted in several new display filters.
It also uses the correct defines (ENC_NA, ENC_BIG_ENDIAN and ENC_LITTLE_ENDIAN)
instead of TRUE/FALSE in all proto_tree_add_item() calls.
Also it prints all out all connected transport data, since this is used by
"IENetP Test Tool" as a part of the XML export.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36844
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Sun, 24 Apr 2011 22:52:49 +0000 (22:52 +0000)]
Packet editing:
- Show next editing bit (for hex it'd require patching packet_hex_apply_reverse_tag)
- Remove memset()s
- Try to fix compilation for win64.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36843
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Sun, 24 Apr 2011 21:57:12 +0000 (21:57 +0000)]
Allocate space for epan_dissect_t inside struct.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36842
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Sun, 24 Apr 2011 21:19:41 +0000 (21:19 +0000)]
Initial support for editing packets inside wireshark.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36841
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Sun, 24 Apr 2011 21:10:45 +0000 (21:10 +0000)]
Fix CID 813: Code after ERROR is dead code (never reached)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36840
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sun, 24 Apr 2011 21:02:55 +0000 (21:02 +0000)]
new_packet_list_find_row_from_data() is always used to select a packet,
so get rid of the select_flag argument, and rename it
new_packet_list_select_row_from_data().
It's also always passed a frame_data *, so make its argument a
frame_data *.
Its return value is used only to detect whether the packet was found in
the display or not, so make it a gboolean. Check it in *all* cases
where it's called, and change the dialog message a bit (the most likely
cause is that the user cancelled a redissection of the packets, so not
all packets in the capture file are in the display.
Also, in the find case, pass it the new packet we found.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36839
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sun, 24 Apr 2011 19:41:28 +0000 (19:41 +0000)]
Make the interface combo box an entry, so you can type in it again.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36838
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sun, 24 Apr 2011 19:38:12 +0000 (19:38 +0000)]
gtk_combo_box_new_text() returns a GtkComboBox, and you connect a
function directly to its "changed" signal; GtkComboBox is a subclass of
GtkBin, but you don't connect to its child.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36837
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Sun, 24 Apr 2011 15:03:44 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-04-24]
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36834
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 23 Apr 2011 19:03:05 +0000 (19:03 +0000)]
Back out previous change - I guess the Solaris buildbot has a pre-2.5.30
flex.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36833
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 23 Apr 2011 17:56:43 +0000 (17:56 +0000)]
Try putting the include of config.h at the top of the generated scanner,
so that the config.h definitions are available before we include
anything else; that way, for example, anything defined to enable
large-file support will be defined before we include any system header
files that might depend on it.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36832
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Sat, 23 Apr 2011 11:10:47 +0000 (11:10 +0000)]
Rename g_gnuc_malloc.h to g_gnuc.h
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36831
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sat, 23 Apr 2011 09:47:28 +0000 (09:47 +0000)]
Check if changing to another profile in change_configuration_profile()
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36830
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Sat, 23 Apr 2011 09:13:16 +0000 (09:13 +0000)]
Use orginal nsstime_t structures (without copying).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36829
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Fri, 22 Apr 2011 19:31:09 +0000 (19:31 +0000)]
Don't pass -fexcess-precision=fast to clang like we do for gcc.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36828
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 22 Apr 2011 18:32:56 +0000 (18:32 +0000)]
Avoid passing a NULL string pointer to format routines: some libc's (e.g.,
Solaris') will seg-fault on that.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36827
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Fri, 22 Apr 2011 18:04:26 +0000 (18:04 +0000)]
Fix various warnings found by clang 3.0 (trunk 129935) complier:
- Extraneous parentheses
- Use _U_ for unused function parameters instead of assigning the variable
to itself
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36826
f5534014-38df-0310-8fa8-
9805f1628bb7