osmith/wireshark
1
0
Fork 0
forked from osmocom/wireshark
Code Pull requests Releases Wiki Activity
49873 commits 23 branches 0 tags 1.3 GiB
Commit graph

49873 commits

This branch
This branch
All branches
Author SHA1 Message Date
Evan Huus
5c319860fb Add a p_add_proto_data call to dissect_ndmp to match the one in 
dissect_ndmp_heur.

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

Potentially we should add a void *data to tcp_dissect_pdus instead...?

svn path=/trunk/; revision=53144
 2013-11-07 17:06:04 +00:00
Evan Huus
6441f10c41 Add modelines. Minor indentation fixes. 
svn path=/trunk/; revision=53143
 2013-11-07 17:03:04 +00:00
Pascal Quantin
8f112c0390 Fix dissection of MBIM data packets when using 32-bits NDPs 
svn path=/trunk/; revision=53142
 2013-11-07 16:53:59 +00:00
Michael Mann
eac2762d46 8-bit counter variable not big enough and causes infinite loop. Bug 9392 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9392). 
svn path=/trunk/; revision=53141
 2013-11-07 15:54:11 +00:00
Alexis La Goutte
50ddf471e8 Try 2 to fix Mac OS X 10.5 buildbot 
Include old-gtk-compat.h

svn path=/trunk/; revision=53140
 2013-11-07 10:41:53 +00:00
Pascal Quantin
9201e8ce14 3GPP2 SMS: add support for KSC5601 (Korean) character set 
svn path=/trunk/; revision=53139
 2013-11-07 10:27:11 +00:00
Alexis La Goutte
9fd106a5e2 (re)Fix warning found by fix-encodings-arg tool 
svn path=/trunk/; revision=53138
 2013-11-07 09:53:56 +00:00
Alexis La Goutte
1f8282d282 Try to fix Mac OS 10.5 Buildbot (with old Glib...) 
gtk_dialog_get_action_area is available only Glib 2.14

svn path=/trunk/; revision=53137
 2013-11-07 09:33:39 +00:00
Alexis La Goutte
c8dc57aaad Remove C++ comments 
svn path=/trunk/; revision=53136
 2013-11-07 09:03:46 +00:00
Alexis La Goutte
5af14eaf16 Add Edit Packet in Right Click 
svn path=/trunk/; revision=53135
 2013-11-07 07:43:19 +00:00
Alexis La Goutte
49485528d8 Add Packet Editor Preference 
svn path=/trunk/; revision=53134
 2013-11-07 07:43:11 +00:00
Alexis La Goutte
6261789695 Add WANT_PACKET_EDITOR to CMake 
svn path=/trunk/; revision=53133
 2013-11-07 07:43:01 +00:00
Alexis La Goutte
4bff9d32a0 Enable Packet Editor by default 
svn path=/trunk/; revision=53132
 2013-11-07 07:42:35 +00:00
Michael Mann
21ddc7ae4e Revert r53118 as it breaks reassemble_test. 
svn path=/trunk/; revision=53130
 2013-11-07 04:50:53 +00:00
Michael Mann
b9e36145f4 Got burned by forgetting to compile first... 
svn path=/trunk/; revision=53129
 2013-11-07 03:13:53 +00:00
Michael Mann
4fb9091422 Have the gsm_rlcmac_ul and gsm_rlcmac_dl use the data parameter of the dissector function instead of pinfo->private_data to receive a RlcMacPrivateData_t structure. 
This work was done in bug 7615 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7615), but the tie in to use the RlcMacPrivateData_t structure (passed by the GSMTAP dissector) was never completed.  Whenever that picks up again, the data parameter of the dissector should be used instead of pinfo->private_data.

svn path=/trunk/; revision=53128
 2013-11-07 02:47:22 +00:00
Guy Harris
f380299687 Note that bug 8808 and bug 9390 are fixed. 
svn path=/trunk/; revision=53125
 2013-11-07 02:11:51 +00:00
Jörg Mayer
29fef43b40 With the updated pidl it is now possible to generate several 
of the dcerpc dissectors again. Commit those of the generated
onces that actually compile.

svn path=/trunk/; revision=53122
 2013-11-06 22:55:17 +00:00
Jörg Mayer
f7f47af562 Reapply the removal or the use of private_data that got removed by 
syncing from samba.org.
If any other patches were applied, then I missed them and they are
lost unless reapplied.

svn path=/trunk/; revision=53121
 2013-11-06 22:50:28 +00:00
Jörg Mayer
02fe7ff23a Copy over the current WIP from samba.org::ftp/unpacked/samba_4_0_test/pidl 
- As the pidl in Wireshark doesn't work anyway we can just mirror the WIP
  so that patches to our code base are against the current code.

