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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
krj [Tue, 18 May 2010 10:45:39 +0000 (10:45 +0000)]
Remove a couple of superfluous NULL assignments
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32872
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Tue, 18 May 2010 10:43:36 +0000 (10:43 +0000)]
Remove a couple of check_col()
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32871
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Tue, 18 May 2010 10:39:12 +0000 (10:39 +0000)]
Parse everything as OBEX (for now).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32870
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Tue, 18 May 2010 09:01:08 +0000 (09:01 +0000)]
Add proper item for "User encapsulation not handled" to be able to
second-click the entry to edit preferences.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32869
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Tue, 18 May 2010 08:29:19 +0000 (08:29 +0000)]
Remove #if 0 code
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32868
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Tue, 18 May 2010 08:22:42 +0000 (08:22 +0000)]
Handle fgets() error path
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32867
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Tue, 18 May 2010 08:08:08 +0000 (08:08 +0000)]
Mark defragment_init() as an init routine
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32866
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Tue, 18 May 2010 07:49:55 +0000 (07:49 +0000)]
Fix several GCC build issues
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32865
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Tue, 18 May 2010 07:37:37 +0000 (07:37 +0000)]
Add Allan M. Madsen
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32864
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Tue, 18 May 2010 07:35:31 +0000 (07:35 +0000)]
Include (local) packet-btl2cap.h properly
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32863
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Tue, 18 May 2010 07:32:04 +0000 (07:32 +0000)]
From Allan M. Madsen:
Initial implementation of Bluetooth OBEX dissector. Work in progress.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32862
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Tue, 18 May 2010 06:16:03 +0000 (06:16 +0000)]
Prepare the docbooks for the 1.4 branch.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32861
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Tue, 18 May 2010 06:09:52 +0000 (06:09 +0000)]
Extract ogf from the opcode
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32860
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Tue, 18 May 2010 06:03:05 +0000 (06:03 +0000)]
Add CPackConfig.txt to the tarball.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32859
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Tue, 18 May 2010 05:46:44 +0000 (05:46 +0000)]
Dissect Synchronous Connection correctly
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32858
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 18 May 2010 05:32:29 +0000 (05:32 +0000)]
Fix some errors. Use FormatMessageA(), as we need the string in ASCII.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32857
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 18 May 2010 03:35:20 +0000 (03:35 +0000)]
Squelch an unused-variable warning.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32856
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 18 May 2010 03:29:45 +0000 (03:29 +0000)]
Add a routine to convert Win32 error statuses into strings, and use it
when generating error messages.
The error code from CreatePipe() is gotten by calling GetLastError();
it's not in errno.
Clean up indentation a bit.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32855
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 18 May 2010 02:48:51 +0000 (02:48 +0000)]
Move some routines around, fix and shuffle comments.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32854
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 18 May 2010 02:36:02 +0000 (02:36 +0000)]
Move get_pcap_linktype() into dumpcap - it's not used elsewhere.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32853
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 18 May 2010 01:48:46 +0000 (01:48 +0000)]
Only negative return values from pcap_activate() are errors; positive
return values are success-with-a-warning.
Report those errors with a string.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32852
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 18 May 2010 00:20:30 +0000 (00:20 +0000)]
Don't write the SP_SUCCESS messages unless -Z was specified.
Add support for a machine-readable "-v" output, which prints only the
pcap version string.
Give a little more information about the machine-readable format, but
note that it's primarily intended for consumption by Wireshark and
TShark and is subject to change.
Properly hyphenate "pcap-ng".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32851
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 17 May 2010 23:56:00 +0000 (23:56 +0000)]
Make -Z always generate machine-readable output, and don't bother
supplying -M along with -Z. (We keep -M around for debugging use; it's
documented, unlike -Z.)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32850
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 17 May 2010 23:13:24 +0000 (23:13 +0000)]
If dumpcap is run with -D, don't select a default interface; it's not
necessary.
If it's run with -D and -M, and we found no interfaces, don't treat that
as an error; let the code that reads our output just indicate it as "no
interfaces available", so *its* caller can decide whether to report an
error or not (in some cases in Wireshark, it's obvious that there are no
interfaces, e.g. there aren't any listed on the welcome screen, so
popping up a dialog is pointless).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32849
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Mon, 17 May 2010 21:49:09 +0000 (21:49 +0000)]
Don't pass a NULL pointer to what is supposed to be (according to the format) a string: some implementations of vsnprintf() will core on that. (Unfortunately it seems that g_vsnprintf() doesn't protect us from this...)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32848
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Mon, 17 May 2010 20:38:46 +0000 (20:38 +0000)]
Add a bunch of tools to the source distribution
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32847
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Mon, 17 May 2010 20:24:28 +0000 (20:24 +0000)]
Added some new features.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32846
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Mon, 17 May 2010 18:48:44 +0000 (18:48 +0000)]
From Lars Ruoff:
Add some more robustness to Alcatel-Lucent vendor specific
DHCP options and add some new option values.
It now supports all currently implemented option values, i.e.:
{Option Opcode Length (bytes) Content}
AVA 58 (0x3A) 2 Vlanid
IP Touch TFTP1 64 (0x40) 4 IPv4 address
IP Touch TFTP2 65 (0x41) 4 IPv4 address
APPLICATION_TYPE 66 (0x42) 1 0 (noe) / 1 (sip)
SIP URL 67 (0x43) x bytes url string
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32845
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 17 May 2010 18:41:48 +0000 (18:41 +0000)]
Update a comment.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32844
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 17 May 2010 18:40:23 +0000 (18:40 +0000)]
When dumpcap is run to get an interface list, interface capabilities, or
interface statistics, have its error messages come out as sync-pipe
errors, have it send a sync-pipe "success" message on success, and have
the callers get that message and display it.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32843
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Mon, 17 May 2010 15:07:08 +0000 (15:07 +0000)]
Update Robert Hogan's entry to include TN5250
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32842
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 17 May 2010 04:08:08 +0000 (04:08 +0000)]
From Torrey Atcitty: IEEE 1722(AVB Transport Protocol) Dissector
See Bug #4764 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4764)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32841
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Mon, 17 May 2010 03:01:03 +0000 (03:01 +0000)]
Move most of the contents of the header file into the .c file.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32840
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Mon, 17 May 2010 03:00:37 +0000 (03:00 +0000)]
Remove trailing white space
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32839
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Mon, 17 May 2010 02:55:51 +0000 (02:55 +0000)]
From Robert Hogan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3922 :
Add support for the IBM TN5250 data stream protocol.
http://wiki.wireshark.org/TN5250
From me:
Move most of the contents of the header file to the .c file.
Replace blurbs that match the hf name with NULL.
Replace empty-string blurbs with NULL.
Fix some abbreviations (hf_tn5220_xxx -> tn5220.xxx).
Make some functions static.
Cast some offset increments to unsigned to make sure we don't go backwards
(which could create a loop). This includes making most of the subdissection
functions return an unsigned number.
Use find_or_create_conversation().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32838
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Mon, 17 May 2010 02:43:15 +0000 (02:43 +0000)]
Add CMakeOptions.txt to the source distribution
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32837
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Sun, 16 May 2010 16:58:04 +0000 (16:58 +0000)]
Some cleanup and adding one more new feature.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32836
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sun, 16 May 2010 15:44:43 +0000 (15:44 +0000)]
Ensure we update default link-layer list when toggeling monitor mode.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32835
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Sun, 16 May 2010 15:04:06 +0000 (15:04 +0000)]
[Automatic manuf and enterprise-numbers update for 2010-05-16]
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32832
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Sun, 16 May 2010 10:58:50 +0000 (10:58 +0000)]
From Chidambaram Arunachalam:
Currently, H.264 dissector in Wireshark allows only one value for the "H264
dynamic payload type" preference value.
This patch allows users to specify a value range for this parameter (96-127)
so that both streams can be decoded for a video call with asymmetric rtp
payload types.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32831
f5534014-38df-0310-8fa8-
9805f1628bb7