Commit Graph

53483 Commits

Author SHA1 Message Date
Evan Huus 592c3673c6 Fix underflow causing infinite loop in openflow dissector
Bug:10208
Change-Id: I8aff9523fd33cf9e0802153100ea032139966b26
Reviewed-on: https://code.wireshark.org/review/2440
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-19 19:08:21 +00:00
Guy Harris 08a318a4df Those address_to_str() calls were in packet scope, and were safe.
Change-Id: Ic727eca800a1b8972cf1a09cf2cf4ef8cfe4d0ba
Reviewed-on: https://code.wireshark.org/review/2439
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-19 19:05:23 +00:00
Guy Harris 46ecf18fbd Use address_to_str(NULL, ...) for strings allocated outside dissectors.
ep_address_to_str() doesn't crash if called outside packet scope, but
it's still not correct to use outside packet scope.  Use
address_to_str(NULL, ...) to allocate those strings, and then explicitly
free them when we're done; exceptions don't get thrown between the
allocate and free, so there's no risk of a leak.

Change-Id: Iea2af93b0757e648d399e2ba64249224eb7e9e3c
Reviewed-on: https://code.wireshark.org/review/2438
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-19 18:58:49 +00:00
Evan Huus 83762f9f9b Add sys/socket.h which should fix solaris
Change-Id: Ic6f9e8dce860c2bd54bb4c5e0f2d0526178fc720
Reviewed-on: https://code.wireshark.org/review/2437
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-19 18:54:53 +00:00
Pascal Quantin 39f6a8b669 Revert "Update PIDL source files with the API changes done in g021e7af"
This reverts commit e09d127a9a.

Change-Id: Id34b9f5875b1d63aaeed96b3ffdc8ece63ab4134
Reviewed-on: https://code.wireshark.org/review/2436
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-19 18:42:44 +00:00
Pascal Quantin d0ac937567 Revert "Update ASN.1 source files with the API changes done in g021e7af"
This reverts commit e308e7c4de.

Change-Id: I079616d63f643f79f1bc03ef5fdf724f36df4071
Reviewed-on: https://code.wireshark.org/review/2435
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-19 18:42:28 +00:00
Evan Huus 7398779206 rename variable to avoid shadow warning
Change-Id: I5934120da2dddf9076972ea3a471191f7dc9596a
Reviewed-on: https://code.wireshark.org/review/2434
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-19 18:27:52 +00:00
Michael Mann b0bc4d5535 Revert "Fixup: ep_address_to_str -> address_to_str"
Most (all?) of these functions are being called within GUI, so they can't have packet_scope, which is why they weren't already converted (I made this mistake once already)

This reverts commit 7fea55a054.

Change-Id: I4bf29b206e5e1f5daefcec131309a8f6e78e1eb1
Reviewed-on: https://code.wireshark.org/review/2428
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19 18:26:57 +00:00
Michael Mann 14824e6adf Revert "Fixup: tvb_* -> tvb_captured"
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html

This reverts commit 246fe2ca4c.

Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f
Reviewed-on: https://code.wireshark.org/review/2430
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19 18:25:59 +00:00
Evan Huus 3557ac4ec6 Fix warnings in test binaries
They aren't built with the same warning flags as normal, but if you add those
flags a bunch of warnings show up.

Change-Id: If3776fbd98cc45e473f055e07c86ea8f6a5034f7
Reviewed-on: https://code.wireshark.org/review/2432
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-19 18:24:09 +00:00
Jesse Gross c95ff6b42f Add dissector for Generic Network Virtualization Encapsulation (Geneve).
Change-Id: I3ecf655d8e49bb7b519c4ba95d4e45c7b114bdd6
Reviewed-on: https://code.wireshark.org/review/2359
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-19 18:24:03 +00:00
Michael Mann 53594f34e4 Dissectors for totemnet and totemsrp protocols implemented in corosync cluster engine. Bug 3232.
From Masatake YAMATO

changes in patch3 (Masatake YAMATO):

  * Fix a typo(s/Sequnce/Sequence/)
  * Use variable len instead of a number literal
  * Put _U_ marker to length parameter of dissect_corosync_totemsrp_ip_address
  * Use tvb_report_length instread of tvb_length

changes in patch5 (Masatake YAMATO):

  * packet-corosync-totemsrp.c: Adapt to new dissector_try_heuristic interface

    + pass hdtbl_entry argument to dissector_try_heuristic.

  * packet-corosync-totemnet.c: Initialize corosync_totemnet_port to 5405

