Commit graph

35416 commits

Author SHA1 Message Date
Jeff Morriss
9cb00ac9fc 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).

svn path=/trunk/; revision=36923
2011-04-28 01:53:40 +00:00
Jeff Morriss
39d326a77c Don't dump core if Python was not able to load the dissector registration file
(e.g., due to a syntax error).

svn path=/trunk/; revision=36922
2011-04-28 01:45:23 +00:00
Bill Meier
4e782042de #include <stdlib.h> not needed;
use consistent indentation.

svn path=/trunk/; revision=36921
2011-04-28 01:07:43 +00:00
Gerald Combs
3af2a4c81f 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.

svn path=/trunk/; revision=36920
2011-04-27 23:20:15 +00:00
Guy Harris
d7b8350c7c Picky, picky....
While we're at it, catch invalid MCS/channel width/GI combinations.

svn path=/trunk/; revision=36919
2011-04-27 23:06:23 +00:00
Anders Broman
7dce5861cc 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

svn path=/trunk/; revision=36918
2011-04-27 22:18:00 +00:00
Jeff Morriss
b798f159bf 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.

svn path=/trunk/; revision=36917
2011-04-27 22:15:42 +00:00
Guy Harris
49b410ffbe 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.

svn path=/trunk/; revision=36916
2011-04-27 21:59:47 +00:00
Jeff Morriss
90a78c635a Fix part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4878 :
Put our one python example in the source distribution.

svn path=/trunk/; revision=36915
2011-04-27 21:26:38 +00:00
Bill Meier
89f055b5fd Comment out some unused code;
Use #if 0/#endif to comment out some code instead of using /* */;
Use consistent indentation & do some whitespace cleanup.

svn path=/trunk/; revision=36914
2011-04-27 19:40:20 +00:00
Bill Meier
f396f68124 Remove unneeded #include <stdlib.h>;
Use consistent indentation;
Add editor modelines;
Use #if 0/#endif to comment out code instead of /* */.

svn path=/trunk/; revision=36913
2011-04-27 19:24:32 +00:00
Bill Meier
00d378fbf8 From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.

svn path=/trunk/; revision=36912
2011-04-27 18:13:31 +00:00
Bill Meier
c588ff282a From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.

svn path=/trunk/; revision=36911
2011-04-27 18:09:39 +00:00
Bill Meier
fafe30d42d From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.

svn path=/trunk/; revision=36910
2011-04-27 17:58:22 +00:00
Bill Meier
1ab1009cc4 From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.
From me:
  Do some (minor) indentation cleanup..

svn path=/trunk/; revision=36909
2011-04-27 17:39:25 +00:00
Bill Meier
e73a3a0cb5 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.

svn path=/trunk/; revision=36908
2011-04-27 17:30:39 +00:00
Bill Meier
5c778feb6b From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.
From me:
  #include <string.h> not req'd.


svn path=/trunk/; revision=36907
2011-04-27 17:22:20 +00:00
Bill Meier
e777d9e375 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.

svn path=/trunk/; revision=36906
2011-04-27 17:15:57 +00:00
Bill Meier
7ba088eaa5 From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.
From me:
  #include <stdlib.h> not req'd.


svn path=/trunk/; revision=36905
2011-04-27 17:06:54 +00:00
Bill Meier
62cea3bb0a #include <stdlib.h> not required;
Whitespace cleanup.

svn path=/trunk/; revision=36904
2011-04-27 17:00:04 +00:00
Bill Meier
abf57a9af2 From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.

svn path=/trunk/; revision=36903
2011-04-27 16:34:37 +00:00
Bill Meier
77d86cadf5 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.

svn path=/trunk/; revision=36902
2011-04-27 16:29:09 +00:00
Bill Meier
3db5412ee7 From Yaniv Kaul:
Some fixes for 'set but not used' errors that GCC 4.6 emits.

svn path=/trunk/; revision=36901
2011-04-27 16:25:05 +00:00
Jeff Morriss
211b659885 From Mathieu Parent via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5826 :
Attached patch fixes dissection of ServiceURLStatMessage.

svn path=/trunk/; revision=36900
2011-04-27 15:23:20 +00:00
Jeff Morriss
889d33c6b2 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.

