Guy Harris
418a98cd8b
It's incremented, so not a const.
...
Clean up indentation while we're at it.
svn path=/trunk/; revision=53418
2013-11-18 21:42:43 +00:00
Alexis La Goutte
e069d1c9ea
From Peter Wu
...
Add RFC6066 CertificateUrl TLS extension
This is not supported by OpenSSL or NSS, the extension itself seems
unsafe, but some implementations seem to support it[1].
Untested, no capture available.
[1]: http://www.ietf.org/mail-archive/web/tls/current/msg02535.html
svn path=/trunk/; revision=53417
2013-11-18 20:27:04 +00:00
Alexis La Goutte
123e3d9203
From Peter Wu
...
Add status_request_v2 TLS extension dissection (RFC6961)
Besides adding status_request_v2 support, this patch moves the
Certificate Status Type from the OCSP Status subtree to its parent
(the extension tree). This is needed because this type applies to all
OCSPResponse fields.
The check for "tree != NULL" seems unnecessary here, it was not
clarified in the original patch so I removed it.
From me
Fix typo
Remove unneeded tvb_ensure_bytes_exist
Use proto_tree_add_item
svn path=/trunk/; revision=53416
2013-11-18 20:26:55 +00:00
Alexis La Goutte
954584d31b
From Peter Wu
...
Add TLS StatusRequest (RFC6066) ClientHello extension recognition
Only empty Responder ID lists and empty Request Extensions are
implemented. I could not really find existing clients or servers that
populate these.
This status_request extension has a different signature for a
ClientHello and ServerHello, in the latter the extension_data field
must be empty. Therefore an additional parameter is added to
dissect_ssl3_hnd_hello_ext.
From me :
Fix typo
svn path=/trunk/; revision=53415
2013-11-18 20:26:46 +00:00
Alexis La Goutte
22f57a900b
From Peter Wu
...
Support for EncryptedExtensions handshake type (a.k.a. NextProtocol)
Based on https://tools.ietf.org/html/draft-agl-tls-nextprotoneg-04
From me
Fix warning found by fix-encoding-args
svn path=/trunk/; revision=53414
2013-11-18 20:26:37 +00:00
Gerald Combs
16e27047d0
1.11.2 → 1.11.3.
...
svn path=/trunk/; revision=53412
2013-11-18 17:41:00 +00:00
Martin Kaiser
6188141e3e
fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9448
...
pass data parameter to afp dissector
svn path=/trunk/; revision=53410
2013-11-18 11:16:32 +00:00
Guy Harris
87fb87b769
I guess "v4" is 1.3 and "v5" is 1.4. I'm sure there's a reason why that
...
makes sense of a sort....
svn path=/trunk/; revision=53409
2013-11-18 07:58:16 +00:00
Guy Harris
9965f29399
You don't get to have three separate protocols all with the name
...
"OpenFlow 1.3".
svn path=/trunk/; revision=53408
2013-11-18 07:54:48 +00:00
Anders Broman
adc82b16ba
From Zoltán Lajos Kis:
...
Start of OpenFlow 1.4 dissector.
svn path=/trunk/; revision=53405
2013-11-18 06:24:27 +00:00
Martin Kaiser
7d39211e62
add a cast to fix compiler warning
...
svn path=/trunk/; revision=53401
2013-11-17 17:51:59 +00:00
Pascal Quantin
b4b5d00712
Fix the number of highlighted bytes in case of unaligned PER constrained integer
...
svn path=/trunk/; revision=53400
2013-11-17 17:00:11 +00:00
Pascal Quantin
1c73d047b3
From Chris Bontje via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9442 :
...
DNP3 bug fix for analog data sign bit bandling
svn path=/trunk/; revision=53399
2013-11-17 16:40:25 +00:00
Pascal Quantin
d28beab722
From Chris Bontje via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9435 :
...
SEL Fast Message bug fix for signed 16-bit integer fast meter messages
svn path=/trunk/; revision=53398
2013-11-17 15:57:51 +00:00
Pascal Quantin
55a9182c00
From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9441 :
...
Fix Notify IPv6 address parsing in RTPproxy dissector
svn path=/trunk/; revision=53394
2013-11-17 14:48:55 +00:00
Pascal Quantin
3ddf37e930
From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9440 :
...
RTPproxy: use proto_item_append_text instead of rewriting the entire item's text
svn path=/trunk/; revision=53393
2013-11-17 14:32:40 +00:00
Alexis La Goutte
374683f052
Fix indent (2 spaces) and remove trailing whitespace
...
svn path=/trunk/; revision=53392
2013-11-17 14:28:42 +00:00
Pascal Quantin
c25fab0718
From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9430 :
...
Fix empty ToTag in RTPproxy's Offer/Update command
svn path=/trunk/; revision=53391
2013-11-17 14:14:41 +00:00
Alexis La Goutte
02284a7988
Fix indent (use 4 spaces) and add modelines
...
svn path=/trunk/; revision=53388
2013-11-17 14:03:32 +00:00
Alexis La Goutte
983ea7664c
Add extern C if cplusplus (when use with Qt) Add Modelines (and fix indent use 4 spaces for oids.h)
...
svn path=/trunk/; revision=53387
2013-11-17 14:03:17 +00:00
Martin Kaiser
768d2777a3
use explicit casts to fix compilation on OS X
...
svn path=/trunk/; revision=53386
2013-11-17 14:02:54 +00:00
Pascal Quantin
101c3cd268
From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9429 :
...
Fix Notify info parsing in RTPproxy dissector
svn path=/trunk/; revision=53385
2013-11-17 13:59:06 +00:00
Martin Kaiser
2510118bc5
From Abhik Sarkar:
...
dissector for Kyoto Tycoon binary protocol
from me:
make port range preference work
highlight the correct bytes for records
remove trailing commas
correct(?) 64->32 cast
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9418
svn path=/trunk/; revision=53383
2013-11-17 13:36:21 +00:00
Pascal Quantin
ea45be32c5
Add a way to retrieve a PER variable bit string length
...
svn path=/trunk/; revision=53382
2013-11-17 13:31:32 +00:00
Guy Harris
db25270df8
Move the epan/filesystem.c routines to wsutil; they're not specific to
...
packet dissection, they're specific to the entire Wireshark suite of
programs.
svn path=/trunk/; revision=53377
2013-11-17 02:55:14 +00:00
Jakub Zawadzki
bc8d5a1e61
Fix previous commit + rename to bitswap.
...
svn path=/trunk/; revision=53375
2013-11-16 22:44:29 +00:00
Jakub Zawadzki
004220fb63
Exporting/importing variables cause problems, so create function to do bitswaping.
...
svn path=/trunk/; revision=53374
2013-11-16 22:31:07 +00:00
Martin Kaiser
e542bd8a78
dissect operator tune status, reorder some defines
...
svn path=/trunk/; revision=53371
2013-11-16 17:23:46 +00:00
Martin Kaiser
f161482f47
dissect extended event usage
...
svn path=/trunk/; revision=53370
2013-11-16 17:22:56 +00:00
Martin Kaiser
65a96c1c59
interpret the flags for EIT p/f, EIT sch usage
...
svn path=/trunk/; revision=53369
2013-11-16 14:17:06 +00:00
Pascal Quantin
28886d126b
Clear protocol column when the dissector is known
...
svn path=/trunk/; revision=53368
2013-11-16 14:08:03 +00:00
Pascal Quantin
13672dc1e8
Put "GSM SIM" in protocol column
...
svn path=/trunk/; revision=53367
2013-11-16 13:15:44 +00:00
Jakub Zawadzki
f3ef33d096
Fix epan_memmem() copyrights.
...
svn path=/trunk/; revision=53366
2013-11-16 09:26:08 +00:00
Jakub Zawadzki
3b9f6dfab4
Move bitswap.[ch] from epan to wsutil.
...
svn path=/trunk/; revision=53365
2013-11-16 09:16:57 +00:00
Jakub Zawadzki
4f78d3c69b
Don't include <epan/bitswap.h> when not needed
...
svn path=/trunk/; revision=53364
2013-11-16 09:11:26 +00:00
Jakub Zawadzki
d84c4ef2ad
Remove svn:executable property from packet-finger.c packet-whois.c
...
svn path=/trunk/; revision=53363
2013-11-16 08:56:44 +00:00
Chris Maynard
09916263a0
Add a basic finger dissector.
...
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9432
svn path=/trunk/; revision=53362
2013-11-16 03:21:06 +00:00
Bill Meier
a848b341ac
Create/use extended-value-strings to reference certain value-strings;
...
Constify a character array;
Fix a typo in a coment;
Tweak some whitespace;
svn path=/trunk/; revision=53360
2013-11-16 02:53:12 +00:00
Bill Meier
3e5b82ddcc
Constify a character array;
...
Add forward declarations for proto_register_...() & proto_reg_hand_off_...();
Remove a boilerpalte comment;
Tweak some whitespace;
Add editor modelines.
svn path=/trunk/; revision=53359
2013-11-16 02:48:43 +00:00
Bill Meier
d973799957
Constify a character array;
...
'localize' some variables;
Remove some unneeded initializers;
Move proto_reg_handoff_...() to the end of the file as per convention;
Add forward declarations for proto_register_...() & proto_reg_hand_off_...();
Reformat some long lines;
Tweak some whitespace;
Add editor modelines.
svn path=/trunk/; revision=53358
2013-11-16 02:46:04 +00:00
Bill Meier
5eac1781ff
Constify two character arrays;
...
'#if 0' variable 'set but never used' & related code;
'localize' some variables;
Remove some unneeded initializers;
Tweak some whitespace;
Add editor modelines.
svn path=/trunk/; revision=53357
2013-11-16 02:36:53 +00:00
Bill Meier
0892ff63fa
Change editor modelines to reflect actual indentation used in file (4 spaces);
...
Replace a few tabs with spaces;
Fix some spelling in comments;
Tweak some whitespace.
svn path=/trunk/; revision=53355
2013-11-16 02:30:02 +00:00
Jakub Zawadzki
ea73d4a55c
Avoid calling find_dissector(), cache result of [new_]register_dissector()
...
svn path=/trunk/; revision=53353
2013-11-16 01:10:05 +00:00
Jakub Zawadzki
72baf400bf
Make swaptab const.
...
svn path=/trunk/; revision=53351
2013-11-15 23:33:48 +00:00
Jakub Zawadzki
8c11584ce1
Make wslua byte_to_str[] array of char[3] instead of pointers to char.
...
XXX, it should use byte_to_hex() from to_str.c
svn path=/trunk/; revision=53350
2013-11-15 23:33:02 +00:00
Pascal Quantin
70b9ce2b48
Dissect USB Com Network Control Model requests
...
svn path=/trunk/; revision=53349
2013-11-15 23:16:25 +00:00
Gerald Combs
f772a268db
1.11.1 → 1.11.2.
...
svn path=/trunk/; revision=53346
2013-11-15 22:34:31 +00:00
Guy Harris
23e55c696e
To quote GCC, "uninitialized const 'zeroes' is invalid in C++". I guess
...
that must be true, and that there's a reason why it's invalid....
svn path=/trunk/; revision=53336
2013-11-15 01:20:34 +00:00
Bill Meier
2fb674f739
Create/use value_string_ext to reference a value-string-array.
...
Define an array as const.
svn path=/trunk/; revision=53334
2013-11-15 00:15:20 +00:00
Bill Meier
530d88d874
Let's try putting the 'const' in the right place...
...
svn path=/trunk/; revision=53332
2013-11-14 23:54:09 +00:00
Bill Meier
bc17e76462
Create/use value_string_ext to reference certain value-string-arrays.
...
Define an array as const.
Add editor modelines.
Do some minor whitespace & formatting style changes.
svn path=/trunk/; revision=53330
2013-11-14 23:11:12 +00:00
Jakub Zawadzki
c0c26f8e2a
64-bits: reorder fields in struct _protocol to remove padding.
...
This patch decrease size of _protocol structure from 64B to 56B
svn path=/trunk/; revision=53328
2013-11-14 22:50:55 +00:00
Jakub Zawadzki
b5916f0f12
Expand CHECK_DISPLAY_AS_X ('this macro looks like a hack') macro in packet-ieee80211.c, remove it.
...
svn path=/trunk/; revision=53327
2013-11-14 22:40:40 +00:00
Bill Meier
64f4e13fff
Create/use value_string_ext to reference certain value-string-arrays.
...
Define an array as const.
Remove some unneeded initializers.
Add editor modelines.
Do some minor whitespace changes.
svn path=/trunk/; revision=53325
2013-11-14 22:26:08 +00:00
Martin Kaiser
7226846846
share Data Broadcast IDs between MPEG descriptor and DVB-CI
...
svn path=/trunk/; revision=53323
2013-11-14 21:49:23 +00:00
Martin Kaiser
ef7e1f107c
fix application capability handling
...
svn path=/trunk/; revision=53322
2013-11-14 21:44:05 +00:00
Martin Kaiser
c333b6f1f5
add Data Broadcast ID for CI+ and HbbTV
...
svn path=/trunk/; revision=53321
2013-11-14 21:42:00 +00:00
Martin Kaiser
cc30b3597b
dissect Operator Profile's delivery capability bytes
...
svn path=/trunk/; revision=53320
2013-11-14 21:40:59 +00:00
Bill Meier
a3cb8fdf95
Create/use value_string_ext to reference certain value-string-arrays.
...
Define a char array as const.
Remove an unneeded initializer.
Add editor modelines.
Do some minor whitespace changes.
svn path=/trunk/; revision=53319
2013-11-14 21:32:47 +00:00
Chris Maynard
d369ee8c05
Cast the return value of conversation_get_proto_data() to whois_transaction_t *.
...
svn path=/trunk/; revision=53318
2013-11-14 21:20:49 +00:00
Chris Maynard
2f523fd9fd
Add a basic whois dissector.
...
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9357
svn path=/trunk/; revision=53317
2013-11-14 21:04:05 +00:00
Bill Meier
87594e3124
Create/use value_string_ext for some value-string-arrays.
...
Define several char arrays as const.
Add editor modelines.
Do some minor whitespace changes.
svn path=/trunk/; revision=53316
2013-11-14 20:32:58 +00:00
Gerald Combs
190bdc32de
Add packet information and selection to the Follow Stream dialog.
...
Collect packet numbers when following streams so that we can correlate
text positions with packets. Add a FollowStreamText class so that we can
track mouse events. Add a hint label that shows the packet under the
cursor along with packet counts and the number of "turns".
Add the packet number to the C array dump. Note that dumping to YAML
might be useful for Scapy users.
svn path=/trunk/; revision=53314
2013-11-14 17:37:40 +00:00
Evan Huus
2809240ead
Add a cast to try and fix the OSX buildbot.
...
svn path=/trunk/; revision=53313
2013-11-14 13:07:53 +00:00
Pascal Quantin
488cf801a2
Fix dissection of MBIM Extended Functional Descriptor MTU
...
svn path=/trunk/; revision=53312
2013-11-14 09:43:32 +00:00
Evan Huus
bfca717c45
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9303 based on patch and
...
help from Matthieu Patou.
If the DCE-RPC heuristic failed to identify a TVB, *but* we've already decoded
a DCE-RPC layer in this packet *and* the heuristic failed because we didn't have
enough data, make the reasonable assumption that it actually is another DCE-RPC
packet, and ask TCP to desegment more data for us and try again.
svn path=/trunk/; revision=53310
2013-11-14 03:34:01 +00:00
Evan Huus
b13c1b7093
The kafka compression codec is only 2 bits, not 3.
...
svn path=/trunk/; revision=53309
2013-11-13 23:47:57 +00:00
Evan Huus
fc08bf1143
Fix what appears to be a mistake during the conversion in r53036 from
...
dissector_try_uint to dissector_try_uint_new: protocols called due to TCP port
matching were not getting added to the list of protocols in the frame. The
"add_proto_name" parameter should be TRUE except in unusual circumstances.
svn path=/trunk/; revision=53308
2013-11-13 23:43:08 +00:00
Martin Kaiser
329873cf97
share service type descriptions between MPEG descriptor and DVB-CI
...
svn path=/trunk/; revision=53307
2013-11-13 23:10:01 +00:00
Gerald Combs
b0063a025b
Highlight selected sequence diagram items.
...
Create a new dialog each time the user follows a stream. A lot of the
follow code seems to assume one and only one dialog so there are likely
outstanding bugs.
Don't use the global cfile (should we deprecate its usage?). We want to
move closer to multiple documents, not further away.
Clean up after ourselves. Free our payload list and unlink our temp
file. Make a bunch of gchar*s QStrings. Make sure our destructor gets
called and use it.
Make member variable and method names more consistent.
svn path=/trunk/; revision=53306
2013-11-13 22:18:01 +00:00
Martin Kaiser
3e41e172db
dissect Refresh Request Flag
...
svn path=/trunk/; revision=53305
2013-11-13 21:52:33 +00:00
Martin Kaiser
ff7f1c80cf
dissect Operator Profile's delivery system hint
...
svn path=/trunk/; revision=53304
2013-11-13 20:41:00 +00:00
Bill Meier
014bbf19b3
(Minor cleanup): unneeded initializers, whitespace, long-lines, typos
...
svn path=/trunk/; revision=53303
2013-11-13 19:29:37 +00:00
Pascal Quantin
53a29dee19
Add more GSM SIM Toolkit info to info column
...
svn path=/trunk/; revision=53302
2013-11-13 17:28:18 +00:00
Jeff Morriss
219fb7fa3e
Fix CID 1113411: close the file descriptor and free the file name even in
...
error cases.
svn path=/trunk/; revision=53301
2013-11-13 17:11:21 +00:00
Jeff Morriss
38eac2f54f
Wrap GCC pragma in an #ifdef to make it compile when we're not using GCC.
...
Again, change manually applied to the .h file.
svn path=/trunk/; revision=53299
2013-11-13 14:00:45 +00:00
Jeff Morriss
8893d3d960
Use a gcc pragma to stop the (pages of) warnings coming out of
...
x11-extensions-implementation.h .
This change was manually applied to the .h file as I can't currently rebuild
the X11 dissector.
svn path=/trunk/; revision=53298
2013-11-13 03:20:37 +00:00
Guy Harris
409dd075c6
Replace fvalue_ftype() with a fvalue_type_ftenum() routine that returns
...
the ftenum_t for the fvalue's ftype, rather than a pointer to the ftype
(which isn't all that useful except as a handle, unless you import the
internal header).
Have fvalue_to_string_repr() return NULL, rather than failing, if the
fvalue's ftype has no val_to_string_repr method.
This lets us not include the ftypes internal header in
ui/cli/tap-diameter-avp.c.
svn path=/trunk/; revision=53290
2013-11-12 22:06:00 +00:00
Martin Kaiser
72f3c258a0
share the text description of service types between MPEG PMT and DVB-CI
...
svn path=/trunk/; revision=53289
2013-11-12 22:04:47 +00:00
Michael Mann
7221215cdc
Add "rtp handle protection" inside srtp_add_address/rtp_add_address/bluetooth_add_address so dissectors calling it don't need to find "rtp" just for the handle check.
...
svn path=/trunk/; revision=53288
2013-11-12 22:04:03 +00:00
Martin Kaiser
99f0fc1d27
From Michal Labedzki
...
add forward declarations
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333
svn path=/trunk/; revision=53287
2013-11-12 21:48:13 +00:00
Martin Kaiser
7221138871
From Michal Labedzki
...
change two local variables to gint16 so we can store
-1 for invalid value
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333
svn path=/trunk/; revision=53286
2013-11-12 21:45:50 +00:00
Martin Kaiser
bcf10a8b17
From robionekenobi
...
add expert info for invalid item length in mq pcf
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9411
svn path=/trunk/; revision=53285
2013-11-12 21:28:27 +00:00
Michael Mann
29ff6875d9
LMP dissector can't be called by anything but UDP, so no need to check that.
...
svn path=/trunk/; revision=53284
2013-11-12 21:22:37 +00:00
Michael Mann
a661864f48
Add "T.38 handle protection" inside t38_add_address() so dissectors calling it don't need to find "t38" just for the handle check.
...
svn path=/trunk/; revision=53283
2013-11-12 21:10:20 +00:00
Jeff Morriss
a97460a39c
Add an item for any unknown tags we come across (just as FT_BYTES).
...
svn path=/trunk/; revision=53278
2013-11-12 18:57:14 +00:00
Jeff Morriss
64f0cafbad
De-duplicate some code by changing a while loop to a do-while loop.
...
svn path=/trunk/; revision=53277
2013-11-12 18:49:57 +00:00
Gerald Combs
1d8a895fa4
Try using UTF8_RIGHTWARDS_ARROW to indicate direction.
...
If this doesn't cause any problems we should probably move
utf8_entities.h from ui to wsutil.
svn path=/trunk/; revision=53276
2013-11-12 17:34:50 +00:00
Michael Mann
76bfa2ce1a
Remove usb_conv_info_t from packet_info and pass the data directly into the subdissectors. Bug 9413 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9413 )
...
svn path=/trunk/; revision=53274
2013-11-12 13:46:51 +00:00
Martin Kaiser
2b729ba554
From Michal Labedski
...
fix Logically Dead Code: allow cmd==0
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9420
svn path=/trunk/; revision=53273
2013-11-12 11:53:05 +00:00
Martin Kaiser
4578241fd7
remove pointless if (tree) checks
...
svn path=/trunk/; revision=53270
2013-11-12 10:08:13 +00:00
Alexis La Goutte
ccb8b8fd36
Remove some #include (Found by iwyu)
...
svn path=/trunk/; revision=53269
2013-11-12 09:23:37 +00:00
Alexis La Goutte
e13ef4109d
Fix typo (for generated Documentation)
...
svn path=/trunk/; revision=53268
2013-11-12 09:23:13 +00:00
Alexis La Goutte
371683c319
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
...
svn path=/trunk/; revision=53267
2013-11-12 09:22:51 +00:00
Alexis La Goutte
ca63f71d93
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
...
svn path=/trunk/; revision=53266
2013-11-12 09:22:28 +00:00
Alexis La Goutte
e706af25ca
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
...
svn path=/trunk/; revision=53265
2013-11-12 09:21:48 +00:00
Martin Mathieson
edbe198322
Include rohc struct inside pdcp instead of repeating all of the fields
...
svn path=/trunk/; revision=53262
2013-11-11 22:36:08 +00:00
Martin Kaiser
77e4c15615
replace proto_tree_add_string_format_value() with proto_tree_add_item()
...
svn path=/trunk/; revision=53261
2013-11-11 22:15:30 +00:00
Gerald Combs
a33c6a8ced
Mark some parameters unused.
...
svn path=/trunk/; revision=53259
2013-11-11 21:55:27 +00:00
Pascal Quantin
628dda9d2c
From Michael Bean via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9384 :
...
Add support for Alcatel-Lucent 8950 AAA
svn path=/trunk/; revision=53258
2013-11-11 21:13:55 +00:00
Pascal Quantin
7652baa0c6
From doh via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9112 :
...
Fix incorrect "bytes missing in capture file" in "check_fragments"
svn path=/trunk/; revision=53257
2013-11-11 20:04:27 +00:00
Michael Mann
5470356154
Remove tcp_tree from packet_info structure.
...
All dissectors that call tcp_dissect_pdus() have the same relative tree position, so it doesn't need to be specifically saved in the packet_info.
svn path=/trunk/; revision=53253
2013-11-11 19:30:59 +00:00
Michael Mann
f738c18446
Create separate heuristic dissectors for TCP and UDP dissection. Some of the checking for "protocol" in the old heuristic dissector can be handled automatically by being registered with TCP/UDP specifically.
...
Also replaced ADWIN_ADD_[LE|BE] macros so check*.pl scripts aren't shirked. Didn't think the macros saved that much.
svn path=/trunk/; revision=53252
2013-11-11 19:28:42 +00:00
Martin Kaiser
44d8b7f412
From Peter Lemenkov
...
display a text description for the RTPProxy version request
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9416
svn path=/trunk/; revision=53249
2013-11-11 16:36:16 +00:00
Martin Kaiser
f771b7874a
fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9411
...
make sure we're not stuck in the while loop
svn path=/trunk/; revision=53248
2013-11-11 12:20:12 +00:00
Martin Kaiser
2759cfb9bd
fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9409
...
don't call proto_item_get_len() when the argument can be NULL
svn path=/trunk/; revision=53247
2013-11-11 10:57:30 +00:00
Michael Mann
77914468aa
tcp_dissect_pdus can handle both desegmented and complete packets, so have the entire pdu be handled that way.
...
svn path=/trunk/; revision=53246
2013-11-11 04:01:50 +00:00
Michael Mann
5bebc2020c
Decode more error replies in RTPproxy dissector. Bug 9408 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9408 )
...
From Peter Lemenkov
svn path=/trunk/; revision=53245
2013-11-11 02:06:17 +00:00
Bill Meier
043f18baa4
Do some whitespace & formatting style changes;
...
Remove some unneeded initializers;
Also: packet-mq.c: Add an XXX coment.
svn path=/trunk/; revision=53244
2013-11-11 01:54:42 +00:00
Michael Mann
4945174ae6
Pass "wild_card" directly to dissector instead of using private_data. "h248term" dissector is not in Wireshark source, so third-party will need to update accordingly.
...
svn path=/trunk/; revision=53241
2013-11-10 21:33:45 +00:00
Michael Mann
ce62a3c5cc
Use ASN.1 private data instead of pinfo->private_data to exchange kerberos callback functions.
...
svn path=/trunk/; revision=53240
2013-11-10 19:58:03 +00:00
Gerald Combs
640d152c45
Mark a parameter unused.
...
svn path=/trunk/; revision=53238
2013-11-10 17:51:00 +00:00
Michael Mann
02e5ce855a
pinfo->private_data is no longer being used, so adjust the logic accordingly.
...
svn path=/trunk/; revision=53237
2013-11-10 17:45:59 +00:00
Michael Mann
d5d8c3c359
context is not being passed to dissector, not through pinfo->private_data so check data parameter, not pinfo->private_data.
...
svn path=/trunk/; revision=53236
2013-11-10 17:17:18 +00:00
Jakub Zawadzki
c2e0f82443
No need to include whole <epan/packet.h>
...
svn path=/trunk/; revision=53235
2013-11-10 17:15:35 +00:00
Michael Mann
5a7cc4836b
Move #defines from packet-hclnfsd.h into the dissector since there is no external need for the values.
...
svn path=/trunk/; revision=53234
2013-11-10 17:03:28 +00:00
Jakub Zawadzki
5518639af2
Fix buildbot:
...
wslua_proto.c(1700) : error C2065: 'TRY' : undeclared identifier
svn path=/trunk/; revision=53233
2013-11-10 16:57:29 +00:00
Michael Mann
fe52a15217
Have rpc_call_info_value be passed through to (sub)dissectors instead of using pinfo->private_data.
...
This was acheived by adding a void* data parameter to the dissect_function_t typedef in packet-rpc.h (r53213). After converting the pinfo->private_data, I'm not sure if it would be better to change the void* data pointer to be a rpc_call_info_value* explicitly. Not all "dissector functions" use it, but it would certainly save a lot of casting...
svn path=/trunk/; revision=53232
2013-11-10 16:39:46 +00:00
Jakub Zawadzki
6f6d04e2f9
Move REPORT_DISSECTOR_BUG() body to proto_report_dissector_bug() function. Remove exceptions.h include from proto.h
...
svn path=/trunk/; revision=53231
2013-11-10 16:04:15 +00:00
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
Jakub Zawadzki
b6512582ab
try to fix buildbot:
...
./wslua_field.c:32:31: fatal error: ftypes/ftypes-int.h: No such file or directory
svn path=/trunk/; revision=53225
2013-11-10 14:00:29 +00:00
Jakub Zawadzki
9a6810481d
Fix buildbot:
...
wslua_field.c(179) : error C2037: left of 'val_to_string_repr' specifies undefined struct/union '_ftype_t'
svn path=/trunk/; revision=53224
2013-11-10 13:38:07 +00:00
Jakub Zawadzki
12d1509aa1
Move struct _ftype_t + callback typedefs + free macro to ftypes-int.h
...
svn path=/trunk/; revision=53223
2013-11-10 13:14:09 +00:00
Jakub Zawadzki
ea478f2c5e
missing include for tvbtest + add 'const' (silent most of warnings).
...
svn path=/trunk/; revision=53222
2013-11-10 13:04:21 +00:00
Jakub Zawadzki
617f2eddef
Remove <epan/ipv6-utils.h> from tvbuff.
...
svn path=/trunk/; revision=53221
2013-11-10 12:31:17 +00:00
Jakub Zawadzki
e7e010be58
Don't test for guard-include-define (or how it's called) inside including header.
...
svn path=/trunk/; revision=53220
2013-11-10 11:53:41 +00:00
Jakub Zawadzki
8b73d378a4
exceptions.h not needed by tvbuff.h (no much progress because it's needed by proto.h)
...
svn path=/trunk/; revision=53219
2013-11-10 11:48:03 +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
Alexis La Goutte
90c2945adb
Fix compilation under Linux (Ubuntu)
...
airpdcap.c:470:18: error: declaration of 'address' shadows a global declaration [-Werror=shadow]
airpdcap.c:611:18: error: declaration of 'address' shadows a global declaration [-Werror=shadow]
svn path=/trunk/; revision=53216
2013-11-10 10:45:29 +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
3b2e519422
Remove comment (leftovers from r49444) + add missing WS_DLL_PUBLIC for adler32
...
(modifing files to be commited when svn commit is already running is no good).
svn path=/trunk/; revision=53192
2013-11-09 14:19:19 +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
9aac55472c
Put "private" to_str.c functions to to_str-int.h
...
svn path=/trunk/; revision=53187
2013-11-09 11:26:41 +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
Jakub Zawadzki
38edae1c71
Replace wtap_nstime with nstime_t, remove wtap_nstime_to_sec.
...
After r50154 nstime_t is inside wsutil/ so wiretap don't need it's own copy.
svn path=/trunk/; revision=53184
2013-11-09 10:38:02 +00:00
Jakub Zawadzki
f207c70075
I have added tvb_get_bits_buf() in r37217, nobody is using it, remove.
...
svn path=/trunk/; revision=53183
2013-11-09 10:08:58 +00:00
Jakub Zawadzki
c86d38af23
Remove old (5 yrs) #if 0 code (from r25028).
...
svn path=/trunk/; revision=53182
2013-11-09 10:02:39 +00:00
Jakub Zawadzki
8be10b5662
Remove #if 0 code (introduced in r29489).
...
svn path=/trunk/; revision=53181
2013-11-09 10:00:54 +00:00
Jörg Mayer
0e61383d07
Fix a tpyo (packet-quic.)
...
svn path=/trunk/; revision=53179
2013-11-09 08:19:13 +00:00
Jakub Zawadzki
9297c9e780
Rename swar_count_bits() to ws_count_ones()
...
Try to make ws_count_ones() inline function.
svn path=/trunk/; revision=53178
2013-11-09 04:47:08 +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
e6944e68b9
Try to split ws_ctz() from hfinfo_bitshift().
...
svn path=/trunk/; revision=53176
2013-11-08 22:01:12 +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
Jakub Zawadzki
b3a4b56ae9
Use escape_string*() functions in ftype-string.
...
Found in attachment #11961 , by Didier Gautheron
svn path=/trunk/; revision=53174
2013-11-08 20:09:54 +00:00
Guy Harris
853da2eb9b
The "file types" we have are actually combinations of types and
...
subtypes, e.g. Network Monitor version 1 and Network Monitor version 2
are separate "file types", even though they both come from Network
Monitor.
Rename various functions, #defines, and variables appropriately.
svn path=/trunk/; revision=53166
2013-11-08 09:53:01 +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
28129427d4
As the code seems to be working now for two people
...
(both using Linux) it's time to be able to play with
the new HFI code.
Run cmake with -DHAVE_HFI_SECTION_INIT and you are good to go.
svn path=/trunk/; revision=53155
2013-11-08 00:23:32 +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
Jörg Mayer
7c2c2d89f5
Fix:
...
cd /home/jmayer/work/wireshark/svn/build/qt-gtk3/epan && /usr/bin/cc -DG_DISABLE_DEPRc
In file included from /home/jmayer/work/wireshark/svn/trunk/epan/packet.h:29:0,
from /home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-2dp:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-2dparityfec.c: In functio:
/home/jmayer/work/wireshark/svn/trunk/epan/proto.h:2128:2: error: ISO C90 forbids mixe]
extern header_field_info __start__data_ ##proto[]; \
^
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-2dparityfec.c:331:4: note’
proto_register_fields(proto_2dparityfec, hfi, array_length(hfi));
^
cc1: all warnings being treated as errors
svn path=/trunk/; revision=53152
2013-11-08 00:01:19 +00:00
Jakub Zawadzki
1dffd1a949
GCC on amd64 align header_field_info variables to 16-bytes, this cause problems with proto_register_fields_section().
...
sizeof(void *) alignment should be enough, use it in HFI_INIT.
This fixes http://www.wireshark.org/lists/wireshark-dev/201311/msg00069.html
svn path=/trunk/; revision=53150
2013-11-07 23:20:06 +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
Alexis La Goutte
49485528d8
Add Packet Editor Preference
...
svn path=/trunk/; revision=53134
2013-11-07 07:43:11 +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
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
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
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
Evan Huus
389423aaaa
Replace pinfo->layer_names as a string with pinfo->layers as a wmem_list of
...
protocol IDs. This is substantially more efficient, which means we can build it
all the time rather than only if tree (in my benchmarks the extra time taken is
not large enough to be statistically significant even over tens of thousands of
packets).
This fixes what was probably a bug in btobex that relied on layer_names for
non-tree dissection. It also enables a much simpler fix for
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9303
svn path=/trunk/; revision=53089
2013-11-05 17:48:48 +00:00
Evan Huus
d04079eedc
Expose wmem_list_remove_frame to make it efficient to do pop operations as
...
wmem_list_remove_frame(wmem_list_tail())
svn path=/trunk/; revision=53088
2013-11-05 17:28:19 +00:00
Evan Huus
1051504005
From Michael Labedzki, call data dissector instead if handle is NULL.
...
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9379
svn path=/trunk/; revision=53087
2013-11-05 13:17:55 +00:00
Alexis La Goutte
bb362a8059
From J. Bruce Fields via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9383
...
Incorrect FATTR4_SECURITY_LABEL value
We got this constant wrong.
See http://tools.ietf.org/html/draft-ietf-nfsv4-minorversion2-dot-x-19 and http://marc.info/?l=linux-nfs&m=138359828516861&w=2
svn path=/trunk/; revision=53086
2013-11-05 08:40:55 +00:00
Bill Meier
005f86cde7
Change "4 space tabs" indentation to use "4 spaces";
...
Clean up alignment of various structs & etc.
svn path=/trunk/; revision=53085
2013-11-05 02:03:18 +00:00
Bill Meier
e656eea99e
Declare many value_string_arrays not used elsewhere as static;
...
IOW: Explicitly declare as global only those value_string_arrays
used elsewhere.
svn path=/trunk/; revision=53084
2013-11-04 20:57:01 +00:00
Bill Meier
629aa84ea1
'#if 0' numerous unused value string arrays.
...
svn path=/trunk/; revision=53082
2013-11-04 20:22:54 +00:00
Anders Broman
7bd7c70907
From Zoltán Lajos Kis:
...
tidying some stuff.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283
svn path=/trunk/; revision=53079
2013-11-04 19:35:00 +00:00
Bill Meier
0243d69057
From robionekenobi: Enhancement of the packet-mq dissector (WMQ 7.1-7.5)
...
Add more detail for SPI Open LPOO Structure
Add more int_to_vals for INQ_Q_MGR reply
Add more display detail for encoding value
Some fix and display correction
Note: The patch used was the *original* patch submitted (plus some fixes by me).
That is: (https://bugs.wireshark.org/bugzilla/attachment.cgi?id=11962 )
plus my fixes
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9367 and comments for
details.
From me:
- Fix bug which resulted in a macro expansion fail on GCC
- Fix a -Wshadow error in packet-mq-pcf.c
svn path=/trunk/; revision=53078
2013-11-04 18:55:06 +00:00
Martin Mathieson
7c1ab97ca4
Don't show the channel information twice in the protocol root proto_item
...
svn path=/trunk/; revision=53077
2013-11-04 15:10:58 +00:00
Evan Huus
8a0ef07000
Effectively remove the tree memory pool and port some of its behaviour to the
...
pinfo memory pool, they have exactly the same scope. Simplification and minor
performance win (one GHashTable we longer have to create/destroy on every
packet).
svn path=/trunk/; revision=53076
2013-11-04 14:12:59 +00:00
Jörg Mayer
ca7923f7d5
Revert r53073, by now the vast majority of dissector do declare the
...
registration functions and if we want to standardize it makes more
sense to fix the remaining ones.
svn path=/trunk/; revision=53075
2013-11-04 10:07:33 +00:00
Alexis La Goutte
55e3b53563
From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9373
...
ieee80211: Decode Radio Measurements (Action Frames)
The length of the fixed fields are dependent on the radio measurement
action. Before this patch, fields following the action code were
ignored, leading to wrong decoding results. This patch adds recognition
for the Radio Measurement action management frames as specified in
IEEE Std 802.11-2012.
From me:
* Rename some hf (Add ff_ in name)
* Link Margin and Transmit Power are signed
* Use always proto_tree_add_item (replace proto_tree_add_text)
svn path=/trunk/; revision=53074
2013-11-04 08:59:48 +00:00
Jörg Mayer
f8e232e8ba
Remove forward declarations of registration functions.
...
svn path=/trunk/; revision=53073
2013-11-03 22:12:48 +00:00
Pascal Quantin
b1b84826f6
Please checkAPIs.pl script
...
svn path=/trunk/; revision=53072
2013-11-03 19:36:36 +00:00
Pascal Quantin
ea0a85c230
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9031 :
...
SIP contact-param parsing fails in case the last parameter includes a quoted string
svn path=/trunk/; revision=53071
2013-11-03 18:07:46 +00:00
Chris Maynard
f1a3e8634f
Try to clarify the documentation for tvb_length_remaining() and tvb_reported_length_remaining() based on Jörg's recommendation from bug 9263.
...
svn path=/trunk/; revision=53070
2013-11-03 18:02:17 +00:00
Anders Broman
6de593197e
NULL terminate a value_str
...
svn path=/trunk/; revision=53069
2013-11-03 17:04:13 +00:00
Anders Broman
3f9ff99ca7
From Zoltán Lajos Kis:
...
dissect the rest of the messages.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283
svn path=/trunk/; revision=53068
2013-11-03 16:59:11 +00:00
Michael Mann
a0062fd684
Sync remaining patches with latest SAMBA PIDL source per http://www.wireshark.org/lists/wireshark-dev/201310/msg00217.html
...
0010-frsrpc-Regenerate-frsrpc-due-to-changes-in-the-pidl-.patch
0016-Regenerate-the-dnserver.patch
are now integrated, but modified to compile on Windows. I suspect the PIDL generators may need to be updated to support this, otherwise regeneration will break the build on Windows again.
svn path=/trunk/; revision=53067
2013-11-03 16:17:35 +00:00
Michael Mann
65b6a98b4a
Bluetooth: AVDTP: Add support for Content Protection type SCMS-T (and some minor cleanup). Bug 7893 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893 )
...
From Michal Labedzki
svn path=/trunk/; revision=53065
2013-11-03 15:25:52 +00:00
Evan Huus
e960c882f8
Fix what appears to be an off-by-one error in the IMAP dissector, causing
...
valgrind errors with the capture from
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9263
svn path=/trunk/; revision=53062
2013-11-03 14:22:53 +00:00
Michael Mann
149de99d68
Have rose_ctx_t passed into subdissectors instead of using pinfo->private_data.
...
svn path=/trunk/; revision=53061
2013-11-03 12:57:58 +00:00
Alexis La Goutte
7054372c26
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
...
svn path=/trunk/; revision=53058
2013-11-03 11:19:10 +00:00
Alexis La Goutte
95d4c4ac88
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
...
svn path=/trunk/; revision=53057
2013-11-03 11:18:54 +00:00
Alexis La Goutte
6166208f12
Make Mac OS X buildbot happy (Missing _U_)
...
svn path=/trunk/; revision=53056
2013-11-03 10:56:55 +00:00
Michael Mann
60e3e52a53
Have asn1_ctx_t passed into the "h245.gef.name" and "h245.gef.content" subdissectors instead of using pinfo->private_data.
...
svn path=/trunk/; revision=53055
2013-11-03 02:45:22 +00:00
Michael Mann
3b7f6f0e5f
Partially revert r53052 because hf_ fields aren't defined (or used)
...
svn path=/trunk/; revision=53054
2013-11-02 21:06:07 +00:00
Evan Huus
cc19763433
Replace glib with wmem when constructing dynamic RADIUS fields. Fixes the memory
...
leaks reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9370
svn path=/trunk/; revision=53053
2013-11-02 20:16:54 +00:00
Michael Mann
f1e8e58ec5
Bluetooth: minor improvements. Bug 7893 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893 )
...
1. AVDTP: Fix double decoded stream
2. AVDTP: Use items for logical block objects
3. HCI_USB use handoffed dissector handles instead of find_dissector()
From Michal Labedzki
svn path=/trunk/; revision=53052
2013-11-02 20:10:51 +00:00
Michael Mann
a267501b82
Bluetooth: Use dissector data instead of pinfo->private_data. Bug 7893 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893 )
...
From Michal Labedzki
svn path=/trunk/; revision=53051
2013-11-02 19:20:04 +00:00
Michael Mann
02a8391535
Require dissector_try_string to pass a data parameter to its subdissectors. There weren't that many calls, so might as well modify the function than create a need for dissector_try_string_new.
...
svn path=/trunk/; revision=53049
2013-11-02 15:52:25 +00:00
Alexis La Goutte
925cba4e91
Fix build (missing some _U_)
...
svn path=/trunk/; revision=53048
2013-11-02 13:31:24 +00:00
Alexis La Goutte
c09657cd7f
Fix warning found by fix-encodings-arg tool
...
svn path=/trunk/; revision=53047
2013-11-02 13:16:19 +00:00
Alexis La Goutte
ea54dd103c
Make checkAPIs Happy (Missing const for value_string)
...
svn path=/trunk/; revision=53046
2013-11-02 13:12:56 +00:00
Michael Mann
872f3efeca
Prep a few more dissectors to receive their string data through dissector data.
...
svn path=/trunk/; revision=53045
2013-11-02 13:05:58 +00:00
Michael Mann
26105b7739
get tcpinfo from dissector data, not pinfo->private_data
...
svn path=/trunk/; revision=53044
2013-11-02 13:02:55 +00:00
Anders Broman
870346a66e
From Zoltán Lajos Kis:
...
dissect multipart request and reply messages
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283
svn path=/trunk/; revision=53043
2013-11-02 10:21:52 +00:00
Michael Mann
8dc0db8d72
Allow json dissector to receive a string through dissector data and give dissector data priority over pinfo->private_data (to discourage it's use)
...
svn path=/trunk/; revision=53042
2013-11-02 02:12:36 +00:00
Michael Mann
ac09e775c9
Allow text-data dissector to receive a string through dissector data and give dissector data priority over pinfo->private_data (to discourage it's use)
...
svn path=/trunk/; revision=53041
2013-11-02 01:36:53 +00:00
Michael Mann
f6934a4ae1
Remove rpc_defrag.h
...
Move the #defines to packet-rpc.h and pull the functions into packet-rpc.c since they aren't used by any dissectors.
svn path=/trunk/; revision=53040
2013-11-02 01:15:13 +00:00
Guy Harris
0a0af31375
Mark unused arguments.
...
svn path=/trunk/; revision=53038
2013-11-02 01:07:07 +00:00
Guy Harris
4302292936
You have to cast void pointers to another type in C++; implicit
...
conversions aren't valid.
svn path=/trunk/; revision=53037
2013-11-02 00:50:24 +00:00
Michael Mann
f8f1f48371
Pass struct tcpinfo into all TCP subdissectors instead of through pinfo->private_data.
...
svn path=/trunk/; revision=53036
2013-11-02 00:36:30 +00:00
Michael Mann
b6484432aa
Allow try_conversation_dissector() to pass data to subdissectors.
...
svn path=/trunk/; revision=53035
2013-11-01 23:45:10 +00:00
Bill Meier
953815dd11
Revert SVN #53027 : It gives compile warning on GCC (at least).
...
(No time right now to figure the problem out).
CC libdissectors_la-packet-mq-base.lo
In file included from packet-mq-base.c:32:0:
packet-mq.h:42:54: error: expected '=', ',', ';', 'asm' or '__attribute__' before '_ext'
#define DEF_VALSEXT(A) value_string_ext GET_VALSV(A)_ext = VALUE_STRING_EXT_INIT(GET_VALSV(A))
^
packet-mq-base.c:1301:1: note: in expansion of macro 'DEF_VALSEXT'
DEF_VALSEXT(selector);
^
packet-mq.h:42:54: error: expected '=', ',', ';', 'asm' or '__attribute__' before '_ext'
#define DEF_VALSEXT(A) value_string_ext GET_VALSV(A)_ext = VALUE_STRING_EXT_INIT(GET_VALSV(A))
^
packet-mq-base.c:1495:1: note: in expansion of macro 'DEF_VALSEXT'
DEF_VALSEXT(mqcmd);
^
svn path=/trunk/; revision=53033
2013-11-01 21:39:23 +00:00
Bill Meier
02f2b76bdd
From robionekenobi: Enhancement of the packet-mq dissector (WMQ 7.1-7.5)
...
Add more detail for SPI Open LPOO Structure
Add more int_to_vals for INQ_Q_MGR reply
Add more display detail for encoding value
Some fix and display correction
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9367
svn path=/trunk/; revision=53027
2013-11-01 20:13:15 +00:00
Michael Mann
9707e464ad
General dissector cleanup.
...
The original intent was to just deal with struct tcpinfo data, but after finding it was unnecessary (and somewhat limited dissection in COL_INFO), I took the cleanup a little farther. Sample traces from wiki and bug 5956 were very helpful in proving I didn't break anything.
svn path=/trunk/; revision=53025
2013-11-01 18:29:29 +00:00
Pascal Quantin
9589727b3a
From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9360 :
...
Fix IRC response command filter
svn path=/trunk/; revision=53016
2013-11-01 15:48:57 +00:00
Anders Broman
39515def5f
Increase PROTO_PRE_ALLOC_HF_FIELDS_MEM
...
svn path=/trunk/; revision=53009
2013-10-31 21:26:27 +00:00
Chris Maynard
a95614a79c
Make declarations consistent, fix typos, remove tabs, use consistent indentation, wrap text at column 80, add modelines.
...
svn path=/trunk/; revision=53004
2013-10-31 17:30:22 +00:00
Michael Mann
35dd14348e
USB/PN532: Fix dissector to use new dissector *data instead of private_data. Bug 9333 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 )
...
From Michal Labedzki
svn path=/trunk/; revision=53003
2013-10-31 15:02:50 +00:00
Michael Mann
8baa713605
Bluetooth: SDP: Recognize attributes by record handle or by UUIDs in request. Bug 9327 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327 )
...
From Michal Labedzki
svn path=/trunk/; revision=53002
2013-10-31 14:35:22 +00:00
Michael Mann
6aaf3aa4f0
sb3_task_id_t is not used in any existing dissector and can't be passed to any other (third-party) dissectors, so don't have it pollute pinfo->private_data.
...
Also, call_dissector shouldn't be under a tree.
svn path=/trunk/; revision=53001
2013-10-31 14:12:53 +00:00
Martin Mathieson
8f6b8276e7
Test was the wrong way around
...
svn path=/trunk/; revision=53000
2013-10-31 13:58:57 +00:00
Evan Huus
68b5888453
From Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9345
...
openSAFETY: Changes for better dissection of additional SADR and SN Fail
messages
svn path=/trunk/; revision=52998
2013-10-31 01:49:10 +00:00
Michael Mann
c0fcebb07a
Add a data parameter to call_ber_oid_callback to be able to pass data to subdissectors found with dissector_try_string_new.
...
The intention is to aid in the removal of pinfo->private_data use as well as static global variables in a dissector. For now, all calls to call_ber_oid_callback have the data parameter set to NULL.
svn path=/trunk/; revision=52994
2013-10-31 00:57:03 +00:00
Martin Kaiser
b84fee4fc7
BAT has a Bouquet ID, no Service ID
...
svn path=/trunk/; revision=52987
2013-10-30 22:34:16 +00:00
Martin Kaiser
63325bdab8
add one more private data specifier
...
svn path=/trunk/; revision=52986
2013-10-30 22:18:55 +00:00
Chris Maynard
3e2863e6b8
Remove an extraneous semicolon.
...
svn path=/trunk/; revision=52985
2013-10-30 18:16:22 +00:00
Martin Mathieson
904971302b
Initialise current_security to NULL, to avoid possibly using uninitialised
...
svn path=/trunk/; revision=52983
2013-10-30 13:45:28 +00:00
Martin Mathieson
7847580ac9
Get rid of value_strings that appear to be a throwback to when ROHC appeared in this dissector
...
svn path=/trunk/; revision=52982
2013-10-30 13:18:15 +00:00
Martin Mathieson
97070acc42
Don't call RRC dissector if should be ciphered. Take care to allow SecurityModeComplete to be shown though (i.e. the next UL frame after security is configured)
...
svn path=/trunk/; revision=52981
2013-10-30 12:58:03 +00:00
Michael Mann
694bc6b763
Allow string-based dissector tables to pass data between dissectors.
...
svn path=/trunk/; revision=52980
2013-10-30 04:06:54 +00:00
Evan Huus
a3648730a6
Replace some proto_tree_add_string_format with proto_tree_add_item +
...
proto_tree_set_text - the string was not the important part, the formatting was.
We were passing the string directly from tvb_get_ptr, but this meant that if the
packet didn't contain a null-terminator we would run off the end. Since the
string comes straight from the packet, just let _add_item handle the length
calculations etc efficiently, and set the display later.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9323
I'm a bit confused honestly why most of these are being set hidden after being
added and formatted, but at least there are no memory errors anymore.
svn path=/trunk/; revision=52979
2013-10-30 02:09:34 +00:00
Michael Mann
1c96e97f71
Update the ASN.1 generated dissectors that were missed as part of the patches in bug 9344 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9344 )
...
svn path=/trunk/; revision=52978
2013-10-30 02:02:08 +00:00
Evan Huus
8f5bdaa54b
When adding an entry to a dissector string table, take a copy of the pattern
...
string (and pass g_free to g_hash_table_new_full to free it).
This means callers don't have to worry about the scope of the memory they pass
in, and fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9296
svn path=/trunk/; revision=52977
2013-10-30 01:42:11 +00:00
Anders Broman
1e6927dbb3
Fix proto.c:4498: warning: 'compare_filter_name' defined but not used
...
svn path=/trunk/; revision=52975
2013-10-29 23:18:26 +00:00
Anders Broman
c864a20398
Optimize proto_get_id_by_filter_name() by using the existing hastable for proto_filter_names.
...
svn path=/trunk/; revision=52972
2013-10-29 22:17:18 +00:00
Martin Mathieson
a7505b3027
Mark an unused parameter as such
...
svn path=/trunk/; revision=52971
2013-10-29 22:16:32 +00:00
Martin Kaiser
733713b4b1
if pointer==0, the section starts immediately
...
don't add an empty fragment to the list
this should fix the asserts reported in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9325
and
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8352
svn path=/trunk/; revision=52969
2013-10-29 21:50:21 +00:00
Martin Kaiser
41182561dd
separate function for dissecting the adaptation field
...
svn path=/trunk/; revision=52967
2013-10-29 21:40:09 +00:00
Jeff Morriss
de0fda9436
Revert r52905 and r52908: they're causing plenty of fuzz failures.
...
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9323 is tracking the fix.
svn path=/trunk/; revision=52966
2013-10-29 21:18:22 +00:00
Jeff Morriss
f37469da6d
Remove no-longer-used parameter.
...
svn path=/trunk/; revision=52965
2013-10-29 21:16:50 +00:00
Michael Mann
bd683d5ee1
Pass T.38 data to subdissectors directly instead of using pinfo->private_data.
...
svn path=/trunk/; revision=52964
2013-10-29 21:12:50 +00:00
Michael Mann
773359cf5f
Remove use of pinfo->private_data
...
svn path=/trunk/; revision=52963
2013-10-29 20:04:50 +00:00
Martin Mathieson
b93a567439
Add casts to results of g_hash_table_lookup() calls
...
svn path=/trunk/; revision=52955
2013-10-29 17:57:56 +00:00
Martin Mathieson
304b96c87b
Show security config settings in each PDCP PDU. Don't call IP dissector for ciphered userplane frames. SRB messages are more complicated - need to keep track of SecurityModeRequest and SecurityModeResponse as they are not ciphered
...
svn path=/trunk/; revision=52953
2013-10-29 17:46:50 +00:00
Michael Mann
86951290ea
Adjust when dissect_diameter_avp loop is called to avoid access violations.
...
from Lukasz Markowski
svn path=/trunk/; revision=52951
2013-10-29 15:18:05 +00:00
Bill Meier
1b55ee144e
Whitespace fixes: Replace some tabs by spaces & etc
...
svn path=/trunk/; revision=52950
2013-10-29 15:00:32 +00:00
Jeff Morriss
37a66d9e0b
From Marko Hrastovec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9347 :
...
Asterix dissector had two #if 0 ... #endif blocks because it obviously did not
compile on some systems.
Blocks were created because of mistyped variable names and variable not used
warning/error.
The errors were corrected.
svn path=/trunk/; revision=52949
2013-10-29 14:48:08 +00:00
Bill Meier
0ad98563a2
From didier gautheron: remove redundant or use faster col_xxx functions
...
- when the text parameter is constant col_add_str() and col_set_str() are equivalent but col_set_str() is faster.
- same for replace col_append_fstr and col_append_str
- remove col_clear() when it's redundant:
+ before a col_set/col_add if the dissector can't throw an exception.
- replace col_append() after a col_clear() with faster col_add... or col_set
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9344
svn path=/trunk/; revision=52948
2013-10-29 14:09:20 +00:00
Martin Mathieson
86c145ecb3
Add a cast to try to fix OSX buildbot
...
svn path=/trunk/; revision=52947
2013-10-29 14:08:19 +00:00
Martin Mathieson
66d64c686e
Pass security command details (integrity and ciphering algorithms) to PDCP (which doesn't yet do much with them)
...
svn path=/trunk/; revision=52946
2013-10-29 13:49:14 +00:00
Gerald Combs
ba49d9bcf0
Revert part of 52896 and (for now) all of 52935. As Jeff pointed out,
...
the PortableApps version relies on U3_-prefixed environment variables.
svn path=/trunk/; revision=52941
2013-10-29 04:05:27 +00:00
Jeff Morriss
58d01512b1
Make it so out-of-tree builds (autofoo and cmake) have access to the various
...
data files (diameter/*, COPYING, manuf) when running *shark from the
build directory.
Do this by passing in the top-level source directory as a compile-time
definition (unfortunately this has to be in the top-level Makefile too because
some programs link directly with epan/filesystem.c).
The plugins dir is no longer below the datafile directory but rather the
progfile directory (if we have one). Handle the special case of AUTHORS-SHORT
(a data file but a generated one) by checking the file name before building
the path.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5664
svn path=/trunk/; revision=52940
2013-10-29 02:28:16 +00:00
Michael Mann
e15afadb11
Have GTPv2 pass its "instance ID" to "private extension" subdissectors rather than use pinfo->private_data. There are no "private extension" subdissectors in the Wireshark source, so I assume it's all done by third-party plugins. They must now update their dissectors to get the "instance ID" from the dissector data parameter.
...
svn path=/trunk/; revision=52938
2013-10-29 00:25:57 +00:00
Gerald Combs
66558ef5a8
Remove some (but not all) U3 remnants.
...
svn path=/trunk/; revision=52935
2013-10-28 22:11:51 +00:00
Martin Kaiser
6ef5eb635c
TABs -> spaces
...
add editor modelines
svn path=/trunk/; revision=52934
2013-10-28 21:49:56 +00:00
Bill Meier
fbba4415a6
FIX compiler warning:
...
packet-gtp.c: In function 'dissect_gtp_common':
packet-gtp.c:7838: warning: unused variable 'pd_save'
svn path=/trunk/; revision=52932
2013-10-28 20:37:58 +00:00
Bill Meier
11934cfb11
From Ishraq Ibne Ashraf: Tinkerforge protocol dissector
...
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9324
From me:
1. Move certain global vars to local storage in dissect_tfp_common()
2. Declare all remaining global vars as static;
3. Fix some bugs:
- base58_encode() needed to be called before call to col_add_fstr()
- display of UID string in tree was being truncated to 4 characters
4. Cleanup whitespace: use consistent indentation (tabs); remove trailing whitespace;
5. Add editor modelines
svn path=/trunk/; revision=52931
2013-10-28 20:07:58 +00:00
Michael Mann
e68d15514b
Add an extra parameter to gtp_match_response() so pinfo->private_data doesn't need to be used.
...
svn path=/trunk/; revision=52930
2013-10-28 20:00:04 +00:00
Michael Tüxen
9a2f5a2db2
Fix the compilation.
...
I guess this is what is meant. Only compile tested...
svn path=/trunk/; revision=52928
2013-10-28 18:59:33 +00:00
Anders Broman
3f0e0d5cbf
Add an if(tree) and tweek col_add_fstr().
...
svn path=/trunk/; revision=52927
2013-10-28 18:10:16 +00:00
Martin Kaiser
5587250676
make Pointer filterable
...
svn path=/trunk/; revision=52925
2013-10-28 17:16:43 +00:00
Martin Kaiser
8367a1acbd
packed_analysis_data_t -> packet_analysis_data_t
...
svn path=/trunk/; revision=52924
2013-10-28 17:13:13 +00:00
Martin Kaiser
1a7a05ab55
correct typos
...
svn path=/trunk/; revision=52923
2013-10-28 17:10:09 +00:00
Martin Kaiser
8a2b9d87f3
remove unnecessary return; lines
...
svn path=/trunk/; revision=52922
2013-10-28 17:08:55 +00:00
Martin Kaiser
c89b9a2cdc
initialize tree variables
...
svn path=/trunk/; revision=52920
2013-10-28 16:59:57 +00:00
Michael Mann
5de5fe6cb1
Pass diam_sub_dis_t directly to the subdissectors instead of using pinfo->private_data.
...
svn path=/trunk/; revision=52919
2013-10-28 15:59:26 +00:00
Martin Mathieson
63407767cf
Remove accidentally-added private dissectors from Makefile
...
svn path=/trunk/; revision=52918
2013-10-28 14:26:13 +00:00
Martin Mathieson
bf004cced4
Comment changes only
...
svn path=/trunk/; revision=52917
2013-10-28 14:09:39 +00:00
Michael Mann
3b91b9586f
Pass tcap_private into the dissectors that need it rather than use private_data. Not sure if value_ptr is the "proper" place to pass tcap_private "internally" within the TCAP dissector, but it gets away from (potential) private_data (ab)use.
...
svn path=/trunk/; revision=52916
2013-10-28 13:36:49 +00:00
Bill Meier
6697d30b72
Revert SVN #52914 ;
...
OSX-10.6-x64 buildbot still givs an error
(At least we now know which line of code gives the error).
svn path=/trunk/; revision=52915
2013-10-28 04:07:52 +00:00
Bill Meier
2c3ec284db
From Shekhar Chandra: support for version 3.0 of netscaler packet wire format.
...
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9280
(Revised patch: let's see if this version compiles w/o error
on all the buildbots)
svn path=/trunk/; revision=52914
2013-10-28 03:16:31 +00:00
Evan Huus
20bbd49810
Use _add_item not _add_uint as pointed out by checkAPI
...
svn path=/trunk/; revision=52912
2013-10-28 00:43:18 +00:00
Michael Mann
3ead3a994a
Remove "Cisco MDS-specific" fields from packet_info. 2 of the 3 fields were used strictly for columns that are considered "deprecated" and I think the third could be put in that category as well.
...
I assume the column enumerations haven't already been removed because of legacy "indexing issues", but if I'm wrong, we should definitely remove the columns altogether. Could also see renaming columns to DEPRECATED_[X].
svn path=/trunk/; revision=52910
2013-10-27 23:18:19 +00:00
Evan Huus
233c409184
Dissect Kafka "fetch" requests and responses.
...
svn path=/trunk/; revision=52909
2013-10-27 23:08:01 +00:00
Jeff Morriss
9259176f87
As pointed by Evan: don't leak memory when the string pointer is NULL.
...
svn path=/trunk/; revision=52908
2013-10-27 22:40:55 +00:00
Pascal Quantin
18b9db29b9
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 :
...
NFC: Add PN532 HCI dissector
svn path=/trunk/; revision=52907
2013-10-27 22:40:45 +00:00
Jeff Morriss
8e2f00bf3d
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9323 :
...
Actually handle non-NULL-terminated FT_STRINGs properly.
svn path=/trunk/; revision=52905
2013-10-27 21:56:58 +00:00
Martin Mathieson
b0aa70b807
Initialise a couple of variables to avoid bogus may-be-used-uninitialised warnings with my version of gcc
...
svn path=/trunk/; revision=52904
2013-10-27 21:52:35 +00:00
Pascal Quantin
289c2796ad
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 :
...
USB: Decode HID interface subclasses and protocols
svn path=/trunk/; revision=52903
2013-10-27 21:32:32 +00:00
Pascal Quantin
13b39aa30d
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 :
...
USB: CDC: Decode ACM, CM and Union Functional Descriptors
svn path=/trunk/; revision=52902
2013-10-27 21:14:22 +00:00
Pascal Quantin
3f26a0fc52
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 :
...
USB: Decode CDC subclasses and protocols
svn path=/trunk/; revision=52901
2013-10-27 20:59:43 +00:00
Evan Huus
8ab858ef99
Mark unused parameters.
...
svn path=/trunk/; revision=52900
2013-10-27 20:58:00 +00:00
Michael Mann
8c64c5da89
Remove iplen and iphdrlen from struct _packet_info.
...
Dissectors should just use (reported) tvb length and taps have other ways to get the data.
svn path=/trunk/; revision=52899
2013-10-27 20:38:42 +00:00
Pascal Quantin
d8bbe9bda2
Do not reset pinfo->curr_layer_num in packet-frame.c
...
Before this change, curr_layer_num could be off by 1 depending on whether we
generated items for Frame protocol or not, leading to a failure to get the
UDP heuristic dissector identified during first pass
svn path=/trunk/; revision=52897
2013-10-27 19:33:55 +00:00
Michael Mann
471f21181b
Have X.25 dissector pass boolean q_bit_set value through dissector data rather than pinfo->private_data.
...
Other "related" dissectors weren't manipulating pinfo->private_data, so it doesn't make sense for them to bother saving/restore it (now that q_bit_set isn't being used)
svn path=/trunk/; revision=52894
2013-10-27 16:03:11 +00:00
Michael Mann
394f67c1b7
Allow "circuit dissectors" to pass data between dissectors. Not sure if this is immediately useful (ie remove need for packet_info (private_)data), but opens the possibility.
...
svn path=/trunk/; revision=52893
2013-10-27 15:00:11 +00:00
Gerald Combs
469fc864e6
[Automatic manuf, services and enterprise-numbers update for 2013-10-27]
...
svn path=/trunk/; revision=52890
2013-10-27 14:03:42 +00:00
Anders Broman
21aa62a20c
From Zoltán Lajos Kis:
...
dissect flow_removed and port_status messages
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283
svn path=/trunk/; revision=52889
2013-10-27 13:02:05 +00:00
Anders Broman
b57038a2ee
From Zoltán Lajos Kis:
...
dissect experimenter, get/set config, packet in and packet out messages
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283
svn path=/trunk/; revision=52888
2013-10-27 12:55:56 +00:00
Jörg Mayer
eb560aa56a
Various updates - go into a little depth now.
...
svn path=/trunk/; revision=52887
2013-10-27 02:18:57 +00:00
Jörg Mayer
3392cb4772
Treat IE 173 (symbol proprietary) like we treat the vendor IE
...
svn path=/trunk/; revision=52886
2013-10-27 02:18:00 +00:00
Michael Mann
09bd9ad788
Have ANSI TCAP dissector pass data through subdissector parameter instead of using struct _packet_info.
...
svn path=/trunk/; revision=52885
2013-10-27 02:00:18 +00:00
Michael Mann
bb36a25089
Remove use of pinfo->private_data and just pass the data around through function parameters
...
Remove g_pinfo from packet-ansi_637.c and add packet_info* as a function parameter while we're at it.
svn path=/trunk/; revision=52883
2013-10-27 01:06:44 +00:00
Evan Huus
01c2eecc35
Updates to radiotap-iter licensing terms. The upstream version has a COPYING
...
file containing what is actually the ISC license (BSD-like), so add that to the
header for licensecheck's sake (and remove the confusing reference to the BSD
license). This makes the code actually your choice of ISC
and GPL2 (since it is used in the Linux kernel which is GPL2-only). ISC is
already acceptable for us, so ISC \union * must be also, so add ISC+GPL2 to
checlicenses' list.
Upstream COPYING file, for reference:
http://git.sipsolutions.net/?p=radiotap.git;a=blob;f=COPYING;hb=97478c8467ce7ab56b7c9e8fd7cdc0f4e2cb22ed
svn path=/trunk/; revision=52879
2013-10-26 20:57:38 +00:00
Pascal Quantin
99c75b2295
From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9330 :
...
Add OID tests for adding named arcs
svn path=/trunk/; revision=52878
2013-10-26 20:50:51 +00:00
Michael Mann
9804a7b332
Don't use private_data for pwatm_private_data_t and instead pass it into the dissectors.
...
svn path=/trunk/; revision=52877
2013-10-26 19:18:12 +00:00
Alexis La Goutte
3a1041c084
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
...
svn path=/trunk/; revision=52875
2013-10-26 17:18:24 +00:00
Alexis La Goutte
39f4eb2edd
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
...
svn path=/trunk/; revision=52874
2013-10-26 17:18:12 +00:00
Alexis La Goutte
70b52fc4f5
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
...
svn path=/trunk/; revision=52873
2013-10-26 17:17:53 +00:00
Alexis La Goutte
6895d1f63d
Remove unused variable
...
svn path=/trunk/; revision=52872
2013-10-26 17:17:38 +00:00
Alexis La Goutte
8bcefa0f42
Fix indent and add modelines info
...
svn path=/trunk/; revision=52871
2013-10-26 17:17:17 +00:00
Evan Huus
3342e3bc89
Convert some emem to wmem. It took some manual flow analysis, but they are only
...
used during actual packet dissection.
svn path=/trunk/; revision=52870
2013-10-26 16:04:21 +00:00
Michael Mann
df5a9be3db
Bluetooth: SDP: Decode custom 128bit UUIDs and minor fixes. Bug 9327 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327 )
...
From Michal Labedzki
svn path=/trunk/; revision=52869
2013-10-26 13:28:47 +00:00
Michael Mann
e154ac38f8
Bluetooth: OBEX: PBAP: Fix Filter parameter. Bug 9327 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327 )
...
From Michal Labedzki
svn path=/trunk/; revision=52868
2013-10-26 13:18:21 +00:00
Anders Broman
24164080b1
Convert to value_str_ext in a couple of places.
...
svn path=/trunk/; revision=52867
2013-10-26 09:37:47 +00:00
Bill Meier
21bed98150
Fix several [-Wunused-const-variable] warnings (using '#if 0').
...
svn path=/trunk/; revision=52866
2013-10-26 03:16:57 +00:00
Evan Huus
70cf133bf5
Cleanups to the TPNCP database parser/loader:
...
- use and free glib memory instead of ep_ memory - another dissector down
- propogate errors correctly
- produce a warning if an error occurs loading the DB
- add XXX comments about realloc handling that may or may not be a memory leak
in failure cases
svn path=/trunk/; revision=52865
2013-10-26 02:54:58 +00:00
Michael Mann
2ebf40a1c2
Bluetooth: SDP: Decode all types of UUIDs. Bug 9327 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327 ).
...
From Michal Labedzki
svn path=/trunk/; revision=52864
2013-10-26 02:36:56 +00:00
Michael Mann
3cc6957fa8
Bluetooth: Use items for logical block objects. Bug 9327 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327 )
...
Bluetooth protocols use items, so dissect it to improve filtering and better user experience - text object cannot be filterable or comparable.
From Michal Labedzki
svn path=/trunk/; revision=52863
2013-10-26 02:24:04 +00:00
Bill Meier
6dd42b581a
Fix some [-Wunused-const-variable] warnings (using '#if 0')
...
svn path=/trunk/; revision=52862
2013-10-26 02:09:14 +00:00
Michael Mann
63869c4037
Bluetooth: SDP: Add MultiProfile UUIDs. Bug 9327 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327 )
...
From Michal Labedzki
svn path=/trunk/; revision=52861
2013-10-26 00:53:23 +00:00
Jeff Morriss
d8f1af511f
Mark a bunch of no-longer-used parameters as unused. Remove a couple of
...
unused parameters.
svn path=/trunk/; revision=52860
2013-10-26 00:41:54 +00:00
Michael Mann
250568ca91
Bluetooth: SDP: Fix PBAP features presentation. Bug 9327 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327 )
...
From Michal Labedzki
svn path=/trunk/; revision=52859
2013-10-26 00:36:16 +00:00
Michael Mann
68a5e46e9d
OBEX: Fix Presentation of Reserved Fields. Bug 9327 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327 )
...
From Michal Labedzki
svn path=/trunk/; revision=52858
2013-10-26 00:31:42 +00:00
Michael Mann
5030e21822
Replace tabs by spaces. Bug 9327 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327 )
...
From Michal Labedzki
svn path=/trunk/; revision=52857
2013-10-26 00:26:41 +00:00
Michael Mann
1e0405a3a3
Remove SMB's use of private_data and just pass the data through all of the dissection functions
...
svn path=/trunk/; revision=52856
2013-10-25 23:59:30 +00:00
Evan Huus
95f484a91e
Add a very small hack to make the UAT update callback error string freeable, and
...
convert all existing UAT update callbacks to use glib memory instead of
ephemeral memory for that string.
UAT code paths are entirely distinct from packet dissection, so using ephemeral
memory was the wrong choice, because there was no guarantees about when it would
be freed.
The move away from emem still needs to be propogated deeper into the UAT code
itself at some point.
Net effect: remove another bunch of emem calls from dissectors, where replacing
with wmem would have caused assertions.
svn path=/trunk/; revision=52854
2013-10-25 22:14:25 +00:00