changes in patch6 (Masatake YAMATO):

  * packet-corosync-totemsrp.c: Use tvb_reported_length instead of tvb_length.
  * packet-corosync-totemsrp.c: Remove unnecessary trailing space in string literals.

  * packet-corosync-totemnet.c: Remove SVN Id tag in a comment.

changes in patch8 (Masatake YAMATO):

  * packet-corosync-totemnet.c: Remove SVN Id tag in comment(again).
  * packet-corosync-totemsrp.c: Use val_to_str_const instead of val_to_str.

changes in patch9 (Masatake YAMATO):

  * wsutil/sober128.[ch]: New files derived from packet-corosync-totemnet.c.
    Decryption code is moved here.
  * packet-corosync-totemnet.c: Remove all decryption code from this file.

Change-Id: Id832d9c5ce1be1668c857c9bbf39e8a84c31880c
Reviewed-on: https://code.wireshark.org/review/725
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-19 18:23:09 +00:00
Anish Bhatt 0b245a4cf8 Use the same offset += rtnValue logic for all TLV types, instead of a special case for chassis, port & ttl.
I've avoided using any mathematical checks even though tlv type vals increase linearly just in case they change in the future.

Change-Id: I0ec7021df5b91543e12edf9ba8d9c4ac44ecb11c
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/2193
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-19 18:22:44 +00:00
Guy Harris 3adc5b8c80 To make a dissector available for Decode As, just use dissector_add_handle().
No need to use dissector_add_uint() with a bogus value.

Change-Id: Ia5e51d199487ba14cd671c7df44231a0d407c50b
Reviewed-on: https://code.wireshark.org/review/2431
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-19 17:54:38 +00:00
Michael Mann daa70feddc Revert "Fixup: tvb_ensure_length_remaining -> tvb_ensure_captured_length_remaining"
See https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html

This reverts commit 021e7afc9f.

Change-Id: I0640eabce5ce8c4ff3a88ebf848b499f8bb8ed2f
Reviewed-on: https://code.wireshark.org/review/2429
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19 17:23:41 +00:00
dameiss 46a808acf4 Add GTK modules for existing LBM dissectors.
bug: 10204
Change-Id: Ie21cc07b0ac9a56648ec72062ce58a1ac800318e
Reviewed-on: https://code.wireshark.org/review/2420
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19 14:36:24 +00:00
Pascal Quantin bcff3c57cc Add the ability to dynamically add a new protocol to export PDU dialog box
Change-Id: I83012cc963d514982e40010e837e11a6fcf1bc3e
Reviewed-on: https://code.wireshark.org/review/2423
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-19 06:48:32 +00:00
Balint Reczey 5a6366c9b5 Generate xz compressed archives instead of .bz2-s
Change-Id: Iad47516ae617f5ecac5b03f2d7e800208c499d4a
Reviewed-on: https://code.wireshark.org/review/2403
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-19 00:35:56 +00:00
Balint Reczey 85499fbbc6 Add simple script to export release tarball right from Git
The files not to be present in the release tarballs are filetered based
on the contents of the .gitattributes files

Change-Id: If12eb00cf174f5d5b6dfffd56685b078a4593bf8
Reviewed-on: https://code.wireshark.org/review/2402
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-19 00:35:02 +00:00
Pascal Quantin 43c64c0ade Update the sample code dealing with desegmentation to new style dissector
Change-Id: I2e9f6341138e7305b849a754e28edfd322d44160
Reviewed-on: https://code.wireshark.org/review/2415
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-19 00:09:52 +00:00
Jakub Zawadzki 5844e12989 Optimize dissect_sip_uri()
- Combine tvb_find_guint8() for comma, semicolon into one tvb_pbrk_guint8()

- Instead of fetching each character use tvb_pbrk_guint8() to fast
  forward.

- Remove not needed tvb_find_guint8() call, as the result is discarded.

Change-Id: I38d6775b187146656d47cea9b64f8e0ccad18d36
Reviewed-on: https://code.wireshark.org/review/2384
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-19 00:08:04 +00:00
Pascal Quantin 153793aaa8 Remove svn $Id$ keyword in Lua scripts
Change-Id: I5c5f8659338aed36ba020a771a8b8222f2f7e025
Reviewed-on: https://code.wireshark.org/review/2416
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-18 23:51:34 +00:00
Guy Harris 4d1e1e7876 Sort the Ethernet pseudo-wire types so that they're together.
Separating the "try to guess whether there's a control word" type from
the "yes, there's a control word" and "no, there's not a control word"
types is just a huge UI botch.