svn path=/trunk/; revision=36899
2011-04-27 14:10:55 +00:00
Jeff Morriss
4794e37bbc Put the length of the country code in parenthesis (for readability).
svn path=/trunk/; revision=36898
2011-04-27 13:32:28 +00:00
Jakub Zawadzki
1b8aa36735 Packet editor: add support for FT_BOOLEAN, and integer bitmasks.
svn path=/trunk/; revision=36897
2011-04-27 12:53:57 +00:00
Jakub Zawadzki
192837a1f2 Restore updating packet bar while loading file (removed in r36851)
svn path=/trunk/; revision=36896
2011-04-27 09:20:02 +00:00
Anders Broman
110e5961bb From Yaniv Kaul:
Fix 'set but not used' errors that GCC 4.6 emits.

svn path=/trunk/; revision=36895
2011-04-27 06:02:16 +00:00
Anders Broman
9c9585c9ea Remove check_col().
svn path=/trunk/; revision=36894
2011-04-27 05:55:54 +00:00
Anders Broman
a9b2736861 From Yaniv Kaul:
Fix 'set but not used' errors that GCC 4.6 emits.

svn path=/trunk/; revision=36893
2011-04-27 05:32:09 +00:00
Anders Broman
f62ac53352 From Yaniv Kaul:
Fix 'set but not used' errors that GCC 4.6 emits.

svn path=/trunk/; revision=36892
2011-04-27 05:24:31 +00:00
Bill Meier
f8b004eb29 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.

svn path=/trunk/; revision=36891
2011-04-27 05:18:58 +00:00
Bill Meier
64a342eca7 From Yaniv Kaul: some 'set but not used' compilation fixes;
From me:
- Remove unneeded #include <stdlib.h> and <ctype.h>;
- Indentation cleanup.

svn path=/trunk/; revision=36890
2011-04-27 05:09:00 +00:00
Bill Meier
2cb9d994a1 From Yaniv Kaul: some 'set but not used' compilation fixes.
svn path=/trunk/; revision=36889
2011-04-27 05:02:47 +00:00
Bill Meier
1b9144beb8 From Yaniv Kaul: some 'set but not used' compilation fixes.
svn path=/trunk/; revision=36888
2011-04-27 04:27:38 +00:00
Bill Meier
2891d9084d From Yaniv Kaul: some 'set but not used' compilation fixes;
From me:
 Use consistent indentation in the source file.

svn path=/trunk/; revision=36887
2011-04-27 04:24:44 +00:00
Guy Harris
f43797cf42 Make the frame_data_sequence structure opaque, and move some other
implementation details into frame_data_sequence.c as well.

svn path=/trunk/; revision=36886
2011-04-27 04:11:37 +00:00
Guy Harris
9e2ecb8d7a Add frame_data_sequence.c.
svn path=/trunk/; revision=36885
2011-04-27 03:57:21 +00:00
Bill Meier
856254da59 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 /* */

svn path=/trunk/; revision=36884
2011-04-27 03:45:19 +00:00
Bill Meier
f4323af2b2 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

svn path=/trunk/; revision=36883
2011-04-27 03:13:08 +00:00
Guy Harris
59ef61f6da Don't free the frame_data_sequence unless we have one.
svn path=/trunk/; revision=36882
2011-04-27 03:13:03 +00:00
Guy Harris
c9b9dd690b 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.

svn path=/trunk/; revision=36881
2011-04-27 02:54:44 +00:00
Guy Harris
6c09e1cf95 Another hack to handle the one-pass case.
svn path=/trunk/; revision=36880
2011-04-27 00:43:31 +00:00
Guy Harris
e403a2f0b2 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.

svn path=/trunk/; revision=36879
2011-04-26 23:17:47 +00:00
Guy Harris
b205288622 If HAVE_LIBGNUTLS isn't defined, don't build functions that are used
only if HAVE_LIBGNUTLS is defined.

svn path=/trunk/; revision=36878
2011-04-26 23:07:40 +00:00
Guy Harris
c97679e264 If HAVE_LIBGNUTLS isn't defined, don't build functions that are used
only if HAVE_LIBGNUTLS is defined.

svn path=/trunk/; revision=36877
2011-04-26 22:56:22 +00:00
Gerald Combs
767e73c3d5 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.

svn path=/trunk/; revision=36876
2011-04-26 22:51:35 +00:00
Gerald Combs
c6fecb57b0 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.

svn path=/trunk/; revision=36875
2011-04-26 21:59:11 +00:00
Anders Broman
6eae60aa2f From Yaniv Kaul:
Fix 'set but not used' errors that GCC 4.6 emits.

svn path=/trunk/; revision=36874
2011-04-26 20:24:53 +00:00