obnox/wireshark/wip.git
13 years agoExpert severity was still overlapping with bits length, so separate them.
martinm [Wed, 26 May 2010 13:53:17 +0000 (13:53 +0000)]
Expert severity was still overlapping with bits length, so separate them.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32974 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoTry to optimize a bit.
etxrab [Wed, 26 May 2010 11:51:41 +0000 (11:51 +0000)]
Try to optimize a bit.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32973 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix indentation.
etxrab [Wed, 26 May 2010 11:51:07 +0000 (11:51 +0000)]
Fix indentation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32972 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoExport value_string_ext related functions
kukosa [Wed, 26 May 2010 07:39:03 +0000 (07:39 +0000)]
Export value_string_ext related functions

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32971 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoUntabify.
stig [Wed, 26 May 2010 07:19:42 +0000 (07:19 +0000)]
Untabify.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32970 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDon't report EINTR - it might be from a ^C.
guy [Wed, 26 May 2010 05:33:57 +0000 (05:33 +0000)]
Don't report EINTR - it might be from a ^C.

Do report the error string for other read errors, though.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32969 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDon't send ^T output to the standard error if we're a capture child.
guy [Wed, 26 May 2010 04:29:36 +0000 (04:29 +0000)]
Don't send ^T output to the standard error if we're a capture child.

Make SIGINFO a restart-the-system-call signal, so reads etc. don't
return an error.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32968 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemember the default value of each protocol preference.
morriss [Wed, 26 May 2010 03:31:30 +0000 (03:31 +0000)]
Remember the default value of each protocol preference.