Make it clearer that the default is "Ethernet pseudo-wire, try to guess
whether there's a control word".

Change-Id: I91cc526fc709ad102b22ca67f5a9d7c98fffa0cc
Reviewed-on: https://code.wireshark.org/review/2414
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18 21:26:04 +00:00
Joerg Mayer 13597c9363 Rename the filtername to initial_rtt
Change-Id: I64af535dc07eb4310b212077bb4c52032e97ecdb
Reviewed-on: https://code.wireshark.org/review/2413
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-18 20:57:53 +00:00
Guy Harris 6da6bf77b3 Get the handle for the pw_hdlc_nocw_hdlc_ppp dissector.
Change-Id: If7bc620c19e9c6511a724847e38cf0776d26b444
Reviewed-on: https://code.wireshark.org/review/2410
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18 20:55:01 +00:00
Joerg Mayer 461c6a0984 Rename the Shortname of initial RTT to something short (iRTT)
Change-Id: I182f2cccae5a385572950f08fa0a6005dcf59ff1
Reviewed-on: https://code.wireshark.org/review/2409
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-18 19:58:37 +00:00
Joerg Mayer 67dac5985f Change the indication for out-of-order packets. This is experimental
and will be verified by Jasper next week

Change-Id: I3cda397285e8174abb9c05b7aaf7c1bfabdfc71a
Reviewed-on: https://code.wireshark.org/review/2408
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-18 19:55:12 +00:00
AndersBroman 681d82309a The data is actually http, call the http disector for it.
Change-Id: I58f63d79bc7f1838dd24a8dcd3e9c528648bdebd
Reviewed-on: https://code.wireshark.org/review/2407
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 19:39:27 +00:00
Joerg Mayer 72078cfc91 Undo more of Graham's changes:
- We don't expect to find all packages and it is normally OK for
  some to fail.

Change-Id: I46c5edbf8ea3635fd703b222d4a9beb5ebb4745a
Reviewed-on: https://code.wireshark.org/review/2406
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-18 19:28:49 +00:00
Guy Harris ff5c9684db Only check for -msse4.2.
We don't care about instruction set extensions other than SSE 4.2, just
check for that.

Do so on all compilers other than MSVC.

Change-Id: I227c31715aab6df0e020d6bc3e3aa41e1bc5cb7e
Reviewed-on: https://code.wireshark.org/review/2405
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18 19:27:24 +00:00
Guy Harris 8dabe0027a We don't need -Qunused-arguments with Clang
check_c_compiler_flag now checks for the message Clang prints for -f and
-m flags it doesn't handle ("argument unused during compilation:
'-{flag}'"), so the checks for it now should fail properly during
testing, causing us not to use the flag in question.  This means we
don't need to suppress that warning, as we shouldn't be getting it.

Change-Id: Ieb9657f9e2cee2f357acd52725199d78d2dad80f
Reviewed-on: https://code.wireshark.org/review/2401
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18 18:58:57 +00:00
Guy Harris c6007e8d26 We don't need -Werror=unknown-warning-option with Clang.
check_c_compiler_flag checks for the message Clang prints for an unknown
warning option ("unknown warning option '-WXXX'"), and fails if it's
produced, so we don't need to force the compiler to fail by passing it
-Werror=unknown-warning-option.