svn path=/trunk/; revision=53120
 2013-11-06 22:48:50 +00:00
Michael Mann
f9e5c14dde Add Zoltan Lajos Kis as author 
svn path=/trunk/; revision=53119
 2013-11-06 22:07:04 +00:00
Michael Mann
c59fab0352 Correctly report segments marked with REASSEMBLE_FLAGS_NO_FRAG_NUMBER. Bug 9304 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9304) 
Instead of incrementing the offset for each new segment by one we add the length of the segment so that each segment is correctly shown in the segment list.

It proves to be very useful to find which packet (segment) is causing an application dissector to go wrong.

From Matthieu Patou

svn path=/trunk/; revision=53118
 2013-11-06 21:59:03 +00:00
Jakub Zawadzki
c011e54567 Fix buildbot, typo: 
tvbuff.c:1258: warning: passing argument 2 of '__builtin___memcpy_chk' makes pointer from integer without a cast
	tvbuff.c:1258: warning: passing argument 2 of '__inline_memcpy_chk' makes pointer from integer without a cast

svn path=/trunk/; revision=53117
 2013-11-06 21:15:46 +00:00
Michael Mann
912b591200 NFC: PN532: Dissect InListPassiveTarget Response and Diagnose request and response. Bug 9333 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333) 
From Michal Labedzki

From me: adjust datatype to guint8 on a few local variables to quiet the Microsoft compiler.

svn path=/trunk/; revision=53116
 2013-11-06 20:57:23 +00:00
Michael Mann
99e20da08e Add response time to the rtpproxy dissector. Bug 9380 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9380) 
From Peter Lemenkov.

svn path=/trunk/; revision=53115
 2013-11-06 20:39:10 +00:00
Guy Harris
2a088c1d53 Add support for displaying dates as year and day-of-year (1-origin). 
In the process, fix various man page descriptions of the -t flag,
and add support for UTC absolute times in the iousers and iostat TShark
taps.

svn path=/trunk/; revision=53114
 2013-11-06 20:39:09 +00:00
Jakub Zawadzki
67f69e99e8 tvb: optimize tvb_get_*guid() 
we already have valid ptr from ensure_contiguous() so use it to fill structure.

svn path=/trunk/; revision=53113
 2013-11-06 20:34:27 +00:00
Jakub Zawadzki
b4be2fa489 tvbuff: use always ops->tvb_size 
svn path=/trunk/; revision=53112
 2013-11-06 20:22:28 +00:00
Jakub Zawadzki
d54b3a74f6 tvbuff: cleanup, remove dead code. 
ensure_contiguous() will throw exception but won't return NULL.

svn path=/trunk/; revision=53111
 2013-11-06 19:03:14 +00:00
Michael Mann
dc53bb7648 Bluetooth: OBEX: Storing info about previous protocol is not needed anymore. Bug 9303 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9303) 
From Michal Labedzki.

svn path=/trunk/; revision=53110
 2013-11-06 18:40:29 +00:00
Evan Huus
5efc340771 Mark more unused parameters. 
svn path=/trunk/; revision=53109
 2013-11-06 17:52:11 +00:00
Evan Huus
99d8439ce0 Add a license-ignore for tools/html2text.py 
Update the preamble to COPYING to clarify that pidl isn't the only tool we carry
which isn't GPLv2-compatible.

svn path=/trunk/; revision=53108
 2013-11-06 17:43:49 +00:00
Michael Mann
55922b6bac Fix for checking RTPS sub message length. Bug 9378 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9378) 
From Steve Osselton

#BACKPORT(1.10)

svn path=/trunk/; revision=53107
 2013-11-06 16:51:19 +00:00
Michael Mann
c278a0ac0a SID28 is special kind of SID where no matter what it uses 28 bytes it's used in the DRS protocol. Bug 9337 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9337) 
From Matthieu Patou

svn path=/trunk/; revision=53106
 2013-11-06 16:30:14 +00:00
Bill Meier
a4b4c92a45 Add _U_ to a function parameter to fix a compiler warning 
svn path=/trunk/; revision=53105
 2013-11-06 16:00:11 +00:00
Bill Meier
53fabc2f8a Add _U_ to a few function parameters to fix compiler warnings 
Note: I hope the following is not indicative of something wrong with the code.
      (I've just marked di as _U_).

packet-dcerpc-netlogon.c: In function 'dissect_secchan_nl_auth_message':
packet-dcerpc-netlogon.c:7582:75: error: unused parameter 'di' [-Werror=unused-parameter]
                                            proto_tree *tree, dcerpc_info *di, guint8 *drep)


