Commit Graph

13004 Commits

Author SHA1 Message Date
Bill Meier 3d909801bc proto_registrar_dump_fields: output "" for blurb if blurb is a zero-length string.
svn path=/trunk/; revision=32975
2010-05-26 14:35:06 +00:00
Martin Mathieson 7c4ec2e051 Expert severity was still overlapping with bits length, so separate them.
svn path=/trunk/; revision=32974
2010-05-26 13:53:17 +00:00
Anders Broman f19eee998f Try to optimize a bit.
svn path=/trunk/; revision=32973
2010-05-26 11:51:41 +00:00
Anders Broman 2ed269439d Fix indentation.
svn path=/trunk/; revision=32972
2010-05-26 11:51:07 +00:00
Tomas Kukosa e2082dedb6 Export value_string_ext related functions
svn path=/trunk/; revision=32971
2010-05-26 07:39:03 +00:00
Jeff Morriss 12b5361a7b 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.

svn path=/trunk/; revision=32967
2010-05-26 03:31:30 +00:00
Gerald Combs d3be76c010 g_error -> expert_add_info_format. Fixup whitespace.
svn path=/trunk/; revision=32966
2010-05-26 02:46:50 +00:00
Guy Harris 347e7a0052 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).

svn path=/trunk/; revision=32963
2010-05-26 02:25:13 +00:00
Guy Harris ebc3739570 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.)

svn path=/trunk/; revision=32961
2010-05-26 02:01:49 +00:00
Jeff Morriss ea0c9d6b14 Reindent a bit
svn path=/trunk/; revision=32960
2010-05-26 01:51:41 +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
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
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 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
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 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 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 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
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
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
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 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
Gerasimos Dimitriadis df3a43e0e5 Remove debugging printf from match_strval_ext_init()
svn path=/trunk/; revision=32903
2010-05-19 22:09:07 +00:00
Martin Mathieson f40e47b4c0 Remove VALS cast as discussed on dev mailing list.
svn path=/trunk/; revision=32902
2010-05-19 21:33:01 +00:00
Jeff Morriss bd215f90bc 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.

svn path=/trunk/; revision=32901
2010-05-19 20:42:53 +00:00
Jaap Keuter 7e44a40238 From Lars Ruoff:
Updated and added some sanity checks to Alcatel-Lucent DHCP vendor specific options.

svn path=/trunk/; revision=32900
2010-05-19 18:09:33 +00:00
Bill Meier 10fb76ce44 Add svn 'keywords' and 'eol-style' properties
svn path=/trunk/; revision=32898
2010-05-19 12:44:57 +00:00
Kovarththanan Rajaratnam 52d4ae5b8d Add and use BTOBEX_CODE_VALS_MASK to avoid hardcoding values
svn path=/trunk/; revision=32897
2010-05-19 08:47:10 +00:00
Kovarththanan Rajaratnam fe48b90849 Remove a couple of check_col()
svn path=/trunk/; revision=32896
2010-05-19 08:37:29 +00:00
Kovarththanan Rajaratnam 855bafe183 Use newly introduced BTOBEX_CODE_VALS_CONNECT define
svn path=/trunk/; revision=32895
2010-05-19 08:23:53 +00:00
Kovarththanan Rajaratnam 9537eb450e Introduce defines to avoid hardcoding values
svn path=/trunk/; revision=32894
2010-05-19 08:19:41 +00:00