Commit Graph

31791 Commits

Author SHA1 Message Date
Guy Harris 7a630c61a1 Add a -q flag to dumpcap, to squelch its reporting of the packet count,
and add support for SIGINFO, so, if your OS supports SIGINFO, you can
get the packet count by typing ^T.

svn path=/trunk/; revision=32958
2010-05-26 00:19:27 +00:00
Gerald Combs 237eef2ae7 r32323 broke packet detail tree expansion using the left/right keys on
X11. Add back the removed code and add checks for expandable items.

svn path=/trunk/; revision=32957
2010-05-25 23:55:33 +00:00
Bill Meier a34ed6fcff Handle lines ending in \r\n.
Fixes Bug #4780 
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4780

svn path=/trunk/; revision=32956
2010-05-25 22:27:00 +00:00
Gerald Combs a07fd7f50d From Sam Leffler and Javier Cardona via email & bug 4793:
Add 802.11s mesh support.

From me:

Merge all of the "#ifdef" and "#if 0" switches into "#ifdef
MESH_OVERRIDES"

Add Fast BSS Transition to the list of overridden tags.

Fix a couple of variable initialization errors.

svn path=/trunk/; revision=32955
2010-05-25 22:15:46 +00:00
Gerald Combs 4ebe9a0e2e Add a note about running autogen.sh.
svn path=/trunk/; revision=32954
2010-05-25 22:11:00 +00:00
Jeff Morriss a12990e603 RFC 4165 uses the same message/parameter formats as draft-12 did so let's
call it RFC 4165.

svn path=/trunk/; revision=32953
2010-05-25 21:12:43 +00:00
Anders Broman 7436d04550 Only try header reassembly for TCP.
svn path=/trunk/; revision=32952
2010-05-25 21:00:55 +00:00
Jeff Morriss 069fbb2ad3 Remove find_val_for_string
svn path=/trunk/; revision=32951
2010-05-25 20:57:51 +00:00
Jeff Morriss c420b83ee5 find_val_for_string() is only used in prefs.c so remove the prototype
and make it static.

When reading enum preferences, use the current value of the preference as the
default value of the preference instead of a hard-coded 1.  This way if we
couldn't find the appropriate value we'll don't end up changing the preference
to something that may or may not make sense.

svn path=/trunk/; revision=32950
2010-05-25 20:57:14 +00:00
Guy Harris 71de391514 Pull the big pile of code that handles the
capture-stopping/file-switching operation into a routine.  Move a few
variables into the loop_data structure so that routine can get at them.

svn path=/trunk/; revision=32949
2010-05-25 20:14:22 +00:00
Anders Broman 91e949512d From Neil Piercy:
Fix  misleading PER Bit string display.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4789
(I Added bits display)

svn path=/trunk/; revision=32948
2010-05-25 19:29:23 +00:00
Jaap Keuter e441284063 Fix for bug 4782:
Use proper bitmask to test the "MATCH"-part.

svn path=/trunk/; revision=32947
2010-05-25 17:47:00 +00:00
Martin Mathieson 892d3112ed Add a filter for DCT2000 error strings, and allow it be included in generated filters from RLC status window.
svn path=/trunk/; revision=32946
2010-05-25 14:02:17 +00:00
Martin Mathieson ee5c636603 Re-organise which FI bits are used to store expert severity and event info, in order to avoid clash with bit offset and length as added in 4413 (Improve bitview display).
The event info values were (mostly) done as though they were flags rather than values, but as it doesn't really make sense to combine events I changed them to use contiguous values.  They now use the 8 m.s. bits, so there are now 9 unused bits available for new uses.

svn path=/trunk/; revision=32945
2010-05-25 11:21:51 +00:00
Tomas Kukosa 2f0c4dde50 Support of value_string_ext in the asn2wrs using new directive #.USE_VALS_EXT
Example usage in NBAP

svn path=/trunk/; revision=32944
2010-05-25 09:07:12 +00:00
Anders Broman 3b8ccd8e63 Remove faulty vendor from SIP AVP:s, update comments.
svn path=/trunk/; revision=32943
2010-05-25 08:42:24 +00:00
Anders Broman 1010acc278 From Jakub Ruzicka:
Trunk packet support in IAX2 dissector 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4783

