obnox/wireshark/wip.git
7 years agoWhite space changes.
etxrab [Mon, 13 Feb 2012 17:34:56 +0000 (17:34 +0000)]
White space changes.

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

7 years agoDrop count is 64 bits
etxrab [Mon, 13 Feb 2012 17:34:15 +0000 (17:34 +0000)]
Drop count is 64 bits

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

7 years agoEdit packet comments
etxrab [Mon, 13 Feb 2012 17:33:05 +0000 (17:33 +0000)]
Edit packet comments

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

7 years agoDrop count is 64 bits
etxrab [Mon, 13 Feb 2012 17:31:54 +0000 (17:31 +0000)]
Drop count is 64 bits

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

7 years agoStart itemizing.
jmayer [Mon, 13 Feb 2012 09:13:37 +0000 (09:13 +0000)]
Start itemizing.

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

7 years agoIn a loop of the form
guy [Mon, 13 Feb 2012 05:35:20 +0000 (05:35 +0000)]
In a loop of the form

for (i = 1; i <= N; i++)
...

the type of "i" must have, as its maximum value, a value >= the maximum
value of N; otherwise, if N is equal to the maximum value that fits in
"i", the loop willnever terminate.  (If that requires "i" to be larger
than you'd like, do the loop as

for (i = 0; i < N; i++)
...

which doesn't have that problem.)

Clean up the "i = 1" clause's white space in those for loops.

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

7 years agoIf WIRESHARK_ABORT_ON_DISSECTOR_BUG is set (in the environment) and we put more
morriss [Mon, 13 Feb 2012 03:14:46 +0000 (03:14 +0000)]
If WIRESHARK_ABORT_ON_DISSECTOR_BUG is set (in the environment) and we put more
than MAX_TREE_ITEMS in the tree, abort() out rather than throwing an exception.

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

7 years agoFix the crash reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6804
morriss [Mon, 13 Feb 2012 03:03:03 +0000 (03:03 +0000)]
Fix the crash reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6804

For WTAP_ENCAP_ERF files if we find an Extension and/or Multi-Channel header,
ensure that the size of the full pseudoheader is smaller than the packet size
to avoid an underflow and subsequent attempt to allocate a rather large amount
of memory.

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

7 years agoDo not assume tab stops are set every 4 spaces.
guy [Sun, 12 Feb 2012 23:50:13 +0000 (23:50 +0000)]
Do not assume tab stops are set every 4 spaces.

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

7 years agoAdd edit_packet_comment_dlg.h to the source distribution
morriss [Sun, 12 Feb 2012 23:17:01 +0000 (23:17 +0000)]
Add edit_packet_comment_dlg.h to the source distribution

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

7 years agoCapitalize the "P" in "Packet" in "Add or Edit Packet Comment". Add
guy [Sun, 12 Feb 2012 23:09:14 +0000 (23:09 +0000)]
Capitalize the "P" in "Packet" in "Add or Edit Packet Comment".  Add
"..." after it, as it pops up a dialog box to let you actually type in a
comment.

Add "Add or Edit Packet Comment" to the menubar's Edit menu.

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

7 years agoFix debug output.
tuexen [Sun, 12 Feb 2012 21:56:00 +0000 (21:56 +0000)]
Fix debug output.

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

7 years agoAdd a button row.
etxrab [Sun, 12 Feb 2012 21:15:11 +0000 (21:15 +0000)]
Add a button row.

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

7 years agoClose parentheses in expert info.
guy [Sun, 12 Feb 2012 20:44:51 +0000 (20:44 +0000)]
Close parentheses in expert info.

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

7 years agoDon't trust the pointer value in a packet; it could be invalid, and this
guy [Sun, 12 Feb 2012 20:03:37 +0000 (20:03 +0000)]
Don't trust the pointer value in a packet; it could be invalid, and this
could cause an unsigned length value to be reduced by more than its
value, turning it into a very large value.

I couldn't exactly reproduce bug 6833, but it was due to an attempt to
allocate 4294967110 bytes, and this bug caused remaining_len to equal
4294967110, and it would try to create a reassembled packet tvbuff of
that size, so I'm guessing this fixes 6833.

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Sun, 12 Feb 2012 19:30:57 +0000 (19:30 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Sun, 12 Feb 2012 19:26:53 +0000 (19:26 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Sun, 12 Feb 2012 19:24:38 +0000 (19:24 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Sun, 12 Feb 2012 18:06:37 +0000 (18:06 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Sun, 12 Feb 2012 18:05:50 +0000 (18:05 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Sun, 12 Feb 2012 18:05:22 +0000 (18:05 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Sun, 12 Feb 2012 18:05:02 +0000 (18:05 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Sun, 12 Feb 2012 18:04:26 +0000 (18:04 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Sun, 12 Feb 2012 18:03:17 +0000 (18:03 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Sun, 12 Feb 2012 18:02:58 +0000 (18:02 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Sun, 12 Feb 2012 18:02:39 +0000 (18:02 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Sun, 12 Feb 2012 17:47:11 +0000 (17:47 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Sun, 12 Feb 2012 17:46:57 +0000 (17:46 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoEnhance BGP Notification message
alagoutte [Sun, 12 Feb 2012 17:41:57 +0000 (17:41 +0000)]
Enhance BGP Notification message
* Make field filterable (3 proto_tree_add_text less ! but there are still 147 proto_tree_add_text...)
* Remove bgp_notify struct
* Use expert info to display a unknown error type

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

7 years agoGet it compiling.
tuexen [Sun, 12 Feb 2012 16:38:47 +0000 (16:38 +0000)]
Get it compiling.

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

7 years agoGet the comment and put it in the textview.
etxrab [Sun, 12 Feb 2012 16:18:25 +0000 (16:18 +0000)]
Get the comment and put it in the textview.

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

7 years agoTry to make the buildbot happy.
etxrab [Sun, 12 Feb 2012 15:48:57 +0000 (15:48 +0000)]
Try to make the buildbot happy.

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

7 years ago[Automatic manuf, services and enterprise-numbers update for 2012-02-12]
gerald [Sun, 12 Feb 2012 15:03:25 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2012-02-12]

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

7 years agoAdd the edit packet comment menu entry and the empty files
etxrab [Sun, 12 Feb 2012 14:56:06 +0000 (14:56 +0000)]
Add the edit packet comment menu entry and the empty files
to actually handel the menu to edit the comments.

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

7 years agoFrom Steve Magnani:
etxrab [Sun, 12 Feb 2012 07:18:05 +0000 (07:18 +0000)]
From Steve Magnani:
USB: add infrastructure for dissecting class-specific descriptors.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6825

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

7 years agoUse the length-on-the-network, not the captured length, when deciding
guy [Sat, 11 Feb 2012 20:57:26 +0000 (20:57 +0000)]
Use the length-on-the-network, not the captured length, when deciding
how far to dissect.

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

7 years agoDon't bail out of a non-heuristic dissector routine just because there's
guy [Sat, 11 Feb 2012 20:37:54 +0000 (20:37 +0000)]
Don't bail out of a non-heuristic dissector routine just because there's
not enough captured data in the tvbuff.

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

7 years agoGet rid of checkapi warning about %hh.
guy [Sat, 11 Feb 2012 20:36:35 +0000 (20:36 +0000)]
Get rid of checkapi warning about %hh.

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

7 years agompeg_pat.cur_next_ind looks like a Boolean; make it one. That also
guy [Sat, 11 Feb 2012 20:35:03 +0000 (20:35 +0000)]
mpeg_pat.cur_next_ind looks like a Boolean; make it one.  That also
fixes checkapi warnings about its value_string not being properly
terminated (by replacing it with a true_false_string).

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

7 years agoStore drop count if present.
etxrab [Sat, 11 Feb 2012 17:31:13 +0000 (17:31 +0000)]
Store drop count if present.

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

7 years agoFrom Steve Magnani:
etxrab [Sat, 11 Feb 2012 16:59:38 +0000 (16:59 +0000)]
From Steve Magnani:
USB: support filtering of isochronous packets via usb.bInterfaceClass.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6824

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

7 years agoFrom Guy Martin:
etxrab [Sat, 11 Feb 2012 16:52:32 +0000 (16:52 +0000)]
From Guy Martin:
Dissector for DVB MultiProtocol Encapsulation (DVB-MPE)

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6822

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

7 years agoFrom Guy Martin:
etxrab [Sat, 11 Feb 2012 16:44:45 +0000 (16:44 +0000)]
From Guy Martin:
Dissector for MPEG Program Association Table (PAT)

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6821

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

7 years agoFrom Guy Martin:
etxrab [Sat, 11 Feb 2012 16:38:01 +0000 (16:38 +0000)]
From Guy Martin:
Dissector for MPEG section packets.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6820

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

7 years agoAdd the abillity to read and write option comments unedited.
etxrab [Sat, 11 Feb 2012 12:34:39 +0000 (12:34 +0000)]
Add the abillity to read and write option comments unedited.
This is POC we may want to have more efficient use of the frame data
structure etc. But this allows for work to be done on the GUI to actually add comments.

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

7 years agoFrom David Wei:
etxrab [Sat, 11 Feb 2012 09:09:27 +0000 (09:09 +0000)]
From David Wei:
Udate AVP:s

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

7 years agoDon't use 16-bit integers as counters. The code won't be any faster on
guy [Sat, 11 Feb 2012 07:12:34 +0000 (07:12 +0000)]
Don't use 16-bit integers as counters.  The code won't be any faster on
anything that can run Wireshark (it might be slower), and if the maximum
count value is 16-bit, you can loop forever if the maximum count value
happens to be 65535.

(Yes, this means that

guint i, j;

...

for (i = 0; i < j; i++)
...

risks looping forever if j is 2^32-1, and the same applies to 64-bit
counters.  There are probably fewer protocols with 32-bit counts, and
probably even fewer with 64-bit counts, but the way it should be done in
those cases, for safety, is

i = 0;
for (;;) {
if (i >= j)
break;

...

if (i == j - 1)
break;
}

or something such as that.)

Fixes bug 6809.

#BACKPORT
Will schedule for 1.6.x.

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

7 years agoIt is a complete mistake to have *ANY* messages during packet capture
guy [Sat, 11 Feb 2012 03:57:49 +0000 (03:57 +0000)]
It is a complete mistake to have *ANY* messages during packet capture
sent to the standard output if "-w" is specified because, when you
capture, you can capture with the output directed to the standard
output, and dumping some text crap to the standard output will corrupt
your capture file.

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

7 years agoUse C89-style comment rather than C++/C99-style comment.
guy [Sat, 11 Feb 2012 02:45:58 +0000 (02:45 +0000)]
Use C89-style comment rather than C++/C99-style comment.

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

7 years agoGet rid of C++/C99-style comment; use #if 0/#endif instead.
guy [Sat, 11 Feb 2012 02:45:16 +0000 (02:45 +0000)]
Get rid of C++/C99-style comment; use #if 0/#endif instead.

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

7 years agoRevert presumably-unintentional turning on of debug messages.
guy [Sat, 11 Feb 2012 02:41:04 +0000 (02:41 +0000)]
Revert presumably-unintentional turning on of debug messages.

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

7 years agoGlobal variables considered harmful. Pass pinfo along as a parameter;
guy [Sat, 11 Feb 2012 02:31:52 +0000 (02:31 +0000)]
Global variables considered harmful.  Pass pinfo along as a parameter;
this appears to fix bug 6823 (the actual crash was a null pinfo being
passed to call_dissector()).

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

7 years agoNETLOGON handle different schannel with the same source
sahlberg [Sat, 11 Feb 2012 02:10:32 +0000 (02:10 +0000)]
NETLOGON handle different schannel with the same source
 ip and dest i

from Matthieu Patou <mat@matws.net>

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

7 years agoNETLOGON: Fix bugs with netlogon decryption not working in some cases
sahlberg [Sat, 11 Feb 2012 02:09:20 +0000 (02:09 +0000)]
NETLOGON: Fix bugs with netlogon decryption not working in some cases

If there is only one Authenticatex in the file, decryption is not
working.

from Matthieu Patou <mat@matws.net>

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

7 years agoNETLOGON: improve debugging messages
sahlberg [Sat, 11 Feb 2012 02:08:02 +0000 (02:08 +0000)]
NETLOGON: improve debugging messages

from Matthieu Patou <mat@matws.net>

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

7 years agoNTLM show the decrypted data buffer in a separate tab
sahlberg [Sat, 11 Feb 2012 02:06:45 +0000 (02:06 +0000)]
NTLM show the decrypted data buffer in a separate tab

from Matthieu Patou <mat@matws.net>

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

7 years agoNTLM print the whole string, not just half the string
sahlberg [Sat, 11 Feb 2012 02:05:57 +0000 (02:05 +0000)]
NTLM  print the whole string, not just half the string

from Matthieu Patou <mat@matws.net>

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

7 years agoNTLM: clear the nt_password_unicode buffer.
sahlberg [Sat, 11 Feb 2012 02:04:36 +0000 (02:04 +0000)]
NTLM: clear the nt_password_unicode buffer.

from Matthieu Patou <mat@matws.net>

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

7 years agoNTLM make it easier to activate/deactivate debugging code in NTLM
sahlberg [Sat, 11 Feb 2012 02:03:20 +0000 (02:03 +0000)]
NTLM make it easier to activate/deactivate debugging code in NTLM

from Matthieu Patou <mat@matws.net>

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

7 years agoNTLM: If we encounter an NTLM blob that is bigger than out fixed maxbuffer,
sahlberg [Sat, 11 Feb 2012 02:01:47 +0000 (02:01 +0000)]
NTLM: If we encounter an NTLM blob that is bigger than out fixed maxbuffer,
log a warning to the user.

from Matthieu Patou <mat@matws.net>

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

7 years agoNTLMv2 blobs can be bigger than 256 bytes. Set the limite to 10k for now.
sahlberg [Sat, 11 Feb 2012 01:59:55 +0000 (01:59 +0000)]
NTLMv2 blobs can be bigger than 256 bytes. Set the limite to 10k for now.

From Matthieu Patou <mat@matws.net>

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

7 years agoFix via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6817 :
morriss [Fri, 10 Feb 2012 23:08:46 +0000 (23:08 +0000)]
Fix via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6817 :

r40200 made ssl_parse()/dtls_parse() post-update-callbacks for those
dissector's UATs so that the dissector would be updated when the user changed
the UAT.  (This allows SSL/DTLS keys to be taken into account without requiring
Wireshark to be restarted.)

But, those functions also update the UAT themselves if the old-style keys_list
preference is used, creating an infinite recursion.

Fix this by splitting the *_parse() functions into two: one for the UAT and one
for the old-style keys list.

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

7 years agoSean Bright <sean.bright@gmail.com>:
jmayer [Fri, 10 Feb 2012 07:16:27 +0000 (07:16 +0000)]
Sean Bright <sean.bright@gmail.com>:

In r37159, the following change was made to ui/gtk/rtp_player.c:

@@ -1654,9 +1636,7 @@
        GtkWidget *dialog;

        /* we should never be here if we are in PLAY and !PAUSE */
-       if(!rtp_channels->stop&&  !rtp_channels->pause){
-               exit(10);
-       }
+       g_assert(!rtp_channels->stop&&  !rtp_channels->pause);

The logic, however, was not negated properly.  The correct assertion should be:

        g_assert(rtp_channels->stop || rtp_channels->pause);

With the current code, the RTP player causes a crash for me when pressing the
'Play' button.

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

7 years agoDelete the TH_* defines and use those from epan/dissectors/packet-tcp.h.
cmaynard [Fri, 10 Feb 2012 05:05:17 +0000 (05:05 +0000)]
Delete the TH_* defines and use those from epan/dissectors/packet-tcp.h.

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

7 years agoSince the nonce and reserved bits were added in r34084, tcp.flags is now 12 bits...
cmaynard [Fri, 10 Feb 2012 03:37:28 +0000 (03:37 +0000)]
Since the nonce and reserved bits were added in r34084, tcp.flags is now 12 bits, so its type needs to be changed from an FT_UINT8 to an FT_UINT16.  This should avoid the crash experienced by Lanell Allen as reported on -dev: article.gmane.org/gmane.network.wireshark.devel/24846 (although in my testing on Windows XP SP3 (32-bit), Wireshark did not crash).

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

7 years agoMake proper use of esg_tree.
cmaynard [Fri, 10 Feb 2012 03:30:28 +0000 (03:30 +0000)]
Make proper use of esg_tree.

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

7 years agoAdd pcapng variables to wtap_pkthdr.
etxrab [Thu, 9 Feb 2012 22:24:00 +0000 (22:24 +0000)]
Add pcapng variables to wtap_pkthdr.

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

7 years agoFrom David Wei:
etxrab [Thu, 9 Feb 2012 22:17:42 +0000 (22:17 +0000)]
From David Wei:
Add a preference to not dissect containers,

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

7 years agoAdd comments about new IEs
etxrab [Thu, 9 Feb 2012 22:14:58 +0000 (22:14 +0000)]
Add comments about new IEs

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

7 years agoFrom Sean Bright via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6815 :
morriss [Thu, 9 Feb 2012 19:17:28 +0000 (19:17 +0000)]
From Sean Bright via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6815 :

Don't use tvb_get_ptr() to retrieve a string being sent into
proto_tree_add_string_format(): use tvb_get_ephemeral_string() instead.

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

7 years agoFrom Wido Kelling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6819 :
morriss [Thu, 9 Feb 2012 19:02:28 +0000 (19:02 +0000)]
From Wido Kelling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6819 :

Patch to fix channelproperty Maintanance decode.

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

7 years agoEliminate a C++/C99-style comment.
morriss [Thu, 9 Feb 2012 18:59:16 +0000 (18:59 +0000)]
Eliminate a C++/C99-style comment.

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

7 years agoAdd tvb_ip_to_str and tvb_ip6_to_str to the Dev Guide
alagoutte [Thu, 9 Feb 2012 17:41:22 +0000 (17:41 +0000)]
Add tvb_ip_to_str and tvb_ip6_to_str to the Dev Guide

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Thu, 9 Feb 2012 17:35:05 +0000 (17:35 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFrom Steve Magnani:
etxrab [Wed, 8 Feb 2012 20:21:44 +0000 (20:21 +0000)]
From Steve Magnani:
USB: Endpoint bmAttributes not decoded correctly.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6814

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

7 years agoWrite address resolution block.
etxrab [Wed, 8 Feb 2012 20:15:59 +0000 (20:15 +0000)]
Write address resolution block.

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

7 years agoFrom a.piesk:
etxrab [Wed, 8 Feb 2012 19:56:48 +0000 (19:56 +0000)]
From a.piesk:
no menu item Fle->Export->SSL Session Keys in GTK
Ported to 1.7 by me.

#BACKPORT
Use the patch in the bug report.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6813

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

7 years agoFrom Harald Welte:
etxrab [Wed, 8 Feb 2012 19:38:58 +0000 (19:38 +0000)]
From Harald Welte:
GSMTAP: add new GPRS/EGPRS RLC related sub-types

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6812

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

7 years agoFrom Harald Welte:
etxrab [Wed, 8 Feb 2012 19:34:53 +0000 (19:34 +0000)]
From Harald Welte:
GSMTAP: whitespace / indent cleanup

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6811

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

7 years agoFrom Harald Welte:
etxrab [Wed, 8 Feb 2012 19:31:23 +0000 (19:31 +0000)]
From Harald Welte:
GSMTAP dissector: introduce a dissector table.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6810

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

7 years agoWhen building QtShark on Windows: Don't (re)compile Wireshark .c files
wmeier [Wed, 8 Feb 2012 18:51:01 +0000 (18:51 +0000)]
When building QtShark on Windows: Don't (re)compile Wireshark .c files

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

7 years agoFrom Sylvain Munaut:
etxrab [Wed, 8 Feb 2012 17:01:09 +0000 (17:01 +0000)]
From Sylvain Munaut:
Fix the windows build by filling up stuct with dummy member

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6798

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

7 years agoFix set-but-not-used warnings turned errors.
jmayer [Wed, 8 Feb 2012 14:57:16 +0000 (14:57 +0000)]
Fix set-but-not-used warnings turned errors.

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

7 years agoAs suggested by Joerg on the -dev list yesterday: count up the number of
morriss [Wed, 8 Feb 2012 14:15:01 +0000 (14:15 +0000)]
As suggested by Joerg on the -dev list yesterday: count up the number of
proto_tree_add_text() calls and compare that to the number of
proto_tree_add_<something else>() calls and complain if more than 50%
of the calls are add_text()'s.

proto_tree_add_text() calls whose returned proto_item is used are not counted
as hanging a subtree off a text item is an appropriate use for text items.

I chose 50% because even at that level there are many dissectors with "too many"
proto_tree_add_text()'s.

The function to do all of this is commented out for now for the same reason
plus the fact that it's pretty slow.

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

7 years agoFixed bug with calculation of bytes in flight.
grahamb [Wed, 8 Feb 2012 11:52:35 +0000 (11:52 +0000)]
Fixed bug with calculation of bytes in flight.

A corner case was posted to the Q&A site showing incorrect calculation of bytes in flight (http://ask.wireshark.org/questions/8843/bytes-in-flight-problems-with-retransmissions)

The capture in question has a tcp segment (frame 12) that is a retransmission of unacked earlier data (frames 4, 9, 10) and also contains some new data.  Eventually an ACK is received for the earlier segments (frame 16) but the code doesn't remove frame 12 from the linked list of unacked segments because it extends past the received ACK.  When more data is received in frame 17, the bytes in flight is calculated from the start of frame 12 rather than from the unacked portion of it, leading to a larger incorrect value.

The change simply updates the starting sequence number in the unacked segment list for any partially acked segment to be the start of unacked data.

The capture in question now shows correct information for bytes in flight, and hopefully the nature of the change won't cause issues elsewhere.

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

7 years agoFix reporting of duplicate IP addresses by creating a hash table of
martinm [Wed, 8 Feb 2012 11:48:02 +0000 (11:48 +0000)]
Fix reporting of duplicate IP addresses by creating a hash table of
results when first visited.

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

7 years agoDisable the File->Merge... menu item if we cannot save-as,
stig [Wed, 8 Feb 2012 11:16:30 +0000 (11:16 +0000)]
Disable the File->Merge... menu item if we cannot save-as,
because this will assert.

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

7 years agoSmall whitespace fix.
jmayer [Wed, 8 Feb 2012 07:43:33 +0000 (07:43 +0000)]
Small whitespace fix.

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

7 years agoLast fix to the wrong approach.
jmayer [Wed, 8 Feb 2012 07:39:51 +0000 (07:39 +0000)]
Last fix to the wrong approach.

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

7 years agoFrom Sylvain Munaut:
etxrab [Wed, 8 Feb 2012 07:26:05 +0000 (07:26 +0000)]
From Sylvain Munaut:
Add support for GMR-1 BCCH dissection.

I #if 0'd out incomplete code.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6798

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

7 years agoHeuristic standard detection:
morriss [Wed, 8 Feb 2012 03:18:04 +0000 (03:18 +0000)]
Heuristic standard detection:
 - Grab optional parameters for LUDT/LUDTS
 - Fix processing of the 2-octet pointers

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

7 years agoFrom Guy Martin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6795 :
morriss [Tue, 7 Feb 2012 19:14:45 +0000 (19:14 +0000)]
From Guy Martin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6795 :

Remove some duplicate checks.

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

7 years agoInitialize felica_tree to NULL to avoid a false warning.
cmaynard [Tue, 7 Feb 2012 17:36:08 +0000 (17:36 +0000)]
Initialize felica_tree to NULL to avoid a false warning.

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

7 years agoMake some minimally required changes as pointed out in bug6758[1].
cmaynard [Tue, 7 Feb 2012 17:01:01 +0000 (17:01 +0000)]
Make some minimally required changes as pointed out in bug6758[1].

In addition:
-> I didn't think using tvb_new_subset_remaining() in order to iterate through the blocks was the best way to implement this, so I changed it to the method I had proposed earlier[2].

-> Some whitespace cleanup.
-> Noted some "TODO"'s for potential further improvements.

[1]: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6758#c9
[2]: http://article.gmane.org/gmane.network.wireshark.devel/24721

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

7 years agoFix the fuzz failure reported in in https://bugs.wireshark.org/bugzilla/show_bug...
morriss [Tue, 7 Feb 2012 16:53:22 +0000 (16:53 +0000)]
Fix the fuzz failure reported in in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6799 :

Ensure that the payload length handed to the reassembly routines doesn't go
negative/very-large-positive.

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

7 years agosmall whitespace fix
jmayer [Tue, 7 Feb 2012 14:01:24 +0000 (14:01 +0000)]
small whitespace fix

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

7 years agoInitiliase another variable.
martinm [Tue, 7 Feb 2012 11:15:22 +0000 (11:15 +0000)]
Initiliase another variable.

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

7 years agoInitialise a variable to avoid warning.
martinm [Tue, 7 Feb 2012 11:12:17 +0000 (11:12 +0000)]
Initialise a variable to avoid warning.

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

7 years agopacket-gsm_sim.c was the wrong file to check in.
jmayer [Tue, 7 Feb 2012 09:06:44 +0000 (09:06 +0000)]
packet-gsm_sim.c was the wrong file to check in.
I meant ui/gtk/voip_calls_dlg.c.

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

7 years agoFix "variable set but not used" warnings turned error. In at least
jmayer [Tue, 7 Feb 2012 09:03:14 +0000 (09:03 +0000)]
Fix "variable set but not used" warnings turned error. In at least
one case this looks like a logic bug and should be investigated.

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