If, when we're writing the preferences file, the current value of the
preference is the same as the default, write out the preference (since the
preference file is also the documentation for the preferences) but comment it
out (so that if, for example, you go back to an older version of Wireshark
you won't get warnings about non-existant preferences that you didn't
change--and thus probably don't care too much about).

It might be interesting to, in the future, add a UI to restore the default
values.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32967 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agog_error -> expert_add_info_format. Fixup whitespace.
gerald [Wed, 26 May 2010 02:46:50 +0000 (02:46 +0000)]
g_error -> expert_add_info_format. Fixup whitespace.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32966 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoUse the right system call name.
guy [Wed, 26 May 2010 02:34:12 +0000 (02:34 +0000)]
Use the right system call name.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32965 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoIf dumpcap exits abnormally, report the error.
guy [Wed, 26 May 2010 02:32:19 +0000 (02:32 +0000)]
If dumpcap exits abnormally, report the error.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32964 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoMore <stdarg.h> cleanup; some are real bugs, some are just "don't do
guy [Wed, 26 May 2010 02:25:13 +0000 (02:25 +0000)]
More <stdarg.h> cleanup; some are real bugs, some are just "don't do
va_start and va_end unless you're actually going to use the va_list"
(those bring the va_start and va_end closer to the use point, which
makes it a little more obvious that we're using <stdarg.h> correctly and
makes it a little harder to use it incorrectly).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32963 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoPut in a warning about the <stdarg.h> problem that I just found and
guy [Wed, 26 May 2010 02:21:23 +0000 (02:21 +0000)]
Put in a warning about the <stdarg.h> problem that I just found and
fixed in one place (and am now fixing in some other places).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32962 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoOnce you've used a va_list, you can't use it again until you
guy [Wed, 26 May 2010 02:01:49 +0000 (02:01 +0000)]
Once you've used a va_list, you can't use it again until you
reinitialize it with va_start().  (Yes, there are platforms where
reusing the va_arg fails, e.g. Mac OS X on x86-64.)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32961 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoReindent a bit
morriss [Wed, 26 May 2010 01:51:41 +0000 (01:51 +0000)]
Reindent a bit

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32960 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix build without pcap.
guy [Wed, 26 May 2010 01:32:00 +0000 (01:32 +0000)]
Fix build without pcap.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32959 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdd a -q flag to dumpcap, to squelch its reporting of the packet count,
guy [Wed, 26 May 2010 00:19:27 +0000 (00:19 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32958 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agor32323 broke packet detail tree expansion using the left/right keys on
gerald [Tue, 25 May 2010 23:55:33 +0000 (23:55 +0000)]
r32323 broke packet detail tree expansion using the left/right keys on
X11. Add back the removed code and add checks for expandable items.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32957 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoHandle lines ending in \r\n.
wmeier [Tue, 25 May 2010 22:27:00 +0000 (22:27 +0000)]
Handle lines ending in \r\n.
Fixes Bug #4780
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4780

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32956 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Sam Leffler and Javier Cardona via email & bug 4793:
gerald [Tue, 25 May 2010 22:15:46 +0000 (22:15 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32955 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdd a note about running autogen.sh.
gerald [Tue, 25 May 2010 22:11:00 +0000 (22:11 +0000)]
Add a note about running autogen.sh.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32954 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRFC 4165 uses the same message/parameter formats as draft-12 did so let's
morriss [Tue, 25 May 2010 21:12:43 +0000 (21:12 +0000)]
RFC 4165 uses the same message/parameter formats as draft-12 did so let's
call it RFC 4165.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32953 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoOnly try header reassembly for TCP.
etxrab [Tue, 25 May 2010 21:00:55 +0000 (21:00 +0000)]
Only try header reassembly for TCP.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32952 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemove find_val_for_string
morriss [Tue, 25 May 2010 20:57:51 +0000 (20:57 +0000)]
Remove find_val_for_string

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32951 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agofind_val_for_string() is only used in prefs.c so remove the prototype
morriss [Tue, 25 May 2010 20:57:14 +0000 (20:57 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32950 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoPull the big pile of code that handles the
guy [Tue, 25 May 2010 20:14:22 +0000 (20:14 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32949 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Neil Piercy:
etxrab [Tue, 25 May 2010 19:29:23 +0000 (19:29 +0000)]
From Neil Piercy:
Fix  misleading PER Bit string display.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4789
(I Added bits display)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32948 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix for bug 4782:
jake [Tue, 25 May 2010 17:47:00 +0000 (17:47 +0000)]
Fix for bug 4782:
Use proper bitmask to test the "MATCH"-part.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32947 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdd a filter for DCT2000 error strings, and allow it be included in generated filters...
martinm [Tue, 25 May 2010 14:02:17 +0000 (14:02 +0000)]
Add a filter for DCT2000 error strings, and allow it be included in generated filters from RLC status window.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32946 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRe-organise which FI bits are used to store expert severity and event info, in order...
martinm [Tue, 25 May 2010 11:21:51 +0000 (11:21 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32945 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoSupport of value_string_ext in the asn2wrs using new directive #.USE_VALS_EXT
kukosa [Tue, 25 May 2010 09:07:12 +0000 (09:07 +0000)]
Support of value_string_ext in the asn2wrs using new directive #.USE_VALS_EXT
Example usage in NBAP

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32944 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemove faulty vendor from SIP AVP:s, update comments.
etxrab [Tue, 25 May 2010 08:42:24 +0000 (08:42 +0000)]
Remove faulty vendor from SIP AVP:s, update comments.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32943 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Jakub Ruzicka:
etxrab [Tue, 25 May 2010 05:48:36 +0000 (05:48 +0000)]
From Jakub Ruzicka:
Trunk packet support in IAX2 dissector
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4783

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32942 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom H.sivank: GtkOSXApplication support.
guy [Tue, 25 May 2010 00:35:44 +0000 (00:35 +0000)]
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".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32941 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoMinor rewording; Also: add note to not use "" for a hf[] array blurb.
wmeier [Tue, 25 May 2010 00:00:58 +0000 (00:00 +0000)]
Minor rewording; Also: add note to not use "" for a hf[] array blurb.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32940 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoJose Pedro Oliveira <jpo@di.uminho.pt>
jmayer [Mon, 24 May 2010 23:41:21 +0000 (23:41 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32939 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAt least according to the CMake 2.6 documentation,
guy [Mon, 24 May 2010 22:50:30 +0000 (22:50 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32938 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix the value_string regexp so it doesn't match value_string_ext (which we don't...
morriss [Mon, 24 May 2010 22:31:51 +0000 (22:31 +0000)]
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)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32937 f5534014-38df-0310-8fa8-9805f1628bb7

13 years ago- Add a comment about the magic in the FindXXX.cmake filenames.
jmayer [Mon, 24 May 2010 21:59:29 +0000 (21:59 +0000)]
- 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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32936 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoUse the new name for the last argument to proto_tree_add_item().
guy [Mon, 24 May 2010 17:39:03 +0000 (17:39 +0000)]
Use the new name for the last argument to proto_tree_add_item().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32935 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoCheck that the PDU isn't bigger than the reported grant size. Thought I was already...
martinm [Mon, 24 May 2010 16:28:34 +0000 (16:28 +0000)]
Check that the PDU isn't bigger than the reported grant size. Thought I was already doing this...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32934 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix reassemble_test's (copy of the) proto_tree_add_item() prototype to get it
morriss [Mon, 24 May 2010 15:13:02 +0000 (15:13 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32933 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoUse value_string_ext for AVP:s
etxrab [Mon, 24 May 2010 14:20:53 +0000 (14:20 +0000)]
Use value_string_ext for AVP:s

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32932 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Tamás Regõs:
etxrab [Mon, 24 May 2010 14:18:02 +0000 (14:18 +0000)]
From Tamás Regõs:
Diameter AVP clean up.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32931 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Pascal Quantin:
etxrab [Mon, 24 May 2010 09:01:22 +0000 (09:01 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32930 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRefer to the endianness arguments as "encoding" rather than
guy [Mon, 24 May 2010 06:06:17 +0000 (06:06 +0000)]
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;

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32929 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdd missing vendor atribute.
etxrab [Mon, 24 May 2010 05:01:39 +0000 (05:01 +0000)]
Add missing vendor atribute.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32928 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoMove VLAN and ARP closer to the top.
etxrab [Mon, 24 May 2010 04:09:03 +0000 (04:09 +0000)]
Move VLAN and ARP closer to the top.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32927 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix a typo.
etxrab [Mon, 24 May 2010 04:03:45 +0000 (04:03 +0000)]
Fix a typo.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32926 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoUse the new REP_ values for proto_tree_add_item().
guy [Mon, 24 May 2010 03:05:19 +0000 (03:05 +0000)]
Use the new REP_ values for proto_tree_add_item().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32925 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoUse REP_BIG_ENDIAN for integral data types not already using REP_
guy [Mon, 24 May 2010 02:54:08 +0000 (02:54 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32924 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoGet rid of private byte-order definition. The definition didn't match
guy [Mon, 24 May 2010 02:28:16 +0000 (02:28 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32923 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoMake get_ber_length() iterative instead of recursive so we don't overrun the
gerald [Sun, 23 May 2010 23:42:58 +0000 (23:42 +0000)]
Make get_ber_length() iterative instead of recursive so we don't overrun the
stack. Discovered by J. Oquendo.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32922 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix for bug 4544 - Decrypted data for STARTLS session is not shown in packet list...
sake [Sun, 23 May 2010 22:23:33 +0000 (22:23 +0000)]
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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32921 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoUpdate the services file from IANA's port-numbers.
stig [Sun, 23 May 2010 16:02:40 +0000 (16:02 +0000)]
Update the services file from IANA's port-numbers.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32920 f5534014-38df-0310-8fa8-9805f1628bb7

13 years ago[Automatic manuf and enterprise-numbers update for 2010-05-23]
gerald [Sun, 23 May 2010 15:03:35 +0000 (15:03 +0000)]
[Automatic manuf and enterprise-numbers update for 2010-05-23]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32917 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDescribe values_string_ext.
etxrab [Sun, 23 May 2010 10:00:50 +0000 (10:00 +0000)]
Describe values_string_ext.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32916 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDeclare ipproto_val_ext as extern, in the hopes that will keep it from
guy [Sun, 23 May 2010 02:27:08 +0000 (02:27 +0000)]
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).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32915 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoUse value_string_ext for ip protocol.
etxrab [Sat, 22 May 2010 22:04:18 +0000 (22:04 +0000)]
Use value_string_ext for ip protocol.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32914 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoHave abs_time_to_str() and abs_time_to_str_secs() take an additional
guy [Fri, 21 May 2010 06:33:25 +0000 (06:33 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32913 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix regression: unable to enter values in Filter Expression window unless value list...
wmeier [Thu, 20 May 2010 23:49:57 +0000 (23:49 +0000)]
Fix regression: unable to enter values in Filter Expression window unless value list present.
(Regression introduced in SVN #30918).
Code reworked slightly for clarification.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32912 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix for bug 4778:
jake [Thu, 20 May 2010 19:03:13 +0000 (19:03 +0000)]
Fix for bug 4778:
Check that the widget pointer is still present.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32911 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Hadar Shoham:
jake [Thu, 20 May 2010 18:34:38 +0000 (18:34 +0000)]
From Hadar Shoham:
Add support to AP request option reserved bit.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32910 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFixed warning "Field width should have type 'int'".
stig [Thu, 20 May 2010 14:53:29 +0000 (14:53 +0000)]
Fixed warning "Field width should have type 'int'".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32909 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRewrote to avoid "More data arguments than '%' conversions" warning.
stig [Thu, 20 May 2010 11:56:58 +0000 (11:56 +0000)]
Rewrote to avoid "More data arguments than '%' conversions" warning.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32908 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRewrote to avoid "More data arguments than '%' conversions" warning.
stig [Thu, 20 May 2010 11:51:24 +0000 (11:51 +0000)]
Rewrote to avoid "More data arguments than '%' conversions" warning.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32907 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDon't assume that certain address columns are always constant strings -
guy [Thu, 20 May 2010 07:15:27 +0000 (07:15 +0000)]
Don't assume that certain address columns are always constant strings -
they're no more guaranteed to be constant strings than the columns we're
*not* assuming are constant strings.  Fixes bug 4771.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32906 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDetect clang and llvm-gcc.
guy [Wed, 19 May 2010 23:39:45 +0000 (23:39 +0000)]
Detect clang and llvm-gcc.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32905 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDon't have -M affect -v yet; if we end up, for example, having dumpcap
guy [Wed, 19 May 2010 23:27:35 +0000 (23:27 +0000)]
Don't have -M affect -v yet; if we end up, for example, having dumpcap
being the only program that needs to be linked with *pcap, that's when
we'd want to fetch that information, but there might be other libraries
(e.g., the POSIX capabilities library) that it might be linked with but
that programs that use it aren't linked with.

Don't commit to the output formats of -M, as they are, as noted, subject
to change from release to release.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32904 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemove debugging printf from match_strval_ext_init()
dimeg [Wed, 19 May 2010 22:09:07 +0000 (22:09 +0000)]
Remove debugging printf from match_strval_ext_init()

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32903 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemove VALS cast as discussed on dev mailing list.
martinm [Wed, 19 May 2010 21:33:01 +0000 (21:33 +0000)]
Remove VALS cast as discussed on dev mailing list.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32902 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFollowup to rev 23668: ansi_a_ios501_elem_1_strings[] and
morriss [Wed, 19 May 2010 20:42:53 +0000 (20:42 +0000)]
Followup to rev 23668: ansi_a_ios501_elem_1_strings[] and
ansi_a_ios401_elem_1_strings[] are different lengths so use 'ansi_a_elem_1_max'
to know how far we can look into the array (instead of ANSI_A_E_NONE).
Since that variable points to the end of the array--a NULL entry--and since we
don't want to pass a NULL string pointer to proto_tree_add*(), ensure that
we only look at the last valid entry.

Also remove check_col() calls and reindent a bit.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32901 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Lars Ruoff:
jake [Wed, 19 May 2010 18:09:33 +0000 (18:09 +0000)]
From Lars Ruoff:
Updated and added some sanity checks to Alcatel-Lucent DHCP vendor specific options.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32900 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoCommit 32350 replaced the self written FindZ.cmake by cmakes
jmayer [Wed, 19 May 2010 13:05:35 +0000 (13:05 +0000)]
Commit 32350 replaced the self written FindZ.cmake by cmakes
FindZLIB.cmake. What it didn't do was do adapt the magic names
that are derived from the name of the FindXXX.cmake script.
Fix that. Also add $Id$ to the FindZLIB.cmake script.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32899 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdd svn 'keywords' and 'eol-style' properties
wmeier [Wed, 19 May 2010 12:44:57 +0000 (12:44 +0000)]
Add svn 'keywords' and 'eol-style' properties

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32898 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdd and use BTOBEX_CODE_VALS_MASK to avoid hardcoding values
krj [Wed, 19 May 2010 08:47:10 +0000 (08:47 +0000)]
Add and use BTOBEX_CODE_VALS_MASK to avoid hardcoding values

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32897 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemove a couple of check_col()
krj [Wed, 19 May 2010 08:37:29 +0000 (08:37 +0000)]
Remove a couple of check_col()

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32896 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoUse newly introduced BTOBEX_CODE_VALS_CONNECT define
krj [Wed, 19 May 2010 08:23:53 +0000 (08:23 +0000)]
Use newly introduced BTOBEX_CODE_VALS_CONNECT define

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32895 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoIntroduce defines to avoid hardcoding values
krj [Wed, 19 May 2010 08:19:41 +0000 (08:19 +0000)]
Introduce defines to avoid hardcoding values

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32894 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoTighten scope of code variable
krj [Wed, 19 May 2010 08:13:26 +0000 (08:13 +0000)]
Tighten scope of code variable

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32893 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdded a preference to display data as text.
stig [Wed, 19 May 2010 07:21:55 +0000 (07:21 +0000)]
Added a preference to display data as text.
This fixes bug 4603.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32892 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemove superfluous NULL assignment
krj [Wed, 19 May 2010 06:45:57 +0000 (06:45 +0000)]
Remove superfluous NULL assignment

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32891 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemove weird assignment to pinfo->private_data
krj [Wed, 19 May 2010 06:28:48 +0000 (06:28 +0000)]
Remove weird assignment to pinfo->private_data

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32890 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemove references to ppp_handle (unused)
krj [Wed, 19 May 2010 06:27:37 +0000 (06:27 +0000)]
Remove references to ppp_handle (unused)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32889 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoPass along btrfcomm_data_t to higher layer protocols
krj [Wed, 19 May 2010 06:26:02 +0000 (06:26 +0000)]
Pass along btrfcomm_data_t to higher layer protocols

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32888 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAlign defines
krj [Wed, 19 May 2010 06:01:29 +0000 (06:01 +0000)]
Align defines

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32887 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix indentation.
guy [Wed, 19 May 2010 03:50:09 +0000 (03:50 +0000)]
Fix indentation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32886 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix comments.
guy [Wed, 19 May 2010 03:49:52 +0000 (03:49 +0000)]
Fix comments.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32885 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoIf the user asks for the Capture -> Interfaces dialog, and there are no
guy [Wed, 19 May 2010 03:05:40 +0000 (03:05 +0000)]
If the user asks for the Capture -> Interfaces dialog, and there are no
network interfaces, pop up a dialog saying that, rather than popping up
an empty Interfaces dialog.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32884 f5534014-38df-0310-8fa8-9805f1628bb7

13 years ago-S doesn't require an interface, either.
guy [Wed, 19 May 2010 02:55:05 +0000 (02:55 +0000)]
-S doesn't require an interface, either.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32883 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRegularize indentation a bit.
guy [Wed, 19 May 2010 02:47:16 +0000 (02:47 +0000)]
Regularize indentation a bit.

Let pcap_statustostr()'s result suffice for most PCAP_ERROR_ errors.
Don't mention the capture device name multiple times in the error
message.  Treat positive returns from pcap_can_set_rfmon() other than 0
or 1 as weird returns, not error returns.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32882 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoiscsi also has a system port (860) registered in addition to the more common
sahlberg [Tue, 18 May 2010 22:00:17 +0000 (22:00 +0000)]
iscsi also has a system port (860) registered in addition to the more common
port (3260).

add knowledge about the registered system port for iscsi to the heuristics
so we automatically detect when iscsi is transported over this optional port.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32881 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoUse val_to_str() instead of match_strval() to ensure we get a non-NULL result to...
morriss [Tue, 18 May 2010 16:05:37 +0000 (16:05 +0000)]
Use val_to_str() instead of match_strval() to ensure we get a non-NULL result to pass to proto_tree_add*().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32880 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdd epan/dissectors/dcerpc/ and epan/dissectors/pidl/ to the source distribution
morriss [Tue, 18 May 2010 15:58:49 +0000 (15:58 +0000)]
Add epan/dissectors/dcerpc/ and epan/dissectors/pidl/ to the source distribution

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32879 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAvoid passing a NULL pointer to a string to proto_tree_add_uint_format()
morriss [Tue, 18 May 2010 14:17:11 +0000 (14:17 +0000)]
Avoid passing a NULL pointer to a string to proto_tree_add_uint_format()

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32878 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoUse val_to_str() instead of match_strval() to ensure we get a non-NULL result.
morriss [Tue, 18 May 2010 14:04:31 +0000 (14:04 +0000)]
Use val_to_str() instead of match_strval() to ensure we get a non-NULL result.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32877 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRestore blank line before "and by" removed in SVN #32864;
wmeier [Tue, 18 May 2010 14:01:59 +0000 (14:01 +0000)]
Restore blank line before "and by" removed in SVN #32864;
Also: Line up EMail address text for slava.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32876 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdd Slava as per https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4741#c4
morriss [Tue, 18 May 2010 13:39:22 +0000 (13:39 +0000)]
Add Slava as per https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4741#c4

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32875 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdd FIXME
krj [Tue, 18 May 2010 11:44:32 +0000 (11:44 +0000)]
Add FIXME

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32874 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemove NULL pointer guard in defragment_init()
krj [Tue, 18 May 2010 10:49:09 +0000 (10:49 +0000)]
Remove NULL pointer guard in defragment_init()

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32873 f5534014-38df-0310-8fa8-9805f1628bb7