svn path=/trunk/; revision=32942
2010-05-25 05:48:36 +00:00
Guy Harris 36623bcb71 From H.sivank: GtkOSXApplication support.
Call the various flavors of OS X integration just "OS X integration",
not anything with "IGE" in it - it appears that, in some places,
"ige-mac-integration" refers only to the older Carbon-based functions,
although the library still appears to be called -ligemacintegration.

Update the URLs for the information about the OS X integration
libraries.

Clean up help message for --with-pcap-remote.

Clean up white space a bit.

Speaking of white space, it's "Mac OS X", not "MacOS X".

svn path=/trunk/; revision=32941
2010-05-25 00:35:44 +00:00
Bill Meier 9bafe20643 Minor rewording; Also: add note to not use "" for a hf[] array blurb.
svn path=/trunk/; revision=32940
2010-05-25 00:00:58 +00:00
Jörg Mayer fbbf502752 Jose Pedro Oliveira <jpo@di.uminho.pt>
(via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4786)

Add missing +INCLUDE(CheckVariableExists) to make the previous
commit work.

svn path=/trunk/; revision=32939
2010-05-24 23:41:21 +00:00
Guy Harris f036ba32ab At least according to the CMake 2.6 documentation,
CHECK_VARIABLE_EXISTS() can be used to check for C variables; use that
to check for pcap_version.

svn path=/trunk/; revision=32938
2010-05-24 22:50:30 +00:00
Jeff Morriss ca2a2b6298 Fix the value_string regexp so it doesn't match value_string_ext (which we don't have to check for NULL termination and the like)
svn path=/trunk/; revision=32937
2010-05-24 22:31:51 +00:00
Jörg Mayer 47e4c55698 - Add a comment about the magic in the FindXXX.cmake filenames.
- Fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4786
  Define HAVE_PCAP_VERSION if HAVE_PCAP_LIB_VERSION is set.

svn path=/trunk/; revision=32936
2010-05-24 21:59:29 +00:00
Guy Harris b8812638dc Use the new name for the last argument to proto_tree_add_item().
svn path=/trunk/; revision=32935
2010-05-24 17:39:03 +00:00
Martin Mathieson 98c68fc8ec Check that the PDU isn't bigger than the reported grant size. Thought I was already doing this...
svn path=/trunk/; revision=32934
2010-05-24 16:28:34 +00:00
Jeff Morriss 64f5d56bba Fix reassemble_test's (copy of the) proto_tree_add_item() prototype to get it
compiling again.

fragment_add_seq_check(), fragment_add_seq_802_11(), and fragment_add_seq_next()
all call fragment_add_seq_check_work() so make their prototypes match each other
in const-ness.  This fixes a warning when compiling reassemble_test.

svn path=/trunk/; revision=32933
2010-05-24 15:13:02 +00:00
Anders Broman 2543a7ab91 Use value_string_ext for AVP:s
svn path=/trunk/; revision=32932
2010-05-24 14:20:53 +00:00
Anders Broman c2e9a963f0 From Tamás Regõs:
Diameter AVP clean up.

svn path=/trunk/; revision=32931
2010-05-24 14:18:02 +00:00
Anders Broman ac8e44a6a5 From Pascal Quantin:
Try to decode the message when the direction is unknown (I dissect it as DL first as fake UL dissection could trigger a malformed packet error). Moreover the patch fixes a shift in the EMM IE strings list, leading to incorrect decoding.

svn path=/trunk/; revision=32930
2010-05-24 09:01:22 +00:00
Guy Harris 1b444c55fd Refer to the endianness arguments as "encoding" rather than
"representation" - we already use "representation" to refer to the text
representation of fields.

Change some routines with an endianness argument to make it a
representation argument instead; 

svn path=/trunk/; revision=32929
2010-05-24 06:06:17 +00:00
Anders Broman 19f350b9f4 Add missing vendor atribute.
svn path=/trunk/; revision=32928
2010-05-24 05:01:39 +00:00
Anders Broman a11836dc8b Move VLAN and ARP closer to the top.
svn path=/trunk/; revision=32927
2010-05-24 04:09:03 +00:00
Anders Broman 5198a0b3de Fix a typo.
svn path=/trunk/; revision=32926
2010-05-24 04:03:45 +00:00
Guy Harris 5e8cbc60d4 Use the new REP_ values for proto_tree_add_item().
svn path=/trunk/; revision=32925
2010-05-24 03:05:19 +00:00
Guy Harris 67c095e188 Use REP_BIG_ENDIAN for integral data types not already using REP_
(they're one-byte, so the byte order is irrelevant, but it's probably a
bit cleaner to use REP_*_ENDIAN for all integral data types), and REP_NA
for the top-level protocol item.

