osmocom/wireshark
14
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity
38981 commits 26 branches 0 tags 795 MiB
Commit graph

38981 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anders Broman
ff4a624dcf Try to make the buildbot happy. 
svn path=/trunk/; revision=40983
 2012-02-12 15:48:57 +00:00
Gerald Combs
dbb3d008ae [Automatic manuf, services and enterprise-numbers update for 2012-02-12] 
svn path=/trunk/; revision=40981
 2012-02-12 15:03:25 +00:00
Anders Broman
f78145ca9f Add the edit packet comment menu entry and the empty files 
to actually handel the menu to edit the comments.

svn path=/trunk/; revision=40980
 2012-02-12 14:56:06 +00:00
Anders Broman
c36b0f1b03 From Steve Magnani: 
USB: add infrastructure for dissecting class-specific descriptors.

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

svn path=/trunk/; revision=40979
 2012-02-12 07:18:05 +00:00
Guy Harris
55140956e8 Use the length-on-the-network, not the captured length, when deciding 
how far to dissect.

svn path=/trunk/; revision=40978
 2012-02-11 20:57:26 +00:00
Guy Harris
357ab3c5f7 Don't bail out of a non-heuristic dissector routine just because there's 
not enough captured data in the tvbuff.

svn path=/trunk/; revision=40977
 2012-02-11 20:37:54 +00:00
Guy Harris
9f116d50cb Get rid of checkapi warning about %hh. 
svn path=/trunk/; revision=40976
 2012-02-11 20:36:35 +00:00
Guy Harris
cd706946e5 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).

svn path=/trunk/; revision=40975
 2012-02-11 20:35:03 +00:00
Anders Broman
74f2ef4f76 Store drop count if present. 
svn path=/trunk/; revision=40974
 2012-02-11 17:31:13 +00:00
Anders Broman
75de89cd1b From Steve Magnani: 
USB: support filtering of isochronous packets via usb.bInterfaceClass.

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

svn path=/trunk/; revision=40973
 2012-02-11 16:59:38 +00:00
Anders Broman
4a0b7db0a2 From Guy Martin: 
Dissector for DVB MultiProtocol Encapsulation (DVB-MPE)

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

svn path=/trunk/; revision=40972
 2012-02-11 16:52:32 +00:00
Anders Broman
9c731b2015 From Guy Martin: 
Dissector for MPEG Program Association Table (PAT)

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

svn path=/trunk/; revision=40971
 2012-02-11 16:44:45 +00:00
Anders Broman
3724dbe6b4 From Guy Martin: 
Dissector for MPEG section packets.

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

svn path=/trunk/; revision=40970
 2012-02-11 16:38:01 +00:00
Anders Broman
8aea738cda 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.

svn path=/trunk/; revision=40969
 2012-02-11 12:34:39 +00:00
Anders Broman
11e815e99a From David Wei: 
Udate AVP:s

svn path=/trunk/; revision=40968
 2012-02-11 09:09:27 +00:00
Guy Harris
0e2773b633 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.

svn path=/trunk/; revision=40967
 2012-02-11 07:12:34 +00:00
Guy Harris
31204e8406 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.

svn path=/trunk/; revision=40966
 2012-02-11 03:57:49 +00:00
Guy Harris
c972b866b5 Use C89-style comment rather than C++/C99-style comment. 
svn path=/trunk/; revision=40965
 2012-02-11 02:45:58 +00:00
Guy Harris
3301c4cb85 Get rid of C++/C99-style comment; use #if 0/#endif instead. 
svn path=/trunk/; revision=40964
 2012-02-11 02:45:16 +00:00
Guy Harris
357a3e2837 Revert presumably-unintentional turning on of debug messages. 
svn path=/trunk/; revision=40963
 2012-02-11 02:41:04 +00:00
Guy Harris
fd8beeae21 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()).

svn path=/trunk/; revision=40962
 2012-02-11 02:31:52 +00:00
Ronnie Sahlberg
232c882946 NETLOGON handle different schannel with the same source 
ip and dest i

from Matthieu Patou <mat@matws.net>

svn path=/trunk/; revision=40961
 2012-02-11 02:10:32 +00:00
Ronnie Sahlberg
4d2cb8bf94 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>

svn path=/trunk/; revision=40960
 2012-02-11 02:09:20 +00:00
Ronnie Sahlberg
7a8e42888b NETLOGON: improve debugging messages 
from Matthieu Patou <mat@matws.net>

svn path=/trunk/; revision=40959
 2012-02-11 02:08:02 +00:00
Ronnie Sahlberg
bec3996bb7 NTLM show the decrypted data buffer in a separate tab 
from Matthieu Patou <mat@matws.net>

svn path=/trunk/; revision=40958
 2012-02-11 02:06:45 +00:00