svn path=/trunk/; revision=53104
 2013-11-06 15:54:24 +00:00
Bill Meier
0f61417ca4 Add _U_ to a function parameter to fix a compiler warning. 
svn path=/trunk/; revision=53103
 2013-11-06 15:46:36 +00:00
Bill Meier
7e9091e8ff Add _U_ to a few function parameters to fix compiler warnings 
svn path=/trunk/; revision=53102
 2013-11-06 15:43:41 +00:00
Bill Meier
c4efddd7d2 From robionekenobi: "packet-mq adapted" 
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9367
      especially comments 8,9,12,13

Patch: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=12014

From me: Remove several uses of DEF_VALSEXT macro
         since the above patch removed the definition.

(It seems that Microsoft C expands undefined macros as null;
 GCC complains).


svn path=/trunk/; revision=53101
 2013-11-06 15:28:23 +00:00
Michael Mann
22760b2d2a Remove pinfo->private_data from DCERPC dissectors and instead have dcerpc_info* infomation be passed in as a function parameter. Bug 9387 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9387) 
All "generated" source was manually modified (with the power of search/replace), but I believe the "source input" files have been adjusted (checked into revs 53098 and 53099) to reflect the necessary changes (with possible whitespace formatting differences).

The Microsoft compiler doesn't flag "unused function parameters", so I apologize in advance if I may have missed a few.  The "dcerpc_info* di" parameter is used in almost every function.

svn path=/trunk/; revision=53100
 2013-11-06 14:31:29 +00:00
Michael Mann
440ac8370f Remove pinfo->private_data from DCERPC dissectors. Bug 9387 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9387) 
This is the "Wireshark DCERPC" input file changes necessary to support removing pinfo->private_data from the DCERPC dissectors in favor of passing it through function parameters.  I didn't regenerate the dissector source, so this is just a "good faith" effort to mimic the manual changes.

svn path=/trunk/; revision=53099
 2013-11-06 13:01:23 +00:00
Michael Mann
79cd3563fc Remove pinfo->private_data from DCERPC dissectors. Bug 9387 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9387) 
This is the PIDL input file changes necessary to support removing pinfo->private_data from the DCERPC dissectors in favor of passing it through function parameters.  I didn't regenerate the dissector source, so this is just a "good faith" effort to mimic the manual changes.

svn path=/trunk/; revision=53098
 2013-11-06 12:36:09 +00:00
Tomas Kukosa
5d50358868 Email updated 
svn path=/trunk/; revision=53097
 2013-11-06 08:19:08 +00:00
Evan Huus
5f2c75e940 Add missing cast. 
svn path=/trunk/; revision=53096
 2013-11-05 22:58:50 +00:00
Pascal Quantin
1631f12389 From robionekenobi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9375 : 
Avoid a 'GetVersionEx deprecated' warning when compiling with MSVC2013

svn path=/trunk/; revision=53095
 2013-11-05 21:49:57 +00:00
Michael Mann
7c33631d69 Remove setting of pinfo->private_data to ETHERCAT_MBOX_HEADER structure as it's not used anywhere in the Wireshark source. 
If it's used by a third-party plugin, please submit a patch that passes the ETHERCAT_MBOX_HEADER structure through the data parameter of the "new" style dissector function.

svn path=/trunk/; revision=53094
 2013-11-05 20:00:57 +00:00
Michael Mann
5465c18a4b Remove DISSECTOR_ASSERT since private_data isn't being used anymore to transport tcp_info data. 
svn path=/trunk/; revision=53093
 2013-11-05 19:51:27 +00:00
Anders Broman
f435f8c52c From Zoltán Lajos Kis: 
display present bit for vlan oxm field 

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

svn path=/trunk/; revision=53092
 2013-11-05 19:38:41 +00:00
Anders Broman
99b598baf1 From Zoltán Lajos Kis: 
use tcp_dissect_pdus to properly dissect messages.

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

svn path=/trunk/; revision=53091
 2013-11-05 19:36:09 +00:00
Michael Mann
b6b78d69db In an effort to reduce the use of pinfo->private_data (and some true global variables), I converted the ASN.1 dissectors that use pinfo->private_data to exchange a SESSION_DATA_STRUCTURE to instead only exchange it in the context of ASN.1. This meant converting dissectors to the "new" style to pass the SESSION_DATA_STRUCTURE as well as providing a pointer to it in asn1_ctx_t.private_data. Yes, it's still "private data", but it's not used by all dissectors like pinfo->private data is. 
svn path=/trunk/; revision=53090
 2013-11-05 18:47:26 +00:00