aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-06-19Revert "Fixup: tvb_* -> tvb_captured"Michael Mann638-3408/+3408
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96. Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f Reviewed-on: https://code.wireshark.org/review/2430 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19Fix warnings in test binariesEvan Huus2-19/+19
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-19Add dissector for Generic Network Virtualization Encapsulation (Geneve).Jesse Gross4-0/+457
Change-Id: I3ecf655d8e49bb7b519c4ba95d4e45c7b114bdd6 Reviewed-on: https://code.wireshark.org/review/2359 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-19Dissectors for totemnet and totemsrp protocols implemented in corosync ↵Michael Mann8-0/+2655
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-19Use the same offset += rtnValue logic for all TLV types, instead of a ↵Anish Bhatt1-6/+16
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-19To make a dissector available for Decode As, just use dissector_add_handle().Guy Harris6-14/+16
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-19Revert "Fixup: tvb_ensure_length_remaining -> ↵Michael Mann23-78/+78
tvb_ensure_captured_length_remaining" See https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html This reverts commit 021e7afc9fcba09094d0e2143cc434a34e3b09dc. Change-Id: I0640eabce5ce8c4ff3a88ebf848b499f8bb8ed2f Reviewed-on: https://code.wireshark.org/review/2429 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19Add GTK modules for existing LBM dissectors.dameiss7-0/+1372
bug: 10204 Change-Id: Ie21cc07b0ac9a56648ec72062ce58a1ac800318e Reviewed-on: https://code.wireshark.org/review/2420 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19Add the ability to dynamically add a new protocol to export PDU dialog boxPascal Quantin7-22/+54
Change-Id: I83012cc963d514982e40010e837e11a6fcf1bc3e Reviewed-on: https://code.wireshark.org/review/2423 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-19Generate xz compressed archives instead of .bz2-sBalint Reczey1-3/+6
Change-Id: Iad47516ae617f5ecac5b03f2d7e800208c499d4a Reviewed-on: https://code.wireshark.org/review/2403 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-19Add simple script to export release tarball right from GitBalint Reczey3-1/+41
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-19Update the sample code dealing with desegmentation to new style dissectorPascal Quantin1-2/+4
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-19Optimize dissect_sip_uri()Jakub Zawadzki1-33/+30
- 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-18Remove svn $Id$ keyword in Lua scriptsPascal Quantin3-6/+0
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-18Sort the Ethernet pseudo-wire types so that they're together.Guy Harris1-24/+24
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-18Rename the filtername to initial_rttJoerg Mayer1-1/+1
Change-Id: I64af535dc07eb4310b212077bb4c52032e97ecdb Reviewed-on: https://code.wireshark.org/review/2413 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-18Get the handle for the pw_hdlc_nocw_hdlc_ppp dissector.Guy Harris1-0/+1
Change-Id: If7bc620c19e9c6511a724847e38cf0776d26b444 Reviewed-on: https://code.wireshark.org/review/2410 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18Rename the Shortname of initial RTT to something short (iRTT)Joerg Mayer1-2/+2
Change-Id: I182f2cccae5a385572950f08fa0a6005dcf59ff1 Reviewed-on: https://code.wireshark.org/review/2409 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-18Change the indication for out-of-order packets. This is experimentalJoerg Mayer1-5/+7
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-18The data is actually http, call the http disector for it.AndersBroman1-4/+10
Change-Id: I58f63d79bc7f1838dd24a8dcd3e9c528648bdebd Reviewed-on: https://code.wireshark.org/review/2407 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18Undo more of Graham's changes:Joerg Mayer2-22/+6
- 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-18Only check for -msse4.2.Guy Harris1-30/+15
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-18We don't need -Qunused-arguments with ClangGuy Harris1-4/+0
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-18We don't need -Werror=unknown-warning-option with Clang.Guy Harris1-6/+0
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-18Another message from Clang for unknown -f and -m flags.Guy Harris1-0/+1
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-18Check for lua by grepping the output of tshark -vEvan Huus1-2/+2
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-18Do C-Flags and CXX-Flags the same way.Guy Harris1-1/+2
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-18Build unit test binaries with CmakeEvan Huus1-0/+15
That was surprisingly easy. Change-Id: Idda34580fd694cb0d253a121921f31d3731d3007 Reviewed-on: https://code.wireshark.org/review/2396 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-18Fix copy-paste probem in COAP dissectorShoichi Sakane1-3/+3
Bug:8070 Change-Id: I7a86a37f7de6b3e4e12fe1c47980a9a6604488d6 Reviewed-on: https://code.wireshark.org/review/2390 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18Update ASN.1 source files with the API changes done in g971ffd6Pascal Quantin1-2/+2
Change-Id: Iac4952f64622cd28941f582adf54ecf7843f8c28 Reviewed-on: https://code.wireshark.org/review/2395 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18Update PIDL source files with the API changes done in g021e7afPascal Quantin4-7/+7
Change-Id: I2917cbae077865f9ec171900810f85f54b349c2c Reviewed-on: https://code.wireshark.org/review/2394 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18PCLI: do not register UDP port 9000 by default as it is not allocated to ↵Pascal Quantin1-1/+1
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-18Get rid of obsolete references to nettlePascal Quantin7-73/+8
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-18Get rid of some ancient qualityreview comments...Joerg Mayer1-7/+0
Change-Id: If25bdd594b20b656c345dcfe62765379f5dd9c5e Reviewed-on: https://code.wireshark.org/review/2392 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-18ssl_parse_key_list() gets called from the UI, so don't use packet scope.Guy Harris1-1/+8
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-18SABP: fix an error spotted by pre-commit hookPascal Quantin2-2/+2
Change-Id: I733e2e72b52293b3c7c15f4e0c240f7e01f4b98c Reviewed-on: https://code.wireshark.org/review/2386 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18Update ASN.1 source files with the API changes done in g021e7afPascal Quantin95-405/+405
Change-Id: I52ecfccbce423206242e3cf99401a8c9e1655d88 Reviewed-on: https://code.wireshark.org/review/2385 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18Try to calculate the initial RTT of tcp connsEvan Huus2-0/+38
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-18move dissection of usbpcap isochronous packets to a separate functionMartin Kaiser1-91/+106
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-18Fixup: ep_address_to_str -> address_to_strDario Lombardo8-23/+23
Change-Id: Id49ba07e32a71357b50b32de7cecfd80e412d508 Reviewed-on: https://code.wireshark.org/review/2379 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18Fixup: tvb_ensure_length_remaining -> tvb_ensure_captured_length_remainingDario Lombardo23-78/+78
Change-Id: I0228f3b6b7067bc0ce51f9d359f99fd18feb2b66 Reviewed-on: https://code.wireshark.org/review/2378 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18Fixup: tvb_* -> tvb_capturedDario Lombardo638-3408/+3408
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f Reviewed-on: https://code.wireshark.org/review/2377 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18Fixup: tvb_get_string(z) -> tvb_get_string(z)_encDario Lombardo171-567/+567
Change-Id: I63a3704effe3fcab01a193dc39b6a22e9f1cf3fe Reviewed-on: https://code.wireshark.org/review/2376 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18Don't compile anything with -msse4.2 unless the compiler supports it.Guy Harris2-1/+3
This includes ws_mempbrk_sse42.c; if the compiler doesn't support -msse4.2, HAS_SSE4_2 isn't defined, so all the stuff in ws_mempbrk_sse42.c that uses SSE 4.2 will be #ifdeffed out. Not all compilers with which we're built will support -msse4.2; in particular, the ones that aren't compiling for x86 won't.... Change-Id: I69566ca06f602104b40c78b3b06fcb7dfeb054b2 Reviewed-on: https://code.wireshark.org/review/2373 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18Don't put c-comments into cmake files. Won't work at midnight either.Joerg Mayer1-2/+2
Change-Id: I80efce78a044f477af56f82cc9d8e85c8544ffbc Reviewed-on: https://code.wireshark.org/review/2372 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-18Fix compilation warningYan Burman1-2/+2
Change-Id: Ia7922415d8b22ba0c5a04ad6940c7e10bc205d57 Reviewed-on: https://code.wireshark.org/review/2371 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-18Fix building uiqt on Windows with the cmake build system:Joerg Mayer2-5/+5
Protecting HAVE_PCAP_CREATE was not enough for the moc run in qt, maybe it doesn't have _WIN32 set? Don't even try to detect this function on WIN32 for now. Change-Id: I0d8a8b5b110cec164f86fe11f26a7add558eee1b Reviewed-on: https://code.wireshark.org/review/2370 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-18PDCP LTE: do not try to decipher PDCP control messages (like ROHC feedback)Pascal Quantin1-3/+6
Change-Id: I4a1596fd45bbc78ed8e90accf69ac048e7053161 Reviewed-on: https://code.wireshark.org/review/2366 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18Replace glib memory with wmem memoryEvan Huus1-66/+25
Fixes potential memory leaks. Bug:8102 Change-Id: I88f9a74e3f782232d2da0bc7d83727dc3253f376 Reviewed-on: https://code.wireshark.org/review/2364 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18Convert the obvious emem to wmem in lua code.Evan Huus4-8/+15
Bug:9927 Change-Id: Ibf0dd45d3b54e489b70a4fde193b825ec703379e Reviewed-on: https://code.wireshark.org/review/2349 Reviewed-by: Anders Broman <a.broman58@gmail.com>