(Yes, the CMake way of handling those annoying options is different from
the way we do that in autotools - autotools adds flags to force errors,
CMake checks for the warning messages - but that's OK.)

Change-Id: I5c2e5d6f4826eba7048736d5134d20417778276a
Reviewed-on: https://code.wireshark.org/review/2400
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18 18:55:27 +00:00
Guy Harris 5e5e2019ee Another message from Clang for unknown -f and -m flags.
For -f and -m flags that don't apply to the target architecture(?),
Clang doesn't fail but does print a warning "argument unused during
compilation: '-{flag}'".  Catch that and treat it as a failure
indication, so we don't use that flag.

Change-Id: I65948ada41fa44fb62f9a2b8b320f137a5902b8f
Reviewed-on: https://code.wireshark.org/review/2399
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18 18:46:09 +00:00
Evan Huus fca7b3f4f8 Check for lua by grepping the output of tshark -v
Grepping config.h doesn't work for out-of-tree builds.

Change-Id: If3f551dffb04dd646f5adece57fac90dc48ff1c9
Reviewed-on: https://code.wireshark.org/review/2389
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-18 18:32:18 +00:00
Guy Harris 77e34736c5 Do C-Flags and CXX-Flags the same way.
It looks weird to have "-- " before C-Flags but not CXX-Flags.

Change-Id: I95f309b60a45cbd4477c8ed6187b198ab9bac9d8
Reviewed-on: https://code.wireshark.org/review/2398
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18 18:31:20 +00:00
Evan Huus 08063d824b Build unit test binaries with Cmake
That was surprisingly easy.

Change-Id: Idda34580fd694cb0d253a121921f31d3731d3007
Reviewed-on: https://code.wireshark.org/review/2396
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-18 18:27:38 +00:00
Shoichi Sakane 009bebbf09 Fix copy-paste probem in COAP dissector
Bug:8070
Change-Id: I7a86a37f7de6b3e4e12fe1c47980a9a6604488d6
Reviewed-on: https://code.wireshark.org/review/2390
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 18:11:49 +00:00
Pascal Quantin 248a503a97 Update ASN.1 source files with the API changes done in g971ffd6
Change-Id: Iac4952f64622cd28941f582adf54ecf7843f8c28
Reviewed-on: https://code.wireshark.org/review/2395
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 18:05:57 +00:00
Pascal Quantin e09d127a9a Update PIDL source files with the API changes done in g021e7af
Change-Id: I2917cbae077865f9ec171900810f85f54b349c2c
Reviewed-on: https://code.wireshark.org/review/2394
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 18:05:04 +00:00
Pascal Quantin f99aaf8de3 PCLI: do not register UDP port 9000 by default as it is not allocated to this protocol by IANA
Change-Id: I5f692ddf5ae5ba7366b34830bd9e99efacd66037
Reviewed-on: https://code.wireshark.org/review/2393
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 18:04:25 +00:00
Pascal Quantin cc37b50334 Get rid of obsolete references to nettle
Bug: 2089
Change-Id: Ie3337a1b750d8d95f6291c77dfd19cd1b0c57e83
Reviewed-on: https://code.wireshark.org/review/2388
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 18:03:43 +00:00
Joerg Mayer c6324a0b1e Get rid of some ancient qualityreview comments...
Change-Id: If25bdd594b20b656c345dcfe62765379f5dd9c5e
Reviewed-on: https://code.wireshark.org/review/2392
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-18 17:47:18 +00:00
Guy Harris 54819e5699 ssl_parse_key_list() gets called from the UI, so don't use packet scope.
Instead, explicitly allocate and free the address string.

Using packet scope was causing test failures.

Change-Id: Ie18d2da44d2eec8a92a6a86b0ba883a5525f49cd
Reviewed-on: https://code.wireshark.org/review/2387
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18 17:03:22 +00:00
Pascal Quantin f2dd6c0a6d SABP: fix an error spotted by pre-commit hook
Change-Id: I733e2e72b52293b3c7c15f4e0c240f7e01f4b98c
Reviewed-on: https://code.wireshark.org/review/2386
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 16:15:58 +00:00
Pascal Quantin e308e7c4de Update ASN.1 source files with the API changes done in g021e7af
Change-Id: I52ecfccbce423206242e3cf99401a8c9e1655d88
Reviewed-on: https://code.wireshark.org/review/2385
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 16:15:42 +00:00
Evan Huus b5a462b087 Try to calculate the initial RTT of tcp conns
This (if it works well) will let us do much more accurate out-of-order
detection, which is currently otherwise hardcoded to 3ms. Ask Jörg for details.

Change-Id: Ie0662723946edeaea1e43958bf7f5158f09dde71
Reviewed-on: https://code.wireshark.org/review/2367
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-18 15:07:08 +00:00
Martin Kaiser cd56eb970f move dissection of usbpcap isochronous packets to a separate function
Change-Id: Id292fd1b0fbff3a043e64296a88c78c1a5ac00d7
Reviewed-on: https://code.wireshark.org/review/2369
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-18 15:00:06 +00:00
Dario Lombardo 7fea55a054 Fixup: ep_address_to_str -> address_to_str
Change-Id: Id49ba07e32a71357b50b32de7cecfd80e412d508
Reviewed-on: https://code.wireshark.org/review/2379
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 14:22:02 +00:00
Dario Lombardo 021e7afc9f Fixup: tvb_ensure_length_remaining -> tvb_ensure_captured_length_remaining
Change-Id: I0228f3b6b7067bc0ce51f9d359f99fd18feb2b66
Reviewed-on: https://code.wireshark.org/review/2378
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 14:20:32 +00:00
Dario Lombardo 246fe2ca4c Fixup: tvb_* -> tvb_captured
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f
Reviewed-on: https://code.wireshark.org/review/2377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 14:14:58 +00:00