Ronnie Sahlberg
d0f5a1842b NTLM print the whole string, not just half the string 
from Matthieu Patou <mat@matws.net>

svn path=/trunk/; revision=40957
 2012-02-11 02:05:57 +00:00
Ronnie Sahlberg
00cebab4aa NTLM: clear the nt_password_unicode buffer. 
from Matthieu Patou <mat@matws.net>

svn path=/trunk/; revision=40956
 2012-02-11 02:04:36 +00:00
Ronnie Sahlberg
9b24fe2822 NTLM make it easier to activate/deactivate debugging code in NTLM 
from Matthieu Patou <mat@matws.net>

svn path=/trunk/; revision=40955
 2012-02-11 02:03:20 +00:00
Ronnie Sahlberg
30e8d6371d 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>

svn path=/trunk/; revision=40954
 2012-02-11 02:01:47 +00:00
Ronnie Sahlberg
bc359fc18f NTLMv2 blobs can be bigger than 256 bytes. Set the limite to 10k for now. 
From Matthieu Patou <mat@matws.net>

svn path=/trunk/; revision=40953
 2012-02-11 01:59:55 +00:00
Jeff Morriss
d45ad837b2 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.

svn path=/trunk/; revision=40952
 2012-02-10 23:08:46 +00:00
Jörg Mayer
18e04269fb 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.


svn path=/trunk/; revision=40951
 2012-02-10 07:16:27 +00:00
Chris Maynard
4e1637e67c Delete the TH_* defines and use those from epan/dissectors/packet-tcp.h. 
svn path=/trunk/; revision=40950
 2012-02-10 05:05:17 +00:00
Chris Maynard
e3fdb92a67 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: http://article.gmane.org/gmane.network.wireshark.devel/24846 (although in my testing on Windows XP SP3 (32-bit), Wireshark did not crash). 
svn path=/trunk/; revision=40949
 2012-02-10 03:37:28 +00:00
Chris Maynard
eaba461f2a Make proper use of esg_tree. 
svn path=/trunk/; revision=40948
 2012-02-10 03:30:28 +00:00
Anders Broman
7be6e75c13 Add pcapng variables to wtap_pkthdr. 
svn path=/trunk/; revision=40947
 2012-02-09 22:24:00 +00:00
Anders Broman
05a76ae7fa From David Wei: 
Add a preference to not dissect containers,

svn path=/trunk/; revision=40946
 2012-02-09 22:17:42 +00:00
Anders Broman
77c24abcdd Add comments about new IEs 
svn path=/trunk/; revision=40945
 2012-02-09 22:14:58 +00:00
Jeff Morriss
976b9abea0 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.

svn path=/trunk/; revision=40944
 2012-02-09 19:17:28 +00:00
Jeff Morriss
bc57b2c8b4 From Wido Kelling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6819 : 
Patch to fix channelproperty Maintanance decode.

svn path=/trunk/; revision=40943
 2012-02-09 19:02:28 +00:00
Jeff Morriss
89a7d29852 Eliminate a C++/C99-style comment. 
svn path=/trunk/; revision=40942
 2012-02-09 18:59:16 +00:00
Alexis La Goutte
5de89fbb74 Add tvb_ip_to_str and tvb_ip6_to_str to the Dev Guide 
svn path=/trunk/; revision=40941
 2012-02-09 17:41:22 +00:00
Alexis La Goutte
90b1095f3e Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang 
svn path=/trunk/; revision=40940
 2012-02-09 17:35:05 +00:00
Anders Broman
5da72b4d78 From Steve Magnani: 
USB: Endpoint bmAttributes not decoded correctly.

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

svn path=/trunk/; revision=40939
 2012-02-08 20:21:44 +00:00
Anders Broman
b8bbfcf379 Write address resolution block. 
svn path=/trunk/; revision=40938
 2012-02-08 20:15:59 +00:00
Anders Broman
b7c03d8235 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

svn path=/trunk/; revision=40937
 2012-02-08 19:56:48 +00:00
Anders Broman
5a31396741 From Harald Welte: 
GSMTAP: add new GPRS/EGPRS RLC related sub-types

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

svn path=/trunk/; revision=40936
 2012-02-08 19:38:58 +00:00
Anders Broman
0c341b3d1c From Harald Welte: 
GSMTAP: whitespace / indent cleanup

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

svn path=/trunk/; revision=40935
 2012-02-08 19:34:53 +00:00
Anders Broman
4a2699a2ef From Harald Welte: 
GSMTAP dissector: introduce a dissector table.

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

svn path=/trunk/; revision=40934
 2012-02-08 19:31:23 +00:00
Bill Meier
b28fe4d079 When building QtShark on Windows: Don't (re)compile Wireshark .c files 
svn path=/trunk/; revision=40933
 2012-02-08 18:51:01 +00:00