svn path=/trunk/; revision=32924
2010-05-24 02:54:08 +00:00
Guy Harris 313b3edf0a Get rid of private byte-order definition. The definition didn't match
the name - a non-zero last argument to proto_tree_add_item(), such as
TRUE or REP_LITTLE_ENDIAN, means "little-endian", and a zero argument,
such as FALSE or REP_BIG_ENDIAN, means "big-endian"; at least as I read
the spec, little-endian is correct, but the wrong definition's been used
for a while, so we'll use REP_BIG_ENDIAN.

svn path=/trunk/; revision=32923
2010-05-24 02:28:16 +00:00
Gerald Combs 20914ee220 Make get_ber_length() iterative instead of recursive so we don't overrun the
stack. Discovered by J. Oquendo.

svn path=/trunk/; revision=32922
2010-05-23 23:42:58 +00:00
Sake Blok d323dd81ec Fix for bug 4544 - Decrypted data for STARTLS session is not shown in packet list when using "starttls" SSL decryption preference
- make sure the SSL dissector knows how to reach the original dissector for the decrypted data
- make sure the SMTP dissector does not call the SSL dissector again with the decrypted data


svn path=/trunk/; revision=32921
2010-05-23 22:23:33 +00:00
Stig Bjørlykke 020a7a5a66 Update the services file from IANA's port-numbers.
svn path=/trunk/; revision=32920
2010-05-23 16:02:40 +00:00
Gerald Combs d8951f226f [Automatic manuf and enterprise-numbers update for 2010-05-23]
svn path=/trunk/; revision=32917
2010-05-23 15:03:35 +00:00
Anders Broman be717625ff Describe values_string_ext.
svn path=/trunk/; revision=32916
2010-05-23 10:00:50 +00:00
Guy Harris 2e191a7a6b Declare ipproto_val_ext as extern, in the hopes that will keep it from
being exported by epan/dissectors/packet-ip.c (imported, yes; exported,
no).

svn path=/trunk/; revision=32915
2010-05-23 02:27:08 +00:00
Anders Broman 2b90c98a1a Use value_string_ext for ip protocol.
svn path=/trunk/; revision=32914
2010-05-22 22:04:18 +00:00
Guy Harris 927b7da346 Have abs_time_to_str() and abs_time_to_str_secs() take an additional
argument indicating whether to include the time zone in the string.  If
we're constructing a display filter, don't include the time zone,
otherwise do.  Fixes bug 4756.

svn path=/trunk/; revision=32913
2010-05-21 06:33:25 +00:00
Bill Meier 4dcaf67f37 Fix regression: unable to enter values in Filter Expression window unless value list present.
(Regression introduced in SVN #30918).
Code reworked slightly for clarification.

svn path=/trunk/; revision=32912
2010-05-20 23:49:57 +00:00
Jaap Keuter 1a3fd99542 Fix for bug 4778:
Check that the widget pointer is still present.

svn path=/trunk/; revision=32911
2010-05-20 19:03:13 +00:00
Jaap Keuter 39bd052f7b From Hadar Shoham:
Add support to AP request option reserved bit.

svn path=/trunk/; revision=32910
2010-05-20 18:34:38 +00:00
Stig Bjørlykke aa6dc5e692 Fixed warning "Field width should have type 'int'".
svn path=/trunk/; revision=32909
2010-05-20 14:53:29 +00:00
Stig Bjørlykke f945be91f6 Rewrote to avoid "More data arguments than '%' conversions" warning.
svn path=/trunk/; revision=32908
2010-05-20 11:56:58 +00:00
Stig Bjørlykke 7773d1a2a6 Rewrote to avoid "More data arguments than '%' conversions" warning.
svn path=/trunk/; revision=32907
2010-05-20 11:51:24 +00:00