Commit Graph

18652 Commits

Author SHA1 Message Date
Jakub Zawadzki ae59b09443 Add missing includes in order to remove exceptions.h from proto.h (next commit).
svn path=/trunk/; revision=53230
2013-11-10 15:59:37 +00:00
Anders Broman c9bafe237d From Zoltán Lajos Kis:
Move OpenFlow v1.0 dissector out from main OpenFlow dissector.

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

svn path=/trunk/; revision=53217
2013-11-10 10:46:13 +00:00
Jakub Zawadzki 7b64bcf0b8 Move prototype of bytes_to_str, bytes_to_str_punct to correct header.
svn path=/trunk/; revision=53214
2013-11-10 09:44:02 +00:00
Michael Mann af0819f942 Add data parameter to dissect_function_t in vsff structure. The intention here is to use it to replace some pinfo->private_data.
I didn't realize how expansive this change would be, so committing it now before replacing the pinfo->private_data, so if something needs to be reverted, all of this is not lost.

svn path=/trunk/; revision=53213
2013-11-10 03:20:04 +00:00
Michael Mann a4c4ca8a75 Register openvpn over TCP and UDP under different dissector names.
svn path=/trunk/; revision=53207
2013-11-09 21:54:26 +00:00
Pascal Quantin c51dcff823 Modify TCPENCAP heuristic to avoid triggering a 'packet size limited during capture' catch
svn path=/trunk/; revision=53206
2013-11-09 21:30:33 +00:00
Gerald Combs 7f3dd7b499 Fix unused and shadow variable errors.
svn path=/trunk/; revision=53200
2013-11-09 18:17:00 +00:00
Michael Mann 8081cf1d90 Add data parameter to tcp_dissect_pdus() as well as convert it to using "new" style dissectors.
Now that "bytes consumed" can be determined, should tcp_dissect_pdus() take advantage of that?

Should tcp_dissect_pdus return length (bytes consumed)?  There are many dissectors that just call tcp_dissect_pdus() then return tvb_length(tvb).  Seems like that could all be rolled into one.

svn path=/trunk/; revision=53198
2013-11-09 17:46:28 +00:00
Jakub Zawadzki c9b2ee3768 include <wsutil/pint.h> only when needed.
svn path=/trunk/; revision=53196
2013-11-09 15:44:29 +00:00
Jakub Zawadzki 7b89063243 Don't include <epan/strutil.h> when not needed.
svn path=/trunk/; revision=53194
2013-11-09 14:58:28 +00:00
Jakub Zawadzki 0b0bbf0965 Replace STRINGIFY with glib version.
svn path=/trunk/; revision=53193
2013-11-09 14:37:13 +00:00
Jakub Zawadzki ca42cb3e40 Move adler32 from epan/ to wsutil/
The same like done for crc*

svn path=/trunk/; revision=53190
2013-11-09 14:03:53 +00:00
Jakub Zawadzki 1899903f69 Include <epan/to_str.h> only when needed.
svn path=/trunk/; revision=53189
2013-11-09 13:41:10 +00:00
Jakub Zawadzki 5aa4b848ee g_snprintf() don't return -1 from glib-1.2.3 [1]
[1] https://developer.gnome.org/glib/2.28/glib-String-Utility-Functions.html#g-snprintf

svn path=/trunk/; revision=53186
2013-11-09 11:23:02 +00:00
Alexis La Goutte 3aaf560877 Add QUIC (Quick UDP Internet Connections) dissector
See http://blog.chromium.org/2013/06/experimenting-with-quic.html

Don't yet support protocol decryption...

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

svn path=/trunk/; revision=53177
2013-11-09 00:19:52 +00:00
Jakub Zawadzki 7e312c9bbc Convert: vlan, sll, rip to NEW_PROTO_TREE_API
svn path=/trunk/; revision=53175
2013-11-08 21:38:32 +00:00
Anders Broman 88d0e909a2 From Katrina Zhang:
Add/fix RFSP dissection.

svn path=/trunk/; revision=53163
2013-11-08 05:58:13 +00:00
Michael Mann d62f92b7f1 Make LDAP dissector use ASN.1 private_data instead of pinfo->private_data.
Cleanup a forgotten pinfo->private_data use in the H245 dissector.

svn path=/trunk/; revision=53160
2013-11-08 02:02:43 +00:00
Jörg Mayer 9aa9d608cf With the new HFI code the compiler complains about unused element - great!
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-mint.c:205:26: error: ‘hfi_mint_control_0x0c_unknown4’ defined but not used [-Werror=unused-variable]
 static header_field_info hfi_mint_control_0x0c_unknown4 MINT_HF_INIT =
                          ^

svn path=/trunk/; revision=53154
2013-11-08 00:13:02 +00:00
Pascal Quantin 696194999e From Vasil Velichkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9382 :
Fix dissection of GSM MAPv3 ReportSM_DeliveryStatusRes

svn path=/trunk/; revision=53148
2013-11-07 21:08:15 +00:00
Jakub Zawadzki ce6ca9a05d Add infrastructure for section-initializing protocol hfis (without array).
configure implementation later.

svn path=/trunk/; revision=53146
2013-11-07 20:14:18 +00:00
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
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
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
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
Michael Mann f9e5c14dde Add Zoltan Lajos Kis as author
svn path=/trunk/; revision=53119
2013-11-06 22:07:04 +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
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
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
Evan Huus 5f2c75e940 Add missing cast.
svn path=/trunk/; revision=53096
2013-11-05 22:58:50 +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