commit 15e89ec Author: Richard Sharpe Date: Sat Oct 4 16:11:43 2014 -0700 Dissect an SVHDX Open Device Context that appears as an Extra Create Parameter in a CREATE request. This helps understand HyperV over SMB 3.x stuff. Bug: 10527 Change-Id: I1e206ed38e12fed419b1ac4a0793b91f9308f364 Signed-off-by: Richard Sharpe Reviewed-on: https://code.wireshark.org/review/4477 Petri-Dish: Pascal Quantin Reviewed-by: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 4611b8d Author: Guy Harris Date: Tue Oct 7 01:05:17 2014 -0700 Make the code a bit more like the pre-API change code. Change-Id: I9a8bd2c7ce97993c1b72caf63254d024950f8b94 Reviewed-on: https://code.wireshark.org/review/4520 Reviewed-by: Guy Harris commit 8439fd5 Author: Martin Kaiser Date: Sat Oct 4 19:07:58 2014 +0200 - Handle strings that have an opening but no closing quote fixes the endless loop reported in Bug: 10521 - Fix a typo. Change-Id: I17b4a15e780d1d6122841a308348518063f82a59 Reviewed-on: https://code.wireshark.org/review/4467 Reviewed-by: Anders Broman commit 05d34b3 Author: Guy Harris Date: Tue Oct 7 00:39:54 2014 -0700 Clean up white space. Change-Id: I73f2406483c13c7917faed46db6fc1f5e2bc8fcd Reviewed-on: https://code.wireshark.org/review/4517 Reviewed-by: Guy Harris commit 3f101f2 Author: Guy Harris Date: Tue Oct 7 00:30:35 2014 -0700 Fix a comment, clean up some whitespace. Change-Id: I5d3d518eee2d61dd896b44c2a61d66057f3c2f7f Reviewed-on: https://code.wireshark.org/review/4516 Reviewed-by: Guy Harris commit 04bca65 Author: Anish Bhatt Date: Mon Oct 6 23:27:15 2014 -0700 [bacnet] update vendor list Change-Id: I6b7bd3b3a110b8d393cd849c12890fff17446e54 Reviewed-on: https://code.wireshark.org/review/4515 Reviewed-by: Alexis La Goutte commit ffd48ce Author: Guy Harris Date: Mon Oct 6 22:01:12 2014 -0700 Whitespace cleanups. Change-Id: I92f983b2e04defab30eb31c14c484b9f0f582413 Reviewed-on: https://code.wireshark.org/review/4513 Reviewed-by: Guy Harris commit 683d657 Author: Alexis La Goutte Date: Sun Oct 5 19:27:15 2014 +0200 PIDL (DCERPC): fix Assigned value is garbage or undefined found by Clang Analyzer packet-dcerpc-dnsserver.c:1002:12: warning: Assigned value is garbage or undefined packet-dcerpc-frstrans.c:1137:12: warning: Assigned value is garbage or undefined packet-dcerpc-lsa.c:6345:12: warning: Assigned value is garbage or undefined packet-dcerpc-nspi.c:7805:12: warning: Assigned value is garbage or undefined packet-dcerpc-dfs.c:3245:11: warning: Function call argument is an uninitialized value packet-dcerpc-dfs.c:3245:9: warning: 'level' may be used uninitialized in this function [-Wmaybe-uninitialized] Change-Id: Ife6a2f565ae215535d0e3d72ef50800114240e3f Reviewed-on: https://code.wireshark.org/review/4478 Reviewed-by: Evan Huus commit de13887 Author: Alexis La Goutte Date: Sun Oct 5 12:59:11 2014 +0200 idl2wrs (DCERPC DRSUAPI): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Add a check if the struct is not empty budb and butc are also regenerate but no change Change-Id: I0d8cfc827f5451f1cdbd924628a263af9d483a7b Reviewed-on: https://code.wireshark.org/review/4473 Reviewed-by: Evan Huus commit 670ebda Author: Guy Harris Date: Mon Oct 6 18:00:57 2014 -0700 Add some higher-level file-read APIs and use them. Add wtap_read_bytes(), which takes a FILE_T, a pointer, a byte count, an error number pointer, and an error string pointer as arguments, and that treats a short read of any sort, including a read that returns 0 bytes, as a WTAP_ERR_SHORT_READ error, and that returns the error number and string through its last two arguments. Add wtap_read_bytes_or_eof(), which is similar, but that treats a read that returns 0 bytes as an EOF, supplying an error number of 0 as an EOF indication. Use those in file readers; that simplifies the code and makes it less likely that somebody will fail to supply the error number and error string on a file read error. Change-Id: Ia5dba2a6f81151e87b614461349d611cffc16210 Reviewed-on: https://code.wireshark.org/review/4512 Reviewed-by: Guy Harris commit 6397ad4 Author: Gerald Combs Date: Mon Oct 6 16:02:16 2014 -0700 Revert "Qt: Try to fix a Visual C++ encoding warning." Revert gafa8c02 since it didn't work on Windows. Use a pragma to squelch Visual C++ instead. Qt's rich text renderer doesn't handle "'". Replace it with "'". Remove a QDebug include. Change-Id: I0e6308efda74a4bc0e67ce841a50a0a9b68f4a8b Reviewed-on: https://code.wireshark.org/review/4511 Reviewed-by: Gerald Combs commit a17067a Author: Gerald Combs Date: Mon Oct 6 15:33:50 2014 -0700 Qt: Rename the "check for updates" slot. The "Check for Updates..." action doesn't exist when QMetaObject::connectSlotsByName is called. Rename on_actionHelpCheckForUpdates_triggered to checkForUpdates so that we don't get the warning QMetaObject::connectSlotsByName: No matching signal for on_actionHelpCheckForUpdates_triggered() at startup. Change-Id: Icbd7eb98731023c323212e6ec3d3c98f1321e245 Reviewed-on: https://code.wireshark.org/review/4510 Reviewed-by: Gerald Combs commit 0644b34 Author: Martin Kaiser Date: Tue Oct 7 00:03:56 2014 +0200 after an lupdate, I should also do an lrelease to keep the .ts file and the .qm file in sync Change-Id: I588f5ff7386bac13c8ce0bba82fee4807c490682 Reviewed-on: https://code.wireshark.org/review/4509 Reviewed-by: Martin Kaiser commit b80d330 Author: Martin Kaiser Date: Mon Oct 6 23:54:45 2014 +0200 lupdate for Japanese Change-Id: Ifa7af35cfc18f85cd547aa7621c5ca7305a9242d Reviewed-on: https://code.wireshark.org/review/4508 Reviewed-by: Martin Kaiser commit 02e902f Author: Martin Kaiser Date: Mon Oct 6 23:24:06 2014 +0200 From 竹下 恵 (Megumi Takeshita) another update of the Japanese translation the translation is fairly complete now, only some recently added items are missing Change-Id: Iacd4ee2da7a83681b6119c5d02a40156b441065b Reviewed-on: https://code.wireshark.org/review/4507 Reviewed-by: Martin Kaiser commit 25683ca Author: Gerald Combs Date: Mon Oct 6 14:44:17 2014 -0700 Qt: QVector::length was added in Qt 5.2. Use ::count instead. Change-Id: Ic890ed8061b7e92eea65c3102de5219e5ac97a93 Reviewed-on: https://code.wireshark.org/review/4505 Reviewed-by: Gerald Combs commit cf201b0 Author: Alexis La Goutte Date: Sat Oct 4 17:39:12 2014 +0200 UI (simple_dialog): fix warning: redundant redeclaration of .. [-Wredundant-decls] simple_dialog.h:78:13: warning: redundant redeclaration of ‘simple_message_box’ [-Wredundant-decls] simple_dialog.h:85:13: warning: redundant redeclaration of ‘vsimple_error_message_box’ [-Wredundant-decls] simple_dialog.h:90:13: warning: redundant redeclaration of ‘simple_error_message_box’ [-Wredundant-decls] Change-Id: I8f6363fc8ec46ba24895e5236368544f64354e42 Reviewed-on: https://code.wireshark.org/review/4460 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 798eb97 Author: Gerald Combs Date: Sun Oct 5 12:23:33 2014 -0700 Qt: Packet list column sorting. Sorting behavior should be identical to GTK+. Pass the correct position to beginInsertRows. Add a list of to-do items to packet_list.cpp. Change-Id: Ie6ab4b9f2d780a2af430d0f90529edca5485dada Reviewed-on: https://code.wireshark.org/review/4481 Reviewed-by: Gerald Combs commit 5051ae1 Author: Bill Meier Date: Mon Oct 6 14:03:47 2014 -0400 Convert "4 space tabs" to spaces; Adjust editor modelines. Change-Id: I8d61d959c79e6aa9875c58680c54a331d18079cc Reviewed-on: https://code.wireshark.org/review/4504 Reviewed-by: Bill Meier commit 24d50bc Author: Bill Meier Date: Mon Oct 6 12:55:18 2014 -0400 Adjust indentation to match editor modelines; Do other minor whitespace changes. Change-Id: Ic020b2c92db5d14a2be9dc4d35aef4514b8b0353 Reviewed-on: https://code.wireshark.org/review/4502 Reviewed-by: Bill Meier commit c822eea Author: Bill Meier Date: Mon Oct 6 12:51:29 2014 -0400 packet-rpcap.c: Don't use mixed space/tab indentation; Change-Id: I21409a02fabc28951d9c15be7a160295f5fb35ca Reviewed-on: https://code.wireshark.org/review/4501 Reviewed-by: Bill Meier commit 2d6621a Author: Bill Meier Date: Mon Oct 6 12:46:31 2014 -0400 Adjust editor modelines to match actual format of the file; Adjust some whiotespace. Change-Id: If930f2c266b61c9348063eab0189af2582b0a331 Reviewed-on: https://code.wireshark.org/review/4500 Reviewed-by: Bill Meier commit 2005fc6 Author: Bill Meier Date: Mon Oct 6 12:42:42 2014 -0400 Convert (what appear to be) "4 space tabs"; Adjust editor-modelines; Do some minor reformatting. Change-Id: Ie078c826ed38a0d682f61fb3e95450b47a9d2c31 Reviewed-on: https://code.wireshark.org/review/4499 Reviewed-by: Bill Meier commit 3377eca Author: Bill Meier Date: Mon Oct 6 12:24:01 2014 -0400 packet-g723.c: Remove some boilerplate comments. Change-Id: Ib322b33c304674835170e1ae2006aabf0f44fd9d Reviewed-on: https://code.wireshark.org/review/4498 Reviewed-by: Bill Meier commit 3af9e33 Author: Bill Meier Date: Mon Oct 6 12:21:48 2014 -0400 packet-hclnfsd.c: Reformat hf[] entries; Adjust some whitespace. Change-Id: I84368080d12cb5001dd7847add0ec96608080604 Reviewed-on: https://code.wireshark.org/review/4497 Reviewed-by: Bill Meier commit 97e6c59 Author: Bill Meier Date: Mon Oct 6 12:16:15 2014 -0400 packet-q931.c: Reformat hf[] entries; Convert apparent "4-space tabs" to spaces. Adjust editor modelines. Change-Id: Iaeb321f0facfc6b3176677779e6cdf5c92226dec Reviewed-on: https://code.wireshark.org/review/4496 Reviewed-by: Bill Meier commit 4d93072 Author: AndersBroman Date: Mon Oct 6 16:11:14 2014 +0200 Dissect 3GPP AVP Presence-Reporting-Area-Elements-List. Change-Id: Ic7b99d41a275fb6f50758ea87763844f24be537c Reviewed-on: https://code.wireshark.org/review/4495 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 9128e43 Author: Evan Huus Date: Sun Oct 5 21:25:19 2014 -0400 tcp: default no-subdissector-on-error to TRUE Dissectors that need this set break badly when it isn't. Dissectors which don't need this set will still generally be understandable without it, since e.g. retransmissions will link to the original packet at the TCP layer, and presumably the subdissector payload is exactly the same in that case. Change-Id: I2871c2a90c601637bdfb8cffaa34a7407995c603 Ping-Bug: 10525 Ping-Bug: 10289 Reviewed-on: https://code.wireshark.org/review/4487 Reviewed-by: Evan Huus commit 47de5a1 Author: AndersBroman Date: Mon Oct 6 14:06:01 2014 +0200 Expand dissection of 8.108 Presence Reporting Area Action. Change-Id: I2ad57d8cdb6758f01146b37ac924e2d8f2141546 Reviewed-on: https://code.wireshark.org/review/4491 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 9c1225f Author: Tomasz Moń Date: Fri Sep 19 19:34:07 2014 +0200 Modify multicheck to accept parent parameter. This makes it possible for multicheck to become a tree-like structure. Example: arg {number=4}{call=--devices}{display=Devices}{tooltip=Device selector}{type=multicheck} value {arg=4}{value=dev1}{display=Parent Device}{enabled=t}{default=t} value {arg=4}{value=dev2}{display=Child Device}{parent=dev1}{enabled=t} value {arg=4}{value=dev3}{display=Another Parent Device}{enabled=t} value {arg=4}{value=dev4}{display=Non-clickable Child Device}{parent=dev3} value {arg=4}{value=dev5}{display=Non-clickable Child of Child}{parent=dev4} Change-Id: I59dd7208ca0ec90cccfc49ae049559cdc6c69a4b Reviewed-on: https://code.wireshark.org/review/4192 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall Reviewed-by: Pascal Quantin commit 0784451 Author: Bill Meier Date: Sun Oct 5 23:40:42 2014 -0400 Adjust some whitespace to match editor modelines. Change-Id: I9fda7de49255857cc1cf270d6202c85573d91674 Reviewed-on: https://code.wireshark.org/review/4490 Reviewed-by: Bill Meier commit 07698d5 Author: Bill Meier Date: Sun Oct 5 22:14:57 2014 -0400 Adjust some whitespace to match editor modelines. Change-Id: Ia22cac3ebd7a454c156f98d967e6fd61f708a2b3 Reviewed-on: https://code.wireshark.org/review/4489 Reviewed-by: Bill Meier commit 0111e46 Author: Bill Meier Date: Sun Oct 5 21:34:19 2014 -0400 plugins: Add editor modelines; Adjust whitespace as needed. Change-Id: I36124f6021d46a228721bdc976f6b9fef1c8c088 Reviewed-on: https://code.wireshark.org/review/4488 Reviewed-by: Bill Meier commit 9e776a1 Author: Martin Kaiser Date: Sun Oct 5 12:18:49 2014 +0200 mpeg-pes: don't modify source and destination address colums the mpeg-pes dissector replaced source or destination address with decoding timestamp, presentation timestamp or pack data rate these values don't belong into address columns and erase the IP addresses when mpeg-pes is transmitted over IP the timestamps etc can be displayed in a user-defined column if required this patch is part of Bug: 10505 Change-Id: I1bf561648f848eb18818862edd138724abfc8e88 Reviewed-on: https://code.wireshark.org/review/4472 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit ad6134b Author: Bill Meier Date: Sun Oct 5 16:12:34 2014 -0400 docsis: Add editor modelines; Adjust whitespace; Remove boilerplate comments. Change-Id: I78f9815616f4fc3c14204339c5826f0ca7d0680e Reviewed-on: https://code.wireshark.org/review/4485 Reviewed-by: Bill Meier commit 0b18d6c Author: Bill Meier Date: Sun Oct 5 15:57:05 2014 -0400 Add editor modelines; Adjust whitespace as needed. Change-Id: I6e70c933ae61a97377235d67b2f6a1b3d67dc155 Reviewed-on: https://code.wireshark.org/review/4484 Reviewed-by: Bill Meier commit e2bdfa1 Author: Bill Meier Date: Sun Oct 5 15:54:49 2014 -0400 Reformat hfi entries; Add editor modelines; Adjust whitespace. Change-Id: Iead53f92cc847d04c32f4a307d45f9748c49a69c Reviewed-on: https://code.wireshark.org/review/4483 Reviewed-by: Bill Meier commit 1e1d1de Author: Bill Meier Date: Sun Oct 5 15:51:54 2014 -0400 packet-igap.c: Reformat hf[] entries; Add editor modelines. Change-Id: I0ac4f2eb7f2b93aab864c6f43dee057774048165 Reviewed-on: https://code.wireshark.org/review/4482 Reviewed-by: Bill Meier commit 560e06d Author: Guy Harris Date: Sun Oct 5 11:46:43 2014 -0700 Read the record length in common code. Instead of reading the 16-byte blob and record length at the same time, just read the 16-byte blob, and then fall through to the record-length reading code. Change-Id: Ib2819a2d654e2670233821882bac79d7cd656b12 Reviewed-on: https://code.wireshark.org/review/4480 Reviewed-by: Guy Harris commit 66d9ca3 Author: Gerald Combs Date: Sun Oct 5 08:06:06 2014 -0700 [Automatic manuf, services and enterprise-numbers update for 2014-10-05] Change-Id: Ib90638f6382b2112f0f49a2d8f5d2d10b4d3c520 Reviewed-on: https://code.wireshark.org/review/4474 Reviewed-by: Gerald Combs commit dbcd94d Author: Pascal Quantin Date: Sat Oct 4 21:52:50 2014 +0200 DLT User: add ability to export PDUs It can be really useful to share hand crafted captures without the need to configure the DLT User table Change-Id: Iefab00b741f95b1f3a3247cb28ed01a367fa4ff4 Reviewed-on: https://code.wireshark.org/review/4469 Reviewed-by: Pascal Quantin Tested-by: Pascal Quantin Reviewed-by: Anders Broman commit e731bc7 Author: Guy Harris Date: Sat Oct 4 22:42:35 2014 -0700 Fix a comment. Change-Id: I875888753859488ed810cedb5656bd870bee7122 Reviewed-on: https://code.wireshark.org/review/4471 Reviewed-by: Guy Harris commit e7dcf1b Author: Guy Harris Date: Sat Oct 4 22:18:27 2014 -0700 Improve comments, and add some #defines, to make it clearer what the code does. Change-Id: I2cd8973bdce171053664cf4ed06a37bdd9b30353 Reviewed-on: https://code.wireshark.org/review/4470 Reviewed-by: Guy Harris commit a13a2e6 Author: Alexis La Goutte Date: Sat Oct 4 18:40:18 2014 +0200 DSR: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: Ifd694dc9a72cde787c00820ec5a02cc33d5157e0 Reviewed-on: https://code.wireshark.org/review/4466 Reviewed-by: Michael Mann commit 5377dee Author: Alexis La Goutte Date: Sat Oct 4 18:35:10 2014 +0200 LLDP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I616e57c84c5721213ee12a41b63595547ab15f72 Reviewed-on: https://code.wireshark.org/review/4465 Reviewed-by: Michael Mann commit 249d075 Author: Alexis La Goutte Date: Sat Oct 4 18:34:57 2014 +0200 EPL: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I88b90302df0202d38b7c089cf243e7860766e653 Reviewed-on: https://code.wireshark.org/review/4464 Reviewed-by: Anders Broman commit 973e09c Author: Alexis La Goutte Date: Sat Oct 4 18:00:30 2014 +0200 GSM-SMS: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: If0700726bf9a7359313d0cb69d959471c0ea9580 Reviewed-on: https://code.wireshark.org/review/4463 Reviewed-by: Anders Broman commit 8e17277 Author: Alexis La Goutte Date: Sat Oct 4 17:55:42 2014 +0200 Juniper: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I9178a3de683dda661ed68ef6d743036a9f8aa39e Reviewed-on: https://code.wireshark.org/review/4462 Reviewed-by: Anders Broman commit 4d62642 Author: Alexis La Goutte Date: Sat Oct 4 17:55:23 2014 +0200 RSVP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: Iccfeaa514cd60f02bb37e210c5f714bcb616521b Reviewed-on: https://code.wireshark.org/review/4461 Reviewed-by: Anders Broman commit 3d7e5a6 Author: Michael Mann Date: Sat Oct 4 13:50:42 2014 -0400 Eliminate proto_tree_add_text from packet-gsm_a_bssmap.c Also remove other_decode_bitfield_value calls. Change-Id: I056fe74fbd547b690cd5ed60e3e8777df9474704 Reviewed-on: https://code.wireshark.org/review/4468 Reviewed-by: Anders Broman commit fa5b76f Author: Alexis La Goutte Date: Sat Oct 4 17:27:47 2014 +0200 GTK (hostlist_table) fix indent (use 4 spaces) and modelines info Change-Id: I072de752df0c0e41be663889dafd0f5860a29c37 Reviewed-on: https://code.wireshark.org/review/4458 Reviewed-by: Anders Broman commit 6d44552 Author: Alexis La Goutte Date: Sat Oct 4 17:22:54 2014 +0200 GTK (hostlist_table) warning: comma at end of enumerator list [-Wpedantic] Change-Id: I83e930b3179ce954fa4c09d1f46cc833517aa1f6 Reviewed-on: https://code.wireshark.org/review/4457 Reviewed-by: Anders Broman commit 75727dc Author: Alexis La Goutte Date: Sat Oct 4 17:21:53 2014 +0200 Qt (manage interface): fix warning: comma at end of enumerator list [-Wpedantic] Change-Id: I728a50e47fd0d8eea77bc1cdebe2a155184ea953 Reviewed-on: https://code.wireshark.org/review/4456 Reviewed-by: Anders Broman commit acc19b7 Author: Alexis La Goutte Date: Sat Oct 4 17:11:18 2014 +0200 extcap: warning: no previous prototype for ‘extcap_free_arglist’ [-Wmissing-prototypes] Remove extcap_free_arglist (never used) Change-Id: I1f751512be627380a992db63c3e4abd22b3aa486 Reviewed-on: https://code.wireshark.org/review/4455 Reviewed-by: Anders Broman commit bedad69 Author: Alexis La Goutte Date: Sat Oct 4 17:05:38 2014 +0200 CEPH: Fix comma at end of enumerator list [-Wpedantic] Change-Id: I0c04a3d217e75986878b276a1ac82b427de38384 Reviewed-on: https://code.wireshark.org/review/4454 Reviewed-by: Anders Broman commit ab6f954 Author: Alexis La Goutte Date: Sat Oct 4 16:59:42 2014 +0200 DCERPC (butc): fix warning: no previous prototype for ... [-Wmissing-prototypes] Fix a typo in last patch and regenerate file Change-Id: Id9083edd797af97d72a872187a0d0b5750e04547 Reviewed-on: https://code.wireshark.org/review/4453 Reviewed-by: Anders Broman commit f1ba16a Author: Alexis La Goutte Date: Sat Oct 4 16:49:49 2014 +0200 CP2179: Fix warning: no previous prototype for proto_register_cp2179 [-Wmissing-prototypes] Move on top also prototype of proto_reg_handoff_cp2179 Change-Id: I00f23a88606426acd17d63104630a885682d3c02 Reviewed-on: https://code.wireshark.org/review/4452 Reviewed-by: Anders Broman commit ebfe8f6 Author: Bill Meier Date: Sat Oct 4 11:28:35 2014 -0400 Add editor modelines; Reformat as appropriate. Change-Id: I8e9c58b75eea85877d22024201e5d8d0e9a3dbfd Reviewed-on: https://code.wireshark.org/review/4459 Reviewed-by: Bill Meier commit 2079592 Author: Tomasz Moń Date: Fri Oct 3 19:27:04 2014 +0200 Update capture_opts in extcap_cleanup(). This fixes redundant extcap_pid handle close that could occur in capture_opts_del_iface() which resulted in unhandled exception on Windows. Change-Id: I06b680fcb65cd6fd854a25fb1b01248dce3251a1 Reviewed-on: https://code.wireshark.org/review/4447 Petri-Dish: Alexis La Goutte Reviewed-by: Roland Knall Reviewed-by: Pascal Quantin commit 06926ae Author: Tomasz Moń Date: Thu Oct 2 18:35:07 2014 +0200 Wait for extcap to connect to pipe on Windows. This prevents dumpcap from failing with timeout exceeded error message with some extcaps (especially those that display UAC screen) by making sure that extcap connects to pipe before dumpcap is even started. Change-Id: I549da9217c7f4ae89509330ca4fa613a119a9523 Reviewed-on: https://code.wireshark.org/review/4428 Petri-Dish: Alexis La Goutte Reviewed-by: Roland Knall Reviewed-by: Pascal Quantin commit a7d6321 Author: Guy Harris Date: Fri Oct 3 19:59:15 2014 -0700 Use some macros to clean up the Snifer decompression code. For code that's used in more than one place, use macros. This combines a bunch of checks into the output macros. Change-Id: Ic32dce75e1c531fd28bfed180856e230277bfe58 Reviewed-on: https://code.wireshark.org/review/4451 Reviewed-by: Guy Harris commit a6988b4 Author: Tomasz Moń Date: Fri Oct 3 19:01:46 2014 +0200 Fix memory leak and heap corruption on Windows. LPSECURITY_ATTRIBUTES is type definition for pointer to SECURITY_ATTRIBUTES structure. Change-Id: I94a835bfd8f7eb76c808fac8286ca3f2db9b19c3 Reviewed-on: https://code.wireshark.org/review/4449 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Reviewed-by: Pascal Quantin commit 8b7d27c Author: Gerald Combs Date: Fri Oct 3 08:53:16 2014 -0700 WSDG: Update the Windows Qt download text. Change-Id: I6fd027ff76b5b463f33992898965a3e037778071 Reviewed-on: https://code.wireshark.org/review/4443 Reviewed-by: Gerald Combs commit bb5daa6 Author: Bill Meier Date: Fri Oct 3 10:13:07 2014 -0400 Add editor modelines; Adjust whitespace as needed. Change-Id: I391cdf80a6e4ae5b0f4068e0500a90d013588f8a Reviewed-on: https://code.wireshark.org/review/4442 Reviewed-by: Bill Meier commit 451de17 Author: Bill Meier Date: Fri Oct 3 10:09:34 2014 -0400 packet-aim-messaging.c: Add editor modelines; reformat various (including hf[] entries). Change-Id: Ie5973a717a80ba75b82e817cb9e30c3529afbb0c Reviewed-on: https://code.wireshark.org/review/4441 Reviewed-by: Bill Meier commit b15914f Author: Bill Meier Date: Fri Oct 3 09:04:57 2014 -0400 packet-dcerpc-fileexp.c: Add editor modelines; reformat various (including hf[] entries). Change-Id: I0d49f4c1c3a3960c3fdc9b1cd411c73097829c09 Reviewed-on: https://code.wireshark.org/review/4440 Reviewed-by: Bill Meier commit 956cfa2 Author: AndersBroman Date: Fri Oct 3 15:18:44 2014 +0200 LocationNumber digits is off by one(to many). Bug 10522. Change-Id: I7887f3ee229ac22d2aa37a3d8900d76d8b814ed0 Reviewed-on: https://code.wireshark.org/review/4439 Reviewed-by: Anders Broman commit 6621b1f Author: Michael Mann Date: Thu Oct 2 21:04:55 2014 -0400 Create field filters for gsm_rr_csn_HL_flag() usages. Change-Id: I74f110b477a3bf7e0c374db3147604d50018deba Reviewed-on: https://code.wireshark.org/review/4435 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Reviewed-by: Anders Broman commit bdfff4d Author: Gerald Combs Date: Thu Oct 2 17:02:13 2014 -0700 Re-enable the Wireshark test suite. Change-Id: Icfd9edb8c6ef7620878bc9d60c8dcc569ad2abad Reviewed-on: https://code.wireshark.org/review/4434 Reviewed-by: Gerald Combs commit 242a1e5 Author: Gerald Combs Date: Wed Oct 1 17:18:31 2014 -0700 CMake: Don't assume we have a "cat" command. Use "copy /B" on Windows to create wireshark.pod, similar to doc/Makefile.nmake. Change-Id: I454afca0bd3497cca795ca18256dd7c4e2f224d4 Reviewed-on: https://code.wireshark.org/review/4415 Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit ff7b51f Author: Gerald Combs Date: Thu Oct 2 13:59:16 2014 -0700 Partially re-enable Wireshark tests. Qt requires Xrender and XKEYBOARD. Unfortunately the Ubuntu and Solaris buildbots run the test script under Xtightvnc, which provides neither of those. Only enable the tests on Windows and OS X for now. Change-Id: I84bc28f810782b862b4dca8fc8df088a4919066d Reviewed-on: https://code.wireshark.org/review/4430 Reviewed-by: Gerald Combs commit 482e8e5 Author: Bill Meier Date: Thu Oct 2 17:47:19 2014 -0400 Add editor modelines & adjust indentation/whitespace as needed. Change-Id: Ice2d93632cd42dfcef3bfbf0e15f2a8a147278fc Reviewed-on: https://code.wireshark.org/review/4433 Reviewed-by: Bill Meier commit 70abd39 Author: Bill Meier Date: Thu Oct 2 17:43:54 2014 -0400 Reformat hf[] entries; Add editor modelines & adjust whitespace. Change-Id: I30b25db89d3fbae5f3913ede8bf7bd66fd2516da Reviewed-on: https://code.wireshark.org/review/4432 Reviewed-by: Bill Meier commit 0299aa3 Author: Bill Meier Date: Thu Oct 2 17:26:35 2014 -0400 packet-nfs.c: (trivial) Add dropped/missing newline; Adjust some whitespace. Change-Id: I2ef3af42a712ced6917d94e1dcf708b3f34d7e82 Reviewed-on: https://code.wireshark.org/review/4431 Reviewed-by: Bill Meier commit 043e6f0 Author: Gerald Combs Date: Thu Oct 2 14:15:05 2014 -0700 Fix the release notes. The Bug Fixes section is empty, which creates an empty Docbook section, which isn't allowed. Comment out its header for now. AsciiDoc interprets single quoted text as emphasized, which probably isn't what was intended. Use curly quote markup instead. Add a link to the AsciiDoc cheat sheet. Change-Id: Ib9746ea714f90a28a2f1204e97e9e185aaef3df6 Reviewed-on: https://code.wireshark.org/review/4429 Reviewed-by: Gerald Combs commit 5262591 Author: Lukas Emersberger Date: Mon Sep 22 14:43:02 2014 +0200 epl: FIX PDO_Mapping The subindex of the R/TPDO frames was interpreted false. Now the subindex is correctly interpreted. ASend SDO Write Multiple Parameter by Index interpreted the mapping data false. Change-Id: Icfb1896e96f5486c5479c1dd060eb1032695f9f6 Reviewed-on: https://code.wireshark.org/review/4397 Reviewed-by: Lukas Emersberger Reviewed-by: Roland Knall Reviewed-by: Pascal Quantin commit 617b826 Author: Pascal Quantin Date: Wed Oct 1 13:23:52 2014 +0200 Upgrade GnuTLS 3.2.15 / Gcrypt 1.6.2 package We bundle a recompiled libcrypt library without AES-NI support so as to workaround a memory corruption seen when configuring AES keys Bug: 10476 Change-Id: I7735343530ec90b7b67ece4c6eb5b4bf1ddb857e Reviewed-on: https://code.wireshark.org/review/4401 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 5c8457e Author: Michael Mann Date: Thu Oct 2 11:18:00 2014 -0400 Create field filters for gsm_rr_csn_flag() usages. Change-Id: I77b0c33c054397666f978a9ae175fa386cb87b59 Reviewed-on: https://code.wireshark.org/review/4419 Petri-Dish: Michael Mann Reviewed-by: Anders Broman Reviewed-by: Pascal Quantin Reviewed-by: Michael Mann commit 3555c06 Author: AndersBroman Date: Thu Oct 2 17:37:24 2014 +0200 Add dissection of IS-IS Router CAPABILITY TLV. Bug 10520. Change-Id: I8d8d56e36d90088af3cd7d2490f95c5f87c75423 Reviewed-on: https://code.wireshark.org/review/4420 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Reviewed-by: Anders Broman commit c0cdf94 Author: Gerald Combs Date: Thu Oct 2 09:28:28 2014 -0700 Qt: Keep dialogs from blocking tests. If WIRESHARK_QUIT_AFTER_CAPTURE is set, call exit(0). This keeps us from emitting the aboutToQuit signal and doing things that might pop up dialogs. Change-Id: I6e986b6e7ad824d8b5258e34a12c32869f5b2d34 Reviewed-on: https://code.wireshark.org/review/4421 Reviewed-by: Gerald Combs commit abfa091 Author: Jeff Morriss Date: Wed Oct 1 11:17:44 2014 -0400 Some Release Notes cleanup. - Don't list bugs which were fixed in 1.12 as being fixed in 1.99. (We probably should add some bugs to the bugs-fixed list.) - Remove new-features list for everything prior to 1.12 (so we only list improvements since 1.12). - Fix bug link to bug 1814. - Fix the wiki's URL (the wiki doesn't appear to support https today). - Remove bugs 4445 and 9242 from the Known Problems list: they've been fixed. Change-Id: Ideb9ddf24e429ee00c19ac975370aa4fe81e652b Reviewed-on: https://code.wireshark.org/review/4403 Reviewed-by: Jeff Morriss commit 0efa992 Author: Michele Baldessari Date: Sat Aug 23 09:10:13 2014 +0200 Extend X11 response parsing Add support to parse screens, depths, visual-types and pixel-formats in the X11 connection initial response. v1->v2: - Do not show unused bytes when their length is 0 - Fix up tabs Change-Id: If62f0eab65a18e050fb3f830a6bd7574ab1f2de6 Reviewed-on: https://code.wireshark.org/review/4249 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 67f1fa5 Author: Gerald Combs Date: Wed Oct 1 19:16:12 2014 -0700 Temporarily disable the Qt tests added in g58cde5c. Apparently what works for me doesn't work for the Buildbot users. Change-Id: I7d3e4f2b89ae8ae3dadc8d92438c0e1923b97ace Reviewed-on: https://code.wireshark.org/review/4416 Reviewed-by: Gerald Combs commit 58cde5c Author: Gerald Combs Date: Wed Oct 1 12:44:14 2014 -0700 Add tests for the Qt UI. Make sure the Qt UI quits if WIRESHARK_QUIT_AFTER_CAPTURE is set. Make sure Bourne shell scripts (*.sh) have UNIX/POSIX line endings. Reduce some time values so that the tests run faster. Change-Id: I81df7c6f72d7d807d1856863cbea1bb6326ca711 Reviewed-on: https://code.wireshark.org/review/4407 Tested-by: Gerald Combs Reviewed-by: Gerald Combs commit b5aa0d2 Author: Gerald Combs Date: Wed Oct 1 14:59:45 2014 -0700 Qt: Try to reduce the initialization time. Change-Id: I4f7e9abee9ebb7ecc862e2122bc47ec65252c3ec Reviewed-on: https://code.wireshark.org/review/4410 Reviewed-by: Gerald Combs commit afa8c02 Author: Gerald Combs Date: Wed Oct 1 14:16:50 2014 -0700 Qt: Try to fix a Visual C++ encoding warning. Try to fix .\simple_dialog.cpp(49) : warning C4566: character represented by universal-character-name '\uFFFF' cannot be represented in the current code page (1252) We're assigning a delimiter. "Cannot be represented" is a feature, not a bug. Change-Id: Iba8bc5f5b42a43ec971d822b0e00f932787c7b16 Reviewed-on: https://code.wireshark.org/review/4409 Reviewed-by: Gerald Combs commit 2a2d75e Author: Pascal Quantin Date: Wed Oct 1 22:22:35 2014 +0200 GSM SMS: follow-up of gd65b7d5 Change-Id: I221e1411501e7c15eafe43e109f478684fa5ef10 Reviewed-on: https://code.wireshark.org/review/4408 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 1318d4c Author: Peter Wu Date: Mon Sep 29 01:39:32 2014 +0200 http: ignore response body for HEAD requests Responses to HEAD requests must not have a message body, so do not attempt to use the Content-Length and similar headers that indicate a non-empty message body in the response. Those point to the entity that would be returned for non-HEAD requests. Requests do not have request_method set, so do not limit desegmentation by HEAD in that case. Verified by comparing the output of `tshark -O http` and by looking in the Wireshark GTK UI. Bug: 6064 Change-Id: I7f027a06d8480673ca9754037d080c3b25cc5816 Reviewed-on: https://code.wireshark.org/review/4357 Reviewed-by: Peter Wu Reviewed-by: Evan Huus Reviewed-by: Alexis La Goutte commit f351a58 Author: Gerald Combs Date: Wed Oct 1 08:42:20 2014 -0700 Update the release notes. Change-Id: I2a5b2d45be806cd873a62062924966d82ce4c296 Reviewed-on: https://code.wireshark.org/review/4406 Reviewed-by: Gerald Combs commit d65b7d5 Author: Michael Mann Date: Tue Sep 30 21:42:48 2014 -0400 Eliminate proto_tree_add_text from GSM_SMS dissector. Change-Id: Ibe189239735da2ebb1b0ce61a5af249975b38be3 Reviewed-on: https://code.wireshark.org/review/4402 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit fa1d0be Author: Peter Wu Date: Fri Sep 26 00:10:13 2014 +0200 cmake: update FindGTK2 to v3.0.1-1824-g0b12815 Current FindGTK2.cmake as included with Wireshark cannot do a 32-bit build even after setting CMAKE_LIBRARY_PATH=/usr/lib32. After an update to upstream FindGTK2 (v3.0.1-1824-g0b12815), things build again. Compared to upstream FindGTK2, FindWSWinLibs and related hints have been added (note that "${GTK2_HINTS}/lib" is not a typo, it is needed as some headers are includes in locations like lib/gtk-2.0/include/). The include paths have become relative again as there are no files like FindPackageHandleStandardArgs in the Wireshark source tree. Diff between upstream FindGTK2 and the version in this patch: diff --git a/cmake/modules/FindGTK2.cmake b/cmake/modules/FindGTK2.cmake index 72bb8eb..9b4f989 100644 --- a/cmake/modules/FindGTK2.cmake +++ b/cmake/modules/FindGTK2.cmake @@ -167,2 +167,5 @@ +include( FindWSWinLibs ) +FindWSWinLibs( "gtk2" "GTK2_HINTS" ) + #============================================================= @@ -176,4 +179,4 @@ -include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake) +include(SelectLibraryConfigurations) +include(CMakeParseArguments) @@ -289,2 +292,5 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr) ${_suffixes} + HINTS + "${GTK2_HINTS}/include" + "${GTK2_HINTS}/lib" ) @@ -395,2 +401,4 @@ function(_GTK2_FIND_LIBRARY _var _lib _expand_vc _append_version) [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib + HINTS + "${GTK2_HINTS}/lib" ) @@ -409,2 +417,4 @@ function(_GTK2_FIND_LIBRARY _var _lib _expand_vc _append_version) [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib + HINTS + "${GTK2_HINTS}/lib" ) @@ -829,3 +839,3 @@ set(_GTK2_did_we_find_everything true) # This gets set to GTK2_FOUND -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) Change-Id: I02103409a79ea30d1bf7cc0dfb43a9e41f8a4db3 Reviewed-on: https://code.wireshark.org/review/4293 Reviewed-by: Graham Bloice Reviewed-by: Anders Broman commit 9506909 Author: Peter Wu Date: Thu Sep 25 12:09:23 2014 +0200 cmake: use pkg-config for resolving dependencies Changes: * Fix glib2 search path. * Add pkg-config support to CAP, GEOIP, GNUTLS, LUA, PortAudio (API 19), zlib, kerberos. * Add pkg-config support to libnl3, libnl2 and libnl1 (but tested only with libnl3). This makes it easier to do 32-bit builds on 64-bit hosts by just setting `PKG_CONFIG_LIBDIR`. Due to how HINTS work, it is still fragile though: missing 32-bit libraries will cause a fallback to 64-bit libraries. A future patch could check for `_FOUND` and remove the manual `find_path` and `find_library` hackery since the paths are already known. Change-Id: Ieb4fb74695c96afb1a4c70168e84abb1fa4612c6 Reviewed-on: https://code.wireshark.org/review/4292 Reviewed-by: Anders Broman commit 0ac441b Author: Anndy Ke Date: Tue Sep 30 17:10:56 2014 +0800 Dissect ext_capab and alt_mac_addr subelements of wifi display IE. Support two subelements of WFD IE: - WFD Extended Capability Bitmap - Alternative MAC Address Change-Id: Ic365fdd84a6db6cf7d21c6ea32924a094432f83a Reviewed-on: https://code.wireshark.org/review/4380 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus Reviewed-by: Anders Broman commit 39c51be Author: Alexis La Goutte Date: Mon Sep 29 21:07:47 2014 +0200 LLDP: TIA Network Policy Unknown Policy Flag Decode is not correct Wrong length for field... Bug:10512 Change-Id: I416a34d5f50cc0e842612a084c95d885eea68ef1 Reviewed-on: https://code.wireshark.org/review/4377 Petri-Dish: Alexis La Goutte Reviewed-by: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 41ef2b0 Author: Alexis La Goutte Date: Wed Oct 1 08:07:20 2014 +0200 idl2wrs (DCERPC): fix some warning * Fix -Wmissing-prototypes in * Fix unused variable for drusapi (using _U_) Need to fix indent and some unused function/variable to remove from DIRTY list Change-Id: Ib6f325f0b54e2eb254ec38a41199b4b60a4d90a1 Reviewed-on: https://code.wireshark.org/review/4398 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 214b127 Author: Pascal Quantin Date: Wed Oct 1 07:49:38 2014 +0200 GIF: add a missing hf registration Change-Id: Ib90054ef8a87f40249f644e8c7065b755419a11c Reviewed-on: https://code.wireshark.org/review/4396 Reviewed-by: Pascal Quantin commit 01b093c Author: Bill Meier Date: Tue Sep 30 19:12:26 2014 -0400 Add editor modelines; Adjust whitespace as needed. Change-Id: I434da226c842298f4fb2a4335d06d51e164af2af Reviewed-on: https://code.wireshark.org/review/4394 Reviewed-by: Bill Meier commit 0cc027c Author: Guy Harris Date: Tue Sep 30 14:31:45 2014 -0700 Note why strlen(args) could be < linelen. Change-Id: I8fb3c35be0aa80895b8a917af8a9fd2542fbd9d6 Reviewed-on: https://code.wireshark.org/review/4393 Reviewed-by: Guy Harris commit 514c101 Author: Martin Kaiser Date: Tue Sep 30 21:07:26 2014 +0200 correct the line length if it was longer than the actual string supplied by the caller Bug: 10516 Change-Id: Ib2c9ab449b95da92cc889d0992fad30f432a2836 Reviewed-on: https://code.wireshark.org/review/4386 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 9b181b9 Author: Bill Meier Date: Tue Sep 30 16:59:17 2014 -0400 Add editor modelines; Adjust whitespace; Remove boilerplate comments Change-Id: I1f5f83ed441f6009125cf2cbe5023af04986898a Reviewed-on: https://code.wireshark.org/review/4392 Reviewed-by: Bill Meier commit 6896c26 Author: Bill Meier Date: Tue Sep 30 16:52:09 2014 -0400 packet-fp_umts_fp.c: various - Use #if 0/#endif to comment out code instead of /* ... */ = Add editor modelines and adjust whitespace as needed. Change-Id: I6f7e18a7955cd17d6d727090de802374a7cae0c4 Reviewed-on: https://code.wireshark.org/review/4391 Reviewed-by: Bill Meier commit a585cd8 Author: Bill Meier Date: Tue Sep 30 16:46:14 2014 -0400 packet-ses.[hc], packet-pres.c: various: - Create/use extended value-strings; - Move proto-register...() to (near) the end of the file; - Add editor modelines and adjust whitespace as needed. Change-Id: I7ebe6dfd62b3fb190aa1cefc9b35d40f156f11ea Reviewed-on: https://code.wireshark.org/review/4390 Reviewed-by: Bill Meier commit f687d63 Author: Bill Meier Date: Tue Sep 30 15:43:12 2014 -0400 packet-simulcrypt.c: various - Add/use several extended value strings; - Add (what appear to be) 3 missing entries to a value-string array; - Add editor mode-lines and adjust whitespace as needed. Change-Id: Ia3bea3c52130ae07d1f0c271659fb010abecb179 Reviewed-on: https://code.wireshark.org/review/4389 Reviewed-by: Bill Meier commit b57a8bb Author: Bill Meier Date: Tue Sep 30 15:15:13 2014 -0400 packet-sscop.c: various: - Add/use extended value-string; - Add editor-modelines and adjust whitespace as needed. Change-Id: I5e03d6bcaeb2f4beee37ad4778a87657ae82128d Reviewed-on: https://code.wireshark.org/review/4388 Reviewed-by: Bill Meier commit 22b5278 Author: Bill Meier Date: Tue Sep 30 15:08:11 2014 -0400 packet-mgcp.[hc]: Various changes: - Add/use extended value-string; - Move proto_register...() and proto_reg_handoff...() to the end of the file; - Add editor modelines and adjust whitespace as appropriate. Change-Id: Iede67c418d9f2b4e263113bb14e77d6a56a16225 Reviewed-on: https://code.wireshark.org/review/4387 Reviewed-by: Bill Meier commit ff307c7 Author: Gerald Combs Date: Tue Sep 30 13:19:24 2014 -0700 Add more HAVE_LIBPCAP checks. Change-Id: I82e62f6be03a2ae1617cd5b8e430b73ca8fbe7f8 Reviewed-on: https://code.wireshark.org/review/4385 Reviewed-by: Gerald Combs commit 0050902 Author: Gerald Combs Date: Tue Sep 30 12:59:51 2014 -0700 Qt: Finish implementing -g Should fix the current dist failure. Change-Id: Ib1b8d92f6267040c9eef2e4c27ca78c6dd0631be Reviewed-on: https://code.wireshark.org/review/4384 Reviewed-by: Gerald Combs commit 9fdc85d Author: Gerald Combs Date: Tue Sep 30 12:15:17 2014 -0700 Qt: Try to fix libpcap-less builds. Change-Id: I64f4d6490388858306180445b58863d57217986a Reviewed-on: https://code.wireshark.org/review/4383 Reviewed-by: Gerald Combs commit ced39b6 Author: Gerald Combs Date: Mon Sep 29 16:27:11 2014 -0700 Qt: Start capture from the command line. Fill in the capture-related mise en place so that -k and -i work. Get rid of global_capture_session in ui/qt and make it a member of MainWindow. Copy over privilege checking from GTK+. Move the global capture session struct to MainWindow. Change-Id: Iab5ec683860a40255a7e1d82e3872ced24fd55cb Reviewed-on: https://code.wireshark.org/review/4382 Reviewed-by: Gerald Combs commit 5330875 Author: Gerald Combs Date: Mon Sep 29 14:34:13 2014 -0700 GTK+: Revert back to 2.24.14-1.1 on Win64. As Pascal discovered in https://www.wireshark.org/lists/wireshark-dev/201409/msg00045.html Wireshark-gtk.exe crashes at startup on Windows 8.1 x64 when compiled with the GTK+ 2.24.23-1.1 bundle and Visual C++ 2013. Revert to the Win64 build to the prior GTK+ bundle, which works on my test system. Update the release notes. Make sure we use a libintl-8.dll that's compatible with GnuTLS. Ideally we'd just upgrade or rebuild the GTK+ bundle but so far that hasn't worked. Prior to this I tried: Updating the gtk2 package at build.opensuse.org to 2.24.24. This fails with [ 187s] make[3]: Leaving directory `/home/abuild/rpmbuild/BUILD/gtk+-2.24.24/gtk' [ 187s] /usr/bin/gtk-update-icon-cache --force --ignore-theme-index \ [ 187s] --include-image-data \ [ 187s] --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ [ 187s] mv gtkbuiltincache.h.tmp gtkbuiltincache.h [ 187s] gtk-update-icon-cache: No theme index file. [ 187s] make[2]: *** [gtkbuiltincache.h] Error 1 Switching to the OBS GTK+ 3.14 package. It looks like a lot of our GTK+ code is deprecated, including GtkAction and GtkAttachOptions. Change-Id: I1548c84022f02895e5d424cd61e0fed7b57b2e75 Ping-Bug: 9914 Reviewed-on: https://code.wireshark.org/review/4379 Reviewed-by: Gerald Combs commit 0744558 Author: Michael Mann Date: Mon Sep 29 14:09:31 2014 -0400 Improve filterability of GTP dissector. Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 1a50aee Author: Michael Mann Date: Sun Sep 28 21:09:06 2014 -0400 Improve filterability of RSVP dissector. Eliminated many, but not all proto_tree_add_text calls. Change-Id: Ic904a0019a9d5d64d47b562bd282f1e6fad617cb Reviewed-on: https://code.wireshark.org/review/4366 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 4342d0f Author: Guy Harris Date: Mon Sep 29 11:59:26 2014 -0700 High Throughput is 11n, not 11g or 11a. Change-Id: I86b6dac9cf3f1f524c1168d675bff4a04e361cee Reviewed-on: https://code.wireshark.org/review/4374 Reviewed-by: Guy Harris commit 3c0a668 Author: Bill Meier Date: Mon Sep 29 14:42:55 2014 -0400 Add editor modelines and adjust indentation as needed. Change-Id: I857700d685354b0bc9e0ca647c57faba981b520f Reviewed-on: https://code.wireshark.org/review/4373 Reviewed-by: Bill Meier commit ff5a772 Author: Bill Meier Date: Mon Sep 29 14:07:49 2014 -0400 Add editor modelines and adjust indentation as needed. Change-Id: Id57d264299f2026d703c5b08bace4b24b32f184c Reviewed-on: https://code.wireshark.org/review/4371 Reviewed-by: Bill Meier commit 1c055f5 Author: Jeff Morriss Date: Mon Sep 29 11:05:38 2014 -0400 Add KNXnetIP and DSR to the list of new-to-1.99 protocols. Add the former's author to AUTHORS. Also mention support of nanosecond timestamps in PCAP-NG files. Change-Id: I31666de845240a311a8332cff42120d78d2d1474 Reviewed-on: https://code.wireshark.org/review/4367 Reviewed-by: Evan Huus commit 97d2030 Author: Hadriel Kaplan Date: Mon Sep 29 11:34:46 2014 -0400 Fix lua bindings for timestamp precision The changes to the timestamp define names broke the init.lua file generation. Change-id Id0c27b31c5 tried to fix this, but would break backwards compatibility of exisitng Lua scripts. This commit fixes that change by adding the timestamp variables in both a new Lua table as well as the old filetypes table. Change-Id: I74749acb51dc85094e8c63b240a1951bd4cc0330 Reviewed-on: https://code.wireshark.org/review/4370 Reviewed-by: Evan Huus commit aef88f4 Author: AndersBroman Date: Mon Sep 29 17:05:34 2014 +0200 Dissect more of the Presence Reporting Area Action IE. Change-Id: I4bf0c7890fff4162e1cf5faad8dd0ca008e0dbe6 Reviewed-on: https://code.wireshark.org/review/4368 Reviewed-by: Anders Broman commit ff87bc8 Author: Evan Huus Date: Mon Sep 29 10:37:52 2014 -0400 Add missing use of a value_string definition Change-Id: I865256633dbcc378b53eeabb62fcf84c617ea1b9 Reviewed-on: https://code.wireshark.org/review/4365 Reviewed-by: Evan Huus commit 1b733e1 Author: AndersBroman Date: Mon Sep 29 16:26:13 2014 +0200 Fix a broken comment Change-Id: I4358c118ec890456468d7aa8eda00fb0ddbaea20 Reviewed-on: https://code.wireshark.org/review/4364 Reviewed-by: Anders Broman commit 1040687 Author: Bill Meier Date: Sun Sep 28 19:25:09 2014 -0400 Add editor modelines; fix indentation as needed. Change-Id: I1ad94654343e5a018a0b3159481d45ffb3a91263 Reviewed-on: https://code.wireshark.org/review/4363 Reviewed-by: Bill Meier commit 768e36f Author: Guy Harris Date: Mon Sep 29 00:05:53 2014 -0700 Remove duplicate packet-dcerpc-mapi.c. Change-Id: If2ffd01c29777840db8e305bee9565efaa58d253 Reviewed-on: https://code.wireshark.org/review/4362 Reviewed-by: Guy Harris commit e976f68 Author: Alexis La Goutte Date: Sun Sep 28 19:58:16 2014 +0200 PIDL (DCERPC mapi): enhance dissector Correctly regenerate mapi dissector (launch via make in pidl/mapi folder) * Fix -Wunused-variable (fix in request/response.cnf files) * Fix trailing whitespace Not yet ready to remove from DIRTY list (there is always some warning about unused tree) Change-Id: I9759202e320e90f0cb91db5c7dd9650ff62bbadd Reviewed-on: https://code.wireshark.org/review/4347 Reviewed-by: Anders Broman commit cf3edd9 Author: Alexis La Goutte Date: Sun Sep 28 18:16:58 2014 +0200 PIDL (DCERPC mdssvc): enhance dissector * Fix -Wunused-function (Add functions to mdssvc.cnf with NOEMIT) * Remove dissector DCERPC mdssvc from DIRTY list Change-Id: Ic097b0067a44fcfd9298ace1abeb7ca8f0daf00b Reviewed-on: https://code.wireshark.org/review/4346 Reviewed-by: Anders Broman commit 4110bde Author: Alexis La Goutte Date: Fri Sep 26 19:51:34 2014 +0200 PIDL: fix indent (use 4 tabs) and remove trailing whitespace Change-Id: I0ee63a040867b44ac9915704f5e581483ed6f7e2 Reviewed-on: https://code.wireshark.org/review/4310 Reviewed-by: Anders Broman commit b2d81a2 Author: Michael Mann Date: Fri Sep 26 22:43:25 2014 -0400 Remove proto_tree_add_text_valist from dissectors. The only remaining call to proto_tree_add_text_valist is in expert.c. Suggestions welcome on how to make it "private" enough so dissectors can't use it. Change-Id: I1b70789bd01a857c3ac06d198667aeb59c4d1be9 Reviewed-on: https://code.wireshark.org/review/4333 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 45fb377 Author: Evan Huus Date: Sun Sep 28 22:32:33 2014 -0400 Fix lua bindings to handle timestamp precision changes The recent wiretap changes broke the generation of init.lua among other things, though it did coincidentally fix one of the "yuck" comments in the generator regex. (Note that this is entirely untested, because out-of-tree init.lua is and always has been broken, but it should work) Change-Id: Id0c27b31c596613997de4ba2f6088eb9d6c8fc53 Reviewed-on: https://code.wireshark.org/review/4361 Reviewed-by: Evan Huus commit 26e7201 Author: Evan Huus Date: Sun Sep 28 22:07:15 2014 -0400 Update debian symbol files to satisfy the buildbot Why is this necessary again? Change-Id: Idf8981a00636b16ac06b5af5962131d29d88dfad Reviewed-on: https://code.wireshark.org/review/4360 Reviewed-by: Evan Huus commit 94c47b1 Author: Evan Huus Date: Sun Sep 28 17:56:16 2014 -0400 mrcpv2: don't use an uninitialized buffer as a string I have no idea what the original intent was with this magical otherwise-totally-unused buffer, but it clearly serves no purpose now. Stop reading garbage from it, and just read the data in the packet which is what the field name suggests. Bug: 10510 Change-Id: I05d0b98c04e59ea70247811168c4c8a64861f43d Reviewed-on: https://code.wireshark.org/review/4352 Petri-Dish: Evan Huus Reviewed-by: Evan Huus commit 9683518 Author: Guy Harris Date: Sun Sep 28 17:10:24 2014 -0700 Pass the global capture options to open_capture_device(). If we support setting the time stamp precision, we need it to determine whether we're writing a pcap-ng file so we know whether to request nanosecond precision or not. Change-Id: I7df19c1afbe1ba90c40c49aef79f6f88ce5df29b Reviewed-on: https://code.wireshark.org/review/4359 Reviewed-by: Guy Harris commit 34fc114 Author: Guy Harris Date: Sun Sep 28 16:54:03 2014 -0700 Support nanosecond-resolution time stamps when writing pcap-ng files. Pcap-ng files have supported variable time stamp resolutions since Day One, and any code that reads those files but can't handle nanosecond-resolution time stamps is broken. Pcap files got a separate magic number for nanosecond-resolution files relatively recently, and not all code that reads pcap files handles that magic number, so we don't support it for pcap files. Based on https://code.wireshark.org/review/#/c/4304/ from Peter Hatina. Change-Id: I4f4e3b5ca0ba4fe9394765edb54bb77a4a776237 Reviewed-on: https://code.wireshark.org/review/4358 Reviewed-by: Guy Harris commit 982c7d3 Author: Guy Harris Date: Sun Sep 28 16:41:43 2014 -0700 Support nanosecond-resolution time stamp adjustment. Based on https://code.wireshark.org/review/#/c/4304/ from Peter Hatina. Change-Id: Ibc5e230b0682990fd4ca1f29597a9a045cb73928 Reviewed-on: https://code.wireshark.org/review/4356 Reviewed-by: Guy Harris commit 392c41c Author: Guy Harris Date: Sun Sep 28 16:28:36 2014 -0700 Add support for getting nanosecond time stamp resolution when capturing. If we have pcap_set_tstamp_precision(), use it to request nanosecond time stamp resolution *if* we're writing a pcap-ng file; any code that reads those files and can't handle nanosecond time stamp resolution is broken and needs to be fixed. If we're writing a pcap file, don't ask for nanosecond resolution time stamps, as that requires a different magic number for pcap files, and not all code that reads pcap files can handle that. (Unlike pcap-ng, where the ability to have non-microsecond time stamp resolution was present from Day One, it's a relatively recent addition to pcap.) We could add a command-line option/GUI option for that, like the option recent versions of tcpdump have, if it matters. Change-Id: I8fa464eb929feecb9a70be70712502c9f0cc5270 Reviewed-on: https://code.wireshark.org/review/4355 Reviewed-by: Guy Harris commit f6b9e7a Author: Alexis La Goutte Date: Sun Sep 28 20:57:13 2014 +0200 PIDL: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: Ibae478771b30d6e9ae07315985f1e71bc6b65423 Reviewed-on: https://code.wireshark.org/review/4350 Reviewed-by: Michael Mann commit fdf3585 Author: Pascal Quantin Date: Sun Sep 28 13:50:38 2014 +0200 Stanag 4607: rename protocol abbreviation from 4607 to s4607 to avoid any collision with a frame number Bug: 10509 Change-Id: I6b97c979ed05378a7d3495fe455bc36b82b19cc9 Reviewed-on: https://code.wireshark.org/review/4338 Reviewed-by: Michael Mann Reviewed-by: Pascal Quantin commit 54b733c Author: Guy Harris Date: Sun Sep 28 11:37:06 2014 -0700 Make the time stamp resolution per-packet. Pcap-ng files don't have a per-file time stamp resolution, they have a per-interface time stamp resolution. Add new time stamp resolution types of "unknown" and "per-packet", add the time stamp resolution to struct wtap_pkthdr, have the libwiretap core initialize it to the per-file time stamp resolution, and have pcap-ng do the same thing with the resolution that it does with the packet encapsulation. Get rid of the TS_PREC_AUTO_XXX values; just have TS_PREC_AUTO, which means "use the packet's resolution to determine how many significant digits to display". Rename all the WTAP_FILE_TSPREC_XXX values to WTAP_TSPREC_XXX, as they're also used for per-packet values. Change-Id: If9fd8f799b19836a5104aaa0870a951498886c69 Reviewed-on: https://code.wireshark.org/review/4349 Reviewed-by: Guy Harris commit efea8ce Author: Gerald Combs Date: Thu Sep 25 15:37:38 2014 -0700 CMake: Conditional build fixes and updates. HAVE_PORTAUDIO_H didn't work for Stig. Use PORTAUDIO_FOUND instead, which is the correct name to use according to the FIND_PACKAGE_HANDLE_STANDARD_ARGS documentation. Use xxx_FOUND in a couple of other places. Conditionally build caputils/airpcap_loader.c. Change-Id: I6a134192902229a446dccf43bfb7bbfe2a55d1e2 Reviewed-on: https://code.wireshark.org/review/4291 Reviewed-by: Gerald Combs Reviewed-by: Graham Bloice Reviewed-by: Stig Bjørlykke Tested-by: Stig Bjørlykke commit 5517c42 Author: Bill Meier Date: Sun Sep 28 13:47:57 2014 -0400 packet-netflow.c: Do various fixes and changes - Allow integer & float fields to have "reduced size encoding"; Fixes Bug #8846; - Add a missing cflow field-type; - Update the names of a few cflow field-types; - Replace all-but-one use of proto_tree_add_text(); - Fix encoding-args as appropriate; - Remove some obsolete comments; - Adust whitespace/indentation/formatting. Change-Id: I4271e3692288cef3ea0f1aa5eb44f5a0b05c29da Reviewed-on: https://code.wireshark.org/review/4348 Petri-Dish: Bill Meier Reviewed-by: Bill Meier commit 938008e Author: Alexis La Goutte Date: Sun Sep 28 17:49:58 2014 +0200 PIDL (DCERPC lsa): enhance dissector * Fix -Wunused-function (Add functions to lsa.cnf with NOEMIT) * Remove also some MANUAL function (no unused too..) * Remove dissector DCERPC lsa from DIRTY list Change-Id: I7b7f924f244757207f378b8650b8dd30e739da08 Reviewed-on: https://code.wireshark.org/review/4325 Reviewed-by: Michael Mann commit 1633724 Author: Alexis La Goutte Date: Fri Sep 26 23:42:19 2014 +0200 PIDL (DCERPC eventlog): enhance dissector * Fix -Wunused-function (Add functions to eventlog.cnf with NOEMIT) * Remove dissector DCERPC eventlog from DIRTY list Change-Id: I29710ce4f548a6e4d9bf1dd6e652acf1eeaddf2c Reviewed-on: https://code.wireshark.org/review/4324 Reviewed-by: Michael Mann commit d572634 Author: Alexis La Goutte Date: Fri Sep 26 23:35:40 2014 +0200 PIDL (DCERPC dnsserver): enhance dissector * Fix -Wunused-function (Add functions to dnsserver.cnf with NOEMIT) * Remove dissector DCERPC dnsserver from DIRTY list Change-Id: Id1d4f43784bfbf417156353fd3254375365c35c8 Reviewed-on: https://code.wireshark.org/review/4323 Reviewed-by: Michael Mann commit 28ec9c2 Author: Alexis La Goutte Date: Fri Sep 26 23:29:43 2014 +0200 PIDL (DCERPC winreg): enhance dissector * Fix PIDL generator for NOEMIT Element (fix -Wunused-function for DCERPC winreg dissector) * Fix indent (use tabs) * Remove DCERPC winreg dissector from DIRTY list Change-Id: I5d16cbfe8481a5e5f7e5df9b51735c93ae4375a7 Reviewed-on: https://code.wireshark.org/review/4322 Reviewed-by: Michael Mann commit e759d82 Author: Alexis La Goutte Date: Fri Sep 26 18:47:53 2014 +0200 PIDL: fix -Wmissing-prototype Change-Id: I4cae47450e8026b10bd373828f235184560e0a99 Reviewed-on: https://code.wireshark.org/review/4308 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 2bd8f50 Author: Gerald Combs Date: Sun Sep 28 08:05:48 2014 -0700 [Automatic manuf, services and enterprise-numbers update for 2014-09-28] Change-Id: I7604c01a061f4832e53aa88903a53c1d6a50e4dc Reviewed-on: https://code.wireshark.org/review/4339 Reviewed-by: Gerald Combs commit 5a16ae7 Author: alage Date: Mon Aug 25 11:03:43 2014 +0200 New dissector for KNXnetIP protocol Bug:10403 Change-Id: I8c733ce69e6d44d1bff0ebbe72995f06212d9d93 Reviewed-on: https://code.wireshark.org/review/3828 Petri-Dish: Michael Mann Reviewed-by: Evan Huus Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit e9c4217 Author: Guy Harris Date: Sun Sep 28 01:01:45 2014 -0700 Don't change the packet list column precision in taps. The only place where the packet list column precision should be set is in the code for the column precision menu item, the code for the recent file item for that precision, and, if we were to provide it, code for a command-line optpion to set it. It's not up to some tap to change it. Change-Id: I547e606fb346b4c21674a66e883cbbe382055a37 Reviewed-on: https://code.wireshark.org/review/4336 Reviewed-by: Guy Harris commit f0b5fb7 Author: Alexis La Goutte Date: Fri Sep 26 21:31:32 2014 +0200 PIDL: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I7f6f974732b7905f4ea4686e1a79ca6fbef78fa8 Reviewed-on: https://code.wireshark.org/review/4319 Reviewed-by: Alexis La Goutte commit 99f5c50 Author: Guy Harris Date: Sat Sep 27 12:38:45 2014 -0700 The Ubuntu build says to do this, so I'll believe it so it stops failing. We get rid of the exports file with ws_symbol_export.h, and then we bring it back with this. Change-Id: Ic689d20ec8ca5806677e1b52018c8c79b381508f Reviewed-on: https://code.wireshark.org/review/4335 Reviewed-by: Guy Harris commit 0067909 Author: Guy Harris Date: Sat Sep 27 11:29:03 2014 -0700 Make get_column_longest_string() static. It's not used outside epan/column.c, so don't export it. Change-Id: I38e084946d92f3c31b06fc4fc1991c88e652f58a Reviewed-on: https://code.wireshark.org/review/4334 Reviewed-by: Guy Harris commit 6e83b38 Author: Pascal Quantin Date: Fri Sep 26 19:41:43 2014 +0200 Get rid of g_hash_table_lookup asserts when loading an external host file Only parse the host file syntax without trying to store the names in the hash tables (it will be done later in host_name_lookup_init()) Change-Id: I2b8c7b29220e6413c1b5c0a0fa238ecb5388c962 Reviewed-on: https://code.wireshark.org/review/4309 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 6fad7d1 Author: Michael Mann Date: Fri Sep 26 19:28:01 2014 -0400 Eliminate proto_tree_add_text from some dissectors. Some other related cleanup. Change-Id: I45f54032aa8318858f4ee784945b6f2ed163b6ea Reviewed-on: https://code.wireshark.org/review/4328 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 65437a7 Author: Simon Zhong Date: Wed Sep 24 22:09:24 2014 -0400 Added support of - "PCEP Extensions for Stateful PCE" (draft-ietf-pce-stateful-pce-09) - "PCEP Extensions for PCE-initiated LSP Setup in a Stateful PCE Model" (draft-ietf-pce-pce-initiated-lsp-01) - "Optimizations of Label Switched Path State Synchronization Procedures for a Stateful PCE" (draft-ietf-pce-stateful-sync-optimizations-01) checkAPIs.pl executed, got "deprecated APIs tvb_length" warning, but I didn't modify them because I saw reverse operations. Fuzz test executed, no error. Can't submit pcap file because is captured during internal test. Change-Id: I063a7f6bda57543017b546506f9f89eda387daf6 Reviewed-on: https://code.wireshark.org/review/4275 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit a3c4133 Author: Pascal Quantin Date: Sat Sep 27 01:21:10 2014 +0200 tshark: fix -H option The dump of the address info list must be differed to the end of the processing so as to know which host name was actually used in the capture Bug: 10507 Change-Id: I44dbfae918d4ae92f9740c309804c7ff21bb4e1b Reviewed-on: https://code.wireshark.org/review/4327 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 7477a46 Author: Guy Harris Date: Fri Sep 26 23:39:46 2014 -0700 Get rid of some unused members of wtapng_simple_packet_t. Change-Id: I790d99cefdd58f01ec4a792d66144634862e7427 Reviewed-on: https://code.wireshark.org/review/4331 Reviewed-by: Guy Harris commit 15569c6 Author: Guy Harris Date: Fri Sep 26 18:27:30 2014 -0700 Regenerate PIDL dissectors with our current PIDL. Change-Id: I63a1874d157c55df6c3c3f69c68098528adbb384 Reviewed-on: https://code.wireshark.org/review/4330 Reviewed-by: Guy Harris commit 8d0b793 Author: Guy Harris Date: Fri Sep 26 18:25:48 2014 -0700 "declare" apparently isn't a valid keyword; use typedef instead. These changes came from the versions of those files at the tip of the Samba trunk, and fix the failures to compile with pidl. Change-Id: Ifc3276d4bc2ff1cfdb19819811f5b8d1b91961b5 Reviewed-on: https://code.wireshark.org/review/4329 Reviewed-by: Guy Harris commit 1749e5e Author: Gerald Combs Date: Fri Sep 26 15:54:09 2014 -0700 Qt: Adjust X11 font search order. Liberation Mono appears to be the preferred font nowadays. Change-Id: Ie953bdb8ba77df6486607dc076daa24225b2f08f Reviewed-on: https://code.wireshark.org/review/4326 Reviewed-by: Gerald Combs commit a2681cc Author: Guy Harris Date: Fri Sep 26 14:12:32 2014 -0700 Note that errors are generated for dnsserver.idl and eventlog.idl. Also fix a typo. Change-Id: Id0713fbb722e88a911cae4ef4371b528fe73e048 Reviewed-on: https://code.wireshark.org/review/4321 Reviewed-by: Guy Harris commit 24ced90 Author: Guy Harris Date: Fri Sep 26 13:14:36 2014 -0700 White space and typo cleanups. Change-Id: If064178a383ce805ed6f440a1a9d3642a706496c Reviewed-on: https://code.wireshark.org/review/4320 Reviewed-by: Guy Harris commit ef106f4 Author: Guy Harris Date: Fri Sep 26 12:30:23 2014 -0700 Update to latest version from Samba Git repository. Comments from Samba Git log: commit ee2148754e2e2604ac918343fa8769a25523eb49 Author: Stefan Metzmacher Date: Tue Aug 26 21:33:05 2014 +0200 pidl/wscript: remove --with-perl-* options These are not needed anymore as we have useful defaults now. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472 Signed-off-by: Stefan Metzmacher Reviewed-by: Michael Adam commit b537c5a340bae2accbf35a4ec5eab7074b90f0b1 Author: Michael Adam Date: Mon Aug 25 23:57:23 2014 +0200 pidl: fix the perl module search path (use lib ...) when installing pidl. This way, pidl can also run with modules installed under the $prefix. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472 Signed-off-by: Michael Adam commit 191fc0e541e7c9d0a1095dc287402df9947ce779 Author: Michael Adam Date: Thu Sep 4 01:38:14 2014 +0200 pidl/wscript: don't check for perl again. This is done at the toplevel now. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472 Pair-Programmed-With: Stefan Metzmacher Signed-off-by: Michael Adam Signed-off-by: Stefan Metzmacher commit 9e591e3d619d127c5ec5f6ac86326c84f59878fa Author: Andreas Schneider Date: Fri Feb 28 15:59:45 2014 +0100 pidl-waf: Check for system perl(Parse::Yapp::Driver). Signed-off-by: Andreas Schneider Reviewed-by: Stefan Metzmacher commit 410ada45b7041be6976fcfefadccbb99212a15a3 Author: Andreas Schneider Date: Fri Feb 28 15:59:41 2014 +0100 pidl-waf: Add a function to check for a system perl module. Signed-off-by: Andreas Schneider Reviewed-by: Stefan Metzmacher commit 17244ef750f699b30ff7ff3a71264f4c76adad6d Author: Andreas Schneider Date: Fri Feb 28 15:53:10 2014 +0100 pidl-waf: Install pidl modules to the perl vendorlib directory. Signed-off-by: Andreas Schneider Reviewed-by: Stefan Metzmacher commit 0bb6b0102f6fa21e6c9f8010421386a660c5a5e0 Author: Andreas Schneider Date: Fri Feb 28 15:54:09 2014 +0100 pidl-waf: Remove unused variable pidl_src. Signed-off-by: Andreas Schneider Reviewed-by: Stefan Metzmacher commit 87976b4e45bd71b086e9201f0d0a563b9071ca4a Author: Andreas Schneider Date: Fri Feb 28 15:46:01 2014 +0100 Revert "pidl: Install pidl files corrently." This reverts commit cee11cfa4544425099268cd32393169afb4bb107. Reviewed-by: Andreas Schneider Reviewed-by: Stefan Metzmacher commit c2d58c3c2059ef3d43f876df547cbc7256235563 Author: Andreas Schneider Date: Fri Feb 28 15:45:51 2014 +0100 Revert "waf: Add option to specify perl vendor dir." This reverts commit 9b200555fec2e33da9521db388d1839375aa8d83. Reviewed-by: Andreas Schneider Reviewed-by: Stefan Metzmacher commit c46aaf1102da5e8ba53e9f89f2f756fe8dce83c5 Author: Andreas Schneider Date: Fri Feb 28 15:45:35 2014 +0100 Revert "pidl: Make perl(Parse:Yapp:Driver) installation optional." This reverts commit f0030c619bcf22dbe9eed54b2c0dc9c61f564838. Reviewed-by: Andreas Schneider Reviewed-by: Stefan Metzmacher commit f0030c619bcf22dbe9eed54b2c0dc9c61f564838 Author: Andreas Schneider Date: Thu Feb 27 13:14:56 2014 +0100 pidl: Make perl(Parse:Yapp:Driver) installation optional. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472 Signed-off-by: Andreas Schneider Reviewed-by: Jelmer Vernooij Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Thu Feb 27 18:47:03 CET 2014 on sn-devel-104 commit 9b200555fec2e33da9521db388d1839375aa8d83 Author: Andreas Schneider Date: Tue Feb 25 17:16:37 2014 +0100 waf: Add option to specify perl vendor dir. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472 Signed-off-by: Andreas Schneider Reviewed-by: Kai Blin Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Thu Feb 27 11:48:54 CET 2014 on sn-devel-104 commit cee11cfa4544425099268cd32393169afb4bb107 Author: Andreas Schneider Date: Tue Feb 25 16:04:24 2014 +0100 pidl: Install pidl files corrently. Globbing is a really bad idea in installtion system. One of them is if you use patch -b to create a backup, you will end up installing the backup file too! BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472 Signed-off-by: Andreas Schneider Reviewed-by: Kai Blin Change-Id: I9c4491f0d74c24d7c45a59e98825c789097a0c7b Reviewed-on: https://code.wireshark.org/review/4318 Reviewed-by: Guy Harris commit 6700a12 Author: Guy Harris Date: Fri Sep 26 12:27:13 2014 -0700 Update to current version from Samba Git repository. Changes from Samba Git log: commit fac24e11655c554cd3113dfb6fc918a0fd3c880c Author: Michael Adam Date: Mon Aug 25 23:58:48 2014 +0200 pidl: remove superfluous "use lib ...". BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472 Signed-off-by: Michael Adam Change-Id: I8a2460a9168ef5989e9f5e95b51cca73987b80a4 Reviewed-on: https://code.wireshark.org/review/4317 Reviewed-by: Guy Harris commit 44551d3 Author: Guy Harris Date: Fri Sep 26 12:21:19 2014 -0700 Update to latest version from Samba Git repository. Changes from Samba Git log: commit cf75ef9f73f2cdbf2a039bbc9468f5da6a14834e Author: Stefan Metzmacher Date: Fri May 9 11:49:10 2014 +0200 pidl/lib/wscript_build: make use of PERL_LIB_INSTALL_DIR Bug: https://bugzilla.samba.org/show_bug.cgi?id=10472 Signed-off-by: Stefan Metzmacher Reviewed-by: Andreas Schneider Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Sat May 10 01:37:33 CEST 2014 on sn-devel-104 commit ee8f98f26a3d6f02a0d10ceeac1194675d505246 Author: Andreas Schneider Date: Fri Feb 28 16:00:54 2014 +0100 pidl-waf: Only install Yapp::Driver if it is not available. Signed-off-by: Andreas Schneider Reviewed-by: Stefan Metzmacher Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Thu Mar 6 23:30:47 CET 2014 on sn-devel-104 commit b7b0ca1ba9067362bb8a4b901f3a7f2f3bcbd6a1 Author: Andreas Schneider Date: Fri Feb 28 15:55:46 2014 +0100 pidl-waf: Do not glob to install pidl modules. Signed-off-by: Andreas Schneider Reviewed-by: Stefan Metzmacher commit 17244ef750f699b30ff7ff3a71264f4c76adad6d Author: Andreas Schneider Date: Fri Feb 28 15:53:10 2014 +0100 pidl-waf: Install pidl modules to the perl vendorlib directory. Signed-off-by: Andreas Schneider Reviewed-by: Stefan Metzmacher commit 87976b4e45bd71b086e9201f0d0a563b9071ca4a Author: Andreas Schneider Date: Fri Feb 28 15:46:01 2014 +0100 Revert "pidl: Install pidl files corrently." This reverts commit cee11cfa4544425099268cd32393169afb4bb107. Reviewed-by: Andreas Schneider Reviewed-by: Stefan Metzmacher commit c2d58c3c2059ef3d43f876df547cbc7256235563 Author: Andreas Schneider Date: Fri Feb 28 15:45:51 2014 +0100 Revert "waf: Add option to specify perl vendor dir." This reverts commit 9b200555fec2e33da9521db388d1839375aa8d83. Reviewed-by: Andreas Schneider Reviewed-by: Stefan Metzmacher commit c46aaf1102da5e8ba53e9f89f2f756fe8dce83c5 Author: Andreas Schneider Date: Fri Feb 28 15:45:35 2014 +0100 Revert "pidl: Make perl(Parse:Yapp:Driver) installation optional." This reverts commit f0030c619bcf22dbe9eed54b2c0dc9c61f564838. Reviewed-by: Andreas Schneider Reviewed-by: Stefan Metzmacher commit f0030c619bcf22dbe9eed54b2c0dc9c61f564838 Author: Andreas Schneider Date: Thu Feb 27 13:14:56 2014 +0100 pidl: Make perl(Parse:Yapp:Driver) installation optional. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472 Signed-off-by: Andreas Schneider Reviewed-by: Jelmer Vernooij Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Thu Feb 27 18:47:03 CET 2014 on sn-devel-104 commit 9b200555fec2e33da9521db388d1839375aa8d83 Author: Andreas Schneider Date: Tue Feb 25 17:16:37 2014 +0100 waf: Add option to specify perl vendor dir. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472 Signed-off-by: Andreas Schneider Reviewed-by: Kai Blin Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Thu Feb 27 11:48:54 CET 2014 on sn-devel-104 commit cee11cfa4544425099268cd32393169afb4bb107 Author: Andreas Schneider Date: Tue Feb 25 16:04:24 2014 +0100 pidl: Install pidl files corrently. Globbing is a really bad idea in installtion system. One of them is if you use patch -b to create a backup, you will end up installing the backup file too! BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472 Signed-off-by: Andreas Schneider Reviewed-by: Kai Blin Change-Id: I4372f2c0854743a0339c7d85ace9e67ce9f8bd02 Reviewed-on: https://code.wireshark.org/review/4316 Reviewed-by: Guy Harris commit 788de8d Author: Guy Harris Date: Fri Sep 26 12:16:35 2014 -0700 Update to current version from Samba Git repository. Changes from Samba Git log: commit d29c143fae4b67c9680a0b9773db3461f2d0d2b7 Author: Stefan Metzmacher Date: Thu Mar 27 14:56:23 2014 +0100 pidl:Samba4/Python: add interface.abstract_syntax() to each interface Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett Change-Id: I9f4650c603ea8b2eff05e7b79d7f44452e1337ab Reviewed-on: https://code.wireshark.org/review/4315 Reviewed-by: Guy Harris commit d720fe8 Author: Guy Harris Date: Fri Sep 26 12:10:32 2014 -0700 Update to the latest version from the Samba Git repository. Changes from the Samba Git log: commit 2ba9453e9ff5d911a146e786ff8878ef67717366 Author: Stefan Metzmacher Date: Thu Sep 26 20:38:12 2013 +0200 pidl:NDR/Client: avoid useless memcpy() If the src and dest pointer of memcpy would be the same we should avoid it in order to avoid valgrind warnings. Signed-off-by: Stefan Metzmacher Reviewed-by: Andreas Schneider commit f50b561336c7b6c08300e6e477859d1f9fab62c2 Author: Stefan Metzmacher Date: Thu Sep 26 01:20:10 2013 +0200 pidl:NDR/Client: fix dcerpc_function() with [out,ref] pointers Signed-off-by: Stefan Metzmacher Reviewed-by: Andreas Schneider commit 662fc2de8c2896503026a2a4052ed1ea8ce78af5 Author: Stefan Metzmacher Date: Fri Aug 30 08:54:10 2013 +0200 pidl:NDR/Client: simplify tevent_req_nterror() usage Signed-off-by: Stefan Metzmacher Reviewed-by: Andreas Schneider commit 02c34fe4e51b5e62157eaf2de1d0aaf9fc6b8d72 Author: Stefan Metzmacher Date: Fri Aug 30 08:53:18 2013 +0200 pidl:NDR/Client: add missing TALLOC_FREE(subreq) after dcerpc_binding_handle_call_recv() Signed-off-by: Stefan Metzmacher Reviewed-by: Andreas Schneider Change-Id: I19017fd216df8d8d202b995305f4eb7b7a8b9a35 Reviewed-on: https://code.wireshark.org/review/4314 Reviewed-by: Guy Harris commit df685fc Author: Guy Harris Date: Fri Sep 26 12:05:40 2014 -0700 Update to the latest version from the Samba Git repository. Changes from the Samba log: commit 3a0fa3605b8eb995a8cc4696256129893e1f6f7e Author: Stefan Metzmacher Date: Sat Sep 21 23:46:01 2013 +0200 pidl:Samba3/ServerNDR: skip DCERPC pipe elements and leave NULL pointers. We don't support them anyway, but this lets us adding them to the idl file and only ignore it on the server. Signed-off-by: Stefan Metzmacher Reviewed-by: Andreas Schneider Change-Id: Idbe742fa13e5d3892343fde2b3943f38a6e90a8c Reviewed-on: https://code.wireshark.org/review/4313 Reviewed-by: Guy Harris commit bcae048 Author: Guy Harris Date: Fri Sep 26 12:02:05 2014 -0700 Update to the latest version from the Samba Git repository. From the Samba log: commit bfdc874e8b98c8ea147dbcc986f96ad4f73d800f Author: Jelmer Vernooij Date: Sat Aug 30 01:59:26 2014 +0200 Various updates to the pidl README file. Remove samba3/samba4-specific comments, add comments about backends and files. Change-Id: Id2253ce85eab7a684b2c50d25f6f2604dc146a8e Signed-Off-By: Jelmer Vernooij Reviewed-by: David Disseldorp Autobuild-User(master): David Disseldorp Autobuild-Date(master): Sun Aug 31 23:47:49 CEST 2014 on sn-devel-104 commit 6824f1aa67f0a75df5c94921e334c2b7c7771611 Author: Jelmer Vernooij Date: Sat Aug 30 01:59:25 2014 +0200 Remove trailing whitespace. Change-Id: I1e0948da34bac278edc62cd63dedd08112426e7a Signed-Off-By: Jelmer Vernooij Reviewed-by: David Disseldorp Change-Id: Ifd445bf32aca2d30a6e501fc8c8dd030471ad284 Reviewed-on: https://code.wireshark.org/review/4312 Reviewed-by: Guy Harris commit c90acf2 Author: Gerald Combs Date: Fri Sep 26 08:30:44 2014 -0700 Qt: Capture fixes. Don't check syntax when we rebuild the CaptureFilterCombo. Make sure we switch back to the main window when capturing fails. Change-Id: Id4137e33a8135645f29ca7b2836c76b90f09e3ac Reviewed-on: https://code.wireshark.org/review/4311 Reviewed-by: Gerald Combs commit 69337f1 Author: Alexis La Goutte Date: Fri Sep 26 15:05:42 2014 +0200 Modbus: Add value 90 (0x5A) used by Unity (Schneider) Change-Id: I205f77bccb8ca042da1a699d49844e305612aac2 Reviewed-on: https://code.wireshark.org/review/4307 Reviewed-by: Evan Huus commit 9c8f10e Author: Alexis La Goutte Date: Fri Sep 26 14:53:43 2014 +0200 Modbus: fix indent and add modelines info Change-Id: Idfcdaa13c24791cf2b765b02d8235e9b3a9cd775 Reviewed-on: https://code.wireshark.org/review/4306 Reviewed-by: Evan Huus commit 2d7c113 Author: Gerald Combs Date: Thu Sep 25 16:21:02 2014 -0700 Move the console log handling code to ui/console.[ch]. Change-Id: I8e554a8e17399d78b0ef29dfb68109a219cd9f1b Reviewed-on: https://code.wireshark.org/review/4294 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit ce36b20 Author: Alexis La Goutte Date: Fri Sep 26 11:56:31 2014 +0200 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: Ia0f29a491af920415d6e56f30ef436544f7d5ddf Reviewed-on: https://code.wireshark.org/review/4303 Reviewed-by: Anders Broman commit a7591fb Author: AndersBroman Date: Fri Sep 26 14:57:51 2014 +0200 Added basic decoding of new IEs Change-Id: I7982fe6ccee806b574f780cc2e96d7139a6a74c5 Reviewed-on: https://code.wireshark.org/review/4305 Reviewed-by: Anders Broman commit 4319ab3 Author: AndersBroman Date: Fri Sep 26 13:24:41 2014 +0200 Add basic dissection for new IEs Change-Id: Ie9fc9ac4672a80c82c3b09188752c928b1e7d6c1 Reviewed-on: https://code.wireshark.org/review/4302 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 1275d05 Author: Michal Labedzki Date: Mon Sep 22 10:25:32 2014 +0200 Reduce compilator warnings warning: cast from 'const guint8 *' (aka 'const unsigned char *') to 'const guint16 *' (aka 'const unsigned short *') increases required alignment from 1 to 2 [-Wcast-align] warning: cast from 'const guint8 *' (aka 'const unsigned char *') to 'const struct logger_entry *' increases required alignment from 1 to 4 [-Wcast-align] Change-Id: I1ef8bfedb31c3f633166405689d8d788d45365db Reviewed-on: https://code.wireshark.org/review/4236 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Tested-by: Michal Labedzki Reviewed-by: Michal Labedzki commit e179870 Author: Pascal Quantin Date: Fri Sep 26 10:49:47 2014 +0200 ANSI IS-637 A: remove a useless variable Change-Id: I50077329d6e78ca39312e72eb04b7a5db85b977b Reviewed-on: https://code.wireshark.org/review/4301 Reviewed-by: Pascal Quantin commit 95dc9a9 Author: Guy Harris Date: Thu Sep 25 23:11:34 2014 -0700 Update a comment as per the previous commit. Change-Id: Ic7adba4302d4d4abff7012cf09d68246ebade922 Reviewed-on: https://code.wireshark.org/review/4296 Reviewed-by: Guy Harris commit 92a0cb8 Author: Guy Harris Date: Thu Sep 25 23:05:20 2014 -0700 Renaming libtool* to glibtool* might require root permission. Define DO_MV as "mv" or "sudo mv", depending on whether the user has write access to /usr/local/bin, and use it to rename libtool* to glibtool* and vice versa. Change-Id: Ifbef4daa4521852bc200522743df9d23e7f0d1c2 Reviewed-on: https://code.wireshark.org/review/4295 Reviewed-by: Guy Harris commit 82d1a85 Author: Pascal Quantin Date: Thu Sep 25 23:11:10 2014 +0200 GTP: display SAC as BASE_HEX_DEC Bug: 10490 Change-Id: I0afe1f2ff51f2452830bfc57210dc3a298b68cbf Reviewed-on: https://code.wireshark.org/review/4290 Reviewed-by: Pascal Quantin Reviewed-by: Anders Broman commit a26b751 Author: Pascal Quantin Date: Thu Sep 25 22:40:00 2014 +0200 CFM: display MEP ID in decimal in OAM Y.1731 Synthetic Loss Message and Reply PDU Bug: 10500 Change-Id: I70dab8fb86965fedbe8739e265db81fe310518cf Reviewed-on: https://code.wireshark.org/review/4289 Reviewed-by: Pascal Quantin Reviewed-by: Anders Broman commit ea6fa04 Author: Gerald Combs Date: Wed Sep 24 14:06:23 2014 -0700 Update the simple dialog code. Rename simple_dialog_qt.{cpp,h} to simple_dialog.{cpp,h}. Make it a subclass of QMessageBox. Queue messages at startup similar to GTK+. Move the GTK+-specific simple_dialog declarations to gtk/simple_dialog.h. Don't yell at the user so much. Replace exclamation points with periods. Change-Id: I1cc771106222d5e06f1f52d67ac29d6dc367cce4 Reviewed-on: https://code.wireshark.org/review/4288 Reviewed-by: Gerald Combs commit 2ee45fe Author: Roland Knall Date: Mon Sep 22 11:05:59 2014 +0200 openSAFETY: Heuristic marks packet as truncated - There are cases, where the heuristic detection tries to access bytes, after a correct openSAFETY frame has been detected, leading to "Packet truncated" messages in the correct and complete detected packet Change-Id: Ie389edf82144283ad2c15f0bf975066de01e3409 Reviewed-on: https://code.wireshark.org/review/4237 Reviewed-by: Roland Knall Reviewed-by: Pascal Quantin commit 7c54eb2 Author: Pascal Quantin Date: Thu Sep 25 17:48:26 2014 +0200 ANSI IS-637 A: get rid of tvb_length() deprecated API Change-Id: I40de03605c051024c604679a1e141afa841a77e9 Reviewed-on: https://code.wireshark.org/review/4287 Reviewed-by: Pascal Quantin commit e520b2b Author: Pascal Quantin Date: Thu Sep 25 15:21:11 2014 +0200 ANSI IS-637-A: fix dissection of fragmented Unicode SMS The computation of the number of characters available was wrong when the User Data Header is present Change-Id: I2809c1460316530654a997b26cfc33c60a32fd6f Reviewed-on: https://code.wireshark.org/review/4284 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit db277bc Author: Martin Mathieson Date: Thu Sep 25 16:23:37 2014 +0100 Freeze Info column while dissecting RRC transparent container Change-Id: I30900fd6a73ca38736b3f28eb416820f74003768 Reviewed-on: https://code.wireshark.org/review/4285 Reviewed-by: Martin Mathieson commit a5a8721 Author: AndersBroman Date: Thu Sep 25 16:43:30 2014 +0200 Add comments about new IEs Change-Id: Ibc035872ff6406830a06bcfd365047a6d8c2478f Reviewed-on: https://code.wireshark.org/review/4283 Reviewed-by: Anders Broman commit 0fa7b01 Author: AndersBroman Date: Thu Sep 25 16:25:48 2014 +0200 Add 3 new 3GPP AVP:s Change-Id: I47742f83a7e515f6fc449daf9492dcf8a5a68410 Reviewed-on: https://code.wireshark.org/review/4282 Reviewed-by: Anders Broman commit 91d1c3c Author: Evan Huus Date: Sun Sep 21 22:49:41 2014 -0400 reassembly: fix when fragment cut off by snapshot Also add an assertion to tvb_generic_clone_offset_len so that it throws an error *before* allocating memory, as otherwise that memory is leaked. Bug: 10474 Change-Id: I5036cefac16841914a59670c64979cf599bf7969 Reviewed-on: https://code.wireshark.org/review/4234 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit d094eab Author: Guy Harris Date: Thu Sep 25 01:15:29 2014 -0700 The length of the pktap header isn't fixed, it's a field in the header. Don't assume that, once we've dissected the fields in the header we know about and skipped past them, that the payload follows immediately afterwards; use the header length from the header to find the payload. Bug: 10502 Change-Id: I645fe652240e0068d99cf00d19e3705615857d5b Reviewed-on: https://code.wireshark.org/review/4280 Reviewed-by: Guy Harris commit a87ea36 Author: Guy Harris Date: Thu Sep 25 00:48:43 2014 -0700 Fix a record size check. It was being checked against the wrong value, so some invalid records passed the check. Also, change one comparison (rec_size is in the range [0, 65535], even though it's in an int, so we can safely cast it to guint) and fix the metadata length value when reading Ethernet packets. Bug: 10495 Change-Id: I2ce5c93fe50d836ec0accfcdef31654ba6b5b7c7 Reviewed-on: https://code.wireshark.org/review/4278 Reviewed-by: Guy Harris commit 38ae61f Author: Guy Harris Date: Wed Sep 24 20:32:26 2014 -0700 radcom_read_rec() should always read from the file specified by the fh argument. It's called both from the read and seek-read routines, so it shouldn't always read from the sequential handle. Change-Id: I8cb33b9f5b7219f335b0aeeef29c479916276f89 Reviewed-on: https://code.wireshark.org/review/4276 Reviewed-by: Guy Harris commit 42018cf Author: Evan Huus Date: Wed Sep 24 09:07:50 2014 -0400 pcapng: respect the fact that wblock->data is a union Make sure to zero the *entire* thing, and only access it as a given type when that's the type indicated by the (non-union) type field. Bug: 10498 Change-Id: I3e94a9c5d399d3ee4aedcd49f1aa2d7678ecf7ce Reviewed-on: https://code.wireshark.org/review/4273 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit a1604bd Author: Alex Badea Date: Wed Sep 17 14:40:48 2014 +0300 test: add decryption test for isakmp with certificates This was suggested in review 2297. Capture and key are from bug 7951. Bug: 7951 Change-Id: I820c5e839b20ec464cc1be438633d5311f657fb2 Signed-off-by: Alex Badea Reviewed-on: https://code.wireshark.org/review/4143 Reviewed-by: Evan Huus commit 4652f95 Author: Gilles Roudiere Date: Mon Sep 22 19:42:59 2014 +0200 Added a new DSR dissector Added a new dissector for the Dynamic Source Routing (DSR) protocol (RFC 4728) It should correctly dissect all DSR packets, including the "Flow State Extension" DSR packets. See Bug #10499 for capture file Change-Id: Ie33a1a2fe095cab19d5abfbfa8e1c79fec664a35 Reviewed-on: https://code.wireshark.org/review/4251 Reviewed-by: Bill Meier commit 8fc2327 Author: Gerald Combs Date: Tue Sep 23 16:39:52 2014 -0700 Qt: Fix preference bugs. Make sure we set the "resolved" member of the column fmt_data struct. Emitting WiresharkApplication::AppSignals from a modal dialog can cause event loop problems on OS X. Queue them up in PreferencesDialog and emit them after closing. Change-Id: I2de77778a0448db3b87d402e431b8e5f325cbbda Reviewed-on: https://code.wireshark.org/review/4274 Reviewed-by: Gerald Combs commit ffe30fb Author: Martin Mathieson Date: Tue Sep 23 18:05:56 2014 +0100 Allow the HandoverPreparationInfoPDU dissector to be looked up by name and called. Change-Id: I9c22b74d5c3329b6c7d74547d26e940c84ffc66c Reviewed-on: https://code.wireshark.org/review/4247 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 5f096ac Author: Guy Harris Date: Tue Sep 23 17:09:46 2014 -0700 Fix presumed cut-and-pasteo. On errors *other* than a short read, we were driving on and processing the non-data that we didn't read. Change-Id: I6289ddf31ff7896918a030af9d1261bdc194e7d3 Reviewed-on: https://code.wireshark.org/review/4270 Reviewed-by: Guy Harris commit 31e8699 Author: Gerald Combs Date: Tue Sep 23 13:35:10 2014 -0700 Qt: Add zoom and column resize actions. Plumb signals and slots for changing the text size in the main window. Remove the bold font code from WiresharkApplication. It was only used in ByteViewText. Adjust the icons a bit. Bug: When we change the font preferences the packet list stops drawing cached strings. I haven't been able to track down the cause. Change-Id: I609d740c9f26265628fa4b7de1b75b0e56651387 Reviewed-on: https://code.wireshark.org/review/4269 Reviewed-by: Gerald Combs commit 3a85a5e Author: AndersBroman Date: Tue Sep 23 17:02:13 2014 +0200 Add decoding of part of access network identifier option fixes Bug 10492. Change-Id: Ib01f457b74825e6c2a7aa1dc1d0f43ff4b104dea Reviewed-on: https://code.wireshark.org/review/4267 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 717ff08 Author: Gerald Combs Date: Mon Sep 22 16:33:05 2014 -0700 Qt: Add the colorization action. Change-Id: I846a48c35c4ef3bbbcf17d03885acc5be8c9a6b5 Reviewed-on: https://code.wireshark.org/review/4259 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit ad6a663 Author: Evan Huus Date: Tue Sep 23 00:26:28 2014 -0400 pcapng: ensure the values we now free are initialized Should fix the remaining test suite failures. Change-Id: I50a6cb1bf57bd6a973d4777349708b75aeb41620 Reviewed-on: https://code.wireshark.org/review/4264 Reviewed-by: Evan Huus commit 7255380 Author: Gerald Combs Date: Mon Sep 22 20:31:31 2014 -0700 Try to fix dist. Change-Id: I73d269c67a0ad5bb6f67fef8da5fc4ca86f169e3 Reviewed-on: https://code.wireshark.org/review/4263 Reviewed-by: Gerald Combs commit d3cd4c4 Author: Gerald Combs Date: Mon Sep 22 09:59:02 2014 -0700 Qt: Re-enable menu icons. The GNOME HIG says "Where a corresponding toolbar icon exists, a menu icon should mirror its design." The Windows and OS X HIGs say that you should use them for common or familiar actions but otherwise avoid clutter. I think icons in the "File" menu look like crap. Try to strike a balance. Use the 16x16 application icon for both the main web site and the wiki since that's the favicon used on both sites. Assume that "Reload" isn't used very often and remove it from the toolbar. Don't use a menu icon for the about box. Other minor fixups. Change-Id: I855211c218d266c2e9ed5acbe05a08750ab6d157 Reviewed-on: https://code.wireshark.org/review/4246 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit be32460 Author: Guy Harris Date: Mon Sep 22 18:37:50 2014 -0700 Make peekclassic_read_packet_v56() more like the _v7 version. We can't use wtap_file_read_expected_bytes() in the _v7 version, as that version returns an int, not a Boolean; just expand wtap_file_read_expected_bytes() in the _v56 version, to make it look similar to the _v7 version. Change-Id: Id907bac265c123ad5821591c1cf081b5747724d8 Reviewed-on: https://code.wireshark.org/review/4262 Reviewed-by: Guy Harris commit e543818 Author: Guy Harris Date: Mon Sep 22 18:13:59 2014 -0700 Remove misuse of wtap_file_read_expected_bytes(). wtap_file_read_expected_bytes() is a macro that can return a Boolean FALSE; it should not be used in routines that don't return a Boolean. In addition, both EOF *and* a short read, in that routine, should be treated as a "not an IPFIX file" indication. While we're at it, a seek failure should be treated as an error. Change-Id: I97815bc9e78169ded567b60835cc7bcf6a0e6f0c Reviewed-on: https://code.wireshark.org/review/4261 Reviewed-by: Guy Harris commit 6ebffcc Author: Guy Harris Date: Mon Sep 22 17:59:39 2014 -0700 Make sure the option string pointers are set before freeing them. Change-Id: If86327a02e4fac7d3ed2d02b2a0c95906209dea0 Reviewed-on: https://code.wireshark.org/review/4260 Reviewed-by: Guy Harris commit bd43331 Author: Bill Meier Date: Mon Sep 22 19:06:12 2014 -0400 packet-openflow_v1.c: Rename "Padding" fields & filter-names to be consistent with those in packet-openflow_v5.c Change-Id: Idd78b49cad86db6f63b4f14edbf4d954120665e3 Also: remove some commented-out "Padding" hf[] entries. Reviewed-on: https://code.wireshark.org/review/4257 Reviewed-by: Bill Meier commit 4c3655e Author: Bill Meier Date: Mon Sep 22 18:36:27 2014 -0400 packet-openflow_v1.c: Fix a bug in dissection of openflow_features_reply_v1 Fixes Bug #10493 Change-Id: Ia330a7b087ea184865fc437d77ee6ca57b1f2e44 Reviewed-on: https://code.wireshark.org/review/4256 Reviewed-by: Bill Meier commit 02d50a5 Author: Evan Huus Date: Mon Sep 22 16:55:32 2014 -0400 Ensure pcapng application name is dynamically allocated I was hasty with my original fix... Change-Id: I339994c1afc34274a5d73eff98c4ebbf030e0f36 Reviewed-on: https://code.wireshark.org/review/4255 Reviewed-by: Evan Huus commit df35a95 Author: Evan Huus Date: Mon Sep 22 16:53:02 2014 -0400 Ensure pcapng application name is always dynamically allocated Change-Id: I408944dfb0fa35bae6019ed0d6d810525b2ffcae Reviewed-on: https://code.wireshark.org/review/4254 Reviewed-by: Evan Huus commit 1db95f7 Author: Evan Huus Date: Mon Sep 22 07:43:14 2014 -0400 pcapng: don't leak block option strings I *think* I got all the cases; I got most of them, at any rate, and enough to shut up valgrind in all the test cases I ran. Change-Id: I393bac0756f577b65e400b792f6719fa6ec4056a Reviewed-on: https://code.wireshark.org/review/4244 Reviewed-by: Michael Mann Reviewed-by: Evan Huus commit ec5915a Author: Guy Harris Date: Mon Sep 22 11:53:34 2014 -0700 Make style more consistent. Change-Id: I4ba40504d8cc308f7c13b465fcfaa9ff5eeebcf2 Reviewed-on: https://code.wireshark.org/review/4252 Reviewed-by: Guy Harris commit 72805be Author: Guy Harris Date: Mon Sep 22 11:50:02 2014 -0700 Consistently use tab indentation. (If somebody wants to convert the entire file to 4-space indentation, go ahead.) Change-Id: I1e3829289ac67db79eea2eb16e6a4ba40c449a8d Reviewed-on: https://code.wireshark.org/review/4250 Reviewed-by: Guy Harris commit 05d1f60 Author: Gerald Combs Date: Mon Sep 22 11:10:06 2014 -0700 Fix dist. Change-Id: I68963f000dc927398d7d41193674e55050e7c634 Reviewed-on: https://code.wireshark.org/review/4248 Reviewed-by: Gerald Combs commit 2474af6 Author: Gerald Combs Date: Sun Sep 21 13:28:29 2014 -0700 Qt: Use wsiconcap while we're capturing. Set the main window icon to the "wsiconcap" version while we're capturing similar to the GTK+ version. Verified on Windows. Not sure if this will do anything on other platforms. Change-Id: I9b082601a2c47e5f52cc38ac8d9b4d9f5fb9a4d9 Reviewed-on: https://code.wireshark.org/review/4230 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 19d55ca Author: Bill Meier Date: Mon Sep 22 10:26:33 2014 -0400 fix-encoding-args.pl: Don't use a feature available only starting with perl 5.14 Specifically: Window msys git uses an earlier version of Perl (5.8) and thus invoking fix-encoding-args.pl in the pre-commit hook script gives a Perl syntax error. See https://code.wireshark.org/review/4172 for details (Also see following for Perl info: http://www.perl.com/pub/2011/05/new-features-of-perl-514-non-destructive-substitution.html) Change-Id: I95a222eaa31942cc6e873ffbde57c5fa5bd2a625 Reviewed-on: https://code.wireshark.org/review/4245 Reviewed-by: Bill Meier commit aac1cb2 Author: Michal Labedzki Date: Fri Aug 29 10:43:31 2014 +0200 Bluetooth: Handle LE ACL session Low Energy use LE Meta event for creating connection so add session when it occur. Change-Id: I6fad42651a3dc6a45cfb1cf679660de5955e76b0 Reviewed-on: https://code.wireshark.org/review/4168 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki commit eab7961 Author: Michal Labedzki Date: Tue Aug 26 12:29:49 2014 +0200 extcap: Always create extcap/ dir in run/ Change-Id: I5d0a2591b9086a138cefb0019f710ffb34a34c52 Reviewed-on: https://code.wireshark.org/review/3876 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki commit 56a09d2 Author: Michal Labedzki Date: Wed Jul 23 12:26:05 2014 +0200 Try to fix some buildbot warnings Most interesting are: warning: cannot optimize loop, the loop counter may overflow [-Wunsafe-loop-optimizations] warning: ISO C forbids zero-size array [-Wpedantic] warning: ISO C90 doesn't support unnamed structs/unions [-Wpedantic] warning: cast discards '__attribute__((const))' qualifier from pointer target type [-Wcast-qual warning: initializer element is not computable at load time [enabled by default] Change-Id: I5573c6bdca856a304877d9bef643f8c0fa93cdaf Reviewed-on: https://code.wireshark.org/review/3174 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki commit c1d6a41 Author: Guy Harris Date: Mon Sep 22 03:47:24 2014 -0700 Clean up reading code. The only place where a short read should be treated as an EOF is if the read of the block header reads 0 bytes. All other short reads, including reads of the block header returning at least 1 byte but not enough for a complete block header, and any reads of the stuff *following* the block header even if they return 0 bytes, should be treated as "short read" errors. If the option length is bigger than the option buffer size, treat that as a bad file (I'm not sure that can happen, so maybe it should be treated as an internal error instead). Use file_skip() rather than file_seek() when skipping forward N bytes. If it fails, treat that as an error under all circumstances. When reading the first section header block in the open routine, have pcap_read_block() return -2 if it doesn't look like an SHB (too short, wrong block type, bad block length, unknown byte-order magic number), as that means the file isn't a pcap-ng file and the open should return 0. Return -1, not 0, for all errors in various block-reading routines. file_seek() returning 0 is *not* an error. file_seek() returning -1 (or any other negative number *is* an error; its return value is signed, so don't assign it to an unsigned variable. This might fix the test errors for the Lua file format handler tests. Change-Id: Ifa7d9834c38bf238461c9cc9625a2aa761cb6ff2 Reviewed-on: https://code.wireshark.org/review/4238 Reviewed-by: Guy Harris commit a886f8f Author: Wasim Abu Moch Date: Wed Sep 17 19:14:52 2014 +0300 packet-infiniband: added support for RoCE-v2 (RRocE) Added support for the new Routable RDMA over Converged Ethernet. (NEW PATCH) Change-Id: I857a27c4f29cc78fcea8efa113e3c7e968eb041b Reviewed-on: https://code.wireshark.org/review/4156 Reviewed-by: Evan Huus commit b8065a5 Author: Evan Huus Date: Sun Sep 21 22:10:33 2014 -0400 dcerpc: correctly initialize certain struct fields Bug: 10482 Change-Id: I4d39d6a79d4ab89685a17a0c622c6181e4fada3d Reviewed-on: https://code.wireshark.org/review/4233 Reviewed-by: Evan Huus commit e483772 Author: Jeff Morriss Date: Sun Sep 21 21:36:14 2014 -0400 Fix up formatting (bring function names over to column 0). Change-Id: I054f3ec13fd5907c8f1e0546292777a5596fc029 Reviewed-on: https://code.wireshark.org/review/4232 Reviewed-by: Jeff Morriss commit a1840c2 Author: Pascal Quantin Date: Sun Sep 21 21:01:51 2014 +0200 Fix dissection of 7 bits ASCII/GSM strings when the bit offset is not byte aligned Bug: 10491 Change-Id: Ib55d83b7739050ba5afd84e8184af3c4608d5776 Reviewed-on: https://code.wireshark.org/review/4228 Tested-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 5d1aafb Author: Gerald Combs Date: Sat Sep 20 19:27:24 2014 -0700 Qt: Multi-state capture start icon. Add ".on" versions of the x-capture-start icon along with corresponding code in the StockIcon constructor to look for ".on" variants and add them with the QIcon::On state. Make the plain versions of x-capture-start blue to match the general application icon. The goal is to make the toolbar and app icon fins blue when Wireshark is "at rest" and green when it's capturing. Change-Id: I31f4f9d910fc99c41d7c63bd9a722db1611760c7 Reviewed-on: https://code.wireshark.org/review/4225 Reviewed-by: Gerald Combs commit e1a420a Author: Gerald Combs Date: Sun Sep 21 08:05:28 2014 -0700 [Automatic manuf, services and enterprise-numbers update for 2014-09-21] Change-Id: I1057fe3657c400a6a0b10a67a7e2451d1266bf44 Reviewed-on: https://code.wireshark.org/review/4222 Reviewed-by: Gerald Combs commit 1952d95 Author: Gerald Combs Date: Sat Sep 20 14:49:25 2014 -0700 CMake: Add conditional builds. In my version of XCode ranlib complains bitterly and returns an error if a module has no symbols. Make the AirPcap, RTP player, and remote capture code conditional. We could also try passing "-no_warning_for_no_symbols" to ranlib but we probably shouldn't try to comple the code in the first place. Change-Id: Ide4f3d649eac354d54f0dde27dbc8e9cb270c65f Reviewed-on: https://code.wireshark.org/review/4220 Reviewed-by: Gerald Combs Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit 5e231d1 Author: Guy Harris Date: Sat Sep 20 15:51:10 2014 -0700 Fix wslua_filehandler_open() to work as wiretap open routines should. They should return 1 on success, -1 on error, and 0 if there was no error but the file isn't one of the type for the routine. They must not return any other value. If they return -1, they must set *err. Change-Id: I0f1e1675b4cc8f0214ad67a23de0e4ecb09cabea Reviewed-on: https://code.wireshark.org/review/4221 Reviewed-by: Guy Harris commit 8605bbf Author: Michael Mann Date: Sat Sep 20 18:11:05 2014 -0400 Restore the inclusion of request.cnf.c and response.cnf.c in the generated DCE/RPC MAPI dissector. Also remove the use of proto_tree_add_text for something filterable. Change-Id: I7c252fb24f5ab51e4d1913fe3b0e520a4150baec Reviewed-on: https://code.wireshark.org/review/4214 Reviewed-by: Michael Mann commit be7f053 Author: Guy Harris Date: Sat Sep 20 13:18:53 2014 -0700 Report (and free) err_info for WTAP_ERR_DECOMPRESS. Change-Id: I61ecc58be4b0688c43df0b0f006fb899bdc1721c Reviewed-on: https://code.wireshark.org/review/4216 Reviewed-by: Guy Harris commit e419ea8 Author: Gerald Combs Date: Sat Sep 20 13:10:48 2014 -0700 Qt: Update the x-capture-file-close icon. Change-Id: I9ea4fe42ccdbc85c8c3f22a426b6e08d595a7460 Reviewed-on: https://code.wireshark.org/review/4215 Reviewed-by: Gerald Combs commit 047bd36 Author: Alexis La Goutte Date: Sat Sep 20 18:32:17 2014 +0200 PIDL: fix trailing tabspace Change-Id: If3b623d82d6bbbf9943a35c8885620881eedb091 Reviewed-on: https://code.wireshark.org/review/4204 Reviewed-by: Michael Mann commit 8576e1c Author: Gerald Combs Date: Thu Sep 18 14:09:55 2014 -0700 Qt: Add stock icons. The new icons are patterned after the existing capture icons. They could probably benefit from some adjustments here and there. Start moving toward icon names and a directory layout compliant with freedesktop.org's Icon Naming Specification and Icon Theme Specification. We aren't fully compliant and might never be but anyone with exposure to FDO icon themes should at least know where everything is. Make Capture Start (x-capture-start) the first icon in the toolbar. Define the Colorize Packets, Auto Scroll, and zoom icons even though the Qt UI doesn't use them yet. Leave the Capture Filter, Display Filter, Coloring Rules, Preferences, and Help icons off for now. The GTK+ toolbar is overly cluttered and I'm not sure they're necessary. Try not to break ui/gtk/toolbar_icons.h. Remove welcome.qrc. I initially added it in case we needed to overlay the welcome screen with translucent .pngs but that never happened. To do: - Move the old GTK+ icons to their own directory. - Find a better name for the "toolbar" directory. "stock"? - Make the toolbar configurable. Change-Id: Ie07592113d307b8db786aedace672312a870fe38 Reviewed-on: https://code.wireshark.org/review/4182 Reviewed-by: Gerald Combs commit 801824b Author: Alexis La Goutte Date: Wed Aug 27 21:50:14 2014 +0200 Add .travis.yml for Travis CI (for Github user...) 4 jobs * autotools / gcc * autotools / clang * cmake / gcc * cmake / clang Change-Id: Ifc5b079415232b77680c87b2dee441566e08c835 Reviewed-on: https://code.wireshark.org/review/3944 Reviewed-by: Evan Huus Reviewed-by: Alexis La Goutte commit 29d9114 Author: Guy Harris Date: Sat Sep 20 12:16:15 2014 -0700 Make load_cap_file() just return a success/fail indication. We don't care *why* it fails; it's printed a message to indicate that. Just have it indicate whether it succeeded or not. Change-Id: I98160999baa5f25ea03ef803b7dbf77dff1518de Reviewed-on: https://code.wireshark.org/review/4213 Reviewed-by: Guy Harris commit 22a0d65 Author: Guy Harris Date: Sat Sep 20 12:06:58 2014 -0700 Free err_info on WTAP_ERR_DECOMPRESS. Change-Id: I57fbb17baf43b0f1365fef72778ac0e65935456a Reviewed-on: https://code.wireshark.org/review/4210 Reviewed-by: Guy Harris commit 10b33c0 Author: Guy Harris Date: Sat Sep 20 11:53:51 2014 -0700 Remove file_error() calls after pcap_read_block() calls. pcap_read_block() takes err and err_info arguments, and sets them on error; no need to call file_error() if pcap_read_block() fails. Change-Id: I33b96d31395bf7d66abdecbebd5cf775e8662004 Reviewed-on: https://code.wireshark.org/review/4209 Reviewed-by: Guy Harris commit 32c38a4 Author: Guy Harris Date: Sat Sep 20 11:30:57 2014 -0700 Add file_error() calls after file_read(). If file_read() doesn't return the exact number of bytes you asked for, and you really need all those bytes to be there, you have to call file_error() to find out what the problem is. Change-Id: I4cc87bc1b6cc5a49bbcbf93b56106f57af290d20 Reviewed-on: https://code.wireshark.org/review/4205 Reviewed-by: Guy Harris commit 2cd9784 Author: Jeff Morriss Date: Thu Sep 18 16:19:33 2014 -0400 Fix sizing of qtshark based on the saved (recent) geometry. Do this by emitting the StaticRecentFilesRead signal after reading the static portion of the recent file. Unfortunately this results in the main window appearing in one size and then resizing to the saved size but I haven't figured out how to fix that yet. At the very least this prevents qtshark's default geometry from being saved to my recent file and affecting wireshark-gtk's geometry. Change-Id: I47b66078a9d00cb321badc744f1337ff39ca42a7 Reviewed-on: https://code.wireshark.org/review/4177 Reviewed-by: Evan Huus commit 845e5e5 Author: Alexis La Goutte Date: Thu Sep 18 22:15:39 2014 +0200 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I5bfbfc03795cd8ba3cd102d2249672ce3e48bc5f Reviewed-on: https://code.wireshark.org/review/4179 Reviewed-by: Evan Huus commit 846a933 Author: Michal Labedzki Date: Fri Aug 22 15:33:17 2014 +0200 Bluetooth: HCI: Add support for user/vendor commands Some Vendors can provide own subset of HCI commands/events, so provide them possibility to write own dissectors and use them by "Decode As". Change-Id: I87ff60ae12ac63ddd4b12b26951aa9f5143eabc6 Reviewed-on: https://code.wireshark.org/review/4166 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann Reviewed-by: Evan Huus commit 3623fce Author: Josip Medved Date: Wed Sep 17 22:47:45 2014 -0700 Added Wx Application-Id. Change-Id: I46152382be0a374019d51f18e7116aad8241e95a Reviewed-on: https://code.wireshark.org/review/4162 Reviewed-by: Alexis La Goutte Reviewed-by: Evan Huus commit ba8617f Author: kardam Date: Sun Sep 14 03:01:05 2014 +0200 Add -I option in editcap to extend Duplicate packet removal Description: Ignore the specified bytes number at the beginning of the frame during MD5 hash calculation. Useful to remove duplicated packets taken on several routers or SW(differents mac addresses for example). e.g. -I 26 in case of Ether/IP/ will ignore ether(14) and IP header(20 - 4(src ip) - 4(dst ip)). The default value is 0. This option is only relevant when used with -d|-D|-w Bug: 8511 Change-Id: I009a09d32778a182b2d88f372651f658a4938882 Reviewed-on: https://code.wireshark.org/review/4104 Tested-by: Evan Huus Reviewed-by: Evan Huus commit 2154e23 Author: Evan Huus Date: Tue Sep 16 21:34:37 2014 +0000 ssl: allocate regexes with glib they're stored in a static variable so we only ever need compile them once and they can just hang around forever Change-Id: Icf43745ad80f4984443a67af21c979625363fc6f Ping-Bug: 10474 Reviewed-on: https://code.wireshark.org/review/4139 Reviewed-by: Evan Huus commit 3c55419 Author: Guy Harris Date: Sat Sep 20 10:45:28 2014 -0700 Set err_info if the attempts to read record headers fail. If it fails due to, for example, the file being gzipped and having a bad gzip CRC, the error returned is WTAP_ERR_DECOMPRESS and, for that error, err_info is expected to be set to a string giving details of the problem, so we need to pass back to our caller the string in question. Bug: 10484 Change-Id: I3aa2a92d04fcc08946ff073a40efa708079bbb3e Reviewed-on: https://code.wireshark.org/review/4201 Reviewed-by: Guy Harris commit 06237e4 Author: Michael Mann Date: Fri Sep 19 22:23:27 2014 -0400 proto_tree_add_text -> proto_tree_add_subtree[_format] for DCE/RPC dissectors. Change-Id: I84755d059ef70ca98b0e7626b6425360daf0529d Reviewed-on: https://code.wireshark.org/review/4199 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 1e47e05 Author: Pascal Quantin Date: Thu Sep 18 07:20:01 2014 +0200 6LoWPAN: fix encapsulating address decoding when a Mesh header is present Bug: 10462 Change-Id: I37d532edc41193123b1a7bb380d48cb76c118bf4 Reviewed-on: https://code.wireshark.org/review/4161 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin Reviewed-by: Michael Mann commit 6f16f26 Author: Guy Harris Date: Sat Sep 20 02:15:44 2014 -0700 The Shomiti document is available on the Wayback Machine. I don't know why it was unavailable at some point, but it appears to be available again. Update the comment to reflect that. Change-Id: I7dc1fcb554e73d3b0fc2bd2fbdf6235e791a4253 Reviewed-on: https://code.wireshark.org/review/4200 Reviewed-by: Guy Harris commit 4fd89b0 Author: Michal Labedzki Date: Mon Sep 1 15:45:49 2014 +0200 Logcat: Fix crashes when try to use logcat_text open routine on binary file Change-Id: Ied0778af9d5ff0e49c6efd4ea9411ae1a72cb8e5 Reviewed-on: https://code.wireshark.org/review/4190 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann Reviewed-by: Alexis La Goutte commit e489df5 Author: Michael Mann Date: Thu Sep 18 22:40:49 2014 -0400 Don't assert that values fit in 32 bits if the NDR64 flag is set. For now, this just pacifies fuzz-testing. If real world examples have this, there needs to be a drastic overhaul to support fields that could be either 32 or 64-bit values. Bug:9329 Change-Id: I3e28808ca0291868a5f84258b0ee1e2a922703c2 Reviewed-on: https://code.wireshark.org/review/4189 Reviewed-by: Michael Mann commit 9fce9ba Author: Michal Labedzki Date: Tue Aug 26 15:37:00 2014 +0200 Bluetooth: ACL/AVDTP: Fix ACL session handling In case like reusing "connection handle" number in next connection (2 -> 3 -> 2 again) AVDTP dissector does not properly dissected packets (it should be Signal, but dissect as Media). Add expert error to all packets that are not in ACL connection. This will show invalid packages (send after dissconnect), however incomplete (mostly beginning) connection will be marked too, but I think it have more pros than cons. Change-Id: I29cf706600cb12c8b93d0188dd2fba18dd5eba88 Reviewed-on: https://code.wireshark.org/review/4167 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit cbe7741 Author: Gerald Combs Date: Fri Sep 19 08:44:58 2014 -0700 Update the documentation to use "Wireshark.pro". Change-Id: I024a882030e489cbd273a4245b0cd3be656f060f Reviewed-on: https://code.wireshark.org/review/4191 Reviewed-by: Gerald Combs commit a58c986 Author: Michael Mann Date: Thu Sep 18 00:10:51 2014 -0400 Update generated DCE/RPC dissectors. Now all generated dissectors can successfully compile. Change-Id: I74728926915d5a9f1694cc49c753b80f213df767 Reviewed-on: https://code.wireshark.org/review/2598 Reviewed-by: Alexis La Goutte Reviewed-by: Michael Mann commit b794004 Author: Bill Meier Date: Thu Sep 18 22:29:29 2014 -0400 packet-http2.c: Do encoding-arg changes (all benign) For: - FT_BYTES: Always use just ENC_NA - integral/floating (other than FT_[U]INT8): Do ENC_NA --> ENC_BIG_ENDIAN Change-Id: I0885f7d110014cb8a7eba1c1892ed8d0852d076a Reviewed-on: https://code.wireshark.org/review/4187 Reviewed-by: Bill Meier commit ea1b746 Author: Bill Meier Date: Thu Sep 18 22:25:01 2014 -0400 packet-http2.c: Fix a very minor bug - incorrect fetch/display of hf_http2_push_promise_r field Change-Id: Iddf2db4807713017519b5abcbff3ba824b3624c6 Reviewed-on: https://code.wireshark.org/review/4186 Reviewed-by: Bill Meier commit cd7a11c Author: Bill Meier Date: Thu Sep 18 21:56:44 2014 -0400 Add editor modelines; Adjust indentation as needed. Change-Id: Ie8d4056ab706bbc85c8247682b1a64ea98bc89f2 Reviewed-on: https://code.wireshark.org/review/4185 Reviewed-by: Bill Meier commit 18d7298 Author: Bill Meier Date: Thu Sep 18 21:18:34 2014 -0400 Do encoding-arg changes (all benign) For: - FT_BYTES: Always use just ENC_NA - integral/floating (other than FT_[U]INT8): Do ENC_NA --> ENC_BIG_ENDIAN Also: - FT_UINT... --> FT_UINT8 in a few cases (to match proto_tree_add_item...) - Change one case of incorrect '||' to '|' Change-Id: I427e0e61618ff8faf55691c8a695930f67d455b0 Reviewed-on: https://code.wireshark.org/review/4184 Reviewed-by: Bill Meier commit 4bdf514 Author: Bill Meier Date: Thu Sep 18 18:41:57 2014 -0400 fix-encoding-args.pl: Add a few additional fixups; Specifically: A number of cases of the use of the encoding arg "ENC_ASCII | ENC_NA" for FT_BYTES FIELDTYPEs seem to have crept into Wireshark source. Also: Add a ToDo comment as to code rework needed to be able to better *validate* encoding args. Change-Id: I9d4b10b869fe2aef3f20bcd2d7ad6531375aba87 Reviewed-on: https://code.wireshark.org/review/4183 Reviewed-by: Bill Meier commit 7b20afc Author: Pascal Quantin Date: Tue Sep 16 17:34:29 2014 +0200 Qt: add support for some more command line options Change-Id: I63b2c51ba857dc5282897c32594102aad2ef9e2f Reviewed-on: https://code.wireshark.org/review/4127 Reviewed-by: Pascal Quantin commit 3397618 Author: Michal Labedzki Date: Thu Aug 28 08:23:27 2014 +0200 Bluetooth: Fix some Clang Analyzer warnings Logic error Dereference of null pointer epan/dissectors/packet-bthci_acl.c 379 Logic error Dereference of null pointer epan/dissectors/packet-bthci_acl.c 390 Logic error Dereference of null pointer epan/dissectors/packet-btsdp.c 3673 Logic error Dereference of null pointer epan/dissectors/packet-btsdp.c 1439 Logic error Dereference of null pointer epan/dissectors/packet-btsdp.c 1662 Thanks for Alexis La Goutte for pointing that. Change-Id: Ia646b33de9e368d32983efddfaa41edf7896d7fd Reviewed-on: https://code.wireshark.org/review/4165 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 051b000 Author: Bill Meier Date: Thu Sep 18 10:44:56 2014 -0400 fix-encoding-args.pl: Add a few fixups for FT_UINT_STRING Change-Id: Ic22e154859877c48a85b808d0029e10e07876b73 Reviewed-on: https://code.wireshark.org/review/4174 Reviewed-by: Bill Meier commit 36ce5e1 Author: Bill Meier Date: Thu Sep 18 10:35:48 2014 -0400 Fix encoding-arg mostly for FT_UINT_STRING; Also: Do misc as needed. Misc: (as needed) - Add editor modelines; - Adjust whitespace. Change-Id: I0e5d877a2a6273842ad8e771ac0c0acbfcb83200 Reviewed-on: https://code.wireshark.org/review/4173 Reviewed-by: Bill Meier commit dbb01af Author: Bill Meier Date: Wed Sep 17 14:47:17 2014 -0400 fix-encoding-args.pl: Fix bug: certain patterns found only in 1st,3rd,... file checked Another perl "You can't DO that" ... Change-Id: I56e11bec19515f883f15286c6aa45018a255ab53 Reviewed-on: https://code.wireshark.org/review/4172 Reviewed-by: Bill Meier commit 4b15171 Author: Jeff Morriss Date: Thu Sep 18 10:26:35 2014 -0400 Fix compilation when we don't HAVE_GEOIP. We really need a buildbot or Petri-Dish which doesn't have GeoIP because this problem keeps popping up. Bug: 10480 Change-Id: Iccba50dfcafd2dbacb315b9416324de4114be220 Reviewed-on: https://code.wireshark.org/review/4171 Reviewed-by: Jeff Morriss commit 1315ee1 Author: Michal Labedzki Date: Fri Aug 29 15:18:23 2014 +0200 Bluetooth: Fix packet types additional description Change-Id: Idddd491da8b6c1d5d2824121f9c334d864aafb8c Reviewed-on: https://code.wireshark.org/review/4169 Reviewed-by: Michal Labedzki commit fe829dc Author: Michal Labedzki Date: Tue Jun 24 15:57:18 2014 +0200 Update Polish Translation It still not complete. Change-Id: I53c3efe9c6cf0456fcea55336114086445d3bfe9 Reviewed-on: https://code.wireshark.org/review/2719 Reviewed-by: Michal Labedzki commit 39864c1 Author: Michal Labedzki Date: Thu Sep 18 10:47:41 2014 +0200 Logcat: Add more save formats over exported pdu Add all logcat format like brief, threadtime, long, etc. when try to save logcat logs where there is EXPORTED_PDU layer. Change-Id: I338f0bbd46dd8db984efc1c03980c7e9c7401a44 Reviewed-on: https://code.wireshark.org/review/4164 Reviewed-by: Michal Orynicz Reviewed-by: Michal Labedzki Tested-by: Michal Labedzki commit 3b46e6e Author: Joerg Mayer Date: Thu Sep 18 08:05:48 2014 +0200 Having CmakeListsCustom.txt in git defeats the purpose of its existence: If it is used, there is a modified file in git. Fix this by only including the file if it exists. Other changes: - Rename the existing Custom files to CMakeListsCustom.txt.example. - Move the plugins custom file to the top level (same level as its including parent). - Optionally allow a list of custom includes instead of the default one. Change-Id: I8960eac6222f741c045055d43d1d5a2d4979caf6 Reviewed-on: https://code.wireshark.org/review/4163 Reviewed-by: Jörg Mayer commit 84629f4 Author: Joseph Huffman Date: Mon Aug 11 14:26:35 2014 -0700 AJTOOLS-4 Data field not being parsed properly by WireShark plugin if two or more AllJoyn Messages are combined in single TCP packet. Fixed bugs where multiple messages are combined in a single packet. Fixed bugs where a single message is distributed across multiple packets. Fixed bug where arrays of zero length were not dissected properly. Change-Id: Icfb83e73519d8217d6c477edf531ba6d3f3dcd48 Reviewed-on: https://code.wireshark.org/review/4159 Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 5d80686 Author: chrysn Date: Tue Sep 16 08:27:02 2014 +0200 CoAP dissector: Update option numbers from RFC7252 * "Accept" option: The option number was changed late in the specification process. * "Proxy-Scheme" / "Size1": After including those, all option numbers specified in the RFC can be dissected by wireshark. Change-Id: I1b475ac6920fd021e3217cd3b44c173d264a5298 Reviewed-on: https://code.wireshark.org/review/4123 Reviewed-by: Evan Huus Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit b2f03f1 Author: Hannes Mezger Date: Wed Sep 17 15:48:58 2014 +0200 opcua: prefix all hf_register_info with opcua, unify naming Change-Id: I575bd2f93202837b2ce15a39b1b0bd9b5c53f5bf Reviewed-on: https://code.wireshark.org/review/4151 Reviewed-by: Michael Mann commit 095a0e8 Author: Hannes Mezger Date: Wed Sep 17 15:41:27 2014 +0200 opcua: use BASE_NONE instead of 0 Change-Id: I5ca5d41edf1f56b24da6360a10f0c6e2600572d2 Reviewed-on: https://code.wireshark.org/review/4150 Reviewed-by: Michael Mann commit 769a984 Author: Hannes Mezger Date: Wed Sep 17 15:36:59 2014 +0200 opcua: format all hf_register_info tables by aligning them to longest value Change-Id: I0b533edd7bad52922dd1e0aaa2c980e56dd88b78 Reviewed-on: https://code.wireshark.org/review/4149 Reviewed-by: Michael Mann commit d8afd59 Author: Hannes Mezger Date: Wed Sep 17 15:06:03 2014 +0200 opcua: remove unused code Change-Id: I78963640e32393f3ac399e59a659ddf619d15c3d Reviewed-on: https://code.wireshark.org/review/4148 Reviewed-by: Michael Mann commit 17c14d6 Author: Hannes Mezger Date: Wed Sep 17 15:03:54 2014 +0200 opcua: add hint to OPCUA settings tooltip It's unclear how the ports should be separated, this additional text in the tooltip clarifies it Change-Id: I686482522d006024f920a3cc26b83cd21c19f8a5 Reviewed-on: https://code.wireshark.org/review/4147 Reviewed-by: Michael Mann commit ec2a20f Author: Joerg Mayer Date: Thu Sep 18 00:09:06 2014 +0200 Add a missing cast to the sample code Change-Id: Id4f258e0e45e44c1ab63bd77a6fab10013a4810c Reviewed-on: https://code.wireshark.org/review/4160 Reviewed-by: Jörg Mayer commit 7e63805 Author: Gerald Combs Date: Fri Sep 5 11:17:17 2014 -0700 Qt: Add the "Map" button to the Endpoints dialog. Move the map creation code from ui/gtk/hostlist_table.c to ui/traffic_table_ui.c. Add CMake commands to copy ipmap.html to the run directory so that WIRESHARK_RUN_FROM_BUILD_DIRECTORY works for the endpoint map. Not sure if they're entirely correct but they appear to work. Add boundary checkes to geoip_db_lookup_ipv[46]. To do: - It looks like there are prettier maps and newer APIs that we might want to use. Change-Id: Ie06992c9bc9c9aa683328aecab3f5f69c9cab966 Reviewed-on: https://code.wireshark.org/review/4011 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 478fab5 Author: Gerald Combs Date: Thu Sep 11 18:03:31 2014 -0700 Qt: Remove duplicate GeoIP columns. Different GeoIP databases have the same column name, e.g. "City" currently matches two revisions each for IPv4 and IPv6. Map each uniquely named column to a list of databases and populate EndpointTreeWidgetItem columns based on the first database match. Fix a copy/pasteo introduced in g30f3d52: Make sure geoip_db_lookup_ipv[46] returns longitude instead of latitude. Change-Id: Idd31f976dfd1cb011cfa7b5aec14b7031ee0e25e Reviewed-on: https://code.wireshark.org/review/4157 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit f0b4411 Author: Evan Huus Date: Wed Sep 17 14:11:11 2014 +0000 Revert "packet-infiniband: added support for RoCE-v2 (RRocE)" This reverts commit 07078921e42cae2ff31ac6e11951bb9986ffe5db. Change-Id: I5b88f0203558c86562694ca841d28314bff336a5 Reviewed-on: https://code.wireshark.org/review/4152 Reviewed-by: Evan Huus commit 933ae8e Author: Evan Huus Date: Wed Sep 17 09:36:30 2014 -0400 Add missing initializer Change-Id: I60917502ef869bb519b37bb0252371dbc91a608d Reviewed-on: https://code.wireshark.org/review/4146 Reviewed-by: Evan Huus commit 0707892 Author: Wasim Abu Moch Date: Tue Aug 19 18:45:29 2014 +0300 packet-infiniband: added support for RoCE-v2 (RRocE) Added support for the new Routable RDMA over Converged Ethernet. Change-Id: I97bc29fdc92bdcb12888f38383107a965837963e Reviewed-on: https://code.wireshark.org/review/3723 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit c4c8257 Author: Pascal Quantin Date: Wed Sep 17 12:14:32 2014 +0200 GTPv2: further fixes for Trace Information IE dissection Bug: 10470 Change-Id: I8b61e5601379a568da39cce2335122e91ab37ec4 Reviewed-on: https://code.wireshark.org/review/4142 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit d05a44c Author: Sean O. Stalley Date: Mon Sep 15 14:26:05 2014 -0700 Show endpoint direction based on EPHandle bit Interpret the meaning of the endpoint handle direction bit, instead of just saying if it is set. Change-Id: I9fc0d6f95f6c3a94d6db90c8394fe3ca8fc83715 Reviewed-on: https://code.wireshark.org/review/4119 Reviewed-by: Evan Huus commit b53405c Author: Sean O. Stalley Date: Tue Sep 16 14:03:03 2014 -0700 Fixed dissection of 8-byte device descriptors during usb device enumeration, a host may attempt to only read the first 8 bytes of a device descriptor. Dissecting a partial device descriptor was throwing a bounds error. Change-Id: I09cdd356d15153afc93ee478fdd98329495a642a Reviewed-on: https://code.wireshark.org/review/4137 Reviewed-by: Evan Huus commit 4cf9e71 Author: Pascal Quantin Date: Tue Sep 16 19:25:37 2014 +0200 GTPv2: fix dissection of Triggering Events IE Bug: 10470 Change-Id: Ieb9819e578f078e956861a4e2d7ab3d8b96416d6 Reviewed-on: https://code.wireshark.org/review/4130 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit 71bb171 Author: Gerald Combs Date: Tue Sep 16 17:15:56 2014 -0700 Update the docbook directory to use https://www.wireshark.org. Change-Id: Ied91158cb055b0235b4a5106c3eb6b9300997c32 Reviewed-on: https://code.wireshark.org/review/4141 Reviewed-by: Gerald Combs commit 1750391 Author: Gerald Combs Date: Tue Sep 16 17:08:53 2014 -0700 Update the doc directory to use https://www.wireshark.org. Change-Id: I9bfc57cb6b6ab6962b80ff58d98eb351d6f69829 Reviewed-on: https://code.wireshark.org/review/4140 Reviewed-by: Gerald Combs commit b5296f4 Author: Guy Harris Date: Tue Sep 16 14:30:16 2014 -0700 Use tvb_new_subset_length() rather than tvb_new_subset(). We rarely, if ever, want to, or need to, explicitly set the captured length of a packet; we want to set the *reported* length and let the tvbuff code figure out how much of that data was actually captured. Change-Id: I9b93d296197989f677d888b10954589dfc1edc59 Reviewed-on: https://code.wireshark.org/review/4138 Reviewed-by: Guy Harris commit 1cbd9c7 Author: Evan Huus Date: Tue Sep 16 20:28:19 2014 +0000 Fix compilation in weird cases Change-Id: I6c52ea9954a4c96f525e6d064dbf3fc2c71bea68 Reviewed-on: https://code.wireshark.org/review/4136 Reviewed-by: Guy Harris commit 983ae6c Author: Gerald Combs Date: Tue Sep 16 13:12:10 2014 -0700 Fix the patch-bzip2 target. The main site URI scheme is now https. Update the URL in some other places while we're here. Change-Id: Ib03d4fd1c58dabd3cf5050dc4f79216e0b94d525 Reviewed-on: https://code.wireshark.org/review/4133 Reviewed-by: Gerald Combs commit eefdaf6 Author: Jeff Morriss Date: Tue Sep 16 10:02:25 2014 -0400 Fix typo in French translation. Bug: 10471 Change-Id: I0e191d4f6b53a16236953d4e5b80956fa421008e Reviewed-on: https://code.wireshark.org/review/4125 Reviewed-by: Pascal Quantin commit a379ac7 Author: Bill Meier Date: Tue Sep 16 11:25:17 2014 -0400 Fix spelling: cant-->can't, wont-->won't, etc Change-Id: Ia6c3e7a25615bf8e052c3bacf096d76df775c9c2 Reviewed-on: https://code.wireshark.org/review/4126 Reviewed-by: Bill Meier commit b14bf98 Author: Bill Meier Date: Tue Sep 16 09:43:06 2014 -0400 Fix spelling: cant-->can't, wont-->won't, etc Change-Id: I4497f1b8b6eab0e576d9dd31b732965f9a6679c6 Reviewed-on: https://code.wireshark.org/review/4124 Reviewed-by: Bill Meier commit fee9277 Author: Jeff Morriss Date: Mon Sep 15 14:28:07 2014 -0400 Fix some logically dead code reported by Coverity (CIDs 1158807, 1158808, 1229737). Replace some conditional + fprintf + DISSECTOR_ASSERT()s with DISSECTOR_ASSERT_HINT() or just change the DISSECTOR_ASSERT() to DISSECTOR_ASSERT_NOT_REACHED() when the hint requires formatting. Change-Id: I80c7c6579d7755a60d644b5ef60ec4e3299ba0ab Reviewed-on: https://code.wireshark.org/review/4115 Reviewed-by: Evan Huus Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot commit 126b4a6 Author: Bill Meier Date: Mon Sep 15 19:32:13 2014 -0400 expert.[hc] Minor changes: - Fix a few parameter descriptions in expert.h; - Do whitespace changes; - Add editor modelines. Change-Id: I1b75fa88021f1f44bd607cd33d0ab7f9ec672ab7 Reviewed-on: https://code.wireshark.org/review/4122 Reviewed-by: Bill Meier commit 85dceb3 Author: Guy Harris Date: Mon Sep 15 13:43:52 2014 -0700 Handle SRVLOC-over-TCP like other XXX-over-TCP protocols. No need to wrap each SRVLOC PDU, which contains a SRVLOC protocol layer, in *another* SRVLOC protocol layer. Change-Id: I25e05d94bb9968eb4e26b63beb09fd151820d750 Reviewed-on: https://code.wireshark.org/review/4118 Reviewed-by: Guy Harris commit ed7c328 Author: Martin Kaiser Date: Sat Sep 13 21:51:24 2014 +0200 dissect the alphanumeric message that's part of operation 30 Bug: 10464 Change-Id: I1a42877ee549b40e0c739dd2d1cbe4615ed9b9bd Reviewed-on: https://code.wireshark.org/review/4098 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 6422563 Author: Martin Mathieson Date: Mon Sep 15 11:24:18 2014 +0100 Show RRC Release cause in the Info column Change-Id: I138859ce735a9ff6541d6852dec29a13c1034c36 Reviewed-on: https://code.wireshark.org/review/4114 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Reviewed-by: Martin Mathieson commit 8f84fe9 Author: Guy Harris Date: Mon Sep 15 03:13:38 2014 -0700 Clean up handling of the message type. Don't use try_val_to_str() and then never test the result to see whether it's null. Instead, use val_to_str_const(). Don't use proto_tree_add_uint_format_value() to emulate what proto_tree_add_uint() does unless the string for the value isn't computed from the value_string for the field. Also, prepend to the Info column as soon as we have the data with which to do so. Change-Id: Iae9bdfc7c80cbd1ec63e1bbb8d43560adec558bd Reviewed-on: https://code.wireshark.org/review/4113 Reviewed-by: Guy Harris commit f30bba3 Author: Sean O. Stalley Date: Thu Sep 11 18:11:50 2014 -0700 USB feature selectors now per USB 3.1 spec previously per USB 2 spec. Change-Id: Ifb25614785bcaf80148c32938f966c8cdded6be2 Reviewed-on: https://code.wireshark.org/review/4087 Reviewed-by: Evan Huus Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 176bd64 Author: Guy Harris Date: Sun Sep 14 14:08:11 2014 -0700 TRY_TO_FAKE_THIS_ITEM() doesn't take a tvbuff_t * argument. Change-Id: I782f73dd072f515e34ce98892340dc176978a364 Reviewed-on: https://code.wireshark.org/review/4112 Reviewed-by: Guy Harris commit af9d2df Author: Jeff Morriss Date: Fri Sep 12 17:21:53 2014 -0400 Don't try to set the length, end, or text of a faked item. If we try we may (in the case of setting the length or end) mistakenly assert out. Bug: 10329 Change-Id: I52083ba17f6427712a6a363f48f1f7ae51f2b74b Reviewed-on: https://code.wireshark.org/review/4093 Reviewed-by: Evan Huus Reviewed-by: Jeff Morriss commit 36ddf54 Author: Jeff Morriss Date: Fri Sep 12 21:18:49 2014 +0000 Revert "Only fake an item by returning 'tree' if they use the same TVB" This reverts commit 5460d7fa0cd13f84ff567c96ee89d07b37cd4b62. Bug:10329 Change-Id: I6f13f9c18bb23fd10b3a574e42ad2d3f6c7beadb Reviewed-on: https://code.wireshark.org/review/4092 Reviewed-by: Jeff Morriss commit a41c122 Author: Guy Harris Date: Sun Sep 14 10:23:24 2014 -0700 Consistent white space. Change-Id: I7c19a16a671db7b68ef2f680813a9a190ed1e13d Reviewed-on: https://code.wireshark.org/review/4109 Reviewed-by: Guy Harris commit 32ee46b Author: Gerald Combs Date: Sun Sep 14 08:05:34 2014 -0700 [Automatic manuf, services and enterprise-numbers update for 2014-09-14] Change-Id: Ib519e0a0ed3e11eb555c338f2e808b555cc6931d Reviewed-on: https://code.wireshark.org/review/4106 Reviewed-by: Gerald Combs commit e74ae46 Author: Guy Harris Date: Sun Sep 14 02:57:05 2014 -0700 Show BER identifiers and lengths in SNMP variable bindings. If the user turns on the "show internal BER encapsulation tokens" preference, show them the tokens inside SNMP variable bindings. Change-Id: Ief9040f422cb214bbff8e4cfd45a2e05c7106480 Reviewed-on: https://code.wireshark.org/review/4105 Reviewed-by: Guy Harris commit 3031247 Author: Guy Harris Date: Sat Sep 13 17:21:56 2014 -0700 Don't use the captured length as the packet length. Add a routine ber_tvb_new_subset_length() used to construct tvbuffs for parts of the packet, and have it check the specified length against the *reported* length. NOTE: that routine should really take an item and an expert info value as arguments and, if the length is greater than the remaining packet length, add an expert info for that. Also, when counting items in a SEQUENCE-OF: keep track of whether we succeeded in counting them, and report an "unknown number of items" if we didn't; if the length of an item in the SEQUENCE-OF is so big we get an overflow, just bail out of the count loop and indicate that we didn't succeed in counting them - let the error be reported in the process of dissection. Change-Id: I32172737baaed35fc9a0e6c19a727a6ac71ddfb2 Reviewed-on: https://code.wireshark.org/review/4103 Reviewed-by: Guy Harris commit 21adbaa Author: Guy Harris Date: Sat Sep 13 17:10:49 2014 -0700 Don't use the captured length, and don't fetch the version until we need it. The captured length reflects the way the capture was done; it should not affect actual lengths used in the dissection. Don't fetch the version until we need it; that lets us dissect more of the packet if the previous change caused us to throw an exception trying to fetch the version from the correct location rather than not throwing an exception by fetching it from an incorrect location that happens to be within the captured data. Change-Id: I9f63afd4ef51f46c19b3afd2a651a5bb768fecaf Reviewed-on: https://code.wireshark.org/review/4101 Reviewed-by: Guy Harris commit 1277839 Author: Guy Harris Date: Sat Sep 13 16:49:50 2014 -0700 Clean up indentation. Change-Id: Ie43c3a55aa954c1ec640ec90c74356b2b19e4156 Reviewed-on: https://code.wireshark.org/review/4100 Reviewed-by: Guy Harris commit e6d7116 Author: Martin Kaiser Date: Sat Sep 13 21:39:14 2014 +0200 update the URL of the specification Change-Id: I7301a739a28c20ece274293447713fd02ffab385 Reviewed-on: https://code.wireshark.org/review/4097 Reviewed-by: Martin Kaiser commit f0982e2 Author: Gerald Combs Date: Sat Sep 13 10:20:38 2014 -0700 GTK+: Make sure we package up Wireshark-gtk.pdb. Make sure we use $(PROGRAM_NAME_GTK) consistently. We still need to add the Qt UI .pdb to the archive but I'm not in front of a proper Windows development environment right now. Change-Id: Ie917f68e3e8349fc7955b3b7e68d446b6fe88235 Reviewed-on: https://code.wireshark.org/review/4096 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 2838618 Author: Martin Kaiser Date: Wed Sep 10 23:03:57 2014 +0200 when we check the parameter for upper(), lower() or len(), return an error if the parameter is _no_ string Bug: 10401 Change-Id: I5643ef05009072538155e63c3178071ed6bab061 Reviewed-on: https://code.wireshark.org/review/4071 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 6a7414f Author: Joerg Mayer Date: Sat Sep 13 07:31:14 2014 +0200 README.dissector was split from README.developer in 2013 - update some documents referring to the split out sections. Remove trailing whitespace while at this. Change-Id: I36cfe0ac55e8f653bffbf850e01f582aacf85557 Reviewed-on: https://code.wireshark.org/review/4094 Reviewed-by: Jörg Mayer commit 0a0654a Author: Pascal Quantin Date: Fri Sep 12 15:56:29 2014 +0200 IPSec: fix compilation when building without libgcrypt Change-Id: Iea3de2f0a54f9c0703afbeb42722d18da99f5c9a Reviewed-on: https://code.wireshark.org/review/4090 Reviewed-by: Martin Mathieson Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit 5ade437 Author: Guy Harris Date: Fri Sep 12 09:59:34 2014 -0700 Treat a length of -1 as a Very Large Length in most cases. For field types where it doesn't mean "to the end of the tvbuff", treat it like other negative length values - as if it were unsigned and thus Very Large and thus likely to be past the end of the tvbuff. That way, some of the "we hax0red your SNMP packets" captures, with length fields of 0xffffffff, report malformed packets rather than dissector bugs. Change-Id: Id53f828b06b6febe7d79f8539e54523e0b43e5c2 Reviewed-on: https://code.wireshark.org/review/4091 Reviewed-by: Guy Harris commit 887f7f1 Author: Guy Harris Date: Fri Sep 12 01:01:00 2014 -0700 Register hfi_rip_zero_padding. Also, sort the hfi[] array to be in the same order as the declarations of the fields, to make it easier to check that all fields are being registered. Change-Id: Ida530590ebd00bbf206e0f6041b8da880bce2c6f Reviewed-on: https://code.wireshark.org/review/4089 Reviewed-by: Guy Harris commit 9accfd1 Author: Guy Harris Date: Fri Sep 12 00:48:45 2014 -0700 Do FT_{U}INT64 the same way we do other FT_{U}INTn types. Change-Id: Iae9c66fa82abfe20e9e8c922ddedfe87b0ab2abe Reviewed-on: https://code.wireshark.org/review/4088 Reviewed-by: Guy Harris commit 3df42e7 Author: Michael Mann Date: Thu Sep 11 16:43:00 2014 -0400 proto_tree_add_text cleanup Create filters (expert and hf_) that have the "most bang for the buck" (ie have many instances for a single filter) Change-Id: I61995e41c5b298df77e084e65cdf30ebe95da1e6 Reviewed-on: https://code.wireshark.org/review/4086 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 47c5929 Author: Guy Harris Date: Thu Sep 11 13:29:37 2014 -0700 Add some additional checks in SnifferDecompress(). Check the input pointer in the while clause of the loop, so that we handle an empty input buffer. When reading a bit mask, check before fetching the bit mask that we have two bytes of bit mask and the byte after it. Before putting an uncompressed input byte into the output, make sure we wouldn't run past the end of the output buffer. Before copying an earlier string from the output buffer, make sure it doesn't run past the end of the data we've decompressed so far. Bug: 10461 Change-Id: I8bb8d0d291368ae8bf0ac26970ff54d3262a7e6e Reviewed-on: https://code.wireshark.org/review/4083 Reviewed-by: Guy Harris commit ab6ad63 Author: Jeff Morriss Date: Thu Sep 11 15:16:45 2014 -0400 Show the sctp.checksum_bad filter rather than hiding it. Follow TCP's lead by putting the filter in a subtree under the checksum. Change-Id: I9351ee865011cd04bc3d3e88c51e8dbb3dc23f07 Reviewed-on: https://code.wireshark.org/review/4082 Reviewed-by: Jeff Morriss commit 0ec1793 Author: Bill Meier Date: Thu Sep 11 14:19:03 2014 -0400 packet-cfm.c: Update some comments; Add editor modelines. - Indicate that ITU-T G.8013/Y.1731 (11/2013) is the latest spec (and that the cfm dissector has not been updated to reflect same). - Remove a comment about a "discrepancy in the recommendation ITU-T Y.1731". The discrepancy has been corrected in the latest spec. Change-Id: I5a5f873d2a0a5fdee3aef1688403bb317a155cdf Reviewed-on: https://code.wireshark.org/review/4081 Reviewed-by: Bill Meier commit 6e81f1d Author: Jeff Morriss Date: Thu Sep 11 14:10:55 2014 -0400 Don't use tvb_bytes_exist() to check if we captured the whole frame, just compare captured_length to reported_length (which we've already retrieved anyway). Replace calls to tvb_length() with non-deprecated versions. Change-Id: I9f6f3461915573fb21716a87cb6af416a3656097 Reviewed-on: https://code.wireshark.org/review/4080 Reviewed-by: Jeff Morriss commit a8fabb9 Author: Bill Meier Date: Thu Sep 11 12:43:08 2014 -0400 packet-cfm.c: Fix Bug 10385: "Ethernet OAM (CFM) frames including TLV's are wrongly decoded as malformed" Regression introduced in ga06cccb (svn #50352) [Jul 3 16:43:40 2013] Bug 10385 Change-Id: I3f5c5518a5804a1f31cac554323a6fa8d3d55d5d Reviewed-on: https://code.wireshark.org/review/4078 Reviewed-by: Bill Meier commit e485bcd Author: Martin Mathieson Date: Thu Sep 11 17:27:08 2014 +0100 Fix an incorrect comment Change-Id: Ic60c67fcc554b5ceb0b359a992fafd0f84521eef Reviewed-on: https://code.wireshark.org/review/4077 Reviewed-by: Martin Mathieson commit 94f90e5 Author: AndersBroman Date: Thu Sep 11 12:31:47 2014 +0200 Code simplification from Hadriels abandoned change. Change-Id: If859ff904b254d3bc62d1d0dc5cf26cace11cae3 Reviewed-on: https://code.wireshark.org/review/4075 Reviewed-by: Anders Broman commit ca04418 Author: Martin Mathieson Date: Tue Sep 9 23:26:31 2014 +0100 Do simple sequence analysis on ESP Sequence Number field Change-Id: I84e204fb7a84eb821f4728a50945f34f4bdba73f Reviewed-on: https://code.wireshark.org/review/4057 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson commit 29993d5 Author: Michael Mann Date: Wed Sep 10 20:04:22 2014 -0400 Eliminate proto_tree_add_text from some dissectors. Change-Id: Ie41ac30f8edaeee75b23717ef1d5147d804a65b3 Reviewed-on: https://code.wireshark.org/review/4074 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit d5940f5 Author: Jeff Morriss Date: Wed Sep 10 14:29:18 2014 -0400 Clarify that 16777229 is the AppID for 3GPP Rx Release 6. (Later releases have a different AppID.) Change-Id: I41d4a498461e777f570641936db64d0551e36186 Reviewed-on: https://code.wireshark.org/review/4070 Reviewed-by: Anders Broman commit 8a580b3 Author: Michael Mann Date: Wed Sep 10 19:58:33 2014 -0400 Make all "padding" fields filterable Change-Id: Ic4e4d9142a9b05ef3b628fac2e8766014c5fccec Reviewed-on: https://code.wireshark.org/review/4073 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 76d776e Author: AndersBroman Date: Wed Sep 10 18:14:44 2014 +0200 Update to V12.2.0 (2014-06), remove deprecated APIs Change-Id: Icfd140f39a440dda197c6e68a4cb7daec2ae0e09 Reviewed-on: https://code.wireshark.org/review/4066 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 0164b75 Author: Bill Meier Date: Wed Sep 10 12:51:34 2014 -0400 packet-netflow.c: fix bug: "top-of-stack" --> "bottom-of-stack" Bug #10458 Change-Id: I733bb54b13da8dd5b96837b57c1893e14f9622ec Reviewed-on: https://code.wireshark.org/review/4067 Reviewed-by: Bill Meier commit cc286ba Author: Bill Meier Date: Wed Sep 10 12:07:04 2014 -0400 Various minor changes: - Create/use some extended value_strings - Remove unneeded #includes; - Do whitespace changes; - Add editor modelines. Change-Id: I2e1ea37dddfd5e8656c90c0d45a6596c4912bb2c Reviewed-on: https://code.wireshark.org/review/4065 Reviewed-by: Bill Meier commit 4567134 Author: AndersBroman Date: Wed Sep 10 16:30:41 2014 +0200 Update to revission V12.2.0 (2014-06) Remove soft deprecated APIs Change-Id: I30adcb9f381c77142385c22fcc4a208169b0cf5e Reviewed-on: https://code.wireshark.org/review/4062 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit cc412a6 Author: Bill Meier Date: Wed Sep 10 10:24:10 2014 -0400 packet-opensafety.c: Fix two bugs: - Actually register dissector on default UDP ports upon startup. - expert_...() shouldn't be called under 'if (tree)' Also: cleanup proto_reg_handoff...() and apply_prefs() code. Change-Id: I6390d9bf311c9a62fbc43647d9bb19f90156baec Reviewed-on: https://code.wireshark.org/review/4063 Reviewed-by: Bill Meier commit 5ff7a26 Author: AndersBroman Date: Wed Sep 10 15:13:46 2014 +0200 Minor performance tweaks: - Only calculate tvb length once. - Use tvb_reported_length() instead of tvb_reported_length_remaining() as this is a subtvb offset is always 0. Change-Id: I03bd7a95061488d4576fa93f26e6b31d55f88738 Reviewed-on: https://code.wireshark.org/review/4060 Reviewed-by: Anders Broman commit c6c8dc2 Author: Martin Mathieson Date: Wed Sep 10 13:08:08 2014 +0100 Make expert info text less verbose for missing ICMP response - no point in including frame number Change-Id: I47ca8159c0716cb49da7ff77b1087cf37babe97e Reviewed-on: https://code.wireshark.org/review/4059 Reviewed-by: Martin Mathieson commit f9d4e0a Author: Evan Huus Date: Mon Sep 8 21:59:38 2014 -0400 Replace deprecated tvb_length calls And a few other misc. cleanups while in the neighbourhood. Change-Id: Ic0d6836dec9c36d31ea244a6adc74d4713565090 Reviewed-on: https://code.wireshark.org/review/4047 Reviewed-by: Anders Broman commit 1bf82c3 Author: AndersBroman Date: Wed Sep 10 09:51:34 2014 +0200 Add tche custom taps to WIRESHARK_TAP_SRC Change-Id: Ifedcc261585ea7308dbe3d493711d055d6d48237 Reviewed-on: https://code.wireshark.org/review/4058 Reviewed-by: Anders Broman commit f93c53e Author: Roland Knall Date: Tue Sep 9 14:27:02 2014 +0200 EPL: Fix offset calculation The offset was calculated too high, as it was added to itself and sizes were added multiple times Change-Id: I1a581e96e2ab66e40f5566074e8bd1089f55bdb0 Reviewed-on: https://code.wireshark.org/review/4049 Reviewed-by: Roland Knall Reviewed-by: Anders Broman commit 93cc6f0 Author: Bill Meier Date: Tue Sep 9 14:05:52 2014 -0400 Fix some spelling & grammar. Change-Id: Iedeaa411caa0823922dd79c27897a2349d4e6907 Reviewed-on: https://code.wireshark.org/review/4054 Reviewed-by: Bill Meier commit 6e7f9ec Author: Bill Meier Date: Tue Sep 9 10:27:46 2014 -0400 packet-sip.c: col_...() functions must not be called under 'if(...tree)' (even indirectly). Fixes Bug #10453 Change-Id: I39f64b801ce9231059ee7e03416dd3828dffeb1f Reviewed-on: https://code.wireshark.org/review/4051 Reviewed-by: Bill Meier commit bf371e3 Author: Anish Bhatt Date: Thu Jul 10 19:51:50 2014 -0700 OSPF : cleanup hf_filter array hf_filter array was removed. Compiles, did some manual testing and didn't see any regression. Bitfield still not changed over to inbuilt functions Change-Id: I510da6160c0f2375398b9ab30042ff172ae31c9f Reviewed-on: https://code.wireshark.org/review/3147 Reviewed-by: Alexis La Goutte Tested-by: Alexis La Goutte commit f91ef6d Author: Michael Mann Date: Mon Sep 8 15:09:50 2014 -0400 General cleanup of RTP-MIDI dissector. The biggest changes involved: 1. Use the "bounds checking" of proto_tree_add_xxx, instead of doing it manually. There are still places where it's done "manually", but they have been drastically reduced. Someone with more understanding of the protocol/dissector would need to take a look at them. 2. proto_tree_add_text -> proto_tree_add_subtree[_format] 3. Use proto_tree_add_bitmask when appropriate. Change-Id: Iddbd2aadf5fd27f2cf9ba63873eb59dbd93b6394 Reviewed-on: https://code.wireshark.org/review/4039 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 80407a4 Author: Michael Mann Date: Sat Sep 6 08:44:23 2014 -0400 Eliminate proto_tree_add_text from some of the dissectors. Other minor cleanups while in the area. Change-Id: I99096ade9c69a4c148962d45bb6b0bd775040ba1 Reviewed-on: https://code.wireshark.org/review/4020 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 124923b Author: Michael Mann Date: Mon Sep 8 19:41:07 2014 -0400 proto_tree_add_text -> something filterable. Most of the items fell under the same 3 filterable fields. Many got converted to proto_tree_add_bitmask. Also removed the superfluous return statements Change-Id: Ib429f986d1c3648e51add8ad3d208428b0ba898c Reviewed-on: https://code.wireshark.org/review/4044 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit a23bbaf Author: Evan Huus Date: Tue Sep 9 00:00:10 2014 +0000 Revert "Explicitly lengthen some constants to 64 bits" Guy already fixed the issue, I was looking at a stale buildbot page. This reverts commit f9bfa976e67da2f8065f172de9ed06fad61762a8. Change-Id: I04e2f1ddfae9558b6cec40740ffbb66a16c3fecb Reviewed-on: https://code.wireshark.org/review/4046 Reviewed-by: Evan Huus commit f9bfa97 Author: Evan Huus Date: Mon Sep 8 19:52:56 2014 -0400 Explicitly lengthen some constants to 64 bits Hopefully squashes the mac buildbot error packet-mp2t.c:993: warning: implicit conversion shortens 64-bit value into a 32-bit value Change-Id: I9ca6420925442b56cfdf5db629b63d6ead7bdfbd Reviewed-on: https://code.wireshark.org/review/4045 Reviewed-by: Evan Huus commit e8491ce Author: Jeff Morriss Date: Mon Sep 8 17:40:30 2014 -0400 Fix automatic generation of the dcerpc-eventlog dissector. The problem described in the README is simply because the conformance file hadn't been updated. Remove trailing white space from the .idl and .cnf files. Change-Id: I778f206aa103e5f60574fe2c5c699597969dc644 Reviewed-on: https://code.wireshark.org/review/4042 Reviewed-by: Evan Huus Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 7143bd7 Author: Guy Harris Date: Mon Sep 8 14:49:53 2014 -0700 Do the PCR and the original PCR the same way. In both cases, make the extension a 16-bit variable, cast the result of extracting the extension to guint16 to clarify that only the 9 bits visible through the mask matter. While we're at it, there's no need to use "proto_tree_add_uint64_format_value() if the format is just the standard format for a 64-bit unsigned integer. Change-Id: I8f1f48595830d4672984f3797be1c9d994e64ea0 Reviewed-on: https://code.wireshark.org/review/4043 Reviewed-by: Guy Harris commit 4af01a8 Author: Martin Kaiser Date: Sun Sep 7 18:40:36 2014 +0200 don't skip another 6 bytes after OPCR Bug: 10446 simplify OPCR calculation while we're at it Change-Id: I8590e409895e712fe6bbb64ab23093caf5795fa7 Reviewed-on: https://code.wireshark.org/review/4040 Petri-Dish: Martin Kaiser Tested-by: Petri Dish Buildbot Reviewed-by: Martin Kaiser commit 412662af Author: Jeff Morriss Date: Mon Sep 8 11:50:41 2014 -0400 Register the dicom dissector by name so it can be used with SSL. Bug: 10450 Change-Id: I786de3de39c6d4829135b67a64936c28757d1ff4 Reviewed-on: https://code.wireshark.org/review/4038 Reviewed-by: Evan Huus Reviewed-by: Anders Broman commit 00a2444 Author: Jérôme LAFORGE Date: Sun Sep 7 16:35:10 2014 +0200 Check hopcount is correctly incremented by 1 Extract RFC3315 about hop-count : 20.1.2. Relaying a Message from a Relay Agent If the message received by the relay agent is a Relay-forward message and the hop-count in the message is greater than or equal to HOP_COUNT_LIMIT, the relay agent discards the received message. The relay agent copies the source address from the IP datagram in which the message was received from the client into the peer-address field in the Relay-forward message and sets the hop-count field to the value of the hop-count field in the received message incremented by 1. Bug:10449 Change-Id: Ifb94e7c54c0a26714fc543862d4358d3e60c2676 Reviewed-on: https://code.wireshark.org/review/4017 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit cf8f11f Author: Michael Mann Date: Sat Sep 6 18:04:28 2014 -0400 Eliminate proto_tree_add_text from some of the dissectors. Other minor cleanups while in the area. Change-Id: I623d941e53128f169e55dfc629547b4221fa72fc Reviewed-on: https://code.wireshark.org/review/4021 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit 433a444 Author: Evan Huus Date: Mon Sep 8 08:11:40 2014 -0400 ses: initialize pres_ctx_id in session struct Bug: 10454 Change-Id: Ib381646cad0a039514117735c48b461c9950f705 Reviewed-on: https://code.wireshark.org/review/4033 Reviewed-by: Evan Huus commit 3f04830 Author: Martin Mathieson Date: Mon Sep 8 15:37:27 2014 +0100 Try to fix build error by giving function a return type Change-Id: I157b6309bc8cb0bef6fc0cd213fd4ec7e4c375ef Reviewed-on: https://code.wireshark.org/review/4035 Reviewed-by: Martin Mathieson commit 806981d Author: Martin Mathieson Date: Mon Sep 8 13:55:23 2014 +0100 Show band info for inter-freq entries in UE capabilities. Addresses Pascal's comments. Change-Id: Ie60dc73e40a2ac1d80197fa712075ccff83cf797 Reviewed-on: https://code.wireshark.org/review/4032 Reviewed-by: Pascal Quantin Reviewed-by: Martin Mathieson commit c1bc1b6 Author: Evan Huus Date: Sun Sep 7 15:01:10 2014 -0400 Convert some deprecated tvb_length calls Change-Id: I6337f8e02a41106a363b9bf767bc4b3697442d41 Reviewed-on: https://code.wireshark.org/review/4027 Reviewed-by: Anders Broman commit 64cabe9 Author: AndersBroman Date: Mon Sep 8 14:39:19 2014 +0200 Use dissect_e164_msisdn() for MSISDN. Change-Id: I297241cafee8ec504b46044cacba457c5f261d6e Reviewed-on: https://code.wireshark.org/review/4034 Reviewed-by: Anders Broman commit 3a4b3e1 Author: Pascal Quantin Date: Mon Sep 8 10:04:26 2014 +0200 ZigBee: fix compilation when building without libgcrypt Change-Id: I4e60cbdaa7c56eca8f95945066dd31660fba045b Reviewed-on: https://code.wireshark.org/review/4031 Reviewed-by: Pascal Quantin commit 95c3f06 Author: Bill Meier Date: Sun Sep 7 23:51:58 2014 -0400 packet-gnm.h: remove: (should have been part of 07b003a "Remove obsolete dissectors") Change-Id: I80455f69c2830609fe34ee79492d37dc4103de10 Reviewed-on: https://code.wireshark.org/review/4030 Reviewed-by: Bill Meier commit 79d7e5d Author: Ronnie Sahlberg Date: Sun Sep 7 18:12:08 2014 -0700 SCSI: fix dissection of ElementAddress... mode page for SMC devices Change-Id: If16ad422ab851f538af309fbf7d567bd2a13cace Signed-off-by: Ronnie Sahlberg Reviewed-on: https://code.wireshark.org/review/4029 commit aebd9d3 Author: Guy Harris Date: Sun Sep 7 14:01:56 2014 -0700 Remove blank line, add newline at the end of the file. Change-Id: I26bed6f3493ee7bb52439af9d72790a0133485c9 Reviewed-on: https://code.wireshark.org/review/4028 Reviewed-by: Guy Harris commit 2b27d91 Author: Michael Mann Date: Sat Sep 6 21:32:39 2014 -0400 Eliminate proto_tree_add_text from some of the dissectors. Other minor cleanups while in the area. Change-Id: Id8dab02df6f111c3462238c3de1bf201e037ca48 Reviewed-on: https://code.wireshark.org/review/4022 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit f76b4d9 Author: Gerald Combs Date: Sun Sep 7 08:06:30 2014 -0700 [Automatic manuf, services and enterprise-numbers update for 2014-09-07] Change-Id: I35bc2282b41810cc9644ded0b5c4036f4508264b Reviewed-on: https://code.wireshark.org/review/4024 Reviewed-by: Gerald Combs commit ef444d3 Author: Guy Harris Date: Sun Sep 7 02:15:45 2014 -0700 Squelch a compiler warning and get rid of an unnecessary variable. Just use "sizeof line" for the size of that array; don't have a separate variable with the number of elements of the array (which at least is equal to the size of the array, as it's an array of char), as that means that you have to remember to change both of them. Then cast "sizeof line" to int, as the second argument to fgets() is an int, not a size_t (fgets(), as I remember, existed before size_t). Change-Id: I3c65774527f4fcd824d7ae39208ab6e8e33eb9b4 Reviewed-on: https://code.wireshark.org/review/4023 Reviewed-by: Guy Harris commit 419de19 Author: Michael Mann Date: Thu Sep 4 08:35:51 2014 -0400 Create subdissector table for RTAC Serial and have dissectors register with it, rather than have the RTAC Serial dissector go find all of the dissectors its interested in. Change-Id: I6b6a05ec242e4798fb56ffa43c661ec277aca955 Reviewed-on: https://code.wireshark.org/review/3984 Reviewed-by: Chris Bontje Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 0d6fb09 Author: Alexis La Goutte Date: Sat Sep 6 10:32:29 2014 +0200 GTK (conversations table): Fix Dereference of null pointer found by Clang analyzer Change-Id: Iebe0c581259b80d905f0ef3e26c1caae07f715d1 Reviewed-on: https://code.wireshark.org/review/4012 Reviewed-by: Michael Mann commit 24d1295 Author: Guy Harris Date: Sat Sep 6 15:58:54 2014 -0700 Don't give names to parameters you don't use. C++, unlike C, lets you do that. This squelches warnings from MSVC++. Change-Id: Id7127392b7690769111afdb951951d743f1d5e63 Reviewed-on: https://code.wireshark.org/review/4019 Reviewed-by: Guy Harris commit d853e92 Author: Guy Harris Date: Sat Sep 6 15:36:44 2014 -0700 Convert all the other function-defining macros. (Perhaps C2099 will finally deprecate old-style function definitions and allow you to declare parameters without names, just as C++ does, and compilers will - obviously - not warn about those parameters being unreferenced, obviating the need for __attribute((unused))__ and the like. And perhaps monkeys will fly out of....) Change-Id: Iff295c1854e66eb4f9e02cdd5761e0191d371365 Reviewed-on: https://code.wireshark.org/review/4018 Reviewed-by: Guy Harris commit 746a265 Author: Guy Harris Date: Sat Sep 6 13:08:40 2014 -0700 Try to suppress MSVC++ unused parameter warnings. I haven't found a way to with MSVC to mark parameters in the argument list as unused. MSVC doesn't give warnings about them in C code, but does appear to give them with C++ code. An answer to http://stackoverflow.com/questions/3020584/avoid-warning-unreferenced-formal-parameter suggests not giving the formal parameter a name in C++. Have a macro UNUSED_PARAMETER(), which takes as an argument a variable name, and expands to nothing in C++ and to the variable name followed by _U_ in C, and use that for some unused parameters. If it works, we'll use it for all of them. Change-Id: I76107bed037f1f0d94615adb42234c9faf83b4db Reviewed-on: https://code.wireshark.org/review/4016 Reviewed-by: Guy Harris commit afb939b Author: Guy Harris Date: Sat Sep 6 11:51:59 2014 -0700 Make the count of bytes read from the file 64 bits. We probably won't get files that big, but let's at least be prepared; that squelches some compiler warnings. Change-Id: Ia43ff78af7df63c7204c41d8331fea946de63116 Reviewed-on: https://code.wireshark.org/review/4015 Reviewed-by: Guy Harris commit 8482173 Author: Guy Harris Date: Sat Sep 6 11:44:15 2014 -0700 Make some variables size_t, as values of that width are assigned to it. (I'd say "as values of that *type* are assigned to it", but the "len" field of a GString is of type "gsize", and, for some unknown reason, the GLib folks, rather than just using size_t, which is required by C89 to be available, invented their own "gsize" type, defined as "long", which happens to be narrower than "size_t" on LLP64 platforms such as 64-bit Windows. Sigh....) This squelches some compiler warnings. Change-Id: Ifca1300297b2e9b777fb2c426dda822ba157cfe5 Reviewed-on: https://code.wireshark.org/review/4014 Reviewed-by: Guy Harris commit 0bafffb Author: Guy Harris Date: Sat Sep 6 04:15:52 2014 -0700 Put asn1 back as a distributed subdirectory. If it's not there, "make distcheck" fails. In addition, 1) "make distclean" doesn't clean out the Makefile.in files under asn1 and 2) you don't get to see the source from which the ASN.1 dissectors were built if you have a source tarball. Change-Id: Ied59d42950373476a535fcf9cfccece46de92599 Reviewed-on: https://code.wireshark.org/review/4013 Reviewed-by: Guy Harris commit 07b003a Author: AndersBroman Date: Fri Sep 5 15:40:18 2014 +0200 Remove obsolete dissectors. Change-Id: Icd480491670de9d8495a95861b18a8a5cb9724b4 Reviewed-on: https://code.wireshark.org/review/4006 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit ceef7eb Author: Michael Mann Date: Fri Sep 5 08:48:37 2014 -0400 Eliminate proto_tree_add_text from some of the dissectors. Other minor cleanups while in the area. Change-Id: I8ea59205cfe6fab643d8fe01b75ce91532004fd9 Reviewed-on: https://code.wireshark.org/review/4004 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit f1ad9eb Author: Alexis La Goutte Date: Fri Sep 5 15:21:37 2014 +0200 MySQL : Eliminate proto_tree_add_text (use proto_tree_add_debug...) Change-Id: I2e14328715cd11bc1ce31dad91b1cc5ef4091130 Reviewed-on: https://code.wireshark.org/review/4005 Reviewed-by: Alexis La Goutte commit 914169f Author: Alexis La Goutte Date: Fri Sep 5 08:59:10 2014 +0200 MySQL: add decode connattrs when use COM_CHANGE_USER Change-Id: I5c24f0bf3d756abed0db17bf2ae8ab0dbf695c43 Ping-Bug:10351 Reviewed-on: https://code.wireshark.org/review/4000 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit b515cd3 Author: Pascal Quantin Date: Sat Sep 6 00:32:05 2014 +0200 6LoWPAN: fix storage of contexts coming from ICMPv6 Router Advertisement messages Bug: 10443 Change-Id: I1a74b4d3036c61f0c8e1fca6373845ea40d87808 Reviewed-on: https://code.wireshark.org/review/4008 Reviewed-by: Pascal Quantin Tested-by: Pascal Quantin commit 56ae87a Author: Jeff Morriss Date: Fri Sep 5 10:42:02 2014 -0400 Fix compilation when we don't HAVE_GEOIP. Change-Id: Ib72178aab69c266cb903ef5ad5587cc0b80eb1fd Reviewed-on: https://code.wireshark.org/review/4007 Reviewed-by: Michael Mann commit 8df622b Author: Guy Harris Date: Fri Sep 5 01:13:30 2014 -0700 Fix compiler warnings. In our build environment, some UN*Xes define the historic index() routine in addition to the standard strchr() routine. Change-Id: Id39ad42a60def6af4c5b3625528207e9d2948392 Reviewed-on: https://code.wireshark.org/review/4002 Reviewed-by: Guy Harris commit 63d7f7f Author: Martin Kaiser Date: Thu Sep 4 23:35:06 2014 +0200 adjust the path to the translation files they were renamed from qtshark_... to wireshark_... Change-Id: I97b245a9028b4ed99812204114ba8f59357d49e8 Reviewed-on: https://code.wireshark.org/review/3995 Reviewed-by: Gerald Combs Reviewed-by: Alexis La Goutte commit f4e2819 Author: Gerald Combs Date: Thu Sep 4 20:42:42 2014 -0700 Fix compiler warnings from g30f3d52. Change-Id: I76fa088f72f0e31da9be105919d56fd8db1ea7b5 Reviewed-on: https://code.wireshark.org/review/3999 Reviewed-by: Gerald Combs commit 97b0738 Author: Alexis La Goutte Date: Thu Sep 4 15:14:59 2014 +0200 CAPWAP: Add some new Message Element Type (RFC5415) * AC Timestamp (6) * Add Station (6) * CAPWAP Local IPv4 Address (30) * CAPWAP Local IPv6 Address (50) * CAPWAP Transport Protocol (51) * MTU Discovery Padding (52) * ECN Support (53) Change-Id: Ib8b2768d5df4b0e1b5b8b5bd28ae66e825020205 Reviewed-on: https://code.wireshark.org/review/3986 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 00cc4c7 Author: Gerald Combs Date: Thu Sep 4 19:59:34 2014 -0700 Fix the GeoIP include path. Change-Id: Ib4b3264a4da5b54b01061153e383f21e1bcf00b2 Reviewed-on: https://code.wireshark.org/review/3998 Reviewed-by: Gerald Combs commit 74ca94b Author: Gerald Combs Date: Thu Sep 4 18:45:47 2014 -0700 Add the GeoIP include path to the Windows qmake build. It looks like we need to install and/or configure Qt on the Windows petri dish builder. Change-Id: I2bdde7cd9216e311d6402116d6c67b37d37e182d Reviewed-on: https://code.wireshark.org/review/3997 Reviewed-by: Gerald Combs commit 30f3d52 Author: Gerald Combs Date: Wed Aug 6 10:07:42 2014 -0700 Qt: Refactor ConversationDialog for endpoints. Create a TrafficTableDialog (for lack of a better name) parent class from the general parts of ConversationDialog. Use it to create EndpointsDialog. Move the contents of conversation_tree_widget.{cpp,h} to conversation_dialog.{cpp,h} to match endpoint_dialog and traffic_table_dialog. Fill in GeoIP columns dynamically instead of using a hard-coded limit. Use "endp_" and "ENDP_" prefixes for a lot of endpoint variables and defines. Try to make geoip_db_lookup_ipv4 and geoip_db_lookup_ipv6 more robust. Clean up some includes. Fix a shadowed variable. Change-Id: I23054816ac7f8c6edb3b1f01c8536db37ba4122d Reviewed-on: https://code.wireshark.org/review/3462 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 382815d Author: Bill Meier Date: Thu Sep 4 17:57:15 2014 -0400 packet-netflow.c: Update "Information Elements" dissected based upon 08/13/2014 IANA IPFIX assignments document Change-Id: Icfabdf5b77cdeef686620b75e649fc5bc270197a Reviewed-on: https://code.wireshark.org/review/3996 Reviewed-by: Bill Meier commit 4147b45 Author: Martin Kaiser Date: Thu Sep 4 23:08:59 2014 +0200 another lupdate + lrelease for Japanese this fixed the line numbers, marked some items as obsolete and added new items corrected some minor problems Promiscious Mode was changed to Monitor Mode, update the translation accordingly Change-Id: I63b3ef0fb3488d941d6d1170b911026281f94a0a Reviewed-on: https://code.wireshark.org/review/3994 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 3b60797 Author: Martin Kaiser Date: Thu Sep 4 22:05:42 2014 +0200 From 竹下 恵 (Megumi Takeshita) japanese language update Change-Id: I92a68f389a7ac1e07eb11c970d5e37c31fde22c1 Reviewed-on: https://code.wireshark.org/review/3993 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 82f5bdf Author: Alexis La Goutte Date: Thu Sep 4 20:11:37 2014 +0200 ICMPv6: Remove soft deprecated API (tvb_length -> tvb_captured_length) Change-Id: Ib6161f778d902430f0903f5aef2df40c8166c5aa Reviewed-on: https://code.wireshark.org/review/3992 Reviewed-by: Anders Broman commit 5ec1ab4 Author: Alexis La Goutte Date: Thu Sep 4 20:05:47 2014 +0200 tvbuff composite: add modelines infos (tabs) Change-Id: I9ea2160b550243b45f6798ad3339f6a45b34a4ef Reviewed-on: https://code.wireshark.org/review/3991 Reviewed-by: Evan Huus commit 67bff64 Author: Alexis La Goutte Date: Thu Sep 4 20:04:56 2014 +0200 tvbuff composite: fix Dereference of null pointer found by Clang Analyzer Change-Id: Ia43cb2e1cab99e4b769c8dfa0805d8e38e225a1c Reviewed-on: https://code.wireshark.org/review/3990 Reviewed-by: Evan Huus commit cccc927 Author: Jeff Morriss Date: Thu Sep 4 11:31:30 2014 -0400 Update NEWS: Add S7 Communication dissector and the extcap interface. Also add the S7 Communication dissector's author to AUTHORS. Mention that the Qt UI is now the default. Change-Id: Ie2629333fd48bbe1ce95052292336a4f8608ea17 Reviewed-on: https://code.wireshark.org/review/3988 Reviewed-by: Alexis La Goutte Reviewed-by: Michael Mann commit 3b20e02 Author: Alexis La Goutte Date: Thu Sep 4 16:17:12 2014 +0200 Fix Mac OS X buildbot packet-s7comm.c:962: warning: declaration of 'time' shadows a global declaration Change-Id: I4020b780e787a91c42f08f7b7b1c7feabcabdc62 Reviewed-on: https://code.wireshark.org/review/3987 Reviewed-by: Alexis La Goutte commit 2c9af79 Author: Roland Knall Date: Wed Jun 25 18:17:50 2014 +0200 openSAFETY: Add datafield for preload - Block Up-/Download will be removed from the protocol It has never been implemented => no impact - Preload will be added in future versions of the openSAFETY specification - Better definition of SSDO ACMD sets to ensure correct protocol dissection - Use TFS.h t/f strings where applicable, remaining strings are referenced directly from specification Change-Id: I9c809098938333c914e1f8ba67d100b994fd33f4 Reviewed-on: https://code.wireshark.org/review/2647 Reviewed-by: Roland Knall Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 1c1f187 Author: Thomas Wiens Date: Thu Aug 21 19:25:06 2014 +0200 s7comm: Add dissector for S7 Communication S7 Communication is a Siemens proprietary protocol that runs between programmable logic controllers (PLC) of the Siemens S7-300/400 family. Dissector T.125 has to be disabled to let this dissector work. Change-Id: I578cf270a4ae567f8e20dbabec1ce1e13fc08e6e Reviewed-on: https://code.wireshark.org/review/3777 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 27d1b6a Author: Evan Huus Date: Wed Sep 3 22:48:46 2014 -0400 Bump the time limit for valgrind fuzzing Some captures are still hitting the limit as a false positive. Bug: 10122 Change-Id: I12dd26ba0f96f44799f5ae642b1f9b0487f86a8a Reviewed-on: https://code.wireshark.org/review/3982 Reviewed-by: Michael Mann commit 2497482 Author: Jeff Morriss Date: Wed Sep 3 21:57:02 2014 -0400 Don't print non-printable characters in AX.25 addresses. Add a new routine to wsutil to make this easy: printable_char_or_period(). Bug: 10439 Change-Id: I0eb2bb6bc0676a1035c3d845b5e20276fa04de60 Reviewed-on: https://code.wireshark.org/review/3981 Petri-Dish: Alexis La Goutte Reviewed-by: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 1192606 Author: Alexis La Goutte Date: Thu Sep 4 13:53:52 2014 +0200 Fix Mac OS X buildbot packet-cp2179.c:719: warning: declaration of 'index' shadows a global declaration Change-Id: Ic622b4f90f9816a43bc62bcb3ce438fbfab3d8a5 Reviewed-on: https://code.wireshark.org/review/3983 Reviewed-by: Alexis La Goutte commit b4045ba Author: Stig Bjørlykke Date: Wed Sep 3 08:49:54 2014 +0200 Fix unused variable... [-Werror,-Wunused-const-variable] Use DATA_FRAG_FLAGS, disabled unused NACK_FLAGS Change-Id: I2d3dda2c3ab1ebbd66e32bf5ec1b62b521a7140d Reviewed-on: https://code.wireshark.org/review/3968 Reviewed-by: Alexis La Goutte commit 23adc87 Author: Qiaoyin Yang Date: Wed Jul 16 10:50:41 2014 -0600 Add dissector for CP "Cooper" 2179 Protocol All credit for development should go Qiaoyin Yang CP2179 protocol is a serial based protocol. The 2179 protocol is implemented with minor variations between vendors. The RTAC implemented the 2179 client supporting a limited function codes and command codes. The RTAC doesn't support multiple function codes in a single request and the dissector also doesn't support decoding these or corresponding responses. Bug:10285 Change-Id: I217bf4185c52b0b183f69b3b5aa84613340d3944 Reviewed-on: https://code.wireshark.org/review/3089 Reviewed-by: Alexis La Goutte commit 511e1fb Author: Jeff Morriss Date: Wed Sep 3 21:39:04 2014 -0400 Fix up some formatting. Change-Id: Ib38561ad5cf0f532e43ae3e10bbb857bb24ab9b6 Reviewed-on: https://code.wireshark.org/review/3980 Reviewed-by: Jeff Morriss commit 5e3a8fa Author: Gerald Combs Date: Wed Sep 3 14:41:02 2014 -0700 Work around an apparent bug in GtkFileChooserButton. It looks like some versions of GTK+ intialize GtkFileChooserButton with a location set to NULL and crash when you select an item from the dropdown menu. Make sure we have a valid location set in that case. Change-Id: If2556ef939b95d8af12581a7116a48fb46586f57 Bug: 10434 Reviewed-on: https://code.wireshark.org/review/3977 Reviewed-by: Gerald Combs commit 3582029 Author: Alexis La Goutte Date: Tue Aug 26 16:41:45 2014 +0200 RPKI RTR: Add support draft-ietf-sidr-rpki-rtr-rfc6810-bis-01 Add new PDU : Router Key (9) Add new field (Expire, Retry... interval) for END OF DATA PDU Ping-Bug:8296 Change-Id: Ic30ab0ff9d0f9989eb7d157f85b74a54d09fb0e7 Reviewed-on: https://code.wireshark.org/review/3948 Reviewed-by: Alexis La Goutte Reviewed-by: Evan Huus commit bf8d601 Author: Alexis La Goutte Date: Wed Sep 3 17:59:06 2014 +0200 RTPS: Add Modelines info Change-Id: Ib29fb16d3b82b53aba52e2d13be2ce8e8727ccfb Reviewed-on: https://code.wireshark.org/review/3973 Reviewed-by: Evan Huus commit 3e5ef80 Author: Pascal Quantin Date: Thu Aug 28 20:08:39 2014 +0200 tvbparse: do not increment the token length when the new sub token length is 0 It fixes the unwanted addition of ignore characters when using tvbparse_some as seen with the capture from bug 10417 Change-Id: If68b587e1821fb34aa1fb56666986e1fa6385c33 Reviewed-on: https://code.wireshark.org/review/3905 Reviewed-by: Pascal Quantin commit 660da5e Author: Alexis La Goutte Date: Wed Sep 3 17:56:21 2014 +0200 RTPS: fix Result of operation is garbage or undefined Missing get num_virtual_guids value... Change-Id: I81a3dea3c96fb946c5c26ffe4ab2bfb82d1d8222 Reviewed-on: https://code.wireshark.org/review/3972 Reviewed-by: Evan Huus commit 241df85 Author: Alexis La Goutte Date: Wed Sep 3 17:22:52 2014 +0200 ICMPv6: fix missing space before 6LBR Change-Id: Ibfb53df05691b67ac08a4f54ab0949ea17a89f89 Reviewed-on: https://code.wireshark.org/review/3971 Reviewed-by: Evan Huus commit 01ca28d Author: Alexis La Goutte Date: Fri May 16 15:13:48 2014 +0200 Don't need include ipproto.h Change-Id: Ia2fe7df0ec72c0ba9eb77ea4beafe58be20d901d Reviewed-on: https://code.wireshark.org/review/3970 Reviewed-by: Evan Huus commit 4ca9a5e Author: AlexL Date: Wed Sep 3 13:50:21 2014 -0400 Updated translations (add Comment fields) for desktop integration. Patch submitted via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10442 Bug: 10442 Change-Id: Idf73b058cff5db520cde951e58e85e5f71c680e2 Reviewed-on: https://code.wireshark.org/review/3975 Reviewed-by: Jeff Morriss commit 4c0fed8 Author: Gerald Combs Date: Wed Sep 3 09:10:35 2014 -0700 Don't override the PA package naming convention. Use our full version in the package name. Set a minimum OS version (Vista). Update some comments. Change-Id: I28096276d2588993136b008a307dbcc7983496b0 Reviewed-on: https://code.wireshark.org/review/3974 Reviewed-by: Gerald Combs commit c1325e8 Author: Jérôme LAFORGE Date: Mon Sep 1 11:15:47 2014 +0200 Check whether the hop-count of most inner message is equal to 0 Extract RFC3315 about relay message and hop-count : 20.1.1. Relaying a Message from a Client If the relay agent received the message to be relayed from a client, the relay agent places a global or site-scoped address with a prefix assigned to the link on which the client should be assigned an address in the link-address field. This address will be used by the server to determine the link from which the client should be assigned an address and other configuration information. The hop-count in the Relay-forward message is set to 0. 20.3. Construction of Relay-reply Messages A server uses a Relay-reply message to return a response to a client if the original message from the client was relayed to the server in a Relay-forward message or to send a Reconfigure message to a client if the server does not have an address it can use to send the message directly to the client. A response to the client MUST be relayed through the same relay agents as the original client message. The server causes this to happen by creating a Relay-reply message that includes a Relay Message option containing the message for the next relay agent in the return path to the client. The contained Relay-reply message contains another Relay Message option to be sent to the next relay agent, and so on. The server must record the contents of the peer-address fields in the received message so it can construct the appropriate Relay-reply message carrying the response from the server. For example, if client C sent a message that was relayed by relay agent A to relay agent B and then to the server, the server would send the following Relay-Reply message to relay agent B: msg-type: RELAY-REPLY hop-count: 1 link-address: 0 peer-address: A Relay Message option, containing: msg-type: RELAY-REPLY hop-count: 0 link-address: address from link to which C is attached peer-address: C Relay Message option: Change-Id: I774cc22c9c090af1a5d3732115c7cd3478343288 Bug:10437 Reviewed-on: https://code.wireshark.org/review/3936 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit 798b1e1 Author: AndersBroman Date: Wed Sep 3 13:07:26 2014 +0200 Actually use the define of custom plugins... Change-Id: Id831e3bff943d9000969f951c3a2b9ead173e033 Reviewed-on: https://code.wireshark.org/review/3969 Reviewed-by: Anders Broman commit 8eaf902 Author: Alexis La Goutte Date: Mon Jun 9 12:16:19 2014 +0200 ieee802.11: Add VHT Action (802.11ac) Add VHT MIMO Control (Part of VHT Compressed Beamforming) No yet supported : * VHT Compressed Beamforming Report, MU Exclusive Beamforming Report (8.5.23.2) * Membership Status Array, User Position Array (8.5.23.3: Group ID Management) * Operation Mode (8.5.23.4: Operation Mode Notification) Bug:10169 Change-Id: I182a487687d44f0ef77a045a99f82c92fba8ff2c Reviewed-on: https://code.wireshark.org/review/2146 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus Reviewed-by: Anders Broman commit 8ffd2f3 Author: Alexis La Goutte Date: Tue Sep 2 16:15:14 2014 +0200 CAPWAP: fix some message type with wrong length (don't use optlen for "fixed type length") Change-Id: Id666086abdd55e38bcb470f8015363585d40728f Reviewed-on: https://code.wireshark.org/review/3957 Reviewed-by: Anders Broman commit 4f4c6ed Author: Alexis La Goutte Date: Mon Aug 25 12:54:11 2014 +0200 CAPWAP: Add some news expert info When it is the mininum wrong length for Message Element Type or when the Message Element Type is not yet decoded by Wireshark Change-Id: I49aca0df5ba5ec70d8fb764fef39c17c46ee22a0 Reviewed-on: https://code.wireshark.org/review/3956 Reviewed-by: Anders Broman commit ee92864 Author: Alexis La Goutte Date: Wed Aug 20 10:08:15 2014 +0200 CAPWAP: Add new ett variable Avoid to have all subtree has expended Only 2 ett actually and there is > 20 subtree... Change-Id: Ia4af85345a6f1963d24d1fd589ff8ee09a8ef412 Reviewed-on: https://code.wireshark.org/review/3955 Reviewed-by: Jeff Morriss Reviewed-by: Anders Broman commit 7a87447 Author: Alexis La Goutte Date: Wed Aug 20 09:46:47 2014 +0200 CAPWAP: Split CAPWAP Control and Data in 2 different protocol Avoid to have 2 CAPWAP in Decode as (and more easy to use too...) Change-Id: I3a332e9b4b069b9215c38b5c08872bd07ac4c2c3 Reviewed-on: https://code.wireshark.org/review/3954 Reviewed-by: Jeff Morriss Reviewed-by: Anders Broman commit 653dc8b Author: Alexis La Goutte Date: Mon Aug 11 23:55:30 2014 +0200 CAPWAP: Use standard boilerplate (see doc/packet-PROTOABBREV.c) For hf field, reindent code Use 0x0 by default for bitmask Remove also some "boilerplate" comment.. Change-Id: I552ccca2e444f3686ee9ecdad456f2ecfbaa5cba Reviewed-on: https://code.wireshark.org/review/3953 Reviewed-by: Anders Broman commit ec2fe0f Author: Alexis La Goutte Date: Mon Aug 11 17:34:28 2014 +0200 CAPWAP: Wrong usage of FT_BOOLEAN for Reserved field... Change-Id: Ie1c472f4db105a1a8db9dba265039282872dffb2 Reviewed-on: https://code.wireshark.org/review/3952 Reviewed-by: Anders Broman commit 6b5669d Author: Gerald Combs Date: Tue Sep 2 22:36:03 2014 -0700 Fix dist. Remove unused files. Change-Id: I44b2dbfa3859841c67e933d8e7c510834b7cc2ee Reviewed-on: https://code.wireshark.org/review/3967 Reviewed-by: Gerald Combs commit cf3218d Author: Gerald Combs Date: Tue Sep 2 18:05:03 2014 -0700 OS X packaging fix. Change-Id: I82936bb1dcfa3a7ca1aea8a3ded388015aa37531 Reviewed-on: https://code.wireshark.org/review/3966 Reviewed-by: Gerald Combs commit b03eeeb Author: Gerald Combs Date: Tue Sep 2 17:55:48 2014 -0700 Fix the PortableApps package name. Remove Installer.nsi while we're here. Change-Id: I739d5d825fd76eac9b50d26fab2d44e853dc83f9 Reviewed-on: https://code.wireshark.org/review/3965 Reviewed-by: Gerald Combs commit d3e1164 Author: Gerald Combs Date: Tue Sep 2 17:19:56 2014 -0700 PortableApps: Remove invalid makefile commands. Change-Id: I6ed0f72a6915cd12d7866c978dce0d25c328dffd Reviewed-on: https://code.wireshark.org/review/3964 Reviewed-by: Gerald Combs commit ccb0a88 Author: Sean O. Stalley Date: Tue Sep 2 16:35:58 2014 -0700 Added name to AUTHORS Change-Id: I7f65d22d4dd96908033c764461196a75716b298a Reviewed-on: https://code.wireshark.org/review/3961 Reviewed-by: Michael Mann commit aee3de9 Author: Gerald Combs Date: Tue Sep 2 16:56:42 2014 -0700 OS X packaging fix: wireshark-qt → wireshark. Change-Id: Ie95c28ca47baf453335abab23eb7baba63d52f47 Reviewed-on: https://code.wireshark.org/review/3963 Reviewed-by: Gerald Combs commit 85eec7f Author: Gerald Combs Date: Tue Sep 2 12:18:20 2014 -0700 Fix PortableApps packaging. Our Windows portable packaging environment has a lot of cruft which is no longer relevant. We removed support for U3 packages and the method we use to generate PortableApps packages has been deprecated for a while. Create PortableApps packages using current file formats (AppInfo v3.0) and tools. Generate the PA launcher using the PortableApps.com Launcher generator. Copy files and directories from the top level instead of using a manifest derived from the NSIS installer. The manifest is a good idea, but we should create a central manifest and use that to generate the NSIS and PortableApps packages instead of trying to parse wireshark.nsi. The new package still needs a bit of work but it installs and runs in the current version of the PA Platform. Remove the define for MAKENSIS_UNICODE. It doesn't look like we were using it. Start tearing down makefiles and scripts that we no longer use. Ping-Bug: 4191 Change-Id: Ib7173eec887d0abf69bb176a1e3f943a5a63bee4 Reviewed-on: https://code.wireshark.org/review/3962 Reviewed-by: Gerald Combs commit 9555c24 Author: Bill Meier Date: Tue Sep 2 14:41:52 2014 -0400 packet-netflow.c: netflow v9: Allow options template with zero-length scope section Fixes Bug #10432 Also: rework several comments. Change-Id: I292829f6dffaf5f500cb089cc8a45e1203a2e731 Reviewed-on: https://code.wireshark.org/review/3959 Reviewed-by: Bill Meier commit 1a44607 Author: Jeff Morriss Date: Mon Aug 11 16:18:08 2014 -0400 Simplify ./configure logic for telling rpmbuild which GUI(s) we're building. Rather than checking for all the "--with" arguments just use the "$have_xxx" variables. Don't allow rpmbuild's ./configure to decide to build a GUI just because it's available: make it build only what was ./configure'd. Change-Id: I68582b4c13da7b52d56591dce68ac426e9f607f1 Reviewed-on: https://code.wireshark.org/review/3958 Reviewed-by: Jeff Morriss commit b7fb116 Author: Gerald Combs Date: Thu Aug 28 16:48:53 2014 -0700 Qt → wireshark. GTK+ → wireshark-gtk. Make sure the Qt UI is named "Wireshark" and its executable is named "wireshark" or "wireshark.exe". Make sure the GTK+ UI is named "Wireshark 1" or "Wireshark (GTK+)" depending on how much the target audience is likely to care about UI toolkits. Make sure the GTK+ executable is named "wireshark-gtk" or "wireshark-gtk.exe". It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps package. It's likely even more broken now. Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake 1.11.3) at some point. The first attempt to compile in ui/qt returns "error: source_file.cpp: No such file or directory". The second attempt works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1). Tested: - Nmake builds - NSIS packaging - CMake builds (Windows, OS X) - Autotools build and distcheck - RPM packaging To do: - Test Debian packaging - Fix PortableApps Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2 Reviewed-on: https://code.wireshark.org/review/3919 Reviewed-by: Gerald Combs commit b9e61be Author: Juanjo Date: Mon Aug 25 17:11:20 2014 +0200 RTPS: added new PIDs and included minor improvements - (Updated) Fixed code review issues - (Updated) Fixed whitespaces and code review issues - Representing now some NTP times as duration (not as date) - Added some vendor specific PIDs (RTI) - Added dissect_APP_ACK_CONF, dissect_APP_ACK and dissect_HEARTBEAT_VIRTUAL - Added is_discovery to dissect_serialize_data to avoid malformed packets when using mutable types (Wireshark assumes serialized data with CDR-PL encapsulation is always discovery data, what is not true when using Mutable types) Change-Id: I491750d95b12f386c41d7de4ae7e280781efa375 Reviewed-on: https://code.wireshark.org/review/3836 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit db6f197 Author: Roland Knall Date: Fri Aug 29 14:52:29 2014 +0200 openSAFETY: Adapt CRC for false-positives - There are rare false-positives, where the entire frame consists of 0 except the addr and id field, which will lead to a correct crc#1 calculation, but still to a false-positive detection. This patch fixes that - Two undefinite-loop errors are corrected as well Change-Id: Ibe5e56e0172ad3a3046bdc024da3711987116e8e Reviewed-on: https://code.wireshark.org/review/3918 Reviewed-by: Roland Knall Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 9ee7c38 Author: Alexis La Goutte Date: Mon Sep 1 08:29:50 2014 +0200 NDMP: Fix Dereference of null pointer found by Clang analyzer Change-Id: I314e7e00633f93dead6a092e059336a304e4a946 Reviewed-on: https://code.wireshark.org/review/3940 Reviewed-by: Evan Huus commit 53dbc0e Author: Alexis La Goutte Date: Mon Sep 1 08:38:14 2014 +0200 NDMP: Fix indent (use tab) Change-Id: I00f4d206e9c27801f8557414b8cd1b5c52752b44 Reviewed-on: https://code.wireshark.org/review/3941 Reviewed-by: Evan Huus commit 906f6b0 Author: Graham Bloice Date: Mon Sep 1 09:51:51 2014 +0100 Removed unnecessary chmod commands Change-Id: Ia6e3f8c567159fc2cf19a8d427a29c5c6dcdf038 Reviewed-on: https://code.wireshark.org/review/3942 Reviewed-by: Graham Bloice Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit b95e6e3 Author: Michael Mann Date: Fri Aug 15 21:32:57 2014 -0400 Escape double quotes when printing ABSOLUTE_TIME field This regression was introduced by the commit e5353bf1198d6abf748de78084ff64f597f13663 done for bug 10081 Bug: 10213 Change-Id: I3925a47ef13055f10f49fa9fefd022731746fbb8 Reviewed-on: https://code.wireshark.org/review/2572 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Reviewed-by: Evan Huus Reviewed-by: Michael Mann commit f2a7a6d Author: Jamil Nimeh Date: Tue Aug 26 18:26:19 2014 +0200 TLS: fix dissection of status_request_v2 hello extension Bug: 10416 Change-Id: I58a3faef227f7eafd61942cafa6e38a17557ee61 Reviewed-on: https://code.wireshark.org/review/3865 Reviewed-by: Evan Huus Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit f20d5d7 Author: Gerald Combs Date: Sun Aug 31 21:52:32 2014 -0700 WSUG: Convert ``Telephony'' to AsciiDoc. Leave most of the content intact for now. Change-Id: I21aad681194d1bb1841e29f4ac41be4677fcb909 Reviewed-on: https://code.wireshark.org/review/3939 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit f0ce0d7 Author: AndersBroman Date: Mon Sep 1 16:33:56 2014 +0200 Add CMake stuff for custom plugins. Change-Id: I1eff6b902d9bd9fb8f3073ab0f4fc3dd143d0fc4 Reviewed-on: https://code.wireshark.org/review/3946 Reviewed-by: Anders Broman commit c343932 Author: AndersBroman Date: Mon Sep 1 15:54:15 2014 +0200 Add abillity to add custom crypto files. Change-Id: I6c5b1cdb0a90f7604bdde088332c171332b43dcc Reviewed-on: https://code.wireshark.org/review/3945 Reviewed-by: Anders Broman commit 85734de Author: AndersBroman Date: Mon Sep 1 10:51:21 2014 +0200 Make it possible to build builtin custom dissectors and GUI files with cmake too. Change-Id: I28eee44f7c3a7e44da89f8b71cdacbe78115c7e3 Reviewed-on: https://code.wireshark.org/review/3943 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit af3e2db Author: Gerald Combs Date: Sun Aug 31 18:40:56 2014 -0700 WSUG: Convert ``Advanced Topics'' to AsciiDoc. Leave most of the content intact for now. Change-Id: Ie91fda8a3fe6ea2eb4c47acf7c41d7e6979235b0 Reviewed-on: https://code.wireshark.org/review/3938 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit a11b7bf Author: AndersBroman Date: Tue Aug 26 14:49:24 2014 +0200 Use a common hf for international E164 numbers (MSISDN). Change-Id: Ie0103c04033d7bf69c92947b789ba4f5a300a74b Reviewed-on: https://code.wireshark.org/review/3863 Reviewed-by: Anders Broman commit 5e6e060 Author: Gerald Combs Date: Sun Aug 31 13:47:39 2014 -0700 WSUG: Convert ``Working with captured packets'' to AsciiDoc. Leave most of the content intact for now. Change-Id: Ic264814aa8e442df100ae8533098843ef6a2e6c9 Reviewed-on: https://code.wireshark.org/review/3937 Reviewed-by: Gerald Combs commit eb14a1f Author: Gerald Combs Date: Sat Aug 30 18:02:52 2014 -0700 WSUG: Convert the ``File I/O'' chapter to AsciiDoc. Leave most of the content intact for now. Remove images for no-longer-supported versions of GTK+. Add an example for building the Guides to README.cmake. Change-Id: Id9e6a308c91b594d1fb7f107d7b9b28074a92a8b Reviewed-on: https://code.wireshark.org/review/3931 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 4a3e62c Author: Роман Донченко Date: Sun Aug 24 23:34:00 2014 +0400 Don't show the echo/python command lines when making plugin.c For consistency with epan/dissectors/Makefile.am. Also, remove the "with python" parts, since that's the only option now. Change-Id: I761e1bf7995c1cc1ebd790013181fd6116b289a1 Reviewed-on: https://code.wireshark.org/review/3925 Reviewed-by: Evan Huus Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice commit 95cd6b7 Author: Роман Донченко Date: Sun Aug 24 23:23:45 2014 +0400 Remove make-tapreg-dotc and its uses, since Python is now mandatory Change-Id: I13fd57a288be68d18819826bf566ed7b5688ebaa Reviewed-on: https://code.wireshark.org/review/3926 Reviewed-by: Evan Huus Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice commit 4f95327 Author: Alexis La Goutte Date: Sun Aug 31 20:19:23 2014 +0200 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I0593b659dcd28929cf51a8b1147392f070574c9e Reviewed-on: https://code.wireshark.org/review/3934 Reviewed-by: Roland Knall Reviewed-by: Evan Huus commit 6c93cc4 Author: Alexis La Goutte Date: Sun Aug 31 20:18:35 2014 +0200 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I32ca31b879ccc458f12f37375c32bc089978b114 Reviewed-on: https://code.wireshark.org/review/3933 Reviewed-by: Evan Huus commit eaaa35f Author: Alexis La Goutte Date: Sun Aug 31 20:35:14 2014 +0200 conv is always used, remove _U_ (unused) flag Change-Id: I648b365b662bd902e26e0c61f6d3499e8543e504 Reviewed-on: https://code.wireshark.org/review/3935 Reviewed-by: Evan Huus commit 37c23fc Author: Gerald Combs Date: Sun Aug 31 11:31:33 2014 -0700 WSUG: Fix URLs Fix broken download URLs in the introduction. Update some macros to use https:// URLs. Change-Id: I145e74e14ec04ce5fcf94a65cd5623059875c6e1 Reviewed-on: https://code.wireshark.org/review/3932 Reviewed-by: Gerald Combs commit 446125a Author: Alexis La Goutte Date: Thu Aug 21 09:06:57 2014 +0200 DNS: Add OpenPGP KEY (61) RRtype (draft-ietf-dane-openpgpkey-00) Not yet tested on real dns traffic Update also last updated DNS parameters (2014-08-12) Change-Id: I6109d585584e5fca11c606a2230d8ef89cdbf7b6 Reviewed-on: https://code.wireshark.org/review/3870 Reviewed-by: Evan Huus commit 5bec37f Author: Alexis La Goutte Date: Thu Aug 28 12:53:45 2014 +0200 Fix error: parameter 'XX' not found in the function declaration (-Wdocumentation) Change-Id: I0a56fb79d2ac3d874a48695ad0499bda96b4b655 Reviewed-on: https://code.wireshark.org/review/3892 Reviewed-by: Alexis La Goutte commit caf7352 Author: Alexis La Goutte Date: Thu Aug 28 18:49:03 2014 +0200 Fix parameter 'key' not found in the function declaration (-Wdocumentation) Change-Id: Ie7f3e192d8980968da15921a8497153506df1fde Reviewed-on: https://code.wireshark.org/review/3903 Reviewed-by: Evan Huus commit c14cac7 Author: Gerald Combs Date: Sun Aug 31 08:06:02 2014 -0700 [Automatic manuf, services and enterprise-numbers update for 2014-08-31] Change-Id: I35507fe1b4ac8ff3ec9391679769764656b9ff27 Reviewed-on: https://code.wireshark.org/review/3928 Reviewed-by: Gerald Combs commit 26731e8 Author: Jérôme LAFORGE Date: Sun Aug 31 00:17:07 2014 +0200 Check whether the hop-count exceeds the HOP_COUNT_LIMIT or not. Change-Id: If1c089e069b93a7b90cb525cd642ac26c5efa2d0 Reviewed-on: https://code.wireshark.org/review/3924 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit f415e1c Author: Guy Harris Date: Sat Aug 30 16:21:10 2014 -0700 Remove some unnecessary definitions. text2pcap.c uses pcapio.c to write pcap files, so it doesn't itself need to know what those files look like. Change-Id: I013d0c094c27515af91f352b565bc9a8bad3e842 Reviewed-on: https://code.wireshark.org/review/3927 Reviewed-by: Guy Harris commit 0d7c4fd Author: Michael Tüxen Date: Sat Aug 30 20:38:33 2014 +0200 Fix char signess issue. This bug was found by compiling wireshark on a Wandboard Quad using FreeBSD. Change-Id: I34ac8a04612a918782160947599245539d6e9427 Reviewed-on: https://code.wireshark.org/review/3923 Reviewed-by: Michael Tüxen commit 2eced36 Author: Pascal Quantin Date: Fri Aug 29 13:19:13 2014 +0200 6LoWPAN: fix dissection when using multicast address compression Also update the value_string arrays with the various SAM/DAM combinations Bug: 10426 Change-Id: I87f13c29f42770ec655d85e2247b847bfe28e3ba Reviewed-on: https://code.wireshark.org/review/3915 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus Reviewed-by: Anders Broman commit 437b448 Author: Stig Bjørlykke Date: Fri Aug 29 19:36:59 2014 +0200 Mark Trap-PDU as obsolete for SNMP versions > 1 Change-Id: I967a1547eb97619042b620bb3d803a29cce9ebe1 Reviewed-on: https://code.wireshark.org/review/3920 Reviewed-by: Evan Huus Reviewed-by: Anders Broman commit 26ab2e4 Author: Alexis La Goutte Date: Fri Aug 29 07:48:18 2014 +0200 Qt Follow Stream Dialog : Add some missing text to translate Fix also indent Change-Id: I864cd785f3b17e6360be63922ca63e349ae13f25 Reviewed-on: https://code.wireshark.org/review/3913 Reviewed-by: Anders Broman commit 021351f Author: Alexis La Goutte Date: Fri Aug 29 07:54:59 2014 +0200 PROTOABBREV: minor fix Fix typo PROTO_ABBREV -> PROTOABBREV Uncomment FIELDCONVERT Change-Id: I7b64c09ecf0c22a38042156d958e1c6c850c839a Reviewed-on: https://code.wireshark.org/review/3914 Reviewed-by: Anders Broman commit 0622e34 Author: Diederik de Groot Date: Fri Aug 29 01:57:03 2014 +0200 Skinny: Fix: ensure that string created in dissect_skinny_displayLabel is always NULL terminated (Fixing Bug: 10429 (Pascal)) Fix: MiscCommandType should use videoFastUpdateGOB Union when command enum is videoFastUpdatePicture Manual Merge PatchSet 4 (Me) and Patchset 7 (Pascal) Fix Merged PatchSet 8 (Pascal) Bug: 10429 Change-Id: I87bc7c6eaff976d7a70856f5fbe8c0ded6257064 Reviewed-on: https://code.wireshark.org/review/3893 Reviewed-by: Pascal Quantin Tested-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit 47f96d9 Author: Pascal Quantin Date: Fri Aug 29 13:37:16 2014 +0200 802.11: rename Control Frame Extension field to match the spec As reported by Richard Sharpe on -dev: https://www.wireshark.org/lists/wireshark-dev/201408/msg00236.html Change-Id: I16638982e14e566bb7e584a2d030c546d2223ebe Reviewed-on: https://code.wireshark.org/review/3916 Reviewed-by: Alexis La Goutte commit 8db0144 Author: Jeff Morriss Date: Thu Aug 28 21:20:56 2014 -0400 Consolidate several 3GPP Diameter xml files into one. Change-Id: If6ef48fbcceaf0b3a3591086015b021c6a80956b Reviewed-on: https://code.wireshark.org/review/3911 Reviewed-by: Jeff Morriss commit fcf6794 Author: Jeff Morriss Date: Thu Aug 28 21:37:25 2014 -0400 Remove AVPs that aren't really 3GPP2 (they are 3GPP). (The 3GPP2 Ty trace in the menagerie wrongly marks several of these AVPs as being 3GPP2.) Change-Id: I27963fbf8e1da51e430c609784e0c8bb4575549d Reviewed-on: https://code.wireshark.org/review/3912 Reviewed-by: Jeff Morriss commit a71f680 Author: Gerald Combs Date: Thu Aug 14 13:20:09 2014 -0700 Qt: Rework the "Manage Interfaces" dialog. Convert QTableWidget to QTreeWidget. It looks like the GTK+ version has a separate set of apply/save buttons for each tab which *only* operates on that tab. This can result unexpected behavior which throws away changes if the user updates more than one tab. Use a single "OK" button that applies all of our changes instead. Reorder the tabs. Put Local Interfaces first and select it by default. Always show Remote Interfaces. Disable it on platforms that don't have PCAP_REMOTE. Automatically start editing when we add a new pipe. Don't immediately update pipe interface settings. Wait until we hit "OK" instead. Rename NewFileDelegate to PathChooserDelegate. Note that we might want to move it use it elsewhere in the application. Try switching the user-facing terminology from "Hide" to the more positive "Show". Tell the user that we don't save pipe or remote interface settings. Add a help URL for the "Manage Interfaces" dialog box. Use the GLib and Qt string functions and classes to split and join comma-separated preferences. This makes sure capture_dev_user_descr_find doesn't skip over the first interface. It also keeps the Qt code from adding a leading comma to our capture preferences. Add a note about strings to README.qt. Summary: Use QStrings. For another day: - If we *do* save remote settings we need to store credentials securely, e.g. with CryptProtectData. - Get rid of the remote settings dialogs. Their controls should fit in the remote settings tab. - Add an extcap tab. - We need getter/setter functions for global_capture_opts.all_ifaces. We iterate over it *way* too much. Change-Id: Ib7b61972f3ece4325e0230f725e7f2678acbb24b Reviewed-on: https://code.wireshark.org/review/3873 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit b65d0e0 Author: Martin Kaiser Date: Thu Aug 28 23:21:36 2014 +0200 set usb_dissector_table for control messages to "other" and "reserved" add a comment to explain this Change-Id: I7aa04ab1653cd8e6ae82c230d93c4c8ead677ace Reviewed-on: https://code.wireshark.org/review/3910 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 9eb855b Author: Martin Kaiser Date: Thu Aug 28 19:02:10 2014 +0200 remove offset parameter from try_dissect_next_protocol() Change-Id: I7452e6c5a9a24d44f83338aeb1dae389b87c8701 Reviewed-on: https://code.wireshark.org/review/3909 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit e3cbc06 Author: Jeff Morriss Date: Thu Aug 28 15:28:27 2014 -0400 Add 3GPP2 Tx AVPs. Move all the 3GPP2 stuff into its own XML file. Change-Id: I7197f84472139c99bafa5b68f724abaab0453faa Reviewed-on: https://code.wireshark.org/review/3908 Reviewed-by: Jeff Morriss commit c2f1511 Author: Martin Kaiser Date: Wed Aug 27 23:15:19 2014 +0200 handle standard and non-standard setup requests in the same function Change-Id: I5204a2fc1082e8a6b8082ad58fb252d4ba6c8bcb Reviewed-on: https://code.wireshark.org/review/3901 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit c361211 Author: Martin Kaiser Date: Wed Aug 27 23:03:59 2014 +0200 simplify dissect_nonstandard_usb_setup_request() create setup_tvb in the calling function Change-Id: Id34635afbd25817b09535fc52d1ba396b2597e5a Reviewed-on: https://code.wireshark.org/review/3900 Petri-Dish: Martin Kaiser Tested-by: Petri Dish Buildbot Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 6603ac9 Author: Martin Kaiser Date: Thu Aug 28 20:56:00 2014 +0200 correct detection of USB header type this fixes a regression for linux USB headers without 64 bytes extension Change-Id: Icb79d983dac6dca25d04657d3324286c73d31f29 Reviewed-on: https://code.wireshark.org/review/3906 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 7312c07 Author: AndersBroman Date: Thu Aug 28 18:25:03 2014 +0200 - Use e212 routine for IMSI. - Add top_tree to function calls to avoid a crash. - Set a21_prefs_initialized. Change-Id: I193ae87189dda9b3806f43c9be3916f1adf7bda2 Reviewed-on: https://code.wireshark.org/review/3902 Reviewed-by: Anders Broman commit 384d95c Author: Martin Kaiser Date: Wed Aug 27 12:07:37 2014 +0200 remove unnecessary try_dissect_linux_usb_pseudo_header_ext() call Change-Id: Iafe173d4625d7e57ee3bd9c2fe9a6e6176624dcc Reviewed-on: https://code.wireshark.org/review/3899 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit c527d1a Author: Martin Kaiser Date: Wed Aug 27 11:40:46 2014 +0200 merge dissect_linux_usb_pseudo_header_ext() and try_dissect_linux_usb_pseudo_header_ext() Change-Id: Ica9e3089cc6bfde9b52158ef5e161dfcddeb716a Reviewed-on: https://code.wireshark.org/review/3898 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 2fe2c62 Author: Martin Kaiser Date: Wed Aug 27 11:32:04 2014 +0200 remove two obsolete comments Change-Id: I339655b699d998bd4194363df64d98543dcae624 Reviewed-on: https://code.wireshark.org/review/3897 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 95194f9 Author: Martin Kaiser Date: Wed Aug 27 11:29:18 2014 +0200 NULL check for usb_conv_info Change-Id: I6cb4347f73afcfe561d3dca846c846d481c1c3bd Reviewed-on: https://code.wireshark.org/review/3896 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit fa40c3a Author: Martin Kaiser Date: Tue Aug 26 16:00:28 2014 +0200 req_type is the same as type Change-Id: Icdc94d65043feb5927aa0194cbef796e634bf3a9 Reviewed-on: https://code.wireshark.org/review/3895 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit ab03797 Author: Martin Kaiser Date: Tue Aug 26 12:15:02 2014 +0200 use proto_tree_add_subtree() Change-Id: I0182397a7a208a2be8587fa4060a8497b54bb273 Reviewed-on: https://code.wireshark.org/review/3894 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit e7c11be Author: Alexis La Goutte Date: Thu Aug 28 09:44:28 2014 +0200 Fix error: not a Doxygen trailing comment found by Clang (-Wdocumentation) Change-Id: Ieff4b888b39c8da82f00b00e0609d89d1203aef9 Reviewed-on: https://code.wireshark.org/review/3891 Reviewed-by: Evan Huus commit cf3b238 Author: Alexis La Goutte Date: Wed Aug 20 09:19:44 2014 +0200 OSI util: Add modelines info Change-Id: I15e44f2f10b80b7c7ce78ce84b748ce8ec7a2eff Reviewed-on: https://code.wireshark.org/review/3890 Reviewed-by: Evan Huus commit c76e496 Author: Alexis La Goutte Date: Thu Aug 21 08:54:16 2014 +0200 DNS: Update CDS and add CDNSKEY (draft-ietf-dnsop-delegation-trust-maintainance-14) Use DS dissector for CDS (see section 3.1) and DNSKEY dissector for CDNSKEY (see section 3.2) Change-Id: I2ee11dc0eb2b5c74447b58604b1611ed249bc329 Reviewed-on: https://code.wireshark.org/review/3869 Reviewed-by: Anders Broman commit 7660da2 Author: Alexis La Goutte Date: Thu Aug 21 08:43:57 2014 +0200 DNS: Update EUI48 and EUI64 to final draft (RFC7043) Change-Id: I2b18ccb874a51e5e752462a34175df8d8a90ce41 Reviewed-on: https://code.wireshark.org/review/3868 Reviewed-by: Anders Broman commit edcd2dd Author: Pascal Quantin Date: Wed Aug 27 23:57:19 2014 +0200 NTP: fix parsing of control assignments with empty value Consider that ',' is a separator between assignments and make value presence optional Bug: 10417 Change-Id: I23f2b4029548a1263d65ee11c6356270e7a89bd7 Reviewed-on: https://code.wireshark.org/review/3884 Reviewed-by: Evan Huus Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 14b0d71 Author: Alexis La Goutte Date: Thu Aug 28 08:47:57 2014 +0200 RPKI-RTR: enhance dissector * fix no display all append COL_INFO... (reset by col_set_clear...) * fix dissection when type is unknown * fix warning about soft-deprecated (tvb_length..) * fix indent * fix some typo (IPV6 => IPv6...) Ping-Bug:8296 Change-Id: I246b04098200afd1528f632cc709f631422e745b Reviewed-on: https://code.wireshark.org/review/3888 Reviewed-by: Anders Broman commit 845b781 Author: Michal Labedzki Date: Tue Aug 26 13:13:57 2014 +0200 Bluetooth: btle: Clear info column before use it This fix "btle" over "ubertooth" dissector, so messeges from both will not be merged. Change-Id: I587b81a405f37d16e8ab417d94edfc633bfc14fc Reviewed-on: https://code.wireshark.org/review/3877 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus Reviewed-by: Anders Broman commit 852493a Author: Alexis La Goutte Date: Wed Aug 20 19:05:20 2014 +0200 TCP/UDP/SCTP: fix Dereference of null pointer found by Clang Analyzer The warning coming after change in g018b84de8 Change-Id: Ia96cdb2993a6283d8de2647c6723ec6b2b0977eb Reviewed-on: https://code.wireshark.org/review/3752 Reviewed-by: Evan Huus commit 4b11680 Author: Luke Chou Date: Thu Aug 14 03:38:54 2014 -0400 11ac decode update for IE196 Channel Switch Wrapper. Bug:10258 Change-Id: Ic8d3ee5323b95c9e827b47ad284be58e11bc97f4 Reviewed-on: https://code.wireshark.org/review/3593 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit 5ee328e Author: Gerald Combs Date: Wed Aug 27 13:55:12 2014 -0700 Increase the error buffer size for rpcap. If the rpcap port is unreachable pcap_findalldevs_ex can write more than PCAP_ERRBUF_SIZE bytes to errbuf. E.g. if we try to capture from Google's all-eights public DNS server we get: ---- Can't get list of interfaces: Is the server properly installed on 8.8.8.8? connect() failed: A connection attempt failed because the connected party did not properly respond after a period of time, or established connection failed because connected host has failed to respond. (code 1 ---- Set the buffer to PCAP_ERRBUF_SIZE*4 bytes. Hopefully that's large enough. Change-Id: I19f34cda16050c1ba8b9d7d6ed2d8e77b945a2af Ping-Bug: 3554 Ping-Bug: 6922 Ping-Bug: 7021 Reviewed-on: https://code.wireshark.org/review/3880 Petri-Dish: Gerald Combs Reviewed-by: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit a8523d7 Author: Guy Harris Date: Wed Aug 27 15:06:09 2014 -0700 At least some compilers don't allow warning pragmas inside functions. So wrap the entire function in USES_APPLE_DEPRECATED_API/USES_APPLE_RST. Change-Id: I6ae3e8ecc40bc407e6f7156ccc5d9dd8c51d650d Reviewed-on: https://code.wireshark.org/review/3885 Reviewed-by: Guy Harris commit 2e67941 Author: Guy Harris Date: Wed Aug 27 14:56:29 2014 -0700 Use the stuff to disable -Wdeprecated-declarations. Change-Id: I4b1fcbf5b25f2515d45015c9e1c4a94d6cfbc79c Reviewed-on: https://code.wireshark.org/review/3883 Reviewed-by: Guy Harris commit c7ce0e0 Author: Guy Harris Date: Wed Aug 27 14:48:22 2014 -0700 Be more selective about turning off deprecation warnings. Only turn them off in the vicinity of those nasty cross-platform APIs. (This also checks in the generated Kerberos dissector, which we forgot to do in the last checkin.) Change-Id: I5dc9162ff64afe764e37866706590ed2ed965acb Reviewed-on: https://code.wireshark.org/review/3882 Reviewed-by: Guy Harris commit d04ec41 Author: Guy Harris Date: Wed Aug 27 14:16:33 2014 -0700 Use FreeRADIUS's warning pragma controls to suppress Apple complaints. Apple would really rather that you use their Shiny Happy Frameworks rather than those crufty old cross-platform APIs. We are a cross-platform program, and will use platform-specific APIs only if there's enough benefit to doing so - and, in this case, that means "using the platform-specific APIs on OS X and the other APIs on other platforms", so that's two code paths to maintain, so "enough benefit" has to outweigh the issues with that. Change-Id: I370ba469a6f5892143d72179d15c9fe22d664fdf Reviewed-on: https://code.wireshark.org/review/3881 Reviewed-by: Guy Harris commit 1b3bc9b Author: Bill Meier Date: Wed Aug 27 12:12:57 2014 -0400 checkhf.pl: (Trivial) remove trailing whitespace. Change-Id: I37ece54d936541b5d92e8c323ffeb429d9cc5f33 Reviewed-on: https://code.wireshark.org/review/3879 Reviewed-by: Bill Meier commit f4b135c Author: Bill Meier Date: Mon Aug 25 22:39:59 2014 -0400 packet-mausb.c: proto-reg-handoff() fixes - proto_reg_handoff...(): Fix handling of tcp port pref change; Rename 'gPORT_PREF' to 'mausb_tcp_port_pref'; Do 'dissector_add_uint("llc.mausb_pid",..)' only once; Change-Id: Ic4498560f61d0ce95f8109c3a1bb3c407221269b Reviewed-on: https://code.wireshark.org/review/3854 Reviewed-by: Bill Meier commit cac381b Author: Pascal Quantin Date: Wed Aug 27 15:40:33 2014 +0200 E.164: update list to Operational Bulletin No. 1057 (1.VIII.2014) Change-Id: If1767dcf9a533d10e0ac946a2f31d7f58ea7b01c Reviewed-on: https://code.wireshark.org/review/3875 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 41764ec Author: Pascal Quantin Date: Wed Aug 27 15:36:45 2014 +0200 E.212: update list to Operational Bulletin No. 1058 (15.VIII.2014) Change-Id: I79d12c4699df01f3435fae5342aa5ec295316959 Reviewed-on: https://code.wireshark.org/review/3874 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 2263b73 Author: Alexis La Goutte Date: Tue Aug 26 21:36:53 2014 +0200 CAPWAP : Fix wrong offset for AC Name with Priority Thanks to Massimo Velluci for sample Change-Id: Ibab2658c2c11c9940d3fdebb0bdc42752d57e1ae Reviewed-on: https://code.wireshark.org/review/3871 Reviewed-by: Alexis La Goutte commit c612029 Author: Sean O. Stalley Date: Tue Aug 26 10:16:58 2014 -0700 Exclude MA USB TransferAck's from USB conversation the usb_trans_info struct only understands Requests & Responses. TransferAcks are currently treated as responses, which throws off the Request/Response pairing & dissection. This patch fixes tracking in the case when a TransferAck & TransferReq are in the same TCP packet. It does not fix the case where there are multiple TransferReq's or TransferResp's in 1 TCP packet. Eventually I want to revamp usb_trans_info structure to support: -multiple requests/responses per transaction (IE: retries) -TransferAck tracking -handling of multiple requests/responses in 1 TCP packet Change-Id: I09be6fecf55a40b4ea2a4f27bd753f3991ccabbd Reviewed-on: https://code.wireshark.org/review/3866 Reviewed-by: Pascal Quantin commit d6aa77d Author: Diederik de Groot Date: Tue Aug 26 18:33:54 2014 +0200 Skinny: Do not try to create a wmem_strbuf whose size is bigger than the max size allowed -> using wmem_strbuf_new instead of wmem_strbuf_sized_new (Evan Huus) While we are at it, fix errors spotted by the pre-commit tools/SkinnyProtocolOptimized -> Did not get any, can you specify which errors ? (Pascal Quantin) FT_IPv6: 'ENC_BIG_ENDIAN | ENC_NA' -> 'ENC_NA' only (2) (Pascal Quantin) Revert back to wmem_strbuf_sized_new instead of wmem_strbuf_new (Pascal Quantin) Use wmem_strbuf_sized_new maxlength = 0 (Pascal Quantin) Bug: 10409 Bug: 10410 Change-Id: Iebfcb53bc0a6289e02d10c38ecb717aa5c89389e Reviewed-on: https://code.wireshark.org/review/3862 Reviewed-by: Pascal Quantin commit efd9534 Author: Alexis La Goutte Date: Mon Aug 25 10:35:09 2014 +0200 Add custom_layer_chm.xsl to UNKNOWN (fix checklicence) Change-Id: I4c336f21f721443e83eca7b9bf8d7a6138b367f4 Reviewed-on: https://code.wireshark.org/review/3827 Petri-Dish: Alexis La Goutte Reviewed-by: Jeff Morriss commit 88a3b30 Author: Pascal Quantin Date: Sun Aug 24 23:43:46 2014 +0200 Extcap: prevent a GLib assert when interface_opts.extcap_args is NULL I was able to trigger it when trying to change the options of extcap_example.py interface Change-Id: I9ecff51d47b3ef6e178637b31d49af46a1928acd Reviewed-on: https://code.wireshark.org/review/3822 Reviewed-by: Pascal Quantin commit e28f490 Author: Pascal Quantin Date: Sun Aug 24 22:35:52 2014 +0200 Extcap: restore compatibility with GLib 2.16.0 While we are at it, fix what seem to be a memory leak in extcaps_init_initerfaces() Change-Id: I1bb9a1b44d16f986eedd192b15cce84c5881a917 Reviewed-on: https://code.wireshark.org/review/3820 Reviewed-by: Roland Knall Reviewed-by: Anders Broman Reviewed-by: Pascal Quantin commit 8fee04a Author: Pascal Quantin Date: Tue Aug 26 10:38:20 2014 +0200 USB: fix dissection of non standard USB setup requests Otherwise captures like the one found in bug 8161 do not dissect properly anymore (sub dissector is called twice) While we are at it, reorganize functions order to void a forward declaration Change-Id: Id02ef835ba24981902a1702f976db099fa07b0fd Reviewed-on: https://code.wireshark.org/review/3858 Reviewed-by: Martin Kaiser commit ff59722 Author: Pascal Quantin Date: Tue Aug 26 12:05:49 2014 +0200 USB: get rid of the remaining proto_tree_add_text instances Change-Id: I6acaa32745e32ec5728874549e420468499d9b24 Reviewed-on: https://code.wireshark.org/review/3860 Reviewed-by: Pascal Quantin commit 7836a71 Author: Pascal Quantin Date: Tue Aug 26 13:01:24 2014 +0200 Skinny: do not try to create a wmem_strbuf whose size is bigger than the max size allowed While we are at it, fix errors spotted by the pre-commit tools/SkinnyProtocolOptimized Bug: 10409 Change-Id: Ic84632e0563f801239603534121e3487cf0d6d24 Reviewed-on: https://code.wireshark.org/review/3861 Reviewed-by: Evan Huus commit 338f6ac Author: Josip Medved Date: Mon Aug 25 20:56:17 2014 -0700 Added Authentication-Method and afew other AVPs that appear in the SIP-Auth-Data-Item grouped AVP. Change-Id: Ie90ec71d8d574d38f32a5ff3de6ad5433b9e5e9f Reviewed-on: https://code.wireshark.org/review/3823 Reviewed-by: Anders Broman commit 64cd827 Author: Sean O. Stalley Date: Mon Aug 25 15:02:10 2014 -0700 Have dissect_usb_setup_request handle non-standard requests Moved code for parsing non-standard setup requests from dissect_usb_common() to dissect_usb_setup_request(). Also added header_info flag USB_HEADER_IS_MAUSB & updated mausb dissector. Change-Id: Ifa8abccbd57bf4dd3965f582872952383e6f737d Reviewed-on: https://code.wireshark.org/review/3851 Petri-Dish: Anders Broman Reviewed-by: Anders Broman commit 3d4d021 Author: Sean O. Stalley Date: Mon Aug 25 12:56:14 2014 -0700 Non-standard USB control requests now handled in own function Change-Id: Icf56f3f5899d17908dac4783d2b3e30373186eba Reviewed-on: https://code.wireshark.org/review/3850 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Reviewed-by: Anders Broman commit 8d54f8a Author: Sean O. Stalley Date: Fri Aug 22 17:40:48 2014 -0700 further rearranged control URB request conditionals combined 2 sections for dissecting non-standard requests into 1 Change-Id: I181346a69e2f96ff47b82f82d3aa69846c45614f Reviewed-on: https://code.wireshark.org/review/3849 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Reviewed-by: Anders Broman commit 3439943 Author: Sean O. Stalley Date: Fri Aug 22 17:11:16 2014 -0700 added try_dissect_linux_usb_pseudo_header_ext helper function Change-Id: I05b0adaef2b979432e293bc26e2a122a0d3551fc Reviewed-on: https://code.wireshark.org/review/3848 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 259e09e Author: Sean O. Stalley Date: Fri Aug 22 16:31:28 2014 -0700 rearranged control URB request conditionals Rearranged conditionals for control URB request to limit variable scope. Now there are 2 major branches based on weather the URB has setup data. Change-Id: I67172c4e949bbda363ccf939d404957258b73840 Reviewed-on: https://code.wireshark.org/review/3847 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 827d899 Author: Joerg Mayer Date: Tue Aug 26 06:32:55 2014 +0200 The remaining build systems didn't know about the change of the capture chapter from xml to asciidoc either. Change-Id: Ia48d4e0e4b445aedabd29a8483bcc19f12c13b20 Reviewed-on: https://code.wireshark.org/review/3857 Reviewed-by: Jörg Mayer commit 1b42025 Author: Joerg Mayer Date: Tue Aug 26 06:29:55 2014 +0200 Whitespace fix Change-Id: Ie42cc8df1066078d26966129fdd3e8b5643c722f Reviewed-on: https://code.wireshark.org/review/3856 Reviewed-by: Jörg Mayer commit 0be336c Author: David Ameiss Date: Mon Aug 25 21:28:38 2014 -0500 Added missing name to AUTHORS file. Change-Id: I674c60a39e9e85e441fdb28c14a0845e34115b53 Reviewed-on: https://code.wireshark.org/review/3853 Reviewed-by: Anders Broman commit 9f6afbc Author: Evan Huus Date: Mon Aug 25 20:40:19 2014 -0400 Fix typo Change-Id: I8e3b3115191ca7a9c5388e866e9add12b7689039 Reviewed-on: https://code.wireshark.org/review/3852 Reviewed-by: Evan Huus commit 7749263 Author: Diederik de Groot Date: Tue Aug 26 01:46:21 2014 +0200 Skinny Dissector: Source Fix: Trailing Whitespace (Reported by Graham Bloice). Dissection Fix: ProtocolVer needed to be split up into two fields to display the protocol version correct during device registration Segfault Fix: Null Pointer Check required after returning from tvb_memdup, before calling strlen (Reported by Evan Huus) Fix: Whitespace (again) Bug: 10409 Change-Id: Ib253ea843363792f678f2e724359f83f12ebfadc Reviewed-on: https://code.wireshark.org/review/3844 Reviewed-by: Evan Huus commit 1c98a12 Author: Joerg Mayer Date: Tue Aug 26 00:41:07 2014 +0200 WSUG_chapter_capture is now an asciidoc file that gets converted into an xml file. Change-Id: I43ae59d14cbdcf460250cf62005aea4a2772d11f Reviewed-on: https://code.wireshark.org/review/3846 Reviewed-by: Jörg Mayer commit 0f8e506 Author: Joerg Mayer Date: Tue Aug 26 00:26:46 2014 +0200 The timezone for generating the NEWS file timestamp was changed to UTC Change-Id: I77187bf4738a20bcebd899e2a01afd6077ae7e6c Reviewed-on: https://code.wireshark.org/review/3845 Reviewed-by: Jörg Mayer commit 7f05ae6 Author: Joerg Mayer Date: Mon Aug 25 07:54:13 2014 +0200 As long as NEWS is still part of the git tree: At least don't differ because of different timezones. Change-Id: I93809447db29c2cc5f848edb438ee16372b57453 Reviewed-on: https://code.wireshark.org/review/3824 Reviewed-by: Jörg Mayer commit a849371 Author: Gerald Combs Date: Mon Aug 18 09:31:26 2014 -0700 WSUG: Convert the "Capturing" chapter to AsciiDoc. Leave most of the content intact for now. Add a section on markup conventions to README.txt. Remove the .mediaobject border. Change-Id: I06cfd482a4c8ea63c90b9f59fcdf2afaf636a4a2 Reviewed-on: https://code.wireshark.org/review/3821 Reviewed-by: Gerald Combs commit d372873 Author: Graham Bloice Date: Sun Aug 24 19:06:56 2014 +0100 Updates for docbook builds on Windows In config.nmake search for multiple versions of fop in a couple of places, preferring fop 1.1 In Makefile.nmake remove any PYTHONPATH env var (as that's probably for Windows) and not the Cygwin python used in asciidoc In Readme.txt update some Cygwin package info Change-Id: I117ec6bbdabc34829b421fd514508383b925090f Reviewed-on: https://code.wireshark.org/review/3816 Reviewed-by: Gerald Combs Reviewed-by: Graham Bloice commit 1aead57 Author: Martin Kaiser Date: Tue Aug 19 09:27:29 2014 +0200 reformat dissect_usb_setup_response() make sure it can handle usb_conv_info==NULL Change-Id: I5f53b26fd6fe22471906b07b5dad8f4c07dffa55 Reviewed-on: https://code.wireshark.org/review/3843 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit bfe9332 Author: Diederik de Groot Date: Mon Aug 25 19:00:05 2014 +0200 SKINNY: Fix some warning Fix: cog [[[END]]] in packet-skinny.h.in Fix: error: expression which evaluates to zero treated as a null pointer constant of type 'const gchar *' (aka 'const char *') [-Werror,-Wnon-literal-null-conversion] (Reported by Alexis La Goutte and found by Clang 3.6) Change-Id: Ic354f349eef8a12a7e18e841b517ea4f72ba86f2 Reviewed-on: https://code.wireshark.org/review/3842 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit ab33c40 Author: Gerald Combs Date: Mon Aug 25 09:37:35 2014 -0700 More README.cmake updates. Change-Id: I1c7e51ee397171af0703878e509665c8119b37ba Reviewed-on: https://code.wireshark.org/review/3841 Reviewed-by: Gerald Combs commit e2acc23 Author: Gerald Combs Date: Mon Aug 25 08:58:43 2014 -0700 Use Segoe UI to render the HTML Help text. Change-Id: I0ff717dda35a39f34c3140f920f8ac2fe74e24bc Reviewed-on: https://code.wireshark.org/review/3840 Reviewed-by: Gerald Combs commit cdc80af Author: Bill Meier Date: Mon Aug 25 11:44:36 2014 -0400 checkhf.pl: (Trivial) fix two typos Change-Id: I2a63127dcf819d671a4c814dcbd82b2dca5022d3 Reviewed-on: https://code.wireshark.org/review/3838 Reviewed-by: Bill Meier commit 3ba56ca Author: Bill Meier Date: Mon Aug 25 11:22:32 2014 -0400 packet-a21.c: Minor changes - Comment out several "set but unused" lines of code; - initialize 'gcsna_handle' only once. Change-Id: I17a89ccff228b28d075d9db9289ad412892b2639 Reviewed-on: https://code.wireshark.org/review/3837 Reviewed-by: Bill Meier commit d127b57 Author: Matthieu Texier Date: Mon Aug 25 15:22:07 2014 +0200 BPG : issue with BGP AS path heuristic (AS_CONFED_SET) Add also a expert info when unable determine ASN length (2 or 4 bytes) Bug: 10399 Change-Id: I24978e29e24f38c2e01e4b953a5a51496f0cf5a6 Reviewed-on: https://code.wireshark.org/review/3831 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit f1dd9bc Author: Alexis La Goutte Date: Thu Aug 7 14:39:28 2014 +0200 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I19df790d18e71d45df28dc6e8731cd2e1acb098b Reviewed-on: https://code.wireshark.org/review/3826 Reviewed-by: Evan Huus commit 3eb3762 Author: Alexis La Goutte Date: Thu Aug 7 14:38:31 2014 +0200 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I4a2ba6902acc0cbd224a8926eeb7bd0b62b4d29e Reviewed-on: https://code.wireshark.org/review/3825 Reviewed-by: Evan Huus commit d3c649b Author: Marian Durkovic Date: Sun Aug 17 09:18:34 2014 +0200 TRILL ISIS: Implement all RFC7176 section 2.2 SubTLVs Bug:10391 Change-Id: Ibdf3e4964668a57362b6d25ef4ae106d368f0e69 Reviewed-on: https://code.wireshark.org/review/3668 Reviewed-by: Alexis La Goutte commit f44e082 Author: Alexis La Goutte Date: Mon Aug 25 16:02:07 2014 +0200 RPKI RTR: Wrong decoding of RPKI RTR End of Data PDU The decoding of the End of Data PDU ignores the Serial Number, i.e., the last 32 bit of this PDU. Instead of that the current dissector implementation starts to decode a new RTR PDU. Details of packet format see http://tools.ietf.org/html/rfc6810#section-5.8 Found by Matthias Wählisch Bug: 10411 Change-Id: I8451b5fbda18a034022b97ff442ddb2a2dabed7b Reviewed-on: https://code.wireshark.org/review/3832 Reviewed-by: Alexis La Goutte commit c697a86 Author: Bill Meier Date: Sun Aug 24 16:36:26 2014 -0400 packet-a21.c: Fix a bug; Do some other misc cleanup. - expert_...() and external dissectors shouldn't be called under 'if (tree)'; - Remove (what appear to be) some unneeded casts; - (Misc cleanup) Change-Id: I5ced313d3342125b918e179529b12d2f3bc4d87a Reviewed-on: https://code.wireshark.org/review/3830 Reviewed-by: Anders Broman commit b737e2e Author: Martin Kaiser Date: Wed Aug 20 14:32:40 2014 +0200 remove trans_info parameter from dissect_usb_endpoint_descriptor() (remove it in the call from mausb as well) add NULL checks for usb_conv_info, usb_trans_info Change-Id: I95d52b85e3fa0d42b6a20047053259aaca8754fe Reviewed-on: https://code.wireshark.org/review/3784 Reviewed-by: Martin Kaiser commit c284e12 Author: Martin Kaiser Date: Wed Aug 20 14:41:26 2014 +0200 remove trans_info parameter from dissect_usb_unknown_descriptor() remove now unused trans_info variable in mausb Change-Id: I99df8a1ed039134c9448546d0f1a738f203f9610 Reviewed-on: https://code.wireshark.org/review/3785 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit d87fbc9 Author: Martin Kaiser Date: Wed Aug 13 23:09:49 2014 +0200 an endpoint_descriptor may only be sent from a USB device to the host as part of a GET DESCRIPTOR Response therefore, pinfo->destport==NO_ENDPOINT is always true for valid USB packets and we can remove the else branch Change-Id: I2163e3000cafa27113ee0e6173fd69b7ef17b812 Reviewed-on: https://code.wireshark.org/review/3585 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit a6cbcb1 Author: AndersBroman Date: Mon Aug 25 13:25:10 2014 +0200 Fix a typo RELEASE_OTHER_REASON 4 -> RELEASE_OTHER_REASON 3 RFC 3057 3.3.1.2 RELEASE_OTHER 0x3 Other reasons Change-Id: I5c2344600646cbfbef379aed5d3ffa9fc48da639 Reviewed-on: https://code.wireshark.org/review/3829 Reviewed-by: Anders Broman commit e784002 Author: Marian Ďurkovič Date: Sat Aug 23 16:26:50 2014 +0200 TRILL ISIS: SubTLVs of Router Capability TLV are valid for MT-Capability TLV as well Change-Id: Idf466c021b1b188d9c6d55ba73a25257ba352412 Reviewed-on: https://code.wireshark.org/review/3803 Petri-Dish: Evan Huus Reviewed-by: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 7fab56a Author: Diederik de Groot Date: Sun Aug 24 21:46:18 2014 +0200 Skinny: packet-skinny Add tools path to the python search path, fixing cog.py generation of package-skinny.c from packet-skinny.c.in Add GPLv2 License to parse_xml2skinny_dissector.py Change-Id: I91b76867b02d8cebc40bba35151db48bc2fcaeca Reviewed-on: https://code.wireshark.org/review/3819 Reviewed-by: Evan Huus Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 549f5c4 Author: Роман Донченко Date: Sun Aug 24 23:29:01 2014 +0400 Remove obsolete comments regarding the shell version of make-dissector-reg Change-Id: I93470e8c6e9afd6c1ebf735eb13141586964be0e Reviewed-on: https://code.wireshark.org/review/3818 Reviewed-by: Pascal Quantin commit 7d81eab Author: Gerald Combs Date: Sun Aug 24 11:24:20 2014 -0700 Fix Autotools AsciiDoc configuration + CSS updates. Fix --asciidoc-opts in Makefile.am. Add borders around menu and keycap markup. I like the latter but the former could probably use more work. Change-Id: If02e3d00875106d6b8f8bcf01cd52b1df4f9b6c8 Reviewed-on: https://code.wireshark.org/review/3817 Reviewed-by: Gerald Combs commit 7de88cc Author: Gerald Combs Date: Sun Aug 24 09:13:11 2014 -0700 Try to get HTML Help to render SVG. Add a custom stylesheet that inserts at the top of our HTML Help output. This *should* convince the WebBrowser control to draw our new SVG images. Change-Id: Iae491128195d3738951f3d19e2f82dd3fc73d1d8 Reviewed-on: https://code.wireshark.org/review/3814 Reviewed-by: Gerald Combs commit a68eab6 Author: Peter Wu Date: Wed Jul 30 13:13:10 2014 +0200 Hack to fix RTP player progress line position PortAudio seems to return 0 as value for Pa_GetStreamTime() on a PulseAudio system using the ALSA host API. This is known for 3 years, but still has not been fixed. As this function basically gives us a monotonically increasing clock in seconds as double, just use the Glib library function for that. I don't know whether this adds much latency, but it is certainly better than breaking the progress line (and also the related auto-scroll). While at it, split the idx calculation and explain what each part does and add modelines. Remove invalid _U_ annotations. [1]: http://music.columbia.edu/pipermail/portaudio/2011-June/012452.html Bug: 10307 Change-Id: I67fff531e0577add4b9b76052e286fb3fd5d01ff Reviewed-on: https://code.wireshark.org/review/3260 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit ed090dd Author: Gerald Combs Date: Sun Aug 24 08:05:34 2014 -0700 [Automatic manuf, services and enterprise-numbers update for 2014-08-24] Change-Id: Ibe3e8e23f8ae5a136c1acb0eda4cfe03928616d2 Reviewed-on: https://code.wireshark.org/review/3811 Reviewed-by: Gerald Combs commit 276a697 Author: Diederik de Groot Date: Wed Aug 13 12:44:57 2014 +0200 [RFC] Skinny: Rewrite using automatic code generation Support: Protocolversion 0 - 22 Includes: Callmanager to/from Cisco Phones, Inter CallManager Messages and CallManager to/from Cisco ASA Code Generator not included, because protocol does not evolve anymore / No newer versions to be expected Fixed: Added more readable information for SoftKeyTemplateRes and SoftKeySetRes, Added Bitfield processing, Added Longer Field Descriptions Fixed: message_handle array overrun, message_ids, hf_skinny fields format Fixed: dialedNumber Message, Setting data on si->fields (tap.h) Fixed: Comments made by Peter Wu Added: Code Generator Sources Fixed: hf_skinny blurp, XML Truncation, Updated ButtonTemplate, SoftKeyTemplate and SoftKeyRes presentation Fixed: EnblocMessage, DialedNumberMessage Added: DisplayLabels Added: dissect_skinny_DisplayLabel function to Lookup and Translate in the phone embedded strings to human readable form Fixed: CallInfoV2, OpenReceiveChannelAck, KeypadButton when generated by a 7912 running old firmware. Fixed: Made changes requested by Peter Wu, in last 2 reviews Fixed: ConfigStatV2, ServerRes Fixed: Comment made by Michael Mann Fixed: CheckAPI.pl / Petri Dish Fixed: Included packet-skinny.h and epan/dissectors/packet-skinny.h.in -> Petri Dish Change-Id: Ic2d2ead8ff0ce80668c9b2e249ce69f53e25a383 Bug: 10262 Reviewed-on: https://code.wireshark.org/review/2921 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Jörg Mayer Reviewed-by: Michael Mann commit cda5c16 Author: Guy Harris Date: Sun Aug 24 01:56:36 2014 -0700 Clean up capinfos output. Make sure there's always a space between a number and "[TGMK]bytes", "[TGMK]bits", and "[TGMK]packets". Change-Id: I710385303e451e9aea6fc9bbea562f59ca0d22c9 Reviewed-on: https://code.wireshark.org/review/3810 Reviewed-by: Guy Harris commit a52939c Author: Guy Harris Date: Sun Aug 24 01:12:13 2014 -0700 Fix trailing blank. Change-Id: Ide4afb2fb78c80800f04a40031fa1f35804f6464 Reviewed-on: https://code.wireshark.org/review/3809 Reviewed-by: Guy Harris commit bb0c175 Author: Guy Harris Date: Sun Aug 24 01:06:35 2014 -0700 Strengthen the heuristics for pcap subtypes. When trying to guess what type of capture a file is, look for as many bogosities (caplen > len, microseconds >= 10^6/nanoseconds >= 10^9, too-high caplen, too-high original len, caplen > snapshort length), to increase the chances of guessing correctly. (Every time somebody uses 0xa1b2c3d4 as the magic number for a capture file that isn't standard pcap format, God kills a kitten. Please, think of the kittens.) Change-Id: I3f397d598ed61dc82e2832be30452ebe8ace98e8 Reviewed-on: https://code.wireshark.org/review/3808 Reviewed-by: Guy Harris commit 28bea6f Author: Graham Bloice Date: Fri Aug 22 23:01:11 2014 +0100 Add captype to the CMake options so it gets built if required Change-Id: I915a7caa32a1f644c30c1579a8ad15e39db9e02a Reviewed-on: https://code.wireshark.org/review/3799 Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice commit 9754616 Author: Graham Bloice Date: Fri Aug 22 22:13:05 2014 +0100 Modify includes of config.h so that out-of-tree builds, i.e. CMake don't pick up the in-tree copy. Change-Id: I7ec473876cdba1a025c52362d7f6adc62d24ce71 Reviewed-on: https://code.wireshark.org/review/3798 Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall Reviewed-by: Graham Bloice commit f88eca4 Author: Gerald Combs Date: Sat Aug 23 22:21:38 2014 -0700 Fix admon.graphics.path. Change-Id: I43d7d56f0fc2bd73efc54a685aea90f635b145ff Reviewed-on: https://code.wireshark.org/review/3807 Reviewed-by: Gerald Combs commit d310115 Author: Gerald Combs Date: Wed Jul 23 18:28:32 2014 -0700 Convert admon graphics to SVG. Use a common set of SVG files for AsciiDoc / DocBook admonition graphics. Put them in a common directory. According to http://caniuse.com/svg all common browsers have had SVG support for a while now. The graphics themselves were created with Inkscape. If you would like to refine them further you are more than welcome. Use variables to assemble xsltproc commands in Autotools and Nmake while we're here. Try to update Debian rules to reflect ga92c3fb. Change-Id: If82647af27a60117c517125dff0aca81c033be72 Reviewed-on: https://code.wireshark.org/review/3206 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 7d035a1 Author: Gerald Combs Date: Sat Aug 23 18:15:52 2014 -0700 WSUG: Minor fixups for the statistics chapter. Fix a quotation warning. Use the menu:[] and button:[] macros. Other minor changes. Clean up whitespace. Change-Id: I3ae98ddcbd90c8d22284a9ef467268dabee8f829 Reviewed-on: https://code.wireshark.org/review/3806 Reviewed-by: Gerald Combs commit a92c3fb Author: Gerald Combs Date: Sat Aug 23 16:09:58 2014 -0700 CMake: More a2x / asciidoc fixes. Create graphics directories and copy files into them similar to Autotools and Nmake. Adjust some xsltproc arguments. Fix the --asciidoc-opts flag. Note: Admon graphics are broken pending change 3206. Change-Id: I94d498de36150a7cb4ffd080581523300b222bd4 Reviewed-on: https://code.wireshark.org/review/3805 Reviewed-by: Gerald Combs commit 40c367e Author: Gerald Combs Date: Sat Aug 23 19:51:22 2014 +0000 Windows: Fix AsciiDoc / DocBook builds. The "quotes" section of the Asciidoctor compatibility file appears to be incompatible with Cygwin's version of AsciiDoc (8.6.3). Change-Id: Ifd08095effa07bc7277a2fff9de322dda51a8d47 Reviewed-on: https://code.wireshark.org/review/3804 Reviewed-by: Gerald Combs commit 02c5a12 Author: Gerald Combs Date: Sun Aug 17 09:23:31 2014 -0700 WSUG: Convert the "User Interface" chapter to AsciiDoc. Add the "asciidoc.conf" compatibility configuration file from Asciidoctor. Although we don't use Asciidoctor it gives us macros that keep us from losing some useful DocBook elements. Update various CMake files to support multiple AsciiDoc configuration files. Leave most of the content intact for now. Hopefully the other chapters aren't as laden with markup. Change-Id: Id69757342b86abb2b3130cb61e90f5695a26ea8a Reviewed-on: https://code.wireshark.org/review/3680 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 6854d89 Author: Pascal Quantin Date: Sat Aug 23 13:02:48 2014 +0200 USB: call USB control dissector table when recipient is "other" Otherwise USB HUB dissector is no more called (see the capture in bug 8161 for an example) Change-Id: Ie8ac1c8ca19bf292d8fc69d9b0b3729f696ffc07 Reviewed-on: https://code.wireshark.org/review/3802 Reviewed-by: Martin Kaiser commit 59b750c Author: Michael Tüxen Date: Sat Aug 23 12:44:31 2014 +0200 Update the SCTP PPIDs. Change-Id: I0b34e544d4332f2b5d8dcc287861636db86ac1b9 Reviewed-on: https://code.wireshark.org/review/3801 Petri-Dish: Michael Tüxen Tested-by: Petri Dish Buildbot Reviewed-by: Michael Tüxen commit 2068b31 Author: Jeff Morriss Date: Fri Aug 22 21:17:36 2014 -0400 Add the 3GPP2 Ty Application ID and a bunch of Ty AVPs. Change-Id: If36c8a22c34a88bbb43afbc932cd0b8193dd9c7b Reviewed-on: https://code.wireshark.org/review/3800 Reviewed-by: Jeff Morriss commit df335d5 Author: Garming Sam Date: Fri Nov 22 14:19:03 2013 +1300 Cope with MIT being line wrapped when compiling with kerberos The line "Massachusetts Institute of Technology" now appears across two lines in the header file. Change-Id: I618b520d6c15f51180b47d93c75e29a6f43b868b Reviewed-on: https://code.wireshark.org/review/3790 Reviewed-by: Evan Huus Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 06565a7 Author: Graham Bloice Date: Wed Aug 20 22:29:33 2014 +0100 Add WinSparkle to the CMake build to bring it into line with the nmake build Change-Id: I944d0fe15b396cad4d0054b6fc359acb42ae3c9c Reviewed-on: https://code.wireshark.org/review/3755 Reviewed-by: Graham Bloice commit 863b664 Author: Jeff Morriss Date: Fri Aug 22 15:44:20 2014 -0400 Replace a couple of implementations of unpack_digits() with tvb_bcd_dig_to_wmem_packet_str(). Change-Id: Ic9e740345fb3a748f6df4f624441bb947bbd9429 Reviewed-on: https://code.wireshark.org/review/3797 Reviewed-by: Anders Broman commit 2d74838 Author: Jeff Morriss Date: Fri Aug 22 15:14:00 2014 -0400 Decode the 3GPP MSISDN AVP using the E.164 routines. Rename dissect_e164_utf8_number() to dissect_e164_msisdn() and give it an 'encoding' argument. Change-Id: I49cf5d2b24b44a0e69427ceae331f378024391c5 Reviewed-on: https://code.wireshark.org/review/3796 Reviewed-by: Jeff Morriss commit 923ba9d Author: Jeff Morriss Date: Fri Aug 22 14:39:42 2014 -0400 Fix a comment typo: tvb_bcd_dig_to_wmem_packet_str() returns a WMEM-allocated string, not an EP-allocated one. Change-Id: I3918ed66429c588d4503d98e10dc460b099e550e Reviewed-on: https://code.wireshark.org/review/3795 Reviewed-by: Jeff Morriss commit 28acde1 Author: Marian Ďurkovič Date: Wed Aug 20 11:30:44 2014 +0200 Parse Capabilities & Flags section of TRILL Version Sub-TLV Change-Id: Ic82a2368c865031eaeee291055b6a4f176cde759 Reviewed-on: https://code.wireshark.org/review/3792 Reviewed-by: Anders Broman commit 76a674f Author: Marian Ďurkovič Date: Tue Aug 19 15:33:26 2014 +0200 TRILL ISIS: Implement TRILL Neighbor TLV (145) Change-Id: I1b17b0ef26150fdc68b966f4837953f9832883cb Reviewed-on: https://code.wireshark.org/review/3717 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit ff94a7f Author: Joerg Mayer Date: Fri Aug 22 12:53:27 2014 +0200 Move generating HAVE_AIRPCAP to main CMakeLists.txt as is done with other liberaries. Also: After set( variable 0 ) the variable is defined. Change-Id: Id26a771875b7643c19f173ce77bb29a4059a1bd0 Reviewed-on: https://code.wireshark.org/review/3793 Reviewed-by: Jörg Mayer commit d5ba8b4 Author: Marian Ďurkovič Date: Tue Aug 19 14:22:49 2014 +0200 TRILL updates Update Version info Update Nickname IDs Add new multicast MAC addresses Change-Id: I72647b5f98a48267340d51df428602e1c77cb206 Reviewed-on: https://code.wireshark.org/review/3714 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit b6cb2ad Author: Wasim Abu Moch Date: Tue Aug 19 16:58:04 2014 +0300 packet-infiniband: added support for Mellanox DC transport type *marked parse_DCCETH() function's unesed parameters with _U_ macro instead of (void) */ *Added few whitespaces (new lines), were mistakenly removed"* Adding minimal support for Mellanox DC transport type which replaces RD (RD isn't implemented in any HW yet). It's minimal in the sense of skipping new headers without parsing/showing them, this allows at least to keep correct IB packet parsing due to the new added header for this TS. (in this stage we can't expose the protocol details including it's header layout) Change-Id: I6cffa6497632ba19a6f9ec60a4f68da60b28e821 Reviewed-on: https://code.wireshark.org/review/3719 Reviewed-by: Evan Huus Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 8b5ca59 Author: Masayuki Takemura Date: Fri Aug 22 13:08:13 2014 +0900 TGPPRx: Add AF-Signalling-Protocol AVP dissection support The AVP is defined in 3GPP TS 29.214, Table 5.3.1: Rx specific Diameter AVPs. Change-Id: Ib0a525f97206ff61bb0d390df81e3d6ebbef59bb Reviewed-on: https://code.wireshark.org/review/3791 Reviewed-by: Anders Broman commit c2eb021 Author: Marian Ďurkovič Date: Wed Aug 20 08:11:29 2014 +0200 TRILL ISIS: Fix incorrectly equal ett variables for different subtrees Change-Id: I38d886d50d74d75a900274df8bc24114e84926e7 Reviewed-on: https://code.wireshark.org/review/3744 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 50bb930 Author: Jeff Morriss Date: Thu Aug 21 20:06:14 2014 -0400 Regenerate the X11 dissector with the latest mesa, xcb, and process-x11-xcb.pl Change-Id: Ie05f9b780011b215ca3ad3293b3daefbcbee68ce Reviewed-on: https://code.wireshark.org/review/3789 Reviewed-by: Jeff Morriss commit 331d87e Author: Peter Harris Date: Wed Aug 20 11:29:35 2014 -0400 X11: Support xcb's new Change-Id: I32c6ab15d6dc7a67cdb50c4187e2752730315588 Reviewed-on: https://code.wireshark.org/review/3751 Reviewed-by: Jeff Morriss commit 0c38cf3 Author: Bill Meier Date: Wed Aug 20 20:11:49 2014 -0400 plugins.c: cleanup plugins_scan_dir() add_plugin() no longer returns ENOMEM. Remove code in plugins_scan_dir() which printed an error message if ENOMEM returned by add_plugin(). Fix comment re add_plugin() return values. Change-Id: Id5170c28e2a55884d41ceebc4e07f16389b75a2a Reviewed-on: https://code.wireshark.org/review/3774 Reviewed-by: Bill Meier commit f580ebe Author: Bill Meier Date: Thu Aug 21 18:44:07 2014 -0400 packet-gsm_cbch.c: various minor changes - tvb_length() --> tvb_reported_length(); - Use -1 for length arg in proto_tree_add_protocol_format(); - Remove unused 'for' loop increment which caused Windows warning: "C4701: potentially uninitialized local variable"; - Add editor modelines. Change-Id: I37833b750c100e333f4fa76d9465169be456d7c1 Reviewed-on: https://code.wireshark.org/review/3788 Reviewed-by: Bill Meier commit 5b5ef96 Author: Graham Bloice Date: Thu Aug 21 23:48:48 2014 +0100 Fix CMake checks of PCap functions, along with AirPCap Change-Id: If55498167d5e357258841f2194962749c0dfc81e Reviewed-on: https://code.wireshark.org/review/3787 Reviewed-by: Graham Bloice Petri-Dish: Graham Bloice Reviewed-by: Roland Knall Tested-by: Petri Dish Buildbot Reviewed-by: Jeff Morriss commit 87b2364 Author: Jeff Morriss Date: Thu Aug 21 10:41:22 2014 -0400 Add a license to this new file (GPLv2+) so we pass the license check. (This change needs to be approved Roland Knall--by the file's author--in Gerrit.) Change-Id: I58285cb1d773a57fe7d087799bf6d2ffbd962364 Reviewed-on: https://code.wireshark.org/review/3773 Reviewed-by: Roland Knall Reviewed-by: Jeff Morriss commit 6edc166 Author: Jeff Morriss Date: Thu Aug 21 17:40:04 2014 -0400 Decode User-Name as an IMSI in S13/S13' and S7a/S7d. Also move the application ID macros into the diameter header file. Change-Id: Iaca5707c8476d81f50ecdb3aab76be293b5ccfe7 Reviewed-on: https://code.wireshark.org/review/3786 Reviewed-by: Jeff Morriss commit b6df4a5 Author: Martin Kaiser Date: Wed Aug 20 14:42:40 2014 +0200 usb_conv_info is no longer unused Change-Id: I27e5c8686e7f7a907bdcec59e97ae93a090b7185 Reviewed-on: https://code.wireshark.org/review/3783 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit c8d9d29 Author: Martin Kaiser Date: Wed Aug 20 14:38:01 2014 +0200 remove trans_info parameter from dissect_usb_interface_assn_descriptor() Change-Id: I9069835a824abcb004b05659a20b00a783a28ed6 Reviewed-on: https://code.wireshark.org/review/3782 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 3313e2d Author: Martin Kaiser Date: Wed Aug 20 13:58:21 2014 +0200 remove usb_trans_info from dissect_usb_interface_descriptor() Change-Id: Ia1bfdd705021e784213e00b70cfabc42b524384d Reviewed-on: https://code.wireshark.org/review/3781 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit a87112f Author: Martin Kaiser Date: Wed Aug 20 13:49:51 2014 +0200 set usb_conv_info->endpoint to "no endpoint" for interface conversations Change-Id: I625d20cc2c874f5b28c063590878077f8aa80196 Reviewed-on: https://code.wireshark.org/review/3780 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit b72acf3 Author: Martin Kaiser Date: Thu Aug 21 12:08:24 2014 +0200 add component descriptor values for HEVC services Change-Id: I28e55dc95a55ad80aa2ce59ab6c5d495d8eb7d99 Reviewed-on: https://code.wireshark.org/review/3779 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 5a3faf9 Author: Martin Kaiser Date: Thu Aug 21 11:53:38 2014 +0200 add service type for HEVC digital television service Change-Id: I9aab67250d9fe7dc83243b55bbc2cb964c140e46 Reviewed-on: https://code.wireshark.org/review/3778 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 8fad638 Author: Bill Meier Date: Thu Aug 21 13:03:45 2014 -0400 text2pcap-scanner.l: On Windows: #include req'd for isatty() Change-Id: I6464f11c3bc5f8dd671f6f36006fb74059d30b26 Reviewed-on: https://code.wireshark.org/review/3776 Reviewed-by: Bill Meier commit 45a7b6c Author: Bill Meier Date: Thu Aug 21 13:00:56 2014 -0400 uat_load.l: Fix "unreachable code" warning (Windows 4702) Change-Id: I0f50bc9f1970578a7a2a44a8a3149173f5935f14 Reviewed-on: https://code.wireshark.org/review/3775 Reviewed-by: Bill Meier commit 1460575 Author: Jeff Morriss Date: Thu Aug 21 09:34:16 2014 -0400 Fix compilation when we don't HAVE_LIBSMI or HAVE_GEOIP. Change-Id: I7523c183fd46a649947ad316518dfffaddb02dbe Reviewed-on: https://code.wireshark.org/review/3772 Petri-Dish: Jeff Morriss Tested-by: Petri Dish Buildbot Reviewed-by: Jeff Morriss commit a3d8f31 Author: Jeff Morriss Date: Wed Aug 20 22:47:22 2014 -0400 Add a function to dissect an E.164 (MSISDN) number in UTF8 format and use it in the Diameter dissector. This new API adds a filter for the MSISDN as well as a subtree and filter for the Country Code. Change-Id: Ibcbf4b5f72178b7e4af63efa7496188d608a9de7 Reviewed-on: https://code.wireshark.org/review/3760 Petri-Dish: Jeff Morriss Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman Reviewed-by: Jeff Morriss commit c7c4aba Author: Michal Labedzki Date: Sat Aug 16 00:28:58 2014 +0200 Bluetooth: btle: Fix reserved field dissection Also cosmetic changes: 1. Clear Info Column at start (fix garbages from previous protocols like Ubertooth) 2. Refactor a little all expert field definitions Change-Id: Ie1cba8c1578597f2d896ec75f7d2af4987325bf3 Reviewed-on: https://code.wireshark.org/review/3768 Reviewed-by: Michal Labedzki commit 6cae829 Author: Michal Labedzki Date: Thu Aug 21 12:05:04 2014 +0200 Bluetooth: HCI_EVT fix fuzz failture Fix possible "Conditional jump or move depends on uninitialised value" Bug: 10396 Change-Id: I2c57f8310f88c68ae921d7e5bd1c060d0df27b8e Reviewed-on: https://code.wireshark.org/review/3769 Reviewed-by: Michal Labedzki commit 8a0d456 Author: Michal Labedzki Date: Fri Aug 15 23:43:57 2014 +0200 Bluetooth: Fix Delete opcode in Linux Monitor transport -1 -> tvb_captured_length(tvb) fixed zero-length packet. Change-Id: I0748fa4e29d91a098f6222d162bce3177b9306e7 Reviewed-on: https://code.wireshark.org/review/3767 Reviewed-by: Michal Labedzki commit 98f16d5 Author: Michal Labedzki Date: Tue Aug 12 15:47:04 2014 +0200 Bluetooth: RFCOMM: Fix recognizing services Add support for missing direction flag in dlci. Change-Id: I1429eb65374014e7b840bb31ca1d6f2ab1959160 Reviewed-on: https://code.wireshark.org/review/3766 Reviewed-by: Michal Labedzki commit 87550a6 Author: Michal Labedzki Date: Mon Aug 4 15:38:22 2014 +0200 Bluetooth: L2CAP: Clear channel options if configure fails On every configuration request clean options before setting anything. Then if configuration will be rejected options will not be set to something that is not set in next configure request. Change-Id: I5acedde96f7ff720e916256d683937acbcd13a48 Reviewed-on: https://code.wireshark.org/review/3765 Reviewed-by: Michal Labedzki commit 3d445dd Author: Michal Labedzki Date: Mon Aug 11 11:48:02 2014 +0200 Update AUTHORS Thanks to Michał Orynicz for finish Logcat support. Also update our hall of fame. One note: my real name is Michał Łabędzki, but if you write Michal Labedzki it will be ok too. Change-Id: I81ae563fa1347f1fee316e0ff79a87722ff88d0b Reviewed-on: https://code.wireshark.org/review/3764 Reviewed-by: Michal Labedzki commit 7b9b881 Author: Guy Harris Date: Thu Aug 21 01:05:52 2014 -0700 Float constants end with "f"; assign float constants to gfloats. This squelches some compiler warnings about assigning double values to floats (no, there's no precision in 0 to lose, but the compiler warns anyway). Change-Id: Ia49618cb8582c5afcdc5bdc5334fe20724b85eda Reviewed-on: https://code.wireshark.org/review/3762 Reviewed-by: Guy Harris commit 66318ad Author: Guy Harris Date: Thu Aug 21 00:35:38 2014 -0700 Don't assert out on tvb_memcpy() with a null data pointer if the length is 0. If the length is 0, there's nothing to copy, so it doesn't matter if there's no data to copy from. This fixes problems caused by allocating a zero-length buffer and using that as the data for a tvbuff; the allocation returns null, so the data pointer is null. Change-Id: I8037ae4b96d30e90a716852bb7e22d3980444f83 Reviewed-on: https://code.wireshark.org/review/3761 Reviewed-by: Guy Harris commit bed29af Author: Roland Knall Date: Tue Feb 25 14:05:11 2014 +0100 Extcap Capture Interface Extcap is a plugin interface, which allows for the usage of external capture interfaces via pipes using a predefined configuration language which results in a graphical gui. This implementation seeks for a generic implementation, which results in a seamless integration with the current system, and does add all external interfaces as simple interfaces. Windows Note: Due to limitations with GTK and Windows, a gspawn-winXX-helper.exe, respective gspawn-winXX-helper-console.exe is needed, which is part of any GTK windows installation. The default installation directory from the build is an extcap subdirectory underneath the run directory. The folder used by extcap may be viewed in the folders tab of the about dialog. The default installation directory for extcap plugins with a pre-build or installer version of wireshark is the extcap subdirectory underneath the main wireshark directory. For more information see: http://youtu.be/Nn84T506SwU bug #9009 Also take a look in doc/extcap_example.py for a Python-example and in extcap.pod for the arguments grammer. Todo: - Integrate with Qt - currently no GUI is generated, but the interfaces are still usable Change-Id: I4f1239b2f1ebd8b2969f73af137915f5be1ce50f Signed-off-by: Mike Ryan Signed-off-by: Mike Kershaw Signed-off-by: Roland Knall Reviewed-on: https://code.wireshark.org/review/359 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 4014698 Author: Wasim Abu Moch Date: Sun Aug 17 15:24:14 2014 +0300 packet-erf: added dissector table for "erf.types.type" type field. 1- removed unnecessary include 2- used fall through in protocol switch case instead of calling same function with same params. fixes/changes after review with Evan Huus, changes ETH/IPv4/IPv6/Infiniband/InfinibandLink to use dissector table instead of direct function calls. other protocols should be called in the same way, we'll do it when have the time. instead of calling subdissector directly from packet-erf.c code it's easier to declare this and each time we need to register a new protocol over erf format we sould easily extend it from the protcol module instead using "dissector_add_uint()" function. the change is still backward compatible, if no upper protocol is registered for the specifc type an old fasion direct function call is performed. Change-Id: I3ae1ccfdd49ab8f90667185296cc950dc2184475 Reviewed-on: https://code.wireshark.org/review/3670 Petri-Dish: Evan Huus Reviewed-by: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit ca5fa53 Author: Guy Harris Date: Wed Aug 20 15:51:40 2014 -0700 Create an IE item for the "Apparent Address" IE. Also, don't initialize ie_item, in the hopes that cases where we don't set it will be caught at compile time rather than run time. Change-Id: I768251d19a7508ec876af44b987a4ecfd04258f7 Reviewed-on: https://code.wireshark.org/review/3759 Reviewed-by: Guy Harris commit ca1ac2c Author: Guy Harris Date: Wed Aug 20 15:15:15 2014 -0700 9P2000.L also has the UID field in tattach. See, for example: http://code.google.com/p/diod/wiki/protocol#attach,_auth_--_messages_to_establish_a_connection and http://code.google.com/p/diod/wiki/protocol#Overview where the latter says 9P2000.L consists of a subset of the canonical 9P2000 operations, the 9P2000.u attach and auth messages, plus new operations designed to map to the Linux VFS in a straightforward way. so tattach and tauth are the same as 9P2000.u. Don't throw a dissector assertion of there's data at the end of the packet; in the particular case that found this bug, yes, it was a dissector bug, but it could also be a malformed packet, and we should not throw dissector assertions unless we know *for certain* that the problem is a dissector bug rather than a malformed packet. Change-Id: I5ef5d837bccb4e7c4844d31a138aa55a85ec1b60 Reviewed-on: https://code.wireshark.org/review/3758 Reviewed-by: Guy Harris commit 2afb736 Author: Guy Harris Date: Wed Aug 20 14:46:37 2014 -0700 Sort hfi[] to match the definitions, and add a missing entry that found. Sorting them to match the definitions of the hfi variables makes it easier to compare the two lists. Comparing the lists found a missing entry; add it. Change-Id: I3517667336b1355195c5a227f0d02f1740a7c4cd Reviewed-on: https://code.wireshark.org/review/3757 Reviewed-by: Guy Harris commit 74e75c5 Author: Guy Harris Date: Wed Aug 20 14:36:44 2014 -0700 Sort the fc_lctl_rjt_val values. That avoids a warning printed when making a value_string_ext table out of it. Change-Id: I7874e6db9d6805abcc21f113f1de7c2cf687e624 Reviewed-on: https://code.wireshark.org/review/3756 Reviewed-by: Guy Harris commit c16db66 Author: Guy Harris Date: Wed Aug 20 14:23:56 2014 -0700 Various dissection improvements. In WCCP V2, check whether the length field runs past the end of the packet (actual packet data, not captured data) and, if so, report an error with expert info, otherwise use the length field to set the length of the tvbuff. That allows the dissector to just use the tvbuff checks to do length checks, so eliminate manual length checks. In find_wccp_address_table(), stop if we run past the reported length or packet length; if we fail to find an address table because we run past the captured length, we should probably note that if we're trying to dissect addresses. Don't do any other checks against the captured length, just throw the BoundsError assertion, to report that the packet was cut short during the capture process. When creating a protocol subtree for an item, give it a "to the end" initial length", and only set the length when we're finished dissecting the item, based on the amount of data dissected. Don't speak of dissectors in expert info - the user needn't know what a dissector is; what matters is what the protocol specifies. Properly report "item is too short" errors - those are indicated by item dissectors returning a negative value, so show the negative of that value. Make the top level item for a capability element be a separate item from the element type; use hf_capability_element_type for the type rather than the entire element, and put the type and length into the protocol tree in that order, as that's the order in which they appear in the packet. Don't do capability element length checks in the capability element dissector, do it in the dissector for the particular capability element, and don't fail with a dissector bug report, fail with an expert info. Sort the ett[] array to match the list of ett_ definitions, to make it easier to check that they're all registered. Change-Id: I6545e000b6caf9824f89234602635668fa1d38d6 Reviewed-on: https://code.wireshark.org/review/3754 Reviewed-by: Guy Harris commit 4ac0438 Author: Graham Bloice Date: Wed Aug 20 13:31:19 2014 +0100 In Visual Studio builds, enable the L4 warning 4189: Local variable is initialized but not referenced Fix some variables found by this Change-Id: Icc13def5413f1fe885ec25e659462c8906a6cfa0 Reviewed-on: https://code.wireshark.org/review/3748 Reviewed-by: Graham Bloice Petri-Dish: Graham Bloice Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit 8fc0ee4 Author: Jeff Morriss Date: Wed Aug 20 15:08:21 2014 -0400 Decode IMSIs found in Subscription-Id AVPs. Move decode of the User-Name AVP out of the 3GPP-specific file. Add a couple of macros for 3GPP AppIDs (rather than using the number directly) in both files. Change-Id: I496b4ae86b05264462167b6e41ce1451392de11b Reviewed-on: https://code.wireshark.org/review/3753 Reviewed-by: Jeff Morriss commit 61b01c3 Author: Jeff Morriss Date: Wed Aug 20 11:14:38 2014 -0400 If the user explicitly requested gnutls or libgcrypt generate an error if they are not found. Accurately describe the default behavior: Wireshark will use the libraries if they are available. May help avoid problems like that described in: https://ask.wireshark.org/questions/35600/not-able-to-configure-wireshark-with-gnutls Change-Id: I5f0b2ce87cb7c6b337de93609f13d8027e662263 Reviewed-on: https://code.wireshark.org/review/3750 Reviewed-by: Jeff Morriss commit 3adaf99 Author: Bill Meier Date: Wed Aug 20 11:05:03 2014 -0400 proto.h; (try to) fix bug in DISSECTOR_ASSERT_CMP... macros; Also: re-enable use of DISSECTOR_ASSERT_CMP... macros in packet-ceph.c Change-Id: Icee80381f5c8feb14cfc7e4033bdeb893018ce95 Reviewed-on: https://code.wireshark.org/review/3749 Reviewed-by: Bill Meier commit ca390ef Author: AndersBroman Date: Wed Aug 20 13:34:41 2014 +0200 Remove now unused code, do API changes missed in previous commit. Change-Id: Ibc814fb56f34b6c74cb7751e790978748ea8b1db Reviewed-on: https://code.wireshark.org/review/3747 Reviewed-by: Anders Broman commit 9f43bbd Author: AndersBroman Date: Wed Aug 20 13:19:38 2014 +0200 Use dissect_e212_imsi() to dissect IMSI. Fix deprecated APIs Restore delted hf. Change-Id: I5c08dd8e702a6fadd0409cec608d9a7b153f8164 Reviewed-on: https://code.wireshark.org/review/3746 Reviewed-by: Anders Broman commit 0685380 Author: AndersBroman Date: Wed Aug 20 12:54:59 2014 +0200 Use dissect_e212_mcc_mnc_wmem_packet_str() to dissect PLMN(id). Fix a few deprecated APIs Change-Id: I8a535417234a6e739eeb0835e524d6e367150340 Reviewed-on: https://code.wireshark.org/review/3745 Reviewed-by: Anders Broman commit 1c10c7b Author: Graham Bloice Date: Tue Aug 19 22:54:08 2014 +0100 Modified script to not use PS 3.0 constructs Change-Id: I0a4a738a410f0aece9459852a51d6c96f11aae76 Reviewed-on: https://code.wireshark.org/review/3739 Reviewed-by: Graham Bloice Petri-Dish: Graham Bloice Reviewed-by: Pascal Quantin Reviewed-by: Anders Broman commit 097401c Author: Bill Meier Date: Wed Aug 20 01:48:42 2014 -0400 packet-ceph.c: Temporarily comment out the use of DISSECTOR_ASSERT_CMP... macros since they have a bug. Change-Id: I007931980644a9283083052f8c27d553f052470a Reviewed-on: https://code.wireshark.org/review/3743 Reviewed-by: Bill Meier commit 41af6dd Author: Kevin Cox Date: Wed Aug 6 09:56:38 2014 -0400 Add more messages for the Ceph protocol. New messages: - Mon Paxos. - Mon Global ID. - Mon Get Version - OSD Ping - Ping - OSD Boot - OSD PG Create. - PG Stats. Other updates: - Documentation for modifying the dissector. - Update assertions to show values. - Replace proto_tree_add_text()/expert_add_info...() by proto_tree_add_expert...(). - Fix a bug: misplaced break. - Do some minor whitespace & other cosmetic changes. Change-Id: Ib19ce509b67fb5e6fb31e82b5a551a9e952a9c6d Reviewed-on: https://code.wireshark.org/review/3623 Petri-Dish: Bill Meier Reviewed-by: Bill Meier commit b9a94f0 Author: Jeff Morriss Date: Tue Aug 19 22:50:17 2014 -0400 Add a routine to dissect an UTF8-encoded IMSI (as you'd find in Diameter) and use it to decode the User-Name AVP of S6a/S6d messages. Also clean up some white space/formatting. Change-Id: Idf2d4cad2af1826b24de7d59407ffeb36100c19b Reviewed-on: https://code.wireshark.org/review/3742 Reviewed-by: Jeff Morriss commit 9d7784d Author: Jeff Morriss Date: Tue Aug 19 22:00:22 2014 -0400 Get it compiling again. Remove set-but-not-used variable. Mark a parameter as unused. Change-Id: I7c3af353da2967e5d611deb2cb027a9e30e54bdf Reviewed-on: https://code.wireshark.org/review/3741 Reviewed-by: Jeff Morriss commit 47b7df8 Author: Pascal Quantin Date: Tue Aug 19 23:57:18 2014 +0200 NAS EPS: remove a now unused hf entry and convert tabs to spaces Change-Id: I3d5e91bd0bdb44fe033284aa38bc1f3a1dc35f4f Reviewed-on: https://code.wireshark.org/review/3740 Reviewed-by: Pascal Quantin commit c7da116 Author: Martin Kaiser Date: Tue Aug 19 23:37:30 2014 +0200 actually store the endpoint in the conversation this fixes the bugfix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10386 (hopefully) Change-Id: Ib61e1033cae7516181c3557bf78d01b4249a7393 Reviewed-on: https://code.wireshark.org/review/3738 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit cdfd6e4 Author: Martin Kaiser Date: Tue Aug 19 18:08:34 2014 +0200 handle all combinations of request type and recipient for USB control messages Change-Id: I9d2ad2995975e1853c73d712b429a30cead8f473 Reviewed-on: https://code.wireshark.org/review/3737 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 7146999 Author: AndersBroman Date: Tue Aug 19 23:00:57 2014 +0200 Use dissect_e212_imsi() to dissect IMSI Fix dissection when MCC starts in the high nibble. Replace deprecated APIs Change-Id: Ic08a1db9ee7ebb535bf7914191807304e9f88981 Reviewed-on: https://code.wireshark.org/review/3736 Reviewed-by: Anders Broman commit e5e8828 Author: Martin Kaiser Date: Tue Aug 19 22:12:17 2014 +0200 start simplifying the parsing of USB control URBs Change-Id: Ie527b89f6be2d100dfd8bc7c96c2f2ac7efa3efc Reviewed-on: https://code.wireshark.org/review/3735 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 22dc992 Author: Martin Kaiser Date: Tue Aug 19 15:46:38 2014 +0200 remove product_data, protocol_data parameters from try_dissect_next_protocol() (another small step to make this function understandable) Change-Id: Ib00aa00af8287969dd2d80a33c1f0ebd0b8f2248 Reviewed-on: https://code.wireshark.org/review/3734 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 74c8ded Author: Martin Kaiser Date: Tue Aug 19 15:40:45 2014 +0200 reformat dissect_usb_setup_get_descriptor_response() Change-Id: I8004c4fd6e9cac3615d27b375229a79d01dfcd68 Reviewed-on: https://code.wireshark.org/review/3733 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit ea7a549 Author: Martin Kaiser Date: Tue Aug 19 15:39:25 2014 +0200 remove the usb_trans_info parameter from dissect_usb_hid_get_report_descriptor() Change-Id: If14357a02a60eff5fc7e50567c2c6bfc6ee3dcc6 Reviewed-on: https://code.wireshark.org/review/3732 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit a1b4025 Author: Martin Kaiser Date: Tue Aug 19 21:56:32 2014 +0200 remove the parameter usb_trans_info from the functions that dissect the standard descriptors usb_trans_info is a part of usb_conv_info, there's no need to have it as a separate parameter Change-Id: I3608c10543b896ca04c6062de23297d852dae31a Reviewed-on: https://code.wireshark.org/review/3731 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 543153b Author: Martin Kaiser Date: Tue Aug 19 21:51:11 2014 +0200 interface and endpoint descriptors can't possibly appear in a get descriptor response on their own, only as part of a configuration descriptor Change-Id: I2d70ab1d1adc19cbc0fe8c2c835071153a40ae7d Reviewed-on: https://code.wireshark.org/review/3730 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 5dc742b Author: Martin Kaiser Date: Tue Aug 19 12:01:15 2014 +0200 now that we have a routine to clean up the packet-specific infos in the usb conversation, there's no need to clean up usb_conv_info after parsing the configuration descriptor this wouldn't work anyway if one of the subfunctions throws an exception Change-Id: Ifd13f320db1ec17c3b706778ce0f5dffa1349770 Reviewed-on: https://code.wireshark.org/review/3729 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit d6775dc Author: Martin Kaiser Date: Mon Aug 18 14:56:52 2014 +0200 Revert "Revert "create audio-specific part of the usb conversation"" This reverts commit 22e10bea0cbd2b29d6e7b82a3ead3910d71988a2. Now that the fuzz failures are fixed, we can re-enable the audio-specific extensions. Change-Id: Id788e10aaa3dbf289df364f7da9ef01e24ba47f9 Reviewed-on: https://code.wireshark.org/review/3728 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 1194061 Author: Martin Kaiser Date: Tue Aug 19 21:33:18 2014 +0200 clear the temporary components of usb_conv_info_t before we dissect a new packet this fixes the fuzz failures in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10386 Change-Id: I8c0ba8c8da9af8d7a3ef9cdd7781769b9966f1a2 Reviewed-on: https://code.wireshark.org/review/3727 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 8c84a23 Author: Martin Kaiser Date: Tue Aug 19 09:16:04 2014 +0200 these two vars are initialized to NULL, we don't have to set them to NULL again Change-Id: Iacd01ca207d2b74ebdbd5a7635f00e6d03b13721 Reviewed-on: https://code.wireshark.org/review/3726 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 5c554c9 Author: Martin Kaiser Date: Tue Aug 19 21:04:38 2014 +0200 fix packet-gtp.c: In function 'decode_gtp_imsi': packet-gtp.c:3210:18: error: variable 'imsi_str' set but not used [-Werror=unused-but-set-variable] cc1: all warnings being treated as errors make[5]: *** [libdissectors_la-packet-gtp.lo] Error 1 by commenting out the unused variable Change-Id: I498595f93423c599f902a1a0cc42b63cef2c4d7c Reviewed-on: https://code.wireshark.org/review/3725 Reviewed-by: Martin Kaiser commit 8670d9f Author: Marian Ďurkovič Date: Tue Aug 19 11:53:55 2014 +0200 TRILL ISIS: Unify MTID presentation in all cases Change-Id: I66eb683d6b1f9dccae3e566ad4dd4cfd18b81ddb Reviewed-on: https://code.wireshark.org/review/3713 Reviewed-by: Evan Huus commit 2e3bc57 Author: Bill Meier Date: Tue Aug 19 13:25:11 2014 -0400 packet-PROTOABBREV.c: various minor changes: - Specify that proto_register...() and proto_reg_handoff...() prototypes are required; - Indicate that certain #includes should be used only as needed; - Don't use CamelCase (or CAPS) in variable names; - Do some reformatting of certain lines; - Futz hf[] array entry so checkAPIs and checkhf tests don't fail. Change-Id: Ie03846f4bebd2a9bece464c85cc3c2ef46dd4fe5 Reviewed-on: https://code.wireshark.org/review/3724 Reviewed-by: Bill Meier Reviewed-by: Evan Huus commit 0cda27c Author: Michael Mann Date: Sun Aug 17 20:31:04 2014 -0400 "Highly discourage" use of proto_tree_add_text. Change-Id: I2e8d18df71688c654f7acaff51fae7823c08aa6a Reviewed-on: https://code.wireshark.org/review/3677 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Jeff Morriss Reviewed-by: Evan Huus commit d7e4564 Author: AndersBroman Date: Tue Aug 19 17:45:19 2014 +0200 Use dissect_e212_imsi() to dissect IMSI fix offset in dissect_e212_mcc_mnc_in_address(). Change-Id: I68006ea3e2c79e2549e6f2d2c8a997e44fc3cdf1 Reviewed-on: https://code.wireshark.org/review/3722 Reviewed-by: Anders Broman commit 88e8025 Author: AndersBroman Date: Tue Aug 19 16:55:52 2014 +0200 Use e212 function to dissect IMSI. Remove deprecated APIs Change-Id: I1d5a1437000c5bc4ffd7708bc5b3ab42f7019acf Reviewed-on: https://code.wireshark.org/review/3721 Reviewed-by: Anders Broman commit 93da617 Author: AndersBroman Date: Tue Aug 19 16:02:40 2014 +0200 Remove unused hf and deprecated API Change-Id: I5196f2be4b15704517ff1dc8bfacc6f9b52ecd71 Reviewed-on: https://code.wireshark.org/review/3720 Reviewed-by: Anders Broman commit 5041319 Author: AndersBroman Date: Tue Aug 19 15:36:33 2014 +0200 Use the E212 function to dissect IMSI correct the filter Id string in E212. Change-Id: I203502b39d4ef216282d305f90c930aca84241bf Reviewed-on: https://code.wireshark.org/review/3718 Reviewed-by: Anders Broman commit 7cc8b7c Author: Jeff Morriss Date: Tue Aug 19 09:01:43 2014 -0400 Don't mark a used parameter as unused. Also fix up some whitespace. Change-Id: I7cd78740199ce7b2682902a5687c4f05c2c963b2 Reviewed-on: https://code.wireshark.org/review/3716 Reviewed-by: Jeff Morriss commit 1cdef1d Author: AndersBroman Date: Tue Aug 19 14:24:13 2014 +0200 Implement a common function to dissect IMSI and use it GSM MAP as a start. - remove soft deprecated APIs and unused hf. Change-Id: Id00c3dd35f3fc65f543bc29df6d35515c45fe7e1 Reviewed-on: https://code.wireshark.org/review/3715 Reviewed-by: Anders Broman commit fc43a8c Author: Marian Ďurkovič Date: Mon Aug 18 19:08:54 2014 +0200 TRILL ISIS: Implement Group IPv4/IPv6 Address Sub-TLVs Change-Id: If75925224fc487f583635d9a4346fa900cb0d1d1 Reviewed-on: https://code.wireshark.org/review/3703 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit a23a4f6 Author: Guy Harris Date: Tue Aug 19 00:09:43 2014 -0700 The error report timer is non-negative; make it FT_UINT16. This squelches an assertion. Use %u to print it, while we're at it. Reformat the generated named fields to match the others. Use proto_tree_add_item for the beacon type. Change-Id: I1dcf161141638de8d7314a3733391a63e0608f67 Reviewed-on: https://code.wireshark.org/review/3711 Reviewed-by: Guy Harris commit 3128589 Author: Kevin Cox Date: Mon Aug 18 20:42:25 2014 -0400 Fix Ceph packet length determination. The authentication string was not being factored in on the length reply. Also there was an issue with different banners. Now the banner length must match what we expect or the packet is rejected. If the banner length changes the protocol is different and we won't be able to parse it anyways. Change-Id: I0c1a7379edaa203042486a0e6f9ce3642427da99 Reviewed-on: https://code.wireshark.org/review/3710 Reviewed-by: Michael Mann commit cf0cb90 Author: Evan Huus Date: Mon Aug 18 20:17:53 2014 +0000 ceph: use col_add_str instead of col_set_str The argument is no longer guaranteed to be a const that hangs around. Bug: 10395 Change-Id: I3c658f6db5927e09a9a38f9ec0fbce153b3e1bc2 Reviewed-on: https://code.wireshark.org/review/3709 Reviewed-by: Michael Mann commit 7b7dd1e Author: Guy Harris Date: Mon Aug 18 12:43:59 2014 -0700 Don't use -1 as the length of an integer. That's not supported. Put the unknown enterprise number in a a 4-byte value, as that's what it is, and then just skip to the end of the packet. Change-Id: I2cce84bfbb46a114d4809dbc61a021d497eb87a8 Reviewed-on: https://code.wireshark.org/review/3708 Reviewed-by: Guy Harris commit 9d6d192 Author: Guy Harris Date: Mon Aug 18 12:29:45 2014 -0700 Use expert info to report unknown TLV types. Unless we plan to fill in all 256 entries in the TLV type table, and unless that's because all 256 types are valid, we should report unknown types with an expert info, not a dissector assertion. Change-Id: Ia6fca37ad6a5969caad3229abaf08a25e20ba992 Reviewed-on: https://code.wireshark.org/review/3707 Reviewed-by: Guy Harris commit a3cecb2 Author: Guy Harris Date: Mon Aug 18 12:08:53 2014 -0700 Don't use proto_tree_add_expert() with an item rather than a tree. proto_tree_add_expert() is to be used only on an item that's been created as a tree (i.e., an interior node, complete with an ett_ value); to hang expert info off of an *item*, which might *not* have been set up to take subtree items, use expert_add_info(). Change-Id: Icdcdf39c31c0a03ff80dbb629186e8f6fa82e8ab Reviewed-on: https://code.wireshark.org/review/3705 Reviewed-by: Guy Harris commit 4a16ffc Author: Guy Harris Date: Mon Aug 18 11:12:59 2014 -0700 Fix handling of STRING16. When part of a ListOfTextItem, show the STRING16 the same way in both places where its value is shown - hex digits or text string. If the STRING16 contains only 8-bit characters, treat it as ASCII; the values 0x20 through 0x7E are *probably* ASCII (although that's not guaranteed), but the values above 0x7F aren't guaranteed to be anything. *Don't* use tvb_get_ptr() to fetch the string value; that's not guaranteed to work with strings. Don't impose an upper limit on the maximum displayed length of a STRING16. Change-Id: Ia14812335b9afbff695efe5046dc0ffc2483a351 Reviewed-on: https://code.wireshark.org/review/3704 Reviewed-by: Guy Harris commit 8f0d81d Author: Marian Ďurkovič Date: Mon Aug 18 09:14:30 2014 +0200 TRILL TREE Sub-TLV fixes 1) Fix starting tree number 2) Display Nicknames both in hex and dec Change-Id: If58d034e98429019d769ebe7be635a296e8ef18d Reviewed-on: https://code.wireshark.org/review/3687 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit 3788097 Author: Anders Broman Date: Mon Aug 18 14:02:46 2014 +0000 Revert "Fix warning: no previous prototype for ... [-Wmissing-prototypes]" This reverts commit 9918435ed70a1e386e1501982c2bbe0eed25e723. Change-Id: I122b65ec59f48b8a21e2b43ccdad0ed146b0e78f Reviewed-on: https://code.wireshark.org/review/3702 Reviewed-by: Anders Broman commit 9918435 Author: Alexis La Goutte Date: Fri Aug 15 10:00:26 2014 +0200 Fix warning: no previous prototype for ... [-Wmissing-prototypes] Change-Id: If41ffdfa15fb24af3e6846f1cfc855eb6cfffb77 Reviewed-on: https://code.wireshark.org/review/3699 Reviewed-by: Anders Broman commit 31f3187 Author: Alexis La Goutte Date: Fri Aug 15 09:59:54 2014 +0200 Fix warning: no previous prototype for ... [-Wmissing-prototypes] Change-Id: I8be913c41695177064985848995db2c0a570c612 Reviewed-on: https://code.wireshark.org/review/3698 Reviewed-by: Anders Broman commit 3adbd93 Author: Alexis La Goutte Date: Fri Aug 15 09:59:42 2014 +0200 Fix warning: no previous prototype for ... [-Wmissing-prototypes] Change-Id: I59e744d905a0a13eea4ff649a984b2ed9f1f51e7 Reviewed-on: https://code.wireshark.org/review/3697 Reviewed-by: Anders Broman commit a913bdd Author: Alexis La Goutte Date: Fri Aug 15 09:59:14 2014 +0200 Fix warning: no previous prototype for ... [-Wmissing-prototypes] Add static before function Change-Id: I42c5be7a1436160bcb82d0cb4309959802b7b3cb Reviewed-on: https://code.wireshark.org/review/3696 Reviewed-by: Anders Broman commit 005a494 Author: Alexis La Goutte Date: Fri Aug 15 09:58:22 2014 +0200 Fix warning: no previous prototype for ... [-Wmissing-prototypes] Add static before function Change-Id: Ia34e4786d6181c7849094dd0c27445b29dd89f10 Reviewed-on: https://code.wireshark.org/review/3695 Reviewed-by: Anders Broman commit de275db Author: Alexis La Goutte Date: Fri Aug 15 09:57:56 2014 +0200 Fix warning: no previous prototype for ... [-Wmissing-prototypes] Add static before function Change-Id: I5e112bee776b149ba7390b4aa2c36cb212d2eeb5 Reviewed-on: https://code.wireshark.org/review/3694 Reviewed-by: Anders Broman commit 9911f1f Author: Alexis La Goutte Date: Fri Aug 15 09:56:52 2014 +0200 Fix warning: no previous prototype for ... [-Wmissing-prototypes] Add static before function Change-Id: Iddf2879407cfc78734719e7ea2a9eb047045c100 Reviewed-on: https://code.wireshark.org/review/3693 Reviewed-by: Anders Broman commit 7b2c3cd Author: Alexis La Goutte Date: Fri Aug 15 09:55:56 2014 +0200 Fix warning: no previous prototype for ... [-Wmissing-prototypes] Add static before function Change-Id: I64e50f0b0349a2ba21cd5d8b8c9ea22e6e960eb3 Reviewed-on: https://code.wireshark.org/review/3692 Reviewed-by: Anders Broman commit c8646fa Author: Alexis La Goutte Date: Fri Aug 15 09:54:21 2014 +0200 Fix warning: no previous prototype for ... [-Wmissing-prototypes] Add static before function Change-Id: I0d6d2dc5715c15522190132bfdcb2da1245b9ef7 Reviewed-on: https://code.wireshark.org/review/3691 Reviewed-by: Anders Broman commit 940532e Author: Alexis La Goutte Date: Fri Aug 15 09:52:37 2014 +0200 Fix warning: no previous prototype for ... [-Wmissing-prototypes] Add static before function Change-Id: Icb54ccf58e5752892e7217327380a0af7da45647 Reviewed-on: https://code.wireshark.org/review/3690 Reviewed-by: Anders Broman commit 5833d6b Author: Alexis La Goutte Date: Fri Aug 15 19:57:12 2014 +0200 Corosync : fix encoding args (for proto_tree_add_item) Change-Id: I908046c04df7f7218627330f64040fafbce6739e Reviewed-on: https://code.wireshark.org/review/3689 Reviewed-by: Anders Broman commit 82d8877 Author: Irene Ruengeler Date: Mon Aug 18 10:04:16 2014 +0200 Capture Options: Add functionality to options and output tab Change-Id: I4a2116fe5b7ae3997dd7b0f2693aa511f9d52061 Reviewed-on: https://code.wireshark.org/review/3688 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit f53c6b3 Author: AndersBroman Date: Mon Aug 18 13:22:27 2014 +0200 Add missing parameter to proto_tree_add_bytes_format_value() tvb_lenght -> tvb_reported_length Change-Id: Ibcb4a7caceaa8207877bdec0f770ad77f84dbe56 Reviewed-on: https://code.wireshark.org/review/3701 Reviewed-by: Anders Broman commit 29c4c36 Author: Michael Mann Date: Sun Aug 17 20:00:43 2014 -0400 Remove proto_tree_add_text from gryphon dissector. Change-Id: If9f85a6cda483c5b89f9bee3524502b888ccb1d1 Reviewed-on: https://code.wireshark.org/review/3676 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Reviewed-by: Anders Broman commit 945b371 Author: Michael Mann Date: Sun Aug 17 16:11:15 2014 -0400 Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the neighborhood. Change-Id: I77cac916d617f56f92f686e9cd9f15fba058facf Reviewed-on: https://code.wireshark.org/review/3675 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Reviewed-by: Anders Broman commit 83ad0d0 Author: Marian Ďurkovič Date: Mon Aug 18 07:38:14 2014 +0200 Fix TRILL LSP display issues 1) Sub-TLVs unknown to wireshark are not necessarily invalid 2) Properly show Root Bridge ID 3) Unify Nickname format to HEX_DEC Change-Id: Ib62f2e2a23f27221b303eaf544868746f56ff6df Reviewed-on: https://code.wireshark.org/review/3686 Reviewed-by: Anders Broman commit e3779f1 Author: Alexis La Goutte Date: Sat Aug 16 15:22:42 2014 +0200 BGP ISIS: Add TLV 14 (Originating LSP Buffer Size) Need more work for TLV 149 Ping-Bug: 10304 Change-Id: I3953b8d1fdee33253601aa7b443edd37417046e4 Reviewed-on: https://code.wireshark.org/review/3336 Reviewed-by: Anders Broman commit 30f3a71 Author: Eugene Sukhodolin Date: Sun Aug 17 20:10:06 2014 -0700 Parse client and server blocks of settings data introduced in newer RDP versions Change-Id: I46b4557623921e1c2c093ca5e3e75908826358e3 Reviewed-on: https://code.wireshark.org/review/3681 Reviewed-by: Anders Broman commit 018b84d Author: Michael Mann Date: Fri Jul 25 11:34:51 2014 -0400 Refactor "common" hostlist/endpoint table functionality. This is very similar in architecture to the changes made to the Conversation table functionality. Since all conversations have endpoints/hostlists, the "registered" list is shared for both. Change-Id: Ie8c6910a68a1b3f27c5b18c4494f49b9404a7b31 Reviewed-on: https://code.wireshark.org/review/3214 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit a76c888 Author: Guy Harris Date: Sun Aug 17 21:11:48 2014 -0700 Add missing field to the list of fields to register. Change-Id: I2590bf69f6778deb15f405c0976c9849af5b4a4e Reviewed-on: https://code.wireshark.org/review/3685 Reviewed-by: Guy Harris commit 970446f Author: Guy Harris Date: Sun Aug 17 21:06:53 2014 -0700 Sort the elements of ett[] to match the definitions, and add a missing entry. Sorted so that we can find missing entries; fixed so that there aren't any missing entries. Change-Id: Ic05e4d30f7b65be5ecbba3ff89b7bd13870aba25 Reviewed-on: https://code.wireshark.org/review/3684 Reviewed-by: Guy Harris commit e926023 Author: Guy Harris Date: Sun Aug 17 20:58:52 2014 -0700 Squelch unused parameter warnings. Change-Id: I3bf3c0500bf27e6f1a3c1df57f3141ea34692304 Reviewed-on: https://code.wireshark.org/review/3683 Reviewed-by: Guy Harris commit 6768255 Author: Alexis La Goutte Date: Fri Aug 15 19:27:58 2014 +0200 Kerberos : Fix indent (use tabs) and add modelines info Change-Id: I7965332ee474d10c90dfb2ef63a66f610cd6fc71 Reviewed-on: https://code.wireshark.org/review/3655 Reviewed-by: Michael Mann commit 4095bbf Author: Marian Durkovic Date: Sun Aug 17 11:24:14 2014 +0200 Make TRILL NEIGHBOR TLV (145) known to ISIS dissector Update RFC references Change-Id: I977190e6bfce2c27d33f940d058be3be6a5ef3c0 Reviewed-on: https://code.wireshark.org/review/3669 Reviewed-by: Michael Mann commit b8293f9 Author: Guy Harris Date: Sun Aug 17 17:32:16 2014 -0700 If we don't find a NetScaler signature, don't report an error. It's *NOT* an error; it's just a file that isn't a NetScaler file. Otherwise, we report errors on files that should just be passed on to other open routines. Also, NetScaler files are *NOT* text files, and we should *NOT* use ".txt" as the suffix. Change-Id: If001abbbbc3de3ea27439a44a47ce1d6071d38ae Reviewed-on: https://code.wireshark.org/review/3678 Reviewed-by: Guy Harris commit 6a82672 Author: Guy Harris Date: Sun Aug 17 16:02:19 2014 -0700 Return 0, not -1, for "this isn't my type of file". -1 means "I got an error reading this file, so there's no point in trying any more open routines". It doesn't mean "I couldn't find any matching pattern in the text"; that's 0, for "this isn't my type of file, but keep trying". Change-Id: I9d2e8b8fe6720052cacf70f0bacdcbc1175202cc Reviewed-on: https://code.wireshark.org/review/3674 Reviewed-by: Guy Harris commit 2d2ecfb Author: Marian Durkovic Date: Sun Aug 17 07:38:43 2014 +0200 Fix TRILL LSP dissector - correctly compute length/offset in all SubTLVs - initialize variable before while() loop - fix VLAN_GROUP SubTLV according to RFC7176 sec. 2.3.7 Change-Id: Ib5cc4ce82f63ad39e83c8b1f4a630708f8a8aa88 Reviewed-on: https://code.wireshark.org/review/3667 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit e1449a8 Author: Gerald Combs Date: Sun Aug 17 08:05:36 2014 -0700 [Automatic manuf, services and enterprise-numbers update for 2014-08-17] Change-Id: I81d4f5ea28eb12eb8d32a6d9ba4a61fff3cab86f Reviewed-on: https://code.wireshark.org/review/3671 Reviewed-by: Gerald Combs commit 95ddeed Author: Marian Durkovic Date: Sat Aug 16 13:45:09 2014 +0200 Fix uninitialized variable and print VLAN numbers in decimal Change-Id: Icf3b3ea4968d1ed94a11ce8eb4b4fdd09ed69012 Reviewed-on: https://code.wireshark.org/review/3660 Reviewed-by: Evan Huus commit 9de7f56 Author: Marian Durkovic Date: Sat Aug 16 14:15:34 2014 +0200 Fix incorrect SubTLV values and properly handle both old and new variant of TRILL Version SubTLV Note that the SubTLV values have not changed in RFC7176. Bug: 10387 Change-Id: I452debb7165e70f31f1a3a19a44c488c5bbdb959 Reviewed-on: https://code.wireshark.org/review/3661 Reviewed-by: Evan Huus commit 0c3e0db Author: Jeff Morriss Date: Fri Aug 15 14:20:01 2014 -0400 Add a few more NEWS items. Fix a typo in the generation of top_srcdir NEWS. Change-Id: I20a140a68b9afca5096d33d99a3ea5d24e776f05 Reviewed-on: https://code.wireshark.org/review/3626 Tested-by: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 7b38bc2 Author: Michael Mann Date: Sat Aug 16 22:29:15 2014 -0400 Remove unnecessary includes Change-Id: Ib1a90a07b2d467a81927c53917e05a1af6ba4ee6 Reviewed-on: https://code.wireshark.org/review/3666 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit e7853d3 Author: Alexis La Goutte Date: Fri Aug 15 19:54:01 2014 +0200 prefs.h : fix indent (use 4 spaces) and add modelines info Change-Id: I319b76973ade38261f40e6120c436de923b5d5bf Reviewed-on: https://code.wireshark.org/review/3658 Reviewed-by: Evan Huus commit 721008c Author: Alexis La Goutte Date: Fri Aug 15 19:49:52 2014 +0200 DCERPC PN IO: Add modelines info Change-Id: I124c5d38f8f3b4aee6d5dbee0367555742350e55 Reviewed-on: https://code.wireshark.org/review/3657 Reviewed-by: Evan Huus commit 305f36d Author: Alexis La Goutte Date: Fri Aug 15 19:48:22 2014 +0200 Wimax Plugins: Fix indent (use tabs) and modelines Change-Id: I27a976c9cac598be5a90412da171915181a784d3 Reviewed-on: https://code.wireshark.org/review/3656 Reviewed-by: Evan Huus commit c8cb153 Author: Alexis La Goutte Date: Fri Aug 15 19:27:23 2014 +0200 Stats Tree: Add Modelines Change-Id: Id4b2a2837377d52e9f6c9145f9fbed2465a538df Reviewed-on: https://code.wireshark.org/review/3654 Reviewed-by: Evan Huus commit 5673893 Author: Alexis La Goutte Date: Fri Aug 15 19:04:35 2014 +0200 PCAPNG Block: Add modelines info Change-Id: I15ddf62318fc8783a2318025fa6ca110b7991ff5 Reviewed-on: https://code.wireshark.org/review/3653 Reviewed-by: Anders Broman commit ef77c1c Author: Alexis La Goutte Date: Fri Aug 15 18:58:30 2014 +0200 OptoMMP: Add modelines info Change-Id: Ia9ea6e553d92d1045f022254d714fea5440257a5 Reviewed-on: https://code.wireshark.org/review/3652 Reviewed-by: Anders Broman commit f17dd37 Author: Alexis La Goutte Date: Fri Aug 15 18:57:06 2014 +0200 LLDP: Fix indent (use 4 spaces) Change-Id: I392d1d23d590187128f81763a937d35229ed6929 Reviewed-on: https://code.wireshark.org/review/3651 Reviewed-by: Anders Broman commit 1111538 Author: Alexis La Goutte Date: Fri Aug 15 18:54:14 2014 +0200 IUUP: Add modelines info Change-Id: I6cde1a17d917b9cf4c08ca202571fd07bb9302ba Reviewed-on: https://code.wireshark.org/review/3650 Reviewed-by: Anders Broman commit ae6c433 Author: Alexis La Goutte Date: Fri Aug 15 18:53:05 2014 +0200 IPMI Update: Add modelines info Change-Id: I5edf987e0df4c1d363d29ef4b48d901873c1c817 Reviewed-on: https://code.wireshark.org/review/3649 Reviewed-by: Anders Broman commit 762e762 Author: Marian Durkovic Date: Sat Aug 16 13:42:17 2014 +0200 Fix TRILL ISIS Hellos: - MT Port Capability TLVs are present in L1 Hellos - unify texts Change-Id: I3dade81ad4487620a8e46e0b242bbbffbb6c2d49 Reviewed-on: https://code.wireshark.org/review/3659 Reviewed-by: Evan Huus commit e9135ce Author: Alexis La Goutte Date: Fri Aug 15 18:44:11 2014 +0200 LINK16: Add modelines info Change-Id: I4267de691f9b7064b6110eba1c85ddb6b755d3f5 Reviewed-on: https://code.wireshark.org/review/3648 Reviewed-by: Evan Huus commit 71901b6 Author: Alexis La Goutte Date: Fri Aug 15 18:43:34 2014 +0200 OUI: Fix indent (use 4spaces) and modelines info Use the same indent like epan/oui.h Change-Id: I02018788bc3f62d170a87a40bd4495630bded1c5 Reviewed-on: https://code.wireshark.org/review/3647 Reviewed-by: Evan Huus commit af8f962 Author: Alexis La Goutte Date: Fri Aug 15 10:05:14 2014 +0200 tap-iousers: fix indent and add modelines info Change-Id: Ia144e016bd7fb0b8d4770d45afa1145057d0a5e9 Reviewed-on: https://code.wireshark.org/review/3646 Reviewed-by: Evan Huus commit 0a8a36e Author: Alexis La Goutte Date: Sat Aug 16 10:15:41 2014 +0200 ISIS:LSP : fix indent (remove last tab) and reindent hf Change-Id: I615e777b4b6af073c174fe0c3554ed0e33f5e68e Reviewed-on: https://code.wireshark.org/review/3645 Reviewed-by: Evan Huus commit a4c0989 Author: Alexis La Goutte Date: Wed Aug 13 13:09:14 2014 +0200 Fix ISO C does not allow extra ';' outside of a function [-Wpedantic] Change-Id: I7c0be29b5e5a54e269fec928e6058395ada7e04b Reviewed-on: https://code.wireshark.org/review/3644 Reviewed-by: Evan Huus commit 9f96842 Author: Alexis La Goutte Date: Wed Aug 13 13:09:00 2014 +0200 Fix ISO C does not allow extra ';' outside of a function [-Wpedantic] Change-Id: Ia956c108d3493e54578247f08ac7b167d8b71f0f Reviewed-on: https://code.wireshark.org/review/3643 Reviewed-by: Evan Huus commit 7395915 Author: Evan Huus Date: Sat Aug 16 13:58:26 2014 -0400 rtsp: parse the correct token for the status code Don't call get_token_len on next_token *and* pass in next_token to store the subsequent pointer - the token we want to parse is the *current* value of next_token, not the next next token (which may be beyond the end of the buffer, if next_token happens to be the *last* token). Bug: 10381 Change-Id: I9fb27e8bdaf2f9556f61841de30cec04b98ffb96 Reviewed-on: https://code.wireshark.org/review/3663 Reviewed-by: Evan Huus commit 22e10be Author: Evan Huus Date: Sat Aug 16 13:32:25 2014 -0400 Revert "create audio-specific part of the usb conversation" Also revert "dissect as interface general descr for v1.00" This reverts commit 7cd4e8930454b3afa8e73eacd62bafc6f029022b and commit 152c6b06f1bb8193b6d2682ae40c61a1d642b7c1 to fix the fuzz failures while we work out a proper solution. Ping-Bug:10386 Change-Id: I6302b95c103f17bb2b48d43f8fc06352587b9e95 Reviewed-on: https://code.wireshark.org/review/3662 Reviewed-by: Evan Huus commit fc2d1bd Author: Alexis La Goutte Date: Wed Aug 13 13:08:37 2014 +0200 Fix comma at end of enumerator list [-Wpedantic] Change-Id: Ib50ddb969471c03cf0ce2f240c3586fe2274965a Reviewed-on: https://code.wireshark.org/review/3642 Reviewed-by: Anders Broman commit 72229b2 Author: Alexis La Goutte Date: Wed Aug 13 13:03:51 2014 +0200 Fix comma at end of enumerator list [-Wpedantic] Change-Id: If8b817e8276bb065a257f209bf5b0f566d9f7907 Reviewed-on: https://code.wireshark.org/review/3641 Reviewed-by: Anders Broman commit 3cddcc2 Author: Alexis La Goutte Date: Fri Aug 15 09:51:03 2014 +0200 Fix warning: no previous prototype for ... [-Wmissing-prototypes] Change-Id: Id61288a6abcff44ba813daaa48d403ee5c769da3 Reviewed-on: https://code.wireshark.org/review/3640 Reviewed-by: Anders Broman commit 91e449e Author: Alexis La Goutte Date: Fri Aug 15 09:51:00 2014 +0200 Fix warning: no previous prototype for ... [-Wmissing-prototypes] Change-Id: I059af62625941e9900b3618aa5721b3b82a2c823 Reviewed-on: https://code.wireshark.org/review/3639 Reviewed-by: Anders Broman commit 5d9709b Author: Alexis La Goutte Date: Fri Aug 15 09:50:20 2014 +0200 Fix warning: no previous prototype for ... [-Wmissing-prototypes] Change-Id: I78f50ade1febc0dcb2231d742e2213f012535bc7 Reviewed-on: https://code.wireshark.org/review/3638 Reviewed-by: Anders Broman commit 0517093 Author: Alexis La Goutte Date: Fri Aug 15 09:49:55 2014 +0200 Fix warning: no previous prototype for ... [-Wmissing-prototypes] Change-Id: I7e935114417712d1101ea2d6f4b236fac44698d0 Reviewed-on: https://code.wireshark.org/review/3637 Reviewed-by: Anders Broman commit 772a7ba Author: Alexis La Goutte Date: Fri Aug 15 09:48:23 2014 +0200 Fix warning: no previous prototype for ... [-Wmissing-prototypes] Change-Id: I6790a6c990bd531362171742b938c9f26cb2e1d5 Reviewed-on: https://code.wireshark.org/review/3636 Reviewed-by: Anders Broman commit 53045fa Author: Alexis La Goutte Date: Fri Aug 15 09:44:18 2014 +0200 Fix warning: no previous prototype for ... [-Wmissing-prototypes] Change-Id: I9dfff8032e8aa4634466fb4cb3b136ff6df1c4b7 Reviewed-on: https://code.wireshark.org/review/3635 Reviewed-by: Anders Broman commit 370bab2 Author: Alexis La Goutte Date: Fri Aug 15 09:44:08 2014 +0200 Fix warning: no previous prototype for ... [-Wmissing-prototypes] Change-Id: Idd1cf83809877d12b18362e722c6c37251b02495 Reviewed-on: https://code.wireshark.org/review/3634 Reviewed-by: Anders Broman commit 3f7b762 Author: Alexis La Goutte Date: Fri Aug 15 09:42:36 2014 +0200 Fix warning: no previous prototype for ... [-Wmissing-prototypes] Change-Id: I4e3e6ffbdae988a37904cba4d43dc5a1c5f66ed6 Reviewed-on: https://code.wireshark.org/review/3633 Reviewed-by: Anders Broman commit fc752f7 Author: Alexis La Goutte Date: Fri Aug 15 09:40:32 2014 +0200 Fix warning: no previous prototype for ... [-Wmissing-prototypes] Change-Id: Ic3152356c51ebe554e2356a360df5b0c23d89d63 Reviewed-on: https://code.wireshark.org/review/3632 Reviewed-by: Anders Broman commit 9bd79f4 Author: Alexis La Goutte Date: Wed Aug 13 17:04:02 2014 +0200 Fix warning: no previous prototype for ... [-Wmissing-prototypes] Change-Id: I6e545cb85b6a75cde0ca6c41c57e8c7d69ae4dcb Reviewed-on: https://code.wireshark.org/review/3631 Reviewed-by: Anders Broman commit bba8edc Author: Gerald Combs Date: Fri Aug 15 16:52:40 2014 -0700 README.cmake: List more cmake options. Change-Id: I80b5c82f57c4de55aba9c7ee8044f565c9819d7e Reviewed-on: https://code.wireshark.org/review/3630 Reviewed-by: Gerald Combs commit e5c1f7b Author: Martin Kaiser Date: Thu Aug 14 22:52:50 2014 +0200 get rid of type_2 in most places type_2 is nothing else but the request type in a setup packet this is already stored in the conversation / transaction structure Change-Id: I4dda7aff423eb1b6174a1a630d57e126662abed4 Reviewed-on: https://code.wireshark.org/review/3598 Petri-Dish: Martin Kaiser Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 61c038e Author: Martin Kaiser Date: Tue Aug 12 17:19:25 2014 +0200 simplify try_dissect_next_protocol() Change-Id: Idd9690689217bdfc66f9eee1461422358e837774 Reviewed-on: https://code.wireshark.org/review/3597 Reviewed-by: Michael Mann commit f0e6239 Author: Gerald Combs Date: Fri Aug 15 11:23:14 2014 -0700 Qt: Disable main menu items that don't do anything. The functionality associated with Capture → Capture Filters, Analyze → Display Filters, Analyze → Display Filter Macros, and Analyze → Apply As Column haven't been implemented yet. Disable each menu item for now so that we don't play tricks on our users. Follow our current action naming convention. Rename "Apply as Column" to "Create a Column". Change-Id: I01901db05adc897d877f6a0a699e3049b0149b4a Reviewed-on: https://code.wireshark.org/review/3629 Reviewed-by: Gerald Combs commit 978faf3 Author: Gerald Combs Date: Thu Aug 14 09:52:09 2014 -0700 NSIS/Qt: Move Qt version logic to windeployqt-to-nsis. Move Qt version checking from packaging/nsis/Makefile.nmake to windeployqt-to-nsis.ps1. Get rid of the -Windeployqt parameter since its absence is a condition we now handle. Change-Id: Ieba86d5a91e8217ed11dbe57e80bedaccd2e99cf Reviewed-on: https://code.wireshark.org/review/3595 Reviewed-by: Gerald Combs commit 4e267ba Author: Gerald Combs Date: Fri Aug 15 08:59:02 2014 -0700 Windows: Fix PowerShell 2.0 compatibility. PowerShell 2.0's Get-ChildItem doesn't support "-File" even though http://technet.microsoft.com/en-us/library/hh847897.aspx says otherwise. Add a config.nmake option to test PS 2.0 compatibility. Change-Id: I8de83cd0841d4ab0b01351c2d39084578a2c84ee Reviewed-on: https://code.wireshark.org/review/3625 Reviewed-by: Gerald Combs commit a3db896 Author: Bill Meier Date: Fri Aug 15 10:33:44 2014 -0400 packet-k12.c: Various minor changes: - Simplify proto_reg_handoff() & move it to the end of the file as per convention; - Reformat hf[] & ei[] for readability; - Add editor modelines & do whitespace changes. Change-Id: If01432c5b86129aaaab478493bbb218295bcb65c Reviewed-on: https://code.wireshark.org/review/3622 Reviewed-by: Bill Meier commit 271deaa Author: Bill Meier Date: Fri Aug 15 09:40:00 2014 -0400 paacket-llc.c: Minor changes - Remove unneeded '#include '; - tvb_length_remaining() --> tvb_reported_length_remaining(); - Add editor modelines. Change-Id: I8410a1286238c0fa1ec9f6b680ab0eb2665672f9 Reviewed-on: https://code.wireshark.org/review/3621 Reviewed-by: Bill Meier commit 60707f8 Author: Bill Meier Date: Fri Aug 15 09:21:22 2014 -0400 packet-usb-audio.c: Trivial changes - Remove unneeded #include; - Remove some trailing whitespace; Change-Id: Iddf137d1d507dea4e3e892831fe6a05b80d2fa50 Reviewed-on: https://code.wireshark.org/review/3620 Reviewed-by: Bill Meier commit 56bd0a2 Author: Bill Meier Date: Thu Aug 14 21:08:43 2014 -0400 Remove unneeded #include; As needed: Add editor modelines & do whitespace changes. Change-Id: Ib345833114aab0c70fc20b1fc74c90abecec486e Reviewed-on: https://code.wireshark.org/review/3619 Reviewed-by: Bill Meier commit 4945599 Author: Bill Meier Date: Thu Aug 14 15:00:37 2014 -0400 packet-scsi-ssc.c: remove empty 'proto_reg_handoff_scsi_ssc()' Change-Id: I1b83d4333644807961922f5adb7be3040fe53e19 Reviewed-on: https://code.wireshark.org/review/3618 Reviewed-by: Bill Meier commit 0fc977d Author: Bill Meier Date: Thu Aug 14 14:55:06 2014 -0400 (Minor) add editor-modelines; Adjust whitespace as needed. Change-Id: Ife2ec66c7985149d3e31e96e9eade3903d235cc4 Reviewed-on: https://code.wireshark.org/review/3617 Reviewed-by: Bill Meier commit 23104e9 Author: Bill Meier Date: Thu Aug 14 14:52:04 2014 -0400 packet-umts_mac.c: remove 'g_warning()' calls; Add editor-modelines; Fix whitespace. Change-Id: Ia05aba095ce9fbf54039e224a4cbb986ceae8868 Reviewed-on: https://code.wireshark.org/review/3616 Reviewed-by: Bill Meier commit 3c073f2 Author: Bill Meier Date: Thu Aug 14 14:28:33 2014 -0400 packet-fclctl.c: remove unnbeeded #include; Create/use value_string_ext; Add editor modelines Change-Id: I1b9547ec33031b9645648c20be3ca20b07b80d76 Reviewed-on: https://code.wireshark.org/review/3615 Reviewed-by: Bill Meier commit 7a1b46a Author: Bill Meier Date: Thu Aug 14 14:25:40 2014 -0400 packet-catapult-dct2000.c: Create/use and extended value-string; Add editor modelines. Change-Id: I881700ec2ec011f22172ff21f2f13dfaa6dae68e Reviewed-on: https://code.wireshark.org/review/3614 Reviewed-by: Bill Meier commit 43afcb4 Author: Bill Meier Date: Thu Aug 14 13:51:36 2014 -0400 Remove unneeded #include ; As needed: Add editor-modelines & adjust whitespaxcce. Change-Id: I6f79357e0f3906f6ccc5b68eb451b69b68636335 Reviewed-on: https://code.wireshark.org/review/3613 Reviewed-by: Bill Meier commit facb76a Author: Bill Meier Date: Sun Aug 10 21:52:54 2014 -0400 packet-gsm_a_dtap.c: various changes (mostly indentation/whitespace/formatting); - Remove #include (no prefs); - tvb_length() --> tvb_reported_length() - Use '4 space' indentation; - Use consistent whitespace formatting; - Reformat hf[] entries for readability; Change-Id: I4fd7e860efa795256972d6a31155f0502fb7dcfd Reviewed-on: https://code.wireshark.org/review/3612 Reviewed-by: Bill Meier commit c84578c Author: Bill Meier Date: Sun Aug 10 20:29:16 2014 -0400 packet-ppp.h/packet-rmt-common.h: Add #include (so certain other files need not do so). Also: Add editor-modelines (packet-rmt-common.h) Change-Id: Ib0c45285a9102bb21e8e3c216763ff8cc0150c32 Reviewed-on: https://code.wireshark.org/review/3611 Reviewed-by: Bill Meier commit 78dab88 Author: Bill Meier Date: Sun Aug 10 20:19:39 2014 -0400 params.h: Yet another Ethereal --> Wireshark Change-Id: I301d1ea80333419141850f944977a67f131e07c2 Reviewed-on: https://code.wireshark.org/review/3610 Reviewed-by: Bill Meier commit 7ee2d6b Author: Jeff Morriss Date: Thu Aug 14 14:02:04 2014 -0400 Mark echld and tfshark as experimental in the ./configure help. Move them to the end of the list of optional programs. Make it clear that echld is not built by default. Change capitalization of tshark and tfshark. Change-Id: Ib702ed72eb2469968e06a16c73a4009ba4cf68ad Ping-Bug: 10380 Reviewed-on: https://code.wireshark.org/review/3596 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Petri-Dish: Jeff Morriss Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Jeff Morriss commit 8ef6f58 Author: oyv Date: Fri Aug 15 11:56:28 2014 +0200 btle advertising header flags (RxAdd/TxAdd) dissected incorrectly bug:10384 Signed-off-by: oyv Change-Id: Ic31772c551f36fc8d144a5eaeae987a1e5f3e3f1 Reviewed-on: https://code.wireshark.org/review/3601 Reviewed-by: Michael Mann (cherry picked from commit 9337e7962df8bc12f27019b20dedbb2311669949) Change-Id: Ic31772c551f36fc8d144a5eaeae987a1e5f3e3f1 Reviewed-on: https://code.wireshark.org/review/3609 Reviewed-by: Michael Mann commit 50c8cc6 Author: Guy Harris Date: Fri Aug 15 03:34:11 2014 -0700 Regenerate manuf with the updated wka.tmpl. Bug: 10383 Change-Id: I5ab14ecd0e460e39c2ec5f9259a8b9dd93c3eeb6 Reviewed-on: https://code.wireshark.org/review/3604 Reviewed-by: Guy Harris commit 47bb34a Author: Guy Harris Date: Fri Aug 15 03:26:02 2014 -0700 Add some missing group addresses. Bug: 10383 Change-Id: I94c9604824f25347fcd3c7bfd5c18aabdbe0a332 Reviewed-on: https://code.wireshark.org/review/3603 Reviewed-by: Guy Harris commit 2cab876 Author: Guy Harris Date: Fri Aug 15 03:15:32 2014 -0700 An NLPID of 0xc0 refers to TRILL. This will, at least, make it show up as the meaning of a field containing an NLPID; whether it's actually used to say "a TRILL packet follows" is another matter. At least partially addresses bug 10382, and fully addresses it if it's never actually used to say "a TRILL packet follows". Change-Id: Ic9dc8ec432532bde692fad3aa9cc97a3109aa634 Reviewed-on: https://code.wireshark.org/review/3602 Reviewed-by: Guy Harris commit 480fcfd Author: Guy Harris Date: Thu Aug 14 18:28:43 2014 -0700 Update some URLs. Change-Id: Iaba677670907dbfb028c1112cd11986d859329cb Reviewed-on: https://code.wireshark.org/review/3600 Reviewed-by: Guy Harris commit 02187b0 Author: Graham Bloice Date: Thu Aug 14 22:37:26 2014 +0100 Remove errant #! from powershell script Change-Id: I6c94ce5983654eba20aa8c852efe300e06c957a5 Reviewed-on: https://code.wireshark.org/review/3599 Reviewed-by: Graham Bloice commit 297237b Author: Evan Huus Date: Thu Aug 14 09:40:10 2014 -0400 fix one last reference to textify.sh Change-Id: I2f8bd5a69fd80d6d34a4079cd05a4f4b278274fd Reviewed-on: https://code.wireshark.org/review/3594 Reviewed-by: Evan Huus commit 673247f Author: Gerald Combs Date: Thu Aug 7 17:30:45 2014 -0700 Windows: Clean up text file packaging. Convert textify.sh to PowerShell. Use PowerShell's built-in line ending conversion so that we don't depend on unix2dos. Only copy the help toc and text files to the staging directory. Add PowerShell to the Developer's Guide. Fixup some other content. (asn1/Makefile.inc.nmake contains a call to u2d. Hopefully that's not a problem.) Change-Id: I61a92aa54820d01015abb9ffa65815558ae31c71 Reviewed-on: https://code.wireshark.org/review/3487 Reviewed-by: Graham Bloice Petri-Dish: Graham Bloice commit d68d0e8 Author: Michael Mann Date: Wed Aug 13 08:56:22 2014 -0400 Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the neighborhood. Change-Id: If73a029f564219782c313d4154c24c7ce7458b52 Reviewed-on: https://code.wireshark.org/review/3574 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit f64421d Author: Alexis La Goutte Date: Tue Aug 12 17:01:25 2014 +0200 Qt: Add note about relaunch Wireshark to apply change about language Change-Id: Ibdc7d6b664d681de990608d689170b02439f0ae7 Reviewed-on: https://code.wireshark.org/review/3559 Reviewed-by: Evan Huus Reviewed-by: Anders Broman commit 4469825 Author: Jeff Morriss Date: Wed Aug 13 21:05:38 2014 -0400 Fix the uninitialized-read error reported in bug 10370. Fix apparent cut-n-pasteo: if offset_e is set then we should be looking at offset_e (instead of offset_s) and ts_end (instead of ts_start). Bug: 10370 Change-Id: I0683ad55ac782c7fd03b7dbdf3f34df713267de5 Reviewed-on: https://code.wireshark.org/review/3589 Reviewed-by: Evan Huus commit 4388b56 Author: Gerald Combs Date: Wed Aug 13 17:27:26 2014 -0700 CMake: More Qt5WinExtras plumbing. Change-Id: I7474e8373668ba554d3574193fec59daceafe00d Reviewed-on: https://code.wireshark.org/review/3588 Reviewed-by: Gerald Combs commit e99bbef Author: Jeff Morriss Date: Wed Aug 13 20:30:25 2014 -0400 Don't show us the full Python command-line for building register.c. The echo and output of make-dissector-reg.py is sufficient. Change-Id: I89462435e8966012ec057ccd45adb595f692b0fb Reviewed-on: https://code.wireshark.org/review/3587 Reviewed-by: Jeff Morriss commit e397827 Author: Gerald Combs Date: Wed Aug 13 08:10:44 2014 -0700 Windows Qt: Add taskbar progress support Add support for the taskbar progress indicator on Windows via QtWinExtras. It is almost as if we're a grown up Windows application. Change-Id: I378206b49510d4bd08f2437d8e9a1b01bc6f1351 Reviewed-on: https://code.wireshark.org/review/3576 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit a83f67c Author: Jeff Morriss Date: Wed Aug 13 17:40:16 2014 -0400 Use a wildcard to exclude all Wireshark (GUI) binaries: rpmbuild in RHEL6 errors out if you %exclude a file that's not there. Fixes the issue reported by Chris on the -dev list. Change-Id: If8d8b6a9ee69c3d94756b729a809f3c04fc2517f Reviewed-on: https://code.wireshark.org/review/3586 Reviewed-by: Christopher Maynard Petri-Dish: Christopher Maynard commit e21fbd1 Author: Martin Kaiser Date: Tue Aug 12 18:00:36 2014 +0200 initialize bus_id and device Change-Id: I18b6e17091c0f019535a0dc1734e60795339bb04 Reviewed-on: https://code.wireshark.org/review/3584 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 797d286 Author: Martin Kaiser Date: Tue Aug 12 17:07:46 2014 +0200 add the bus_id when we search for an existing conversation to our endpoint (the existing code uses bus_id 0 by default and creates a new conversation) Change-Id: I33a105bdf4218ac2dd21cf76825e972ff2dd1b9b Reviewed-on: https://code.wireshark.org/review/3583 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 152c6b0 Author: Martin Kaiser Date: Mon Aug 11 11:48:10 2014 +0200 dissect as interface general descr for v1.00 Change-Id: I338ce8d6eb0865af9d0f5669c44389ade2bf0f49 Reviewed-on: https://code.wireshark.org/review/3582 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 7cd4e89 Author: Martin Kaiser Date: Mon Aug 11 11:06:52 2014 +0200 create audio-specific part of the usb conversation store the major spec version there Change-Id: I55564cbca7fb9faa307f1a684858d2e5d2393fc9 Reviewed-on: https://code.wireshark.org/review/3581 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit a2e99f5 Author: Martin Kaiser Date: Fri Aug 8 11:37:45 2014 +0200 distinguish between different audio descriptor types and subtypes dissect the AC interface header descriptor Change-Id: I10f81e5cbf3837d958b255b5a3405ac2465b171f Reviewed-on: https://code.wireshark.org/review/3580 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit b7c02da Author: Martin Kaiser Date: Thu Aug 7 23:10:19 2014 +0200 get conversation info when we parse audio class-specific descriptors reject the descriptor if the class is not audio Change-Id: Ie07f0fb711884e63cbe86d9417570108edd6b5ab Reviewed-on: https://code.wireshark.org/review/3578 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 2952daa Author: Martin Kaiser Date: Fri Aug 8 10:42:32 2014 +0200 rename the defines to make it clear that these are interface subclasses Change-Id: I0ad2168f89f8c4fbb2d2324f60de1276d023b41c Reviewed-on: https://code.wireshark.org/review/3579 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit cef38a7 Author: Martin Kaiser Date: Fri Aug 8 16:56:51 2014 +0200 additional parentheses around the macro argument Change-Id: Idd590dc4d79c1a550d35544b46a79a5cc755f503 Reviewed-on: https://code.wireshark.org/review/3577 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 3e1fec0 Author: Jeff Morriss Date: Tue Aug 12 20:35:56 2014 -0400 More INSTALL updates. - We now support Gtk+-3, Gtk+-2, and Qt (Gtk+-1 is long dead). - Sync several of the configure options to what ./configure actually does (don't bother listing features which default to disabled though). - Don't mention sysconfdir since manuf doesn't go there any more (it goes in datadir). - Remove special install instructions for an ancient version of libpcap. - Point users to the Q&A site. Change-Id: I96a9e13fcf4225c526c5d9b536425b2d20e659f6 Reviewed-on: https://code.wireshark.org/review/3566 Reviewed-by: Evan Huus commit 9e560bc Author: Joerg Mayer Date: Wed Aug 13 14:33:34 2014 +0200 Fix warning when compiling with -O3 /home/jmayer/work/wireshark/git/epan/dissectors/packet-lmp.c: In function ‘dissect_lmp’: /home/jmayer/work/wireshark/git/epan/dissectors/packet-lmp.c:776:13: error: array subscript is below array bounds [-Werror=array-bounds] ti = proto_tree_add_item(lmp_tree, ^ Change-Id: Ie949b4280f71a8f9f480a8e1d6592098ee7e67b5 Reviewed-on: https://code.wireshark.org/review/3573 Reviewed-by: Jörg Mayer commit 633f156 Author: Joerg Mayer Date: Wed Aug 13 14:18:16 2014 +0200 Fix warning when compiling with -O3: /home/jmayer/work/wireshark/git/epan/dissectors/packet-ipp.c: In function ‘dissect_ipp’: /home/jmayer/work/wireshark/git/epan/dissectors/packet-ipp.c:583:78: error: ‘name_val’ may be used uninitialized in this function [-Werror=maybe-uninitialized] if ((name_length > 5) && name_val && !strcmp(name_val+name_length-5, "-time")) { ^ /home/jmayer/work/wireshark/git/epan/dissectors/packet-ipp.c:557:11: note: ‘name_val’ was declared here char *name_val; ^ Change-Id: I5e49596010572b285e4ca8f210cdcf49d56bfc10 Reviewed-on: https://code.wireshark.org/review/3572 Reviewed-by: Jörg Mayer commit ea87383 Author: Luke Chou Date: Thu Jul 10 01:37:58 2014 -0400 802.11 : 11ac decode update , base on IEEE-11ac-2013 IE193 Extended BSS Load element (8.4.2.162) IE194 Wide Bandwidth Channel Switch element (8.4.2.163) IE199 Operating mode notification And extend capabilities octet 8. Bug:10258 Change-Id: If5ef2b72eec2bdbf1d111eaa2b4d2d5954b7413b Reviewed-on: https://code.wireshark.org/review/2915 Reviewed-by: Alexis La Goutte commit acf39ff Author: Alexis La Goutte Date: Wed Aug 13 08:51:20 2014 +0200 SNMP : Continue to fix indent (use tab) Change-Id: I6b92deb2dbf9b9c4be7fd75d6d788755524a7483 Reviewed-on: https://code.wireshark.org/review/3570 Reviewed-by: Anders Broman commit 3841821 Author: Alexis La Goutte Date: Wed Aug 13 08:25:21 2014 +0200 SNMP: Remove some unused hf field Change-Id: I33c89d07af6658569df3a9a094e2865e28ed0acb Reviewed-on: https://code.wireshark.org/review/3569 Reviewed-by: Anders Broman commit f59e694 Author: Joerg Mayer Date: Wed Aug 13 07:59:35 2014 +0200 Fix warning (turning error) when compiling with -O3 In file included from /home/jmayer/work/wireshark/git/epan/wslua/lrexlib_glib.c:199:0: /home/jmayer/work/wireshark/git/epan/wslua/lrexlib_algo.h: In function ‘generic_find_func’: /home/jmayer/work/wireshark/git/epan/wslua/lrexlib_algo.h:486:14: error: ‘ud’ may be used uninitialized in this function [-Werror=maybe-uninitialized] TUserdata *ud; ^ /home/jmayer/work/wireshark/git/epan/wslua/lrexlib_algo.h: In function ‘algf_gsub’: /home/jmayer/work/wireshark/git/epan/wslua/lrexlib_algo.h:281:14: error: ‘ud’ may be used uninitialized in this function [-Werror=maybe-uninitialized] TUserdata *ud; ^ Change-Id: I835103ea562ced44bc3cce5fadf6115476a78d0e Reviewed-on: https://code.wireshark.org/review/3568 Reviewed-by: Jörg Mayer commit d9e5021 Author: Evan Huus Date: Tue Aug 12 20:21:19 2014 -0400 hip: fix infinite loop in dissect_hip_tlv We can't use tree_item == NULL to determine which branch of the previous if was hit, since proto_tree_add_item can return NULL when run without tree, which was leading to an infinite loop since we were never advancing the offset. Use the actual locator_type instead. Introduced by either g3635d7bed70 or gebff85fdbb although neither of them directly touch this code path. I'm guess that g3635d7bed70 removed an if (tree) guard in some calling function which would have prevented this, but I haven't checked. The bug would still have been there before, it just wouldn't have been hit because it's only present with a NULL tree. Somebody more familiar with the protocol should probably go over a capture or two and make sure this isn't a symptom of some other decoding gone awry in the recent changes. Change-Id: Ie1ce89b16ef667b437c0d99c25e3f3cb2504347d Reviewed-on: https://code.wireshark.org/review/3564 Reviewed-by: Evan Huus commit 20721cb Author: Evan Huus Date: Tue Aug 12 20:39:07 2014 -0400 http2: C90 doesn't permit anonymous structs or unions Change-Id: I88d048e4012109957a0b5e7a2480faed9fbe9cc4 Reviewed-on: https://code.wireshark.org/review/3565 Reviewed-by: Evan Huus commit a5405e0 Author: Tatsuhiro Tsujikawa Date: Mon Aug 4 21:06:14 2014 +0900 http2: Add additional header decoding information This patch adds additional header decoding information, such as header encoding representation, including header table size update (HPACK draft-09, section 7). Previously when user clicks the decoded header info, it highlights wrong byte sequence in compressed pane. This patch fixes this and now clicking header will highlight the byte sequence it was decoded from. Change-Id: I611a34edef31640c59a1f8bbc26db1c42eb16ce2 Reviewed-on: https://code.wireshark.org/review/3407 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit 61d522f Author: Jeff Morriss Date: Tue Aug 12 18:02:11 2014 -0400 Indicate that Python is required to compile Wireshark. Remove some trailing white space at the same time. (The ./configure options in INSTALL are significantly out of date--that will be the subject of a separate commit.) Change-Id: I3c03f90dab099e6d3386a235f35b691e7ff671be Reviewed-on: https://code.wireshark.org/review/3563 Reviewed-by: Daniel Black Reviewed-by: Evan Huus commit 65ac652 Author: Joerg Mayer Date: Tue Aug 12 23:30:16 2014 +0200 Remove make-dissector-reg and require python for autotool builds as well Change-Id: I6239063a08ba37199a4e95302a3650a80544c750 Reviewed-on: https://code.wireshark.org/review/3562 Reviewed-by: Jörg Mayer commit 433eeda Author: Jeff Morriss Date: Tue Aug 12 10:09:03 2014 -0400 When checking if a message is Diameter also check for a minimum message length. This improves the detection of Diameter messages within a TCP bytestream (i.e., when the Diameter PDUs don't neatly align with frames). Bug: 10362 Change-Id: I49a6e8cf076a6ab8a14761493aab9f3b11e4756e Reviewed-on: https://code.wireshark.org/review/3557 Petri-Dish: Evan Huus Petri-Dish: Jeff Morriss Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit b698426 Author: Joerg Mayer Date: Tue Aug 12 18:58:29 2014 +0200 Remove unneeded include of config.h Change-Id: I7688c9a9dc88023d562fb665109185e22f2d06e8 Reviewed-on: https://code.wireshark.org/review/3560 Reviewed-by: Jörg Mayer commit 7b05f6c Author: Eugene Sukhodolin Date: Sun Aug 10 20:24:05 2014 -0700 Remove parsing of non-existing TS_UD_SC_SEC1 fields When RDP encryption method/level is NONE (CredSSP implies this case), TS_UD_SC_SEC1::encryptionLevel is the last present field. Subsequent fields aren't present in this case. Change-Id: I44cfea3ed52fae1ed6c416aeb01c3cf6ff002a3c Reviewed-on: https://code.wireshark.org/review/3545 Reviewed-by: Alexis La Goutte commit ddada16 Author: Pascal Quantin Date: Sun Aug 10 16:48:40 2014 +0200 NSIS: check Windows version before running uninstaller Change-Id: Icc8d725bff484c48d14e0a9208c545ca512a9768 Reviewed-on: https://code.wireshark.org/review/3533 Reviewed-by: Pascal Quantin Reviewed-by: Christopher Maynard Petri-Dish: Christopher Maynard Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 0ea25a6 Author: Роман Донченко Date: Sun Aug 10 18:21:31 2014 +0400 Remove a bogus make-dissector-reg dependency from UseMakeDissectorReg.cmake The shell script is not used in the CMake build system. Change-Id: I97d3d750f2521c626594200da8fc9a4453414576 Reviewed-on: https://code.wireshark.org/review/3530 Reviewed-by: Evan Huus Reviewed-by: Anders Broman commit 4fd9809 Author: Jeff Morriss Date: Mon Aug 11 16:41:38 2014 -0400 Fix generation of wslua taps in out-of-source-tree builds when the source tree is a source tarball (rather than git): Don't put the $(srcdir) path (from when the source tarball was made) into the C file: that file isn't regenerated when ./configure is run. (This is a correction to 0996730b91fddbf8aa7c61730a50da28ea1ab6a0). Also change a few dependency paths so they'll work in out-of-source-tree builds. Change-Id: I416f2d3611fb61659b9a7f7285e5f54a354fbe7d Reviewed-on: https://code.wireshark.org/review/3554 Petri-Dish: Jeff Morriss Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus Reviewed-by: Anders Broman commit 50c7d8e Author: Tim Furlong Date: Tue Jun 17 13:00:03 2014 -0700 Use an explicit path for stats_tree_dialog.cpp. Change the entry for stats_tree_dialog.cpp in ui/qt/QtShark.pro to have a relative "../qt/" path, so that Qt Creator can find it from its build...-release temporary directory. Change-Id: I8fa40e15a7fbb643d5565e216ce92f73afcd4871 Reviewed-on: https://code.wireshark.org/review/2340 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit f022e15 Author: Dom Gifford Date: Mon Aug 11 14:53:04 2014 +0100 Guard against buffer overflow when copying group key bytes into security association structure. Change-Id: I2f573a0626bab44aaca1ac6716bf5ac3d6a9b7ed Reviewed-on: https://code.wireshark.org/review/3553 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit cb44442 Author: Alexis La Goutte Date: Mon Aug 11 09:35:11 2014 +0200 SNMP: fix mixed indent (use tab) Change-Id: I19fde26bf7d1d2b19fcb56573f6e0814d1a7b8ab Reviewed-on: https://code.wireshark.org/review/3551 Reviewed-by: Evan Huus commit 4c131ce Author: Alexis La Goutte Date: Mon Aug 11 09:16:18 2014 +0200 SNMP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I00d66ff57fd3ea1ede692c85b2ae0286c30557b7 Reviewed-on: https://code.wireshark.org/review/3550 Reviewed-by: Evan Huus commit db7143d Author: Alexis La Goutte Date: Mon Aug 11 09:05:18 2014 +0200 SNMP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: Ifd4fef4ff7cc5a3197a802e0da5851370ddcd715 Reviewed-on: https://code.wireshark.org/review/3549 Reviewed-by: Evan Huus commit aaeedcb Author: Alexis La Goutte Date: Mon Aug 11 08:58:13 2014 +0200 Fix modeline (use Wireshark standard with C comment and no C++ comment) Fix also some indent (tab->4spaces) Change-Id: Ieef26591d405c6abe622f9fa26d2a7117af3c259 Reviewed-on: https://code.wireshark.org/review/3548 Reviewed-by: Anders Broman commit a2090cd Author: Guy Harris Date: Mon Aug 11 02:40:17 2014 -0700 Give more information about string encodings. Fix some indentation while we're at it. Change-Id: I887af6e7507e1cd3c7e2b5bb5124d913aea01f9c Reviewed-on: https://code.wireshark.org/review/3552 Reviewed-by: Guy Harris commit 9deb769 Author: Eugene Sukhodolin Date: Sun Aug 10 23:02:30 2014 -0700 Minor typo corrections Change-Id: I5962ba6a9b9285095ddacf00307a3094c697461a Reviewed-on: https://code.wireshark.org/review/3546 Reviewed-by: Alexis La Goutte commit 9c79921 Author: Graham Bloice Date: Fri Aug 8 23:14:54 2014 +0100 Fix the CMake QT build The HAVE_PCAP_REMOTE definition is in config.h, so the .h files that depend on the definition must include it so the MOC compiler will generate the required code. Change-Id: Ifc17db4fc3f0e3323726792308e303d28d8bcc7f Reviewed-on: https://code.wireshark.org/review/3516 Reviewed-by: Evan Huus commit 93e03e6 Author: Gerald Combs Date: Sun Aug 10 17:53:00 2014 -0700 IAPP: Remove an unused variable. Change-Id: Iee584bdb384056afe0f980bf18163b449ccecf59 Reviewed-on: https://code.wireshark.org/review/3544 Reviewed-by: Gerald Combs commit d161f21 Author: Bill Meier Date: Sun Aug 10 17:34:52 2014 -0400 packet-hislip.c: various minor fixes - Create/use an extended value-string; - Clean up code relating to setting COL_PROTO & COL_INFO; - Use consistent whitespace formatting. Change-Id: I3087d959db09cd90c1a5dd53fe7af7baf999b76c Reviewed-on: https://code.wireshark.org/review/3542 Reviewed-by: Bill Meier commit e7301a1 Author: Bill Meier Date: Sat Aug 9 11:51:10 2014 -0400 packet-hislip.c: Fix various bugs and deficiencies - Remove an incorrect call to conversation_new() (which messed up TCP sequence number analysis). - hislip Request/Response analysis must be done during 'pass1' (i.e. when 'flags.visited == 0'); Not doing so caused various problems including tshark '1 pass' poor dissection. - Remove 'if (tree)' around a call to expert_...(). - Don't show "unknown" for Async/Sync when the value is actually known. - Simplify some code. - Mark a field as GENERATED. Change-Id: I286c12f52e5f73377bed3a2792f3ff0003e2785f Reviewed-on: https://code.wireshark.org/review/3541 Petri-Dish: Bill Meier Reviewed-by: Bill Meier commit d13b031 Author: Bill Meier Date: Fri Aug 8 11:55:25 2014 -0400 packet-lg8979.c: Various minor changes - tvb_length() --> tvb_reported_length(); - Add an XXX comment re use of 'get_length' for tcp_dissect_pdus(); - Remove a few unneeded initializers; - Simplify/adjust code in a few places; - Remove some boilerplate comments; - Reformat some whitespace and long-lines. Change-Id: I17b9750cc1bdb5140edc28efbae5bf0f6ec23b6e Reviewed-on: https://code.wireshark.org/review/3538 Petri-Dish: Bill Meier Reviewed-by: Bill Meier commit 52ddc45 Author: Bill Meier Date: Fri Aug 8 12:34:46 2014 -0400 packet-epon.c: remove an unneeded #include Change-Id: Ia8af5d6ff496c099ba3c38d393a622f3a6c8fe67 Reviewed-on: https://code.wireshark.org/review/3540 Reviewed-by: Bill Meier commit 468cead Author: Bill Meier Date: Fri Aug 8 12:22:47 2014 -0400 packet-elmi.c: Remove an unneeded #include. Change-Id: I55d9fef94467d03f88f5acad6cb6ada3fc873b7c Reviewed-on: https://code.wireshark.org/review/3539 Reviewed-by: Bill Meier commit 3635d7b Author: Michael Mann Date: Sat Aug 9 13:43:44 2014 -0400 Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the neighborhood. Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f Reviewed-on: https://code.wireshark.org/review/3537 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 18346c8 Author: Роман Донченко Date: Sun Aug 10 21:17:53 2014 +0400 ssh.dh_gex.nbits: there's only one number Change-Id: Ia3bd392b2223cf666828d65a61e069c465d3894a Reviewed-on: https://code.wireshark.org/review/3536 Reviewed-by: Alexis La Goutte commit e1de06f Author: Роман Донченко Date: Sun Aug 10 21:05:52 2014 +0400 SSH: don't display "Payload" if it's empty The "Payload" field only makes sense for packets that have unknown type or are unexpectedly long. For normal traces, it will always be empty, so hide it. Note: this length check used to be implicitly performed by ssh_proto_tree_add_item before 2aa66aa2b2daf0693e405371a5f9037a43896441, so this just restores the former behaviour. Change-Id: I948935bce660018377a004c661b829a19eb0a53b Reviewed-on: https://code.wireshark.org/review/3535 Reviewed-by: Alexis La Goutte commit ed85bd3 Author: Gerald Combs Date: Sun Aug 10 08:05:44 2014 -0700 [Automatic manuf, services and enterprise-numbers update for 2014-08-10] Change-Id: I052b92f415e7ccfb84db47d0d3102d4bdfcfe25c Reviewed-on: https://code.wireshark.org/review/3531 Reviewed-by: Gerald Combs commit 6bddb0e Author: Pascal Quantin Date: Sun Aug 10 15:25:59 2014 +0200 PIM: fix a copy/paster error introduced in gebff85f Bug: 10358 Change-Id: Iddfd5dcd53e80a18cb253834920d9625195b3669 Reviewed-on: https://code.wireshark.org/review/3529 Reviewed-by: Pascal Quantin commit 6034a60 Author: Pascal Quantin Date: Sun Aug 10 10:43:33 2014 +0200 CredSSP: update ASN.1 source file with the change done in gd2396d2 Change-Id: I87d0f212f485b9e28fa00101eec9e3c07bc57c67 Reviewed-on: https://code.wireshark.org/review/3528 Reviewed-by: Pascal Quantin commit d2396d2 Author: Eugene Sukhodolin Date: Sat Aug 9 21:24:09 2014 -0700 The version of the CredSSP protocol can be 2 or 3 According to Microsoft documentation, valid values for the Version field are 2 and 3. Newer servers (like Windows 2012 R2) respond with Version=3. Change-Id: Ifb0c6f52d09c75bbde2b4a46d13366461736b9c0 Reviewed-on: https://code.wireshark.org/review/3527 Reviewed-by: Pascal Quantin commit 2f0278c Author: Pascal Quantin Date: Sat Aug 9 21:21:27 2014 +0200 ULP: upgrade to approved version 2.0.2 Change-Id: Icf09e430a1732708ddd9e7abb49f7b1a6225afde Reviewed-on: https://code.wireshark.org/review/3526 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit dc748b1 Author: Роман Донченко Date: Sun Aug 3 23:47:42 2014 +0400 Now that Python is mandatory on Windows, remove checks for it from nmakefiles Change-Id: I2ca6abb372ec4bda0af1aa40089082533a61df3a Reviewed-on: https://code.wireshark.org/review/3392 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit a4a94af Author: Evan Huus Date: Sat Aug 9 09:33:23 2014 -0400 Fix regression introduced by gf3b631668b I made a stupid when simplifying the bit-twiddling, and accidentally reversed two of the bytes which completely broke MAC address name resolution. Bug: 10344 Change-Id: I0720755fb290423150e4d84da9d45cb0b76341e4 Reviewed-on: https://code.wireshark.org/review/3522 Reviewed-by: Michael Mann commit ddeac70 Author: Pascal Quantin Date: Sat Aug 9 18:18:08 2014 +0200 LTE RRC: fix dissection of CDMA System Time broken in gcd02af5 Also put back initial text indentation Change-Id: I6fe207086018a806a258b1de2888ac0b9310aac6 Reviewed-on: https://code.wireshark.org/review/3524 Reviewed-by: Pascal Quantin commit 020d0f8 Author: Alexis La Goutte Date: Fri Aug 8 19:50:24 2014 +0200 Qt: Fix when build with Qt < 4.8.0 StyleName is not available in Qt < 4.8 Change-Id: Icbfcef7c62b124ce67f1a02ed928a96233ae2d9d Reviewed-on: https://code.wireshark.org/review/3508 Reviewed-by: Christopher Maynard commit 6379236 Author: Alexis La Goutte Date: Fri Aug 8 17:27:53 2014 +0200 Qt: Add missing text to translation Change-Id: I49d00f73e3e1cf662ead1b01e5d1c0b420c6ccef Reviewed-on: https://code.wireshark.org/review/3504 Reviewed-by: Anders Broman commit 3035e6e Author: MarkPhillips Date: Sat Aug 9 11:03:01 2014 +0100 802.11 BA sequence number decode is broken Bug: 10334 Change-Id: If2da1c5ed63d7e2684a107181d56be38ed921106 Reviewed-on: https://code.wireshark.org/review/3519 Reviewed-by: Alexis La Goutte commit cd02af5 Author: Michael Mann Date: Fri Aug 8 09:19:29 2014 -0400 Eliminate (almost all) proto_tree_add_text calls from ASN.1 dissectors. This mostly involved adding expert info capabilities to many of the dissectors so that they could correctly flag error conditions. Only remaining proto_tree_add_text calls are in H248.cnf, which has a convoluted way of using hf_ data to make its tree. Change-Id: I6412150c2ec1977d7fa38f3f0ed416680bdfb141 Reviewed-on: https://code.wireshark.org/review/3500 Petri-Dish: Michael Mann Reviewed-by: Michael Mann commit bb15274 Author: Guy Harris Date: Fri Aug 8 18:15:34 2014 -0700 Update symbol lists. Change-Id: I55ce6396b943ce9376649a9a8973a6e1cadcced7 Reviewed-on: https://code.wireshark.org/review/3518 Reviewed-by: Guy Harris commit ebff85f Author: Guy Harris Date: Fri Aug 8 18:09:00 2014 -0700 Clean up Internet checksum handling. Add macros to set entries of a vec_t, one for use when you have a pointer to private data, and one for use when you have data in a tvbuff. The latter wraps the use of tvb_get_ptr(), so that you're not directly calling it in a dissector. Move ip_checksum() to epan/in_cksum.c, and add an ip_checksum_tvb() that wraps the use of tvb_get_ptr(). In the CARP dissector, give the length variable an unsigned type - there's no benefit to it being signed, and that requires some casts to be thrown around. In the DCCP dissector, check only against the coverage length to see if we have enough data, combine the "should we check the checksum?" check with the "*can* we check the checksum?" check in a single if, and throw a dissector assertion if the source network address type isn't IPv4 or IPv6. Get rid of inclues of in dissectors that don't use any of the Internet checksum routines. In the HIP dissector, make sure we have the data to calculate the checksum before doing so. Change-Id: I2f9674775dbb54c533d33082632809f7d32ec8ae Reviewed-on: https://code.wireshark.org/review/3517 Reviewed-by: Guy Harris commit fe74e31 Author: Pascal Quantin Date: Fri Aug 8 23:44:42 2014 +0200 BOFL: fix assertion introduced in g5db1352 Bug: 10356 Change-Id: Ie3846d6462f212c7fd5162e65e9f83c1524aee36 Reviewed-on: https://code.wireshark.org/review/3515 Reviewed-by: Pascal Quantin commit bbdd34a Author: Guy Harris Date: Fri Aug 8 13:02:46 2014 -0700 Add a tvbuff version of crc6_compute(). Use it in the MBMS synchronisation protocol dissector, rather than calling tvb_get_ptr() there. Change-Id: I7ddb3c6b30547826cb5372352c7c483d8a24dc8e Reviewed-on: https://code.wireshark.org/review/3514 Reviewed-by: Guy Harris commit 479e288 Author: Guy Harris Date: Fri Aug 8 12:51:32 2014 -0700 The "MPEG-2" CRC-32 is also the ATM CRC-32. Use it in the ATM dissector, and use a tvbuff version, so that we don't do tvb_get_ptr() ourselves. Change-Id: I0bd3594bc739e0cca447ac06f34a471441cf2e70 Reviewed-on: https://code.wireshark.org/review/3513 Reviewed-by: Guy Harris commit cf5f0d3 Author: Guy Harris Date: Fri Aug 8 12:20:12 2014 -0700 Fix the polynomial for the CCITT CRC. And note that it's the same polynomial for the MPEG-2 CRC. Change-Id: Ie89e392156ae77a2adeec3eb8e704aa75c0cd0dc Reviewed-on: https://code.wireshark.org/review/3512 Reviewed-by: Guy Harris commit 8b364ea Author: Gerald Combs Date: Fri Aug 8 11:20:53 2014 -0700 Autodiscover flex and bison in config.nmake. Change-Id: I4683d0eeb06e5616103f3e6e25ce7f1549a2bb05 Reviewed-on: https://code.wireshark.org/review/3510 Petri-Dish: Gerald Combs Reviewed-by: Gerald Combs commit 24da9a8 Author: Guy Harris Date: Fri Aug 8 11:29:28 2014 -0700 Don't subtract 4 from the length passed to update_crc10_by_bytes_iuup(). The length passed to it already has 4 subtracted from it by the caller. Change-Id: I6e047c6c4c4cd5220be923b4663088b6b275d768 Reviewed-on: https://code.wireshark.org/review/3511 Reviewed-by: Guy Harris commit 6f104a0 Author: Guy Harris Date: Fri Aug 8 11:08:35 2014 -0700 Clean up the CRC-10 code. Have the wsutil routine just accumulate the stuff from the buffer handed to us. Have the IUUP dissector deal with the extra stuff. Add a update_crc10_by_bytes_tvb() routine, which is passed a tvbuff, offset, and length, and use that rather than using tvb_get_ptr() in dissectors. Change-Id: Iadd0823c764080e60d1339abb94d2e19150eabfe Reviewed-on: https://code.wireshark.org/review/3509 Reviewed-by: Guy Harris commit 9b9005e Author: Guy Harris Date: Fri Aug 8 10:10:36 2014 -0700 The DRM DCP CRC-16 is the same as the X.25 CRC-16. So just use crc16_x25_ccitt_tvb(), which goes a byte at a time rather than a bit at a time, and which takes a tvbuff rather than requiring you to call tvb_get_ptr(). It also doesn't 1's-complement the result, so we can compare it against the 0x1D0F in ETSI TS 102 821 V1.4.1 (2012-10) rather than against a 1's-complement version, 0xE2F0. Change-Id: Ia513f851f0a8ff1e7853278ddf3618c532fb2aba Reviewed-on: https://code.wireshark.org/review/3507 Reviewed-by: Guy Harris commit 57927c8 Author: Guy Harris Date: Fri Aug 8 09:17:58 2014 -0700 Fix compiler warning. Change-Id: Idf275d89591558fd2ea082c886ce07e62523807a Reviewed-on: https://code.wireshark.org/review/3506 Reviewed-by: Guy Harris commit 22ad90c Author: Guy Harris Date: Fri Aug 8 08:57:31 2014 -0700 Add routines for CRC-16 with a polynomial of 0x3D65. There are routines that take a buffer and a length and that take a tvbuff, offset, and length; use those routines in the DNP dissector (which no longer needs its own table and loop), and use the tvbuff routine instead of calling tvb_get_ptr(). Change-Id: Ic67b0f3b65b94ea47c0fdc2f3d3b6f88df77f9c6 Reviewed-on: https://code.wireshark.org/review/3505 Reviewed-by: Guy Harris commit 8da72cd Author: Dom Gifford Date: Thu Jul 24 15:32:55 2014 +0100 Fix support for decrypting 802.11 broadcast messages. A little bit of guess work is involved as the group key can use a different cipher to the pairwise key, and we are trying to do this purely based on the EAPOL messages with no prior knowledge of the associate request. We try to guess the cipher based on the lengths. Bug:8734 Change-Id: I4c456b45939c00a9d1122406891f704fa037349c Reviewed-on: https://code.wireshark.org/review/3183 Reviewed-by: Evan Huus Reviewed-by: Michael Mann commit 345a1d2 Author: Alexis La Goutte Date: Fri Aug 8 08:35:41 2014 +0200 ISIS: Fix reachability IPv4 Interface/Neighbor (wrong length) Change-Id: I8903a097a59bf9bf1ec62b59e57cdc60e382bdb5 Reviewed-on: https://code.wireshark.org/review/3490 Reviewed-by: Evan Huus commit 143cdf1 Author: Alexis La Goutte Date: Wed Aug 6 22:22:17 2014 +0200 ISIS: Add type and length to CLV Change-Id: If6dc8e3a9328571ccdb106b0aabc617889c434c7 Reviewed-on: https://code.wireshark.org/review/3465 Reviewed-by: Evan Huus commit 6fd6955 Author: Stig Bjørlykke Date: Fri Aug 8 10:06:55 2014 +0200 The -k flag has been removed from Makefile.common Change-Id: Ib7399c4b5457c5810df3ce2160a56813785b11ec Reviewed-on: https://code.wireshark.org/review/3498 Petri-Dish: Stig Bjørlykke Reviewed-by: Stig Bjørlykke Tested-by: Stig Bjørlykke commit aa6400a Author: Stig Bjørlykke Date: Fri Aug 8 10:35:34 2014 +0200 Sync t125 from asn1. This adds "Remove unused hf entries" from Anders. Change-Id: I1150f34f0eafab03415339d4b34f5f2e7f69f85b Reviewed-on: https://code.wireshark.org/review/3499 Reviewed-by: Stig Bjørlykke Tested-by: Stig Bjørlykke commit 735263e Author: Michał Orynicz Date: Fri Aug 8 09:06:38 2014 +0200 Logcat text: small fixes * fix exporting "beginning of" frame logs into info field * add missing "Failure" level to regexp in wiretap part * remove usage of GDateTime from wiretap part Change-Id: Ibdea730623241cccbbc1694a34daa308e48c0a89 Reviewed-on: https://code.wireshark.org/review/3493 Reviewed-by: Pascal Quantin commit ad4d672 Author: Guy Harris Date: Fri Aug 8 01:05:47 2014 -0700 Add a CRC32_ACCUMULATE() macro for a single CRC-32 step and use it. Change-Id: I9462d45c5db6d54c0ee695046cb72be1acf379e8 Reviewed-on: https://code.wireshark.org/review/3497 Reviewed-by: Guy Harris commit 4a30cfd Author: Guy Harris Date: Fri Aug 8 00:47:11 2014 -0700 Use crc32_ccitt_tvb_offset_seed(). One fewer tvb_get_ptr() call. Yay! Change-Id: I08ac4888d696f0b6b6a17e9e22f3dfec5aedad59 Reviewed-on: https://code.wireshark.org/review/3496 Reviewed-by: Guy Harris commit d3832d7 Author: Guy Harris Date: Fri Aug 8 00:36:12 2014 -0700 Get rid of no-longer-used variable. Change-Id: I63bde706a6561c834aab9b10975dbb242c65d998 Reviewed-on: https://code.wireshark.org/review/3495 Reviewed-by: Guy Harris commit 6495ab4 Author: Guy Harris Date: Fri Aug 8 00:20:19 2014 -0700 Get rid of no-longer-used variable. Change-Id: I64d1177b9a424ede9d1f687843e38bd37723c137 Reviewed-on: https://code.wireshark.org/review/3494 Reviewed-by: Guy Harris commit 7431229 Author: Guy Harris Date: Fri Aug 8 00:19:07 2014 -0700 Fix indentation. Change-Id: I4342ec7723c43f8e12d6187609a1493a61725d31 Reviewed-on: https://code.wireshark.org/review/3492 Reviewed-by: Guy Harris commit 39d919b Author: Alexis La Goutte Date: Fri Aug 8 09:01:37 2014 +0200 Qt: Make buildbot happy capture_interfaces_dialog.cpp: In member function ‘void CaptureInterfacesDialog::updateStatistics()’: capture_interfaces_dialog.cpp:483:100: error: operation on ‘points’ may be undefined [-Werror=sequence-point] QList *points = points = ti->data(col_traffic_, Qt::UserRole).value *>(); Change-Id: I63afb0f207142d516403968f6a3e988f8ad61d4d Reviewed-on: https://code.wireshark.org/review/3491 Reviewed-by: Alexis La Goutte commit b8a6cfc Author: Роман Донченко Date: Sun Aug 3 03:21:31 2014 +0400 Make Python mandatory to build on Windows While nominally optional, building without it doesn't work, so just make it mandatory. The verify_tools target already passes $(PYTHON) to win-setup.sh --appverify; we just need to supply a default value for PYTHON, so that $(PYTHON) doesn't expand to an empty string. It's also convenient for the developer if Python can be automatically found on the PATH. Change-Id: I4f54695625b74c5b4c758ef1e3bc9ed4467db514 Reviewed-on: https://code.wireshark.org/review/3391 Petri-Dish: Jörg Mayer Reviewed-by: Jörg Mayer Tested-by: Jörg Mayer Reviewed-by: Anders Broman commit 4da7570 Author: Gerald Combs Date: Wed Aug 6 14:50:48 2014 -0700 Use a QTreeWidget instead of QTableWidget. Even though Qt's widget naming suggests otherwise, a QTreeWidget is usually a better choice for tables than QTableWidget. The former gives you a nice, clean Plain Old Table while the latter gives you something that looks and acts like a spreadsheet. In this particular instance using QTreeWidget also gives us the option of adding sub-items with detailed information. Do so for attached addresses. Allow sorting by traffic while we're here. Simplify the column hiding logic. Make sure the sparkline delegate isn't editable. Change-Id: Ia36ba2e12c1c0cb86ae5b2154e6afcf6549ae049 Reviewed-on: https://code.wireshark.org/review/3466 Reviewed-by: Gerald Combs Tested-by: Gerald Combs Petri-Dish: Gerald Combs Reviewed-by: Anders Broman commit 40d5c50 Author: Pascal Quantin Date: Fri Aug 8 00:02:16 2014 +0200 Logcat Text: drop use of GDateTime It's only available from GLib 2.26 while we only require 2.16 Change-Id: I3c2e6748aa93b9af7158f5051433baff6a7c0324 Reviewed-on: https://code.wireshark.org/review/3480 Petri-Dish: Pascal Quantin Reviewed-by: Evan Huus Reviewed-by: Anders Broman commit 4b78ead Author: Pascal Quantin Date: Fri Aug 8 00:31:09 2014 +0200 Logcat Text: fix assert when dissecting PID or TID Per Android documentation, the PID and TID are int Change-Id: I05326d134047315d61a873c33dd02a48d1849f8d Reviewed-on: https://code.wireshark.org/review/3481 Reviewed-by: Evan Huus Reviewed-by: Anders Broman commit a22b707 Author: Michael Mann Date: Thu Aug 7 08:36:30 2014 -0400 Eliminate proto_tree_add_text from some dissectors. Change-Id: I6f1710a093fc548c718defa9b40ab68877ede977 Reviewed-on: https://code.wireshark.org/review/3470 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Reviewed-by: Anders Broman commit 532a98d Author: Guy Harris Date: Thu Aug 7 20:56:22 2014 -0700 Wrap tvb_get_ptr() calls in the CRC routines. That doesn't eliminate them, but at least it encapsulates them. Change-Id: I78f0202cb7d2eb86e2dce220b2b97acc256d1e42 Reviewed-on: https://code.wireshark.org/review/3489 Reviewed-by: Guy Harris commit 20c0fff Author: Guy Harris Date: Thu Aug 7 20:38:11 2014 -0700 Wrap some tvb_get_ptr calls in crc32c_tvb_offset_calculate(). This eliminates some tvb_get_ptr calls from dissectors, as part of trying to minimize if not eliminate its use in dissectors (it's a bit of what's called an "attractive nuisance", in that users who don't understand what it does - and doesn't! - do may use it in ways that are unsafe, e.g. thinking you can use it to get a null-terminated string from a packet). It also eliminates the possibility of passing one length to tvb_get_ptr() and another to crc32c_calculate(). Change-Id: I8a07168d0bc088b45d607e00c5bb1d98421ebc73 Reviewed-on: https://code.wireshark.org/review/3488 Reviewed-by: Guy Harris commit c10396d Author: Evan Huus Date: Thu Aug 7 20:25:34 2014 -0400 Fix read-past-end-of-buffer in CUPS dissector Even when the protocol specifies that a string ends in a null-terminator, there are packets which won't. Therefore: **the result of tvb_get_ptr SHALL NOT be treated as a null-terminated string** We need to post that in big neon lettering somewhere obvious. Bug: 10353 Change-Id: Ie30cd13353a9830311e573e734dd89dc07622c98 Reviewed-on: https://code.wireshark.org/review/3485 Reviewed-by: Evan Huus commit dea377b Author: Guy Harris Date: Thu Aug 7 17:07:46 2014 -0700 Put setargv.obj back in the list of objects for mergecap. This should enable automatic wildcard expansion and fix bug 10354. Add the usual setargv.obj comment for reordercap, which also links with setargv.obj. Change-Id: I2ceee700ae274713bf7a6d5fae0d523e9feca481 Fixes-Bug: 10354 Reviewed-on: https://code.wireshark.org/review/3483 Reviewed-by: Guy Harris commit 8a34884 Author: Gerald Combs Date: Thu Aug 7 16:56:17 2014 -0700 Update the Developer's Guide for Chocolatey's Win flex-bison. Change-Id: Id86a00b521e112e445856251f0c242fbb7a2573b Reviewed-on: https://code.wireshark.org/review/3482 Reviewed-by: Gerald Combs commit 714fa85 Author: Gerald Combs Date: Thu Aug 7 14:07:16 2014 -0700 Win flex-bison and Chocolatey updates. Chocolatey's latest winflexbison package is usable. Update config.nmake, FindLEX.cmake, and FindYACC.cmake accordingly. Rename CHOCOLATEY_INSTALL_PATH to CHOCOLATEY_BIN_PATH since that's what we're finding. Change-Id: I39973fba0531b3f7a1315ca010a8bd70581db3fb Reviewed-on: https://code.wireshark.org/review/3479 Reviewed-by: Gerald Combs commit 1dc88ed Author: Joerg Mayer Date: Thu Aug 7 22:55:21 2014 +0200 Add back a comment lost in 8b2a8a9636d090 Change-Id: I7bdd4767bdffdc23b964898085a216f6ef7c8aff Reviewed-on: https://code.wireshark.org/review/3474 Reviewed-by: Jörg Mayer commit e44e407 Author: AndersBroman Date: Thu Aug 7 17:41:39 2014 +0200 Change the application Ids to avoid duplicates. Change-Id: I127ac215b0b8ed1615e4d11c9a5a5952e3ea8d88 Reviewed-on: https://code.wireshark.org/review/3473 Reviewed-by: Anders Broman commit 35453cf Author: Alexis La Goutte Date: Mon Aug 4 19:09:10 2014 +0200 HTTP: Fix indent (use tab) Change-Id: I4056d8b876f71c1f9ce4804a4dc4b0d16ab5afda Reviewed-on: https://code.wireshark.org/review/3409 Reviewed-by: Anders Broman commit 5b5d9a8 Author: AndersBroman Date: Thu Aug 7 15:30:24 2014 +0200 Add two new true_fals strings. Change-Id: I43440ef6fac1a0c01eec630d2238fcfb085255a5 Reviewed-on: https://code.wireshark.org/review/3471 Reviewed-by: Anders Broman commit ccbe5fd Author: Pascal Quantin Date: Wed Aug 6 19:50:06 2014 +0200 MIPv6: fix dissection of Service Selection Identifier APN field is not encoded as a dotted string so the first character is not a length Bug: 10323 Change-Id: Ia62137c785d505e9d0f1536a333b421a85480741 Reviewed-on: https://code.wireshark.org/review/3461 Petri-Dish: Pascal Quantin Reviewed-by: Pascal Quantin Reviewed-by: Anders Broman commit 378e8b7 Author: Martin Kaiser Date: Wed Aug 6 17:59:16 2014 +0200 we're matching against {any}/port_b, not address_b Change-Id: Ief00f09225805c6c7488d92f8aa5b59c21575788 Reviewed-on: https://code.wireshark.org/review/3464 Reviewed-by: Martin Kaiser commit 083006b6 Author: Martin Kaiser Date: Thu Jul 31 23:15:38 2014 +0200 when a linux USB isochronous descriptor is selected, highlight its data part as well Change-Id: Ia69ac6b1460245ffa44b6ad3b17f07948baf03d4 Reviewed-on: https://code.wireshark.org/review/3463 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 7bf2f2e Author: Jeff Morriss Date: Mon Aug 4 19:08:05 2014 -0400 Support building the NEWS file in out-of-source-tree builds. Copy the built file into the source directory (since it's generated but checked in). Don't fail to build, though, if we can't do that copy. Change-Id: Ia94a19b6f813ee78b191cd09d51198462f95b223 Reviewed-on: https://code.wireshark.org/review/3425 Reviewed-by: Jeff Morriss commit 2c79761 Author: Jeff Morriss Date: Wed Aug 6 17:12:05 2014 +0000 Revert "Add a cmake build to distcheck to ensure that we distribute all the files necessary to do a cmake build." We can't know, in autofoo, what arguments are necessary to make 'cmake' actually run successfully on a given system. We should probably just add a buildbot step to build cmake from the source tarball. This reverts commit 70a6d204a7f0b4039ee986cd6557cd7242e5ff0c. Change-Id: I1961b79ece2e26bafad3eddb189bd0cfab2af846 Reviewed-on: https://code.wireshark.org/review/3460 Reviewed-by: Jeff Morriss commit 2c59a6d Author: Jeff Morriss Date: Wed Aug 6 17:10:57 2014 +0000 Revert "When doing the distcheck cmake check only verify that cmake runs, don't verify that it can build Wireshark." This change doesn't help: we can't get cmake to run properly. This reverts commit 956f4423df447f2e7c0f9691ba9928f104d79820. Change-Id: If1c0ec13ff35fdaa266dcd491350477e2bd91bd1 Reviewed-on: https://code.wireshark.org/review/3459 Reviewed-by: Jeff Morriss commit d55e1b5 Author: Alexis La Goutte Date: Tue Aug 5 17:23:41 2014 +0200 NSIS: Fix multiple issues. Restore the "!include qt-dll-manifest.nsh" clobbered by ga722f83 and which resulted in missing DLL warnings (e.g. QT5PrintSupport.dll). Fix overly aggressive search+replace in wireshark.nsi which broke the WinPcap installation page and GTK+ selection. Try to finish the work on promoting Qt started in ga722f83. Bug: 10349 Change-Id: I7086be7c5272f4ae1b2cc26bbd5d5b725f013573 Reviewed-on: https://code.wireshark.org/review/3428 Reviewed-by: Gerald Combs Reviewed-by: Pascal Quantin commit 892703f Author: AndersBroman Date: Wed Aug 6 15:26:20 2014 +0200 The heuristic for T.125 per is too week and we do not have a PER dissector for T.125 so remove the test. Remove unused hf entries. Fixes bug 10350. Change-Id: If28de7877388c669082f8c8a21dd63107d417fbf Reviewed-on: https://code.wireshark.org/review/3458 Reviewed-by: Anders Broman commit 53b2096 Author: Alexis La Goutte Date: Wed Aug 6 09:07:02 2014 +0200 Add Modelines and fix indent Change-Id: I7abb415bccff4de846ab273eed3e3b2a434d94b7 Reviewed-on: https://code.wireshark.org/review/3455 Reviewed-by: Anders Broman commit 530f70f Author: AndersBroman Date: Wed Aug 6 12:42:52 2014 +0200 Try to fix: packet-mq.c:3653: warning: declaration of 'tree' shadows a parameter Change-Id: I1226dac3764b15a097378aed7696567b9224f4c4 Reviewed-on: https://code.wireshark.org/review/3457 Reviewed-by: Anders Broman commit d67e40e Author: Sean O. Stalley Date: Fri Aug 1 10:23:28 2014 -0700 Added dissection of Device Capability Descriptors in CapResp Packets CapResp Packets may contain Device Capability Descriptors. This patch allows wireshark to show what descriptors are present, & checks that their length fields are valid. See section 6.3.3 of the MA USB spec for more information. Change-Id: Ia120435bdffcced091b67e66e0ba8f1a750358db Reviewed-on: https://code.wireshark.org/review/3330 Petri-Dish: Anders Broman Reviewed-by: Alexis La Goutte commit febbe12 Author: AndersBroman Date: Wed Aug 6 10:29:10 2014 +0200 Add casts to make logcat-text build on Win64 Change-Id: I38d65a06b925653e22a59a4a4cd0a53a87072b49 Reviewed-on: https://code.wireshark.org/review/3456 Reviewed-by: Anders Broman commit 09357c1 Author: robionekenobi Date: Sun Aug 3 21:49:29 2014 +0200 mq improvements: - handle RFH structure - use tvb_reported_length..., - Add Conversation/Request in row display Change-Id: I84c5cf3e9479d91b363eb093e71bb6bdf07e8194 Reviewed-on: https://code.wireshark.org/review/3354 Reviewed-by: Anders Broman commit 1a02ca0 Author: Michał Orynicz Date: Wed May 14 09:45:23 2014 +0200 Add support for android logcat text files Wireshark already supports reading and writing logcat logs saved in binary files. Binary format, although better, is used less often than saving those logs to text files. This patch extends wireshark's support for android logcat logs to reading and writing logcat logs in text files. Features: * support for tag, brief, process, thread, time, threadtime and long formats * saving in original format * it's generally awesome Change-Id: I013d6ac2da876d9a2b39b740219eb398d03830f6 Reviewed-on: https://code.wireshark.org/review/1802 Reviewed-by: Anders Broman commit 71d07bc Author: Alexis La Goutte Date: Sat Aug 2 10:23:52 2014 +0200 MySQL: Add support of SSL in MySQL Launch SSL dissector when MySQL switch to SSL Ping-Bug:9515 Bug:10338 Change-Id: I96487d6d2131db3678f4a24095d702b6cd4ea5b2 Reviewed-on: https://code.wireshark.org/review/3411 Reviewed-by: Daniël van Eeden Reviewed-by: Anders Broman commit 91b2adf Author: Daniël van Eeden Date: Tue Aug 5 21:43:30 2014 +0200 MySQL: add utf8mb4 charsets Change-Id: I7dfda411ed1d91e9eea43a1eb0cbc70807fedfbb Reviewed-on: https://code.wireshark.org/review/3451 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Reviewed-by: Anders Broman commit 2dcec4e Author: Daniël van Eeden Date: Tue Aug 5 21:29:08 2014 +0200 MySQL: decode pwd and charset for COM_CHANGE_USER This fixes decoding of authetication data in MySQL 5.6+ It also decodes the charset. Bug: 10351 Change-Id: Ic76961e94d2e3bf15bc72e279128a5251acfd749 Reviewed-on: https://code.wireshark.org/review/3441 Reviewed-by: Evan Huus Petri-Dish: Evan Huus Reviewed-by: Anders Broman commit 657d5f9 Author: Joerg Mayer Date: Tue Aug 5 23:51:16 2014 +0200 - Fix the whitespace fix - Also, trying to commit this "properly" gave this message: Error: Found prohibited APIs in dumpcap.c: strncpy,htons,strerror,open How does this happen? Why does gerrit accept this stuff in case a user does not have the (current) hooks installed? Change-Id: I692d053dcd9221aee31ed2780170c0671b856264 Reviewed-on: https://code.wireshark.org/review/3454 Reviewed-by: Jörg Mayer commit f3dd7fe Author: Bill Meier Date: Tue Aug 5 16:10:44 2014 -0400 Fix whitespace/indentation to match editor modelines. Change-Id: I3445ae22f10584582d465bf632942e016f5f70ca Reviewed-on: https://code.wireshark.org/review/3452 Reviewed-by: Bill Meier commit dfe331e Author: Martin Kaiser Date: Tue Aug 5 21:09:54 2014 +0200 we may set a TFTP port via Decode As take this setting into account when we try to detect the first packet of a tftp transfer Change-Id: Ia80f9b5f994b02ecaaa063308b1a87d00fe0dafe Reviewed-on: https://code.wireshark.org/review/3450 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 7f030bb Author: Martin Kaiser Date: Tue Aug 5 20:59:29 2014 +0200 we either have a source or a destination file name when we set one, we clear the other Change-Id: I7c316dc9cc7b2c93cfa1b00eb617553f55a58715 Reviewed-on: https://code.wireshark.org/review/3449 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit ad20fd6 Author: Martin Kaiser Date: Tue Aug 5 11:04:08 2014 +0200 delete the port range before re-creating it Change-Id: I80f7e438cbb44c40ee28f1eb78a7779f43563732 Reviewed-on: https://code.wireshark.org/review/3448 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit cbb68ba Author: Martin Kaiser Date: Tue Aug 5 10:33:37 2014 +0200 if the original packet already contains a file name, don't add a generated tree item with the filename stored in the conversation Change-Id: Ia9a7fe712d0dd8241399e456509019b8e3902554 Reviewed-on: https://code.wireshark.org/review/3447 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit d60ce0b Author: Martin Kaiser Date: Tue Aug 5 10:29:24 2014 +0200 no need for if(tree) display the opcode first, followed by the file name Change-Id: Ic5dd7409414d2f748c326c59a4b850dc2244da1f Reviewed-on: https://code.wireshark.org/review/3446 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit c5ca59f Author: Martin Kaiser Date: Tue Aug 5 10:21:32 2014 +0200 delete unnecessary return; Change-Id: Ia91d51acd7dedd18ba5d0a73bc353b2d198474c7 Reviewed-on: https://code.wireshark.org/review/3445 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 956f442 Author: Jeff Morriss Date: Tue Aug 5 12:17:23 2014 -0400 When doing the distcheck cmake check only verify that cmake runs, don't verify that it can build Wireshark. The purpose of the cmake check is to ensure we are distributing all the of necessary cmake files. We don't want to get into the business of giving cmake all the options required to actually build Wireshark (e.g., which version of Qt is installed and where). This also means that distcheck doesn't compile Wireshark twice. Change-Id: I62f5c42df7c710f7695bd020b0dda80e54435829 Reviewed-on: https://code.wireshark.org/review/3432 Reviewed-by: Evan Huus commit 81134a8 Author: Martin Kaiser Date: Tue Aug 5 21:39:51 2014 +0200 fix a warning with gcc 4.7.2 on linux packet-isakmp.c: In function 'dissect_isakmp': packet-isakmp.c:1873:6: error: 'ivd' may be used uninitialized in this function [-Werror=maybe-uninitialized] packet-isakmp.c:1747:14: note: 'ivd' was declared here cc1: all warnings being treated as errors (not sure why the compiler complains here) Change-Id: I9b9589d3193b0dc37f2db8f6c4c6727b2a92eaaa Reviewed-on: https://code.wireshark.org/review/3444 Reviewed-by: Martin Kaiser commit b76e0f7 Author: Jeff Morriss Date: Tue Aug 5 15:31:55 2014 -0400 Fix some dates in the changelog; add some recent changes to the changelog. Apparently rpmbuild now verifies the dates (including the day of the week) you entered. Change-Id: I1c67fb3170de3199b5fe5f8c117eaefb4d4d28c7 Reviewed-on: https://code.wireshark.org/review/3442 Reviewed-by: Jeff Morriss commit 72c2a33 Author: Bill Meier Date: Tue Aug 5 14:54:55 2014 -0400 Do various minor dissector changes: - remove unneeded initializers; - replace tabs in files with editor mode line 'expandtabs'; - col_set_str() --> col_add_str() (in one case); - tvb_length() -- > tvb_reported_length() (in one case); - do some whitespace & indentation fixes/changes. Change-Id: Ib8ffbbcdb6e4a74c0df6021a75430ae1ef9ae089 Reviewed-on: https://code.wireshark.org/review/3435 Reviewed-by: Bill Meier commit 9dc3324 Author: Bill Meier Date: Tue Aug 5 12:35:36 2014 -0400 Various minor dissector fixes/changes - Fix a few minor bugs; - Remove unneeded #includes; - Do some whitespace/long_lines formatting changes. Change-Id: I97239fa20727498604682239cda0e1b87b10f4bc Reviewed-on: https://code.wireshark.org/review/3434 Petri-Dish: Bill Meier Reviewed-by: Bill Meier commit 79c55a3 Author: AndersBroman Date: Tue Aug 5 15:22:14 2014 +0200 Fix Bug #10348 Different dissection results for same file. The fault is that reassembly_table_init() must be called when reloading the file - move it to an init routine and register the init routine. While there move the proto_register_opcua() routine to the end of the file to be more consistent with other dissectors. Change soft deprecated APIs Change-Id: I2b93692be24dbf60f4ef09aa7283e55ebf3c1874 Reviewed-on: https://code.wireshark.org/review/3431 Reviewed-by: Anders Broman commit 8b2a8a9 Author: Graham Bloice Date: Tue Aug 5 13:27:24 2014 +0100 Suppress 10 of the CMP0020 CMake warnings on Windows, only 8 left now. Change-Id: I2f85529728e0346b8c4888cd1c23e86a306cc613 Reviewed-on: https://code.wireshark.org/review/3430 Reviewed-by: Graham Bloice commit 1de0203 Author: AndersBroman Date: Tue Aug 5 13:57:16 2014 +0200 device.remote_opts.sampling_method and device.remote_opts.sampling_param only exists if we have HAVE_PCAP_SETSAMPLING. Change-Id: I60b98fd0539d1a8f4fcdd3a079f39f8062a43844 Reviewed-on: https://code.wireshark.org/review/3429 Reviewed-by: Anders Broman commit 601d99d Author: Alexis La Goutte Date: Mon Aug 4 18:24:34 2014 +0200 MySQL: Request Unknown (133) (SSL: Handshake response packet) After the MySQL protocol has established a SSL connection the first packet is a HandshakeResponse packet (aka Login Request). http://dev.mysql.com/doc/internals/en/ssl.html http://dev.mysql.com/doc/internals/en/connection-phase-packets.html#packet-Protocol::HandshakeResponse The loginrequest within the SSL stream is not packet_number 1. (it however is the first packet in the ssl stream) Issue found by Daniël van Eeden Change-Id: Ic6110c38f7206a9788158c5c6861064939644221 Ping-Bug:10338 Reviewed-on: https://code.wireshark.org/review/3408 Reviewed-by: Evan Huus Reviewed-by: Daniël van Eeden Reviewed-by: Michael Mann commit f080b43 Author: Irene Ruengeler Date: Mon Aug 4 13:57:17 2014 +0200 Windows: Manage remote interfaces Add remote interfaces to capture from a remote host. Change-Id: I34e31d865304f3c6dd972ab9ab1c23829d564665 Reviewed-on: https://code.wireshark.org/review/3405 Petri-Dish: Jeff Morriss Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 3b91474 Author: Sean O. Stalley Date: Thu Jul 31 15:54:24 2014 -0700 Dissection of CapResp Packets Added dissection of MAUSB Capability Response (CapResp) fields. Change-Id: I41044a25c72b72ef9c8ef5640a609eb6448b054d Reviewed-on: https://code.wireshark.org/review/3329 Reviewed-by: Evan Huus Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 9d5f914 Author: Michael Mann Date: Sun Aug 3 21:10:24 2014 -0400 Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the area. Change-Id: Id8d957d3d68a2e3dd5089f490bd59d773e1be967 Reviewed-on: https://code.wireshark.org/review/3427 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit edbb9ed Author: Jeff Morriss Date: Mon Aug 4 19:02:09 2014 -0400 Add Stateless Transport Tunneling to the list of new protocols and its author to AUTHORS. Change-Id: I2afcdb88b43fc8360b05d69ebc7d261e9bc84b32 Reviewed-on: https://code.wireshark.org/review/3421 Reviewed-by: Evan Huus commit bbda3dd Author: Guy Harris Date: Mon Aug 4 16:37:48 2014 -0700 Write out decode_as entries from the actual dissector tables. Have a save_decode_as_entries() routine in ui/decode_as_utils.c, that does all the work of saving the entries by iterating through all the changed entries with dissector_all_tables_foreach_changed(). When doing so, write out the selector for integral values in decimal, as older versions of Wireshark only handled decimal values, and some of those older versions are EOLed and won't be fixed. Change-Id: I2dab461604524b98e3515867839a4b86c86c5d7b Reviewed-on: https://code.wireshark.org/review/3426 Reviewed-by: Guy Harris commit ce7b041 Author: Guy Harris Date: Mon Aug 4 16:04:06 2014 -0700 Squelch a compiler warning. Change-Id: I8916bb3cc136c03c39fbdaf5d7bb61c3dae137e6 Reviewed-on: https://code.wireshark.org/review/3422 Reviewed-by: Guy Harris commit e095b53 Author: Guy Harris Date: Mon Aug 4 15:34:37 2014 -0700 Add in a missing newline. Change-Id: I704be0f8a87c939b5058d574da833b237a32148d Reviewed-on: https://code.wireshark.org/review/3419 Reviewed-by: Guy Harris commit 01361a9 Author: Guy Harris Date: Mon Aug 4 15:26:00 2014 -0700 Support both decimal and hex values for uint dissectors. And, while we're at it, reject entries with invalid numbers. Change-Id: Ifefe28396cfe391d2d5c7f7ff335d0f041e35a03 Reviewed-on: https://code.wireshark.org/review/3417 Reviewed-by: Guy Harris commit 7c72f70 Author: Guy Harris Date: Mon Aug 4 15:00:42 2014 -0700 Remove a comment asking a question, as the answer is "no". I.e., no, the epan/decode_as.c stuff belongs in libwireshark, not libui, because dissectors need to be able to say "I support decode-as...". Code to implement the UIs that allow decode-as entries to be specified would belong in libui. Change-Id: Ibf9da19e752481a3892d0f03d0a0537590ab1811 Reviewed-on: https://code.wireshark.org/review/3416 Reviewed-by: Guy Harris commit 7bc0b9b Author: Kevin Cox Date: Thu May 1 17:13:35 2014 -0400 Initial Ceph Dissector. This is the first version of a Ceph dissector. It is not complete but is far enough along to be helpful to many people working with Ceph. Currently the dissector can fully dissect the Ceph protocol and has support for full dissection of most common messages. For the other messages for which full dissection is not available their metadata is parsed and shown along with the raw data of the different message sections. Change-Id: Ic7917a3d01148c6fe2f9ea2c13ecd09ecc06c2d7 Reviewed-on: https://code.wireshark.org/review/1889 Reviewed-by: Bill Meier commit d434e08 Author: Guy Harris Date: Mon Aug 4 13:42:00 2014 -0700 Fix a comment. Change-Id: I4dff4912ad8355552ba9efee73c0aae9a2a55000 Reviewed-on: https://code.wireshark.org/review/3415 Reviewed-by: Guy Harris commit 70a6d20 Author: Jeff Morriss Date: Fri Aug 1 11:10:55 2014 -0400 Add a cmake build to distcheck to ensure that we distribute all the files necessary to do a cmake build. Note that this does mean that anyone doing "make distcheck" needs cmake. Bug: 10331 Change-Id: I4360a305aa7f6ffc1b5a5dffad24b928eed45016 Reviewed-on: https://code.wireshark.org/review/3326 Reviewed-by: Gerald Combs Petri-Dish: Jeff Morriss Tested-by: Petri Dish Buildbot Reviewed-by: Jeff Morriss commit 644b2e7 Author: Jeff Morriss Date: Mon Aug 4 15:44:02 2014 -0400 Fix RPM builds with a prefix other than /usr. The location of update-alternatives does not depend on Wireshark's installation prefix: it's always in /usr/sbin/. Change-Id: I7dda9cebec83bc64133adfeb5ee6af70dc6dc7ab Reviewed-on: https://code.wireshark.org/review/3413 Reviewed-by: Jeff Morriss commit 4a2e968 Author: Alexis La Goutte Date: Mon Aug 4 19:42:29 2014 +0200 MySQL: decoding response fails MySQL Response packets within an SSL stream are not correctly decoded. When not using SSL: - Decoding works - Multiple MySQL protocol entries per frame - Info==Response With SSL: - Decoding partly works - One MySQL protocol entry per fram - Info==Response Tabular From me: call dissect_mysql (with tcp_dissect_pdus..) and not dissect_mysql_pdu ! Bug: 10339 Change-Id: I253f6683105ed23b49a72865fea005e31e2594d8 Reviewed-on: https://code.wireshark.org/review/3412 Reviewed-by: Evan Huus commit c540e55 Author: Alexis La Goutte Date: Tue Jul 22 18:01:50 2014 +0200 DNS: Fix minor typo (Missing a space...) Change-Id: Ie983ba3b88102c4f3749ab2f13d519eb78838bbc Reviewed-on: https://code.wireshark.org/review/3410 Reviewed-by: Evan Huus commit 37b5b09 Author: Evan Huus Date: Mon Aug 4 07:22:59 2014 -0400 Rip out the filetap code We decided at sharkfest that this wasn't the right design for file dissection; we have more-or-less settled on way forward, but nobody's shown interest in implementing it. Whether or not that ever happens, this code is effectively dead and should be removed. Change-Id: I14d6086df3204fffb6485228db39d9f407661417 Reviewed-on: https://code.wireshark.org/review/3400 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit 76e4698 Author: Jakub Zawadzki Date: Mon Aug 4 07:39:49 2014 +0200 Always create subtree in proto_item_add_subtree(). It might fix bug #10345 Ping-Bug: 10345 Change-Id: I695a2955a9bb0248ff3967bdaef004389500bbc9 Reviewed-on: https://code.wireshark.org/review/3402 Reviewed-by: Anders Broman Tested-by: Anders Broman Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit f25f1ea Author: Evan Huus Date: Sun Aug 3 22:59:57 2014 -0400 Don't try and run checkAPIs.pl on deleted files It fails, for obvious reasons, and makes it impossible to commit the removal of c/h files. Change-Id: Ifcd067f8959684e2e0191983fd60fb94ae86bca3 Reviewed-on: https://code.wireshark.org/review/3401 Reviewed-by: Alexis La Goutte Reviewed-by: Evan Huus commit da5dd18 Author: Guy Harris Date: Sun Aug 3 23:39:05 2014 -0700 CMake 2.8+ supports CMAKE_OSX_DEPLOYMENT_TARGET; don't do that stuff ourselves. Do, however, do the "for a target of 10.4 or 10.5, build 32-bit only" stuff, as that's specific to programs that capture traffic, such as Wireshark (well, I guess we could just limit it to dumpcap, but...). Change-Id: I5f4d4d57fd126e5c295dedae9ed13b263035a911 Reviewed-on: https://code.wireshark.org/review/3403 Reviewed-by: Guy Harris commit 0294b29 Author: Evan Huus Date: Sun Aug 3 20:30:52 2014 -0400 Try to detect overflow without causing signedness warnings. Change-Id: I957ead1f674e2c56e9c741841fea11395769b238 Reviewed-on: https://code.wireshark.org/review/3398 Reviewed-by: Evan Huus commit efb8a1e Author: Evan Huus Date: Sun Aug 3 17:48:06 2014 -0400 Check for multiplicative overflow in the wmem_alloc_array macros. Bug:10343 Change-Id: Iea511c806b92999b3b497f94886c46a818100a23 Reviewed-on: https://code.wireshark.org/review/3396 Reviewed-by: Bill Meier commit 5b9acda Author: rvichery Date: Mon Jul 14 12:51:24 2014 +0200 Stateless Transport Tunneling: Add STT dissector support Bug: 10282 Change-Id: Id3e53c53d024a74df0dfb5254e26d4594eb2e9a4 Reviewed-on: https://code.wireshark.org/review/3036 Reviewed-by: Michael Mann commit 6af0631 Author: Guy Harris Date: Sun Aug 3 13:53:58 2014 -0700 Remove duplicate line. Change-Id: I0b32ccaaa7c9e0294ee7bc96fe4937a98d8461d5 Reviewed-on: https://code.wireshark.org/review/3394 Reviewed-by: Guy Harris commit 79f9665 Author: Guy Harris Date: Sun Aug 3 13:19:41 2014 -0700 Squelch some compiler warnings. The version of GCC on the OS X 32-bit buildbot isn't smart enough to figure out that this can't happen (it's one of those "if (xxx) foo = bar; ... if (xxx) use foo;" cases.) Change-Id: I04fef2d602c913761ae7832c4f568aaaad398c87 Reviewed-on: https://code.wireshark.org/review/3390 Reviewed-by: Guy Harris commit 3b72a7d Author: Guy Harris Date: Sun Aug 3 13:13:23 2014 -0700 Add some issues that came up when comparing autotools and CMake compile flags. Also be consistent about whether OS X is working or not, and note that we're also doing CMake builds on Solaris. Change-Id: I2da18d2fb5aec7e5806dc7ea186f729acef94272 Reviewed-on: https://code.wireshark.org/review/3389 Reviewed-by: Guy Harris commit 2d126cf Author: Guy Harris Date: Sun Aug 3 13:07:46 2014 -0700 Add an OSX_DEPLOY_TARGET option to control building for a target OS version. It should be set to an OS version, such as "10.5" or "10.6" or..., and, if set (and if you're building for "APPLE"), it'll try to find the SDK (and fail if it's not found), and add appropriate -isysroot, -mmacosx-version-min, and, if appropriate, -m32 compiler options. (It will need more work once we support building OS X app bundles and installers; pick up more stuff from configure.ac for that.) Change-Id: I0aebf2db8aa39304a41be4e2a9879dea6f308ec7 Reviewed-on: https://code.wireshark.org/review/3388 Reviewed-by: Guy Harris commit 27cfea6 Author: Guy Harris Date: Sun Aug 3 11:48:44 2014 -0700 Define INET6 in config.h rather than in the Makefile. That's what we do with nmake and CMake; this makes it uniform, so it's easier to compare compiler commands. Change-Id: Ice2c4bd796e921fa3089e8a45a32ad14d9b0e0a4 Reviewed-on: https://code.wireshark.org/review/3387 Reviewed-by: Guy Harris commit 53957d8 Author: Guy Harris Date: Sun Aug 3 11:28:36 2014 -0700 Go back to non-verbose Makefiles. (The difference in question turned out to be that optimization wasn't turned on for autotools builds but was turned on for CMake builds. Comparing the compiler options also found some other differences that should be cleaned up.) Change-Id: I2edb28dedc47fe10b3f68f25d3e302430b27bf46 Reviewed-on: https://code.wireshark.org/review/3386 Reviewed-by: Guy Harris commit 3da89d6 Author: Evan Huus Date: Sun Aug 3 13:54:30 2014 -0400 Add missing macro parameter This is what you get for forward-cherrypicking commits you made on master-1.12. Change-Id: I8e51181d497dc63c614fe623439506cfe99c6fa3 Reviewed-on: https://code.wireshark.org/review/3385 Reviewed-by: Evan Huus commit 0996730 Author: Jeff Morriss Date: Fri Aug 1 16:14:23 2014 -0400 Make Lua taps work in out-of-source-tree builds. make-taps.pl needs to know where to find the source files in order to build the taps. This makes the wslua test suite run in autofoo out-of-source-tree builds too. To make it work with cmake builds requires putting all the epan/wslua/ output (or at least init.lua) in epan/wslua/ instead of epan/. Change-Id: I1b3c517f08d3c752ee03cb89482ee4951ceb5bf3 Reviewed-on: https://code.wireshark.org/review/3348 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit d34d09e Author: Evan Huus Date: Sun Aug 3 13:25:19 2014 -0400 Initialize a variable to squelch a false-positive warning on the mac buildbot Change-Id: I43f5ea7a73941b518c714216df0d7e25ad260012 Reviewed-on: https://code.wireshark.org/review/3384 Reviewed-by: Evan Huus commit 5460d7f Author: Evan Huus Date: Fri Aug 1 21:27:01 2014 -0400 Only fake an item by returning 'tree' if they use the same TVB Otherwise the offsets will be wrong when calling, e.g. proto_item_set_end. Bug:10329 Change-Id: I5ae0c660af90678e446817b65f83c075e7c0b84e Reviewed-on: https://code.wireshark.org/review/3341 Reviewed-by: Evan Huus commit a6fc5a3 Author: Evan Huus Date: Sun Aug 3 12:29:36 2014 -0400 Cast G_STRUCT_OFFSET to gint to fix mac buildbot glib casts the result to glong for no apparent reason (has anybody ever defined a structure of more than 2^32 bytes?) which was causing a whole bunch of useless 64-to-32-bit conversion warnings. Change-Id: I70305fb3b03332bb876023acdd107eb1e95fea27 Reviewed-on: https://code.wireshark.org/review/3383 Reviewed-by: Evan Huus commit 5db1352 Author: Michael Mann Date: Fri Aug 1 10:08:57 2014 -0400 Eliminate proto_tree_add_text from some dissectors. Change-Id: I398e9cf4f6882e76644aa758e12c39a39159e95f Reviewed-on: https://code.wireshark.org/review/3319 Petri-Dish: Michael Mann Petri-Dish: Evan Huus Reviewed-by: Michael Mann commit 3fa5625 Author: Michael Mann Date: Thu Jul 31 12:39:40 2014 -0400 Eliminate proto_tree_add_text from some dissectors. Change-Id: Ib6024307e85d6c23decf40e9759f549c19ffe136 Reviewed-on: https://code.wireshark.org/review/3318 Petri-Dish: Michael Mann Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 7a7a72e Author: Pascal Quantin Date: Sun Aug 3 15:03:50 2014 +0200 Fix TCP/UDP/SCTP conversations broken by g59ef97d and g31ecdf5 Bug: 10336 Change-Id: Ia0dbe3abfade59a1c9714eacd8a854eafa6cf879 Reviewed-on: https://code.wireshark.org/review/3379 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 50b6e16 Author: Gerald Combs Date: Sun Aug 3 08:05:47 2014 -0700 [Automatic manuf, services and enterprise-numbers update for 2014-08-03] Change-Id: Icb7fc56e6127761465c38deed755ae54bef6f272 Reviewed-on: https://code.wireshark.org/review/3380 Reviewed-by: Gerald Combs commit af6ea57 Author: Tatsuhiro Tsujikawa Date: Sat Aug 2 16:22:28 2014 +0900 http2: Update to h2-14 * Expand frame length field to 24 bits * Add new SETTINGS: - SETTINGS_MAX_FRAME_SIZE - SETTINGS_MAX_HEADER_LIST_SIZE * Update libnghttp2 HPACK * Remove END_SEGMENT flag Change-Id: I5906322ad5a4d61c963ed95fada9415e66e146da Reviewed-on: https://code.wireshark.org/review/3357 Reviewed-by: Alexis La Goutte commit 5ced893 Author: Alexis La Goutte Date: Sat Aug 2 10:36:34 2014 +0200 HTTP2: Fix README about change of nghttp2 nghttp2ver.h is a local header, so use "" not <> See commit 4a182d48b1105889b51ee3bb06b033c636965130 Change-Id: I49210906290210fde8f496996e0e5ae69d697338 Reviewed-on: https://code.wireshark.org/review/3349 Reviewed-by: Evan Huus commit 518f339 Author: Peter Wu Date: Fri Aug 1 14:40:24 2014 +0200 lbm: fix "member access within null pointer" warning This patch avoids the following warning with `clang -fsanitize=undefined`: epan/dissectors/packet-lbtrm.c:1519:36: runtime error: member access within null pointer of type 'lbtrm_hdr_t' Change-Id: I973caf92547f5d16c0de20908b2b3fbc09227df0 Reviewed-on: https://code.wireshark.org/review/3313 Reviewed-by: Evan Huus commit 2d50397 Author: Peter Wu Date: Fri Aug 1 14:28:11 2014 +0200 paltalk: fix undefined behavior (shift out of range) The shift `(gint32)0xFF << 24` invokes undefined behavior as it may not fit in a signed integer. Fix this by explicitly casting 0xFF as unsigned. Caught by `clang -fsanitize=undefined`. While at it, convert to tvb_captured_length and add modelines. Change-Id: I241ff8ed91815369ec0c19719750cee4b6b12343 Reviewed-on: https://code.wireshark.org/review/3311 Reviewed-by: Evan Huus commit 0b23e0f Author: Alexis La Goutte Date: Sat Aug 2 12:00:59 2014 +0200 HTTP2: Add a preference to enable/disable HTTP2 (weak) heuristics By default, the heuristic is disabled Change-Id: I26ef23e8b153576a4fabd2e3324e830756e64bb7 Ping-Bug:10335 Ping-Bug:10310 Reviewed-on: https://code.wireshark.org/review/3350 Reviewed-by: Pascal Quantin Reviewed-by: Evan Huus commit 7df03a7 Author: Guy Harris Date: Sun Aug 3 03:40:11 2014 -0700 Get rid of debugging output, and get CMake to produce verbose makefiles. On the 32-bit OS X buildbot, automake is old enough that autotools builds are verbose, printing the command line for each compile step; if we cause CMake to produce verbose makefiles, they will also print the command line, so we can see what differences there are. This means the other debugging output we added isn't necessary; remove it. Sort the extra warning options in configure.ac based on whether they're for C and C++ or just C, just as is the case in CMake, to make it easier to keep the lists in sync; add comments to configure.ac to mirror the ones in CMakeLists.txt. Get rid of -Wno-deprecated-declarations; the CMake build doesn't use it, and it doesn't appear to be necessary - if we ever have problems with OS X complaining about using OpenSSL, for example, we should do as tcpdump does and wrap uses of the "deprecated"-but-cross-platform APIs in the appropriate pragmas. Change-Id: I0b8b45f00481ac2b67da5c7dd028a029b130dcc4 Reviewed-on: https://code.wireshark.org/review/3377 Reviewed-by: Guy Harris commit 8d51a50 Author: Evan Huus Date: Thu Jul 31 13:25:00 2014 -0400 Remove get_next_di() and just use packet-scope for those Presumably that was added for tap purposes, but packet-scope is much simpler and less dangerous. Noticed while investigating the scan-build issues with stack-local variables being pointed to by globals. Change-Id: I851d756b103df71079b656e624f7472354c15862 Reviewed-on: https://code.wireshark.org/review/3290 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Petri-Dish: Anders Broman Reviewed-by: Anders Broman commit 9112a09 Author: Evan Huus Date: Fri Aug 1 22:05:32 2014 -0400 Fix an infinite loop when the line has no length Bug:10333 Change-Id: Ia2dae94095dddf57e4c75792b5477b0eb37c29c9 Reviewed-on: https://code.wireshark.org/review/3343 Reviewed-by: Anders Broman commit 06ba328 Author: Peter Wu Date: Fri Aug 1 12:32:43 2014 +0200 Fix uninitialized session ticket If the tvb contained too few data, ssl_dissect_hnd_hello_ext_session_ticket would then allocate session_ticket, but not initialize the contents. Fix this by adding a check for the TVB length. The same is done for ssl_dissect_hnd_new_ses_ticket. That might, or might not, be necessary as proto_tree_add_item() is called with the range. When tree is NULL, ssl is usually NULL too. For clarity (and to avoid surprises in the future), add it anyway. Bug: 10330 Change-Id: I469e97542542aaef4cbd660086bedf92ba1c0b6e Reviewed-on: https://code.wireshark.org/review/3309 Reviewed-by: Evan Huus Reviewed-by: Anders Broman commit 9dc3d67 Author: Evan Huus Date: Sat Aug 2 10:51:55 2014 -0400 wmem: get rid of the allocator timing test Some of the allocators are close enough that a little bit of system load at the time of the test was enough to throw them off, and it was causing unnecessary buildbot failures. Benchmarking on real-world cases at the time of implementation (as well as reliable "average" results on the buildbots) has left me confident that block_fast is, in fact, faster than block, which is faster than simple/strict. Additionally, the allocators are effectively "done" and unlikely to change, so the possibility of uncaught performance regressions is low. Change-Id: I144ea4cd9d6000edc4075ed682ce6a4aeaf5e28a Reviewed-on: https://code.wireshark.org/review/3356 Reviewed-by: Anders Broman commit fb68a0c Author: Gerald Combs Date: Sat Aug 2 19:31:33 2014 -0700 Have ConversationDialog retain data between captures. Remove our tap listeners when the capture file closes. This lets us view conversation data for multiple capture files. Change-Id: Ifaa1d2c9d3cd10b1d282aa0070ee2edacc7ce3b0 Reviewed-on: https://code.wireshark.org/review/3376 Reviewed-by: Gerald Combs commit 363f1e5 Author: Guy Harris Date: Sat Aug 2 18:34:11 2014 -0700 Print the actual compiler, not its "CMake-id". Hopefully this will help figure out whether we're using different compilers for the autotools and CMake builds. Change-Id: If6d2ee93cd14570c53723140dcedf347600cbe34 Reviewed-on: https://code.wireshark.org/review/3375 Reviewed-by: Guy Harris commit 5234d4c Author: Guy Harris Date: Sat Aug 2 17:46:32 2014 -0700 OK, try sorting the compiler options. Also, comment out the addition of -Wno-deprecated-declarations, as the CMake build doesn't use it. If this succeeds in making the autotools and CMake builds compile C code with the same -W and -f flags in the same order, that should eliminate at least one reason why the CMake build produces compiler warnings that the autotools build doesn't. Change-Id: I0eaeae91b8e3c39c53f502daef86c2d103c8bdab Reviewed-on: https://code.wireshark.org/review/3374 Reviewed-by: Guy Harris commit 2dd2690 Author: Guy Harris Date: Sat Aug 2 16:26:50 2014 -0700 Note that the ...COMMON_FLAGS are for C and C++. Change-Id: I0ef87b3b4aaed984a8a53660b36746345626583a Reviewed-on: https://code.wireshark.org/review/3373 Reviewed-by: Guy Harris commit 43eea3c Author: Gerald Combs Date: Sat Aug 2 15:42:20 2014 -0700 Convert the Statistics chapter to AsciiDoc. Don't update any content for now. Change-Id: Ib4f6402d9b23bd1ad57a57831b63c63a150391aa Reviewed-on: https://code.wireshark.org/review/3372 Reviewed-by: Gerald Combs commit 27c68f0 Author: Gerald Combs Date: Sat Aug 2 15:47:03 2014 -0700 Fix markup. Change-Id: I370af51abca6156a5ce293485970896b417bd7bf Reviewed-on: https://code.wireshark.org/review/3371 Reviewed-by: Gerald Combs commit 55646c8 Author: Guy Harris Date: Sat Aug 2 15:45:44 2014 -0700 Always check some -f flags. Now that we check each flag with all previously-accepted flags, this catches the case where -fwrapv causes -fno-strict-overflow to produce a warning when tested. This way, what we do matches what the autotools do. Change-Id: I68ce281dc33a32b591e3137db626f2749c4a0708 Reviewed-on: https://code.wireshark.org/review/3370 Reviewed-by: Guy Harris commit e2969cb Author: Guy Harris Date: Sat Aug 2 15:43:36 2014 -0700 When testing compiler flags, test them with previously-tested flags. That mirrors what we're doing with autotools, and catches cases where an earlier-tested flag affects the results for a later-tested flag (e.g., -fwrapv can affect whether -fno-strict-overflow produces a warning when tested). Change-Id: I8ca0b6f5dee14d2394af9b6b8b93b9dbda2702d7 Reviewed-on: https://code.wireshark.org/review/3369 Reviewed-by: Guy Harris commit 81f5d71 Author: Guy Harris Date: Sat Aug 2 14:18:31 2014 -0700 Get rid of trailing blank line. Change-Id: Ibcdacbad865478ee682995170937cedd575389ec Reviewed-on: https://code.wireshark.org/review/3368 Reviewed-by: Guy Harris commit b273563 Author: Guy Harris Date: Sat Aug 2 14:17:09 2014 -0700 Fix Debian package build complaints. Apply the patches printed out when the Debian package build complains, and then remove the #MISSING indications that correspond to routines we don't export outside the library (either because we don't declare them as exported outside the library, because they've been removed, or because they've been moved to another library). Change-Id: Iba2d5c5436dabd31d7f84fd400bb78afcb5ee69f Reviewed-on: https://code.wireshark.org/review/3367 Reviewed-by: Guy Harris commit a722f83 Author: Gerald Combs Date: Tue Jul 29 18:31:43 2014 -0700 Convert the build and install chapter to AsciiDoc. Add OS X content. Remove GTK+ content. Update the names in the NSIS package to match the documentation (untested). Change-Id: Id8fd08982bc26871bb8a319b0319808bcdba878c Reviewed-on: https://code.wireshark.org/review/3366 Reviewed-by: Gerald Combs commit 50b6734 Author: Guy Harris Date: Sat Aug 2 14:01:07 2014 -0700 Dump additional debugging information. For autotools, dump CC, CFLAGS, CXX, and CXXFLAGS. For CMake, dump CMAKE_C_COMPILER_ID and CMAKE_CXX_COMPILER_ID. Hopefully this will help figure out why CMake builds catch different warnings from autotools builds. Change-Id: I26955ad955f60e8bad248562fa87963a3a1bb42f Reviewed-on: https://code.wireshark.org/review/3365 Reviewed-by: Guy Harris commit 493c4c2 Author: Guy Harris Date: Sat Aug 2 13:53:44 2014 -0700 Wait until the C and C++ compiler flags are fully set before showing them. That way, we report the *full* contents of those flags. Change-Id: Idab78049247c04b7d35a3ce804c8ea9daaf84312 Reviewed-on: https://code.wireshark.org/review/3364 Reviewed-by: Guy Harris commit 7f937c9 Author: Guy Harris Date: Sat Aug 2 11:54:54 2014 -0700 Add tvb_ensure_bytes_exist64 to the API list. I thought ws_symbol_export.h was supposed to eliminate API list files. Apparently it didn't, so we have to update this file every time we add a new API. Change-Id: I93dda6ccc992c79d52d2b460e818995e6332f1be Reviewed-on: https://code.wireshark.org/review/3363 Reviewed-by: Guy Harris commit f4d2421 Author: Guy Harris Date: Sat Aug 2 11:32:42 2014 -0700 Add a routine to check whether all bytes implied by a 64-bit length exist. This lets us blow up with oversized 64-bit length values, before casting them to the 31-bit lengths we can actually handle in Wireshark, rather than blindly casting them with weird results. Use that in the MySQL dissector, and, if we get past the test, cast the lengths to int to squelch warnings. Change-Id: I3a5e9bd0027fa4ddcb9622f77952dba8f6b23c27 Reviewed-on: https://code.wireshark.org/review/3362 Reviewed-by: Guy Harris commit d888087 Author: Daniël van Eeden Date: Sun Jul 20 21:37:22 2014 +0200 MySQL: Support authplugin and connattrs Bug:10294 Signed-off-by: Alexis La Goutte Change-Id: I65ec69821fd562da8f873ae85b1846c79ab400d9 Reviewed-on: https://code.wireshark.org/review/3138 Reviewed-by: Daniël van Eeden Reviewed-by: Evan Huus commit b5f4cb5 Author: Martin Kaiser Date: Fri Aug 1 12:32:21 2014 +0200 fix multi-byte entries in Operator Profile capability loops (this problem showed up in an APDU with two 16bit application ids) Change-Id: Ie4842181b19db984a693534144fac5e91b217b34 Reviewed-on: https://code.wireshark.org/review/3358 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit fde0dbe Author: Evan Huus Date: Sat Aug 2 10:45:28 2014 -0400 fix warning: 'cipher_hd' may be used uninitialized in this function I don't think it's an actual issue, but the new compiler on the mac buildbots isn't smart enough to tell that. Change-Id: I759e1afe9c4011d5612be0d15282076be6f5a331 Reviewed-on: https://code.wireshark.org/review/3355 Reviewed-by: Evan Huus commit 2a3dba5 Author: Guy Harris Date: Sat Aug 2 04:27:05 2014 -0700 Add a cast to squelch a warning. Change-Id: Id8eba103b9edd54bdfdea9144c807c3fbe0cb4e4 Reviewed-on: https://code.wireshark.org/review/3353 Reviewed-by: Guy Harris commit 0734ac3 Author: Guy Harris Date: Sat Aug 2 04:00:48 2014 -0700 Rename buffer_ routines to ws_buffer_ to avoid name collisions. In particular, epan/wslua/lrexlib.c has its own buffer_ routines, causing some linker warnings on some platforms, as reported in bug 10332. (Not to be backported to 1.12, as that would change the API and ABI of libwsutil and libwiretap. We should also make the buffer_ routines in epan/wslua/lrexlib.c static, which should also address this problem, but the name change avoids other potential namespace collisions.) Change-Id: I1d42c7d1778c7e4c019deb2608d476c52001ce28 Reviewed-on: https://code.wireshark.org/review/3351 Reviewed-by: Guy Harris commit 41e3225 Author: Evan Huus Date: Sat Aug 2 02:11:29 2014 +0000 Revert "Make Lua taps work in out-of-source-tree builds." Breaks on windows... This reverts commit 6b11cd97f2153bb015ade6efd05929999de85457. Change-Id: I1caf5500da993d7988e09fc0758950469f8252cf Reviewed-on: https://code.wireshark.org/review/3346 Reviewed-by: Evan Huus commit fade4b4 Author: Evan Huus Date: Fri Aug 1 22:13:24 2014 -0400 Fix another (valid) complaint from the mac buildbot What mystical new compiler upgrade is this? Change-Id: I89b3bfb53b9a19bbfb1cc8339d38cdc4a4652c62 Reviewed-on: https://code.wireshark.org/review/3347 Reviewed-by: Evan Huus commit 005fd7e Author: Evan Huus Date: Fri Aug 1 21:12:19 2014 -0400 Rename variable to avoid -Wshadow on mac buildbots Change-Id: I13d591248718fcc36cd300bf28f779e2d9e0265a Reviewed-on: https://code.wireshark.org/review/3339 Reviewed-by: Evan Huus commit edb7a91 Author: Jeff Morriss Date: Fri Aug 1 15:26:18 2014 -0400 Make the nameres test suite work out of tree by looking for the global hosts file in the build directory (rather than the source directory). Change-Id: I365e573ee84e9a41aa76f4aa9a4a6efaf42fb60e Reviewed-on: https://code.wireshark.org/review/3334 Reviewed-by: Evan Huus commit 6b11cd9 Author: Jeff Morriss Date: Fri Aug 1 16:14:23 2014 -0400 Make Lua taps work in out-of-source-tree builds. make-taps.pl needs to know where to find the source files otherwise none of the tap data gets built correctly. This makes the wslua test suite run in out-of-source-tree builds too. Change-Id: I059474d90d59e87bd57dba18530a66a927a014cf Reviewed-on: https://code.wireshark.org/review/3337 Reviewed-by: Evan Huus commit 69d0788 Author: Gerald Combs Date: Fri Aug 1 16:32:02 2014 -0700 CompiledFilterOutput dialog fixes and updates. Apply a layout to the "Compiled Filter Output" dialog. Render the filter as monospaced text. Don't add an "expert OK" icon to the list. It doesn't seem to indicate any sort of status. Use a "Close" button instead of "OK". According to http://uxmovement.com/buttons/why-the-ok-button-is-no-longer-okay/ "OK" implies we're going to perform some sort of action. Add a "Copy" button while we're here. Change-Id: Ia63f3032916e322fa9f4f2d465140b128b4f8078 Reviewed-on: https://code.wireshark.org/review/3338 Reviewed-by: Gerald Combs commit 45f3dee Author: Matthieu Texier Date: Fri Aug 1 20:59:19 2014 +0200 Fixing indentation with tabs in isis dissector Change-Id: I4f6296f1cb988dca8c94ca5089ff6aa03439da32 Reviewed-on: https://code.wireshark.org/review/3333 Reviewed-by: Evan Huus commit 2fbd9e1 Author: Sean O. Stalley Date: Thu Jul 31 12:23:51 2014 -0700 Fix variable-length managment packet dissection Before, several managment packets were dissected incorrectly as EPHandleDeleteReq's. Now they are dissected with the generic managment packet dissector. Change-Id: Id2f0951b91b99ba2340ff77c6285f382436788ef Reviewed-on: https://code.wireshark.org/review/3328 Reviewed-by: Evan Huus commit e70251e Author: Gerald Combs Date: Fri Aug 1 12:29:12 2014 -0700 Fix comparison. Change-Id: If2af35c8a49f405bee70eb144e26e539a7dc61f2 Reviewed-on: https://code.wireshark.org/review/3335 Reviewed-by: Gerald Combs commit c93297c Author: Jeff Morriss Date: Fri Aug 1 14:51:53 2014 -0400 Remove the old wireshark binary during RPM upgrades. If we have a pre-alternatives wireshark binary out there (e.g., because we're upgrading from wireshark-1.10 to wireshark-1.12), get rid of it in the %pre script. Otherwise the binary gets left there (because it's listed as a %ghost in the new spec file). Change-Id: I5828fcff486af3d269bad8dfe544c7659179bf5e Reviewed-on: https://code.wireshark.org/review/3332 Reviewed-by: Jeff Morriss commit fb52620 Author: Gerald Combs Date: Fri Aug 1 11:25:08 2014 -0700 Fix the CMake WinPcap library path check. Look for wpcap.lib in WpdPack/Lib/x64 when our target platform is Win64. Change-Id: I9a1bac22106bcb6a1f155ce83c02e344e6ec0d55 Reviewed-on: https://code.wireshark.org/review/3331 Reviewed-by: Gerald Combs commit fbc1a9a Author: Alexis La Goutte Date: Fri Aug 1 17:09:07 2014 +0200 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I847c7217b520a5f7ec581e6170fe3dc77c628e96 Reviewed-on: https://code.wireshark.org/review/3322 Reviewed-by: Evan Huus commit f6008e4 Author: Gerald Combs Date: Fri Aug 1 10:23:49 2014 -0700 Update to match the current Windows Buildbot environment. Update some OS X information as well. Change-Id: I9a252ec83712848696dbb531e6da15b3c7644591 Reviewed-on: https://code.wireshark.org/review/3327 Reviewed-by: Gerald Combs commit e7df09b Author: Jeff Morriss Date: Fri Aug 1 12:15:47 2014 -0400 Add the easy_codec plugin to the source distribution. It doesn't build on Linux but cmake looks for it (won't build without it) and Windows users might want it. Change-Id: I978f0de0a2895a82f4f3b8c1e9e0ecec6a93e6f4 Reviewed-on: https://code.wireshark.org/review/3325 Reviewed-by: Jeff Morriss commit 44d30ec Author: Jeff Morriss Date: Fri Aug 1 11:26:12 2014 -0400 cmake: forget about plugins/asn1: it's not used any more. (Don't load plugins/asn1/plugin.rc.in) Change-Id: I621552a7e915396f61c5bb450a99d4e575ac30df Reviewed-on: https://code.wireshark.org/review/3324 Reviewed-by: Jeff Morriss commit 3c9556a Author: Jeff Morriss Date: Fri Aug 1 11:13:13 2014 -0400 Add doxygen_global.cfg to the source distribution. Change-Id: Ifc552ac74b84bce2a695189794440c905bf140a5 Reviewed-on: https://code.wireshark.org/review/3323 Reviewed-by: Jeff Morriss commit 84e2abc Author: Peter Wu Date: Fri Aug 1 14:32:33 2014 +0200 tcp: detect invalid window scale shift value According to RFC 1323, the window scale shift value must not exceed 14. Detect this and cap at 14 to prevent undefined behavior (shifting by a too large value). Caught by `clang -fsanitize=undefined`. Change-Id: I1acad252b86c7f23e497575b48d9496346327e00 Reviewed-on: https://code.wireshark.org/review/3312 Reviewed-by: Michael Mann commit 7f9fdbb Author: Jeff Morriss Date: Fri Aug 1 10:08:38 2014 -0400 Add wireshark.pc.in to the source distribution (needed for cmake). Bug: 10331 Change-Id: I81e0d224917cd4b38215e28ec146cd80efdb99d2 Reviewed-on: https://code.wireshark.org/review/3316 Reviewed-by: Jeff Morriss commit a644744 Author: Evan Huus Date: Thu Jul 31 13:18:21 2014 -0400 Use packet_scope instead of a stack local As clang pointed out we end up storing a reference to it in a global and (more relevantly) pushing that global to a tap which would run after the current frame has returned. Thanks to Alexis for bringing this to my attention. Change-Id: I3aac43a806d217b0dc8a973f6bb2fa48cdd041bb Reviewed-on: https://code.wireshark.org/review/3289 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Reviewed-by: Anders Broman commit dc9b44c Author: Jeff Morriss Date: Thu Jul 31 17:26:04 2014 -0400 Ignore RPM output directories. Change-Id: I35cda66d512448317f3c7d6ed922f9dca2893690 Reviewed-on: https://code.wireshark.org/review/3304 Reviewed-by: Evan Huus commit 435e7c6 Author: Guy Harris Date: Thu Jul 31 17:29:36 2014 -0700 Move the AirPcap stuff into caputils. Change-Id: I64b45dad36a3ec491aeb9de3439b4fe19b46f9d8 Reviewed-on: https://code.wireshark.org/review/3308 Reviewed-by: Guy Harris commit f38c7d6 Author: Joerg Mayer Date: Thu Jul 31 23:53:41 2014 +0200 Copy over autofoo change: No more .h file. Change-Id: I283ffccd0b3e1f10a9fbf85e033c5e07cd426bbe Reviewed-on: https://code.wireshark.org/review/3305 Reviewed-by: Jörg Mayer commit 1ebfb3f Author: Guy Harris Date: Thu Jul 31 14:17:07 2014 -0700 Distinguish between wireshark *source files* and wireshark *dependencies*. Only the former should be run through checkAPI.pl; Windows .rc files, for example, shouldn't. Change-Id: I948705b4020b413834c37a0d685eedcb747aa237 Reviewed-on: https://code.wireshark.org/review/3303 Reviewed-by: Guy Harris commit cb96099 Author: Guy Harris Date: Thu Jul 31 14:00:33 2014 -0700 Lua - it's not just for breakfast^Wdissectors any more! Change-Id: I7cefdec10a2fdd47f8a50ab5a45002662cc14f3c Reviewed-on: https://code.wireshark.org/review/3302 Reviewed-by: Guy Harris commit d05e679 Author: Martin Kaiser Date: Thu Jul 31 10:08:29 2014 +0200 sync and behaviour are defined only for isochronous endpoints Change-Id: Ic7755a7756589167b4fea5cf42a21419f59ecdae Reviewed-on: https://code.wireshark.org/review/3301 Reviewed-by: Martin Kaiser commit f3982ee Author: Martin Kaiser Date: Thu Jul 31 10:00:26 2014 +0200 defines for endpoint transfer types Change-Id: Iffd5d81dde15eba12511dc89664d7ea06a70436f Reviewed-on: https://code.wireshark.org/review/3300 Reviewed-by: Martin Kaiser commit 9a03227 Author: Martin Kaiser Date: Thu Jul 31 09:59:29 2014 +0200 this is the _URB_ transfer type - which is different from the transfer type in the endpoint descriptor Change-Id: I9e23d9825efb30311cd3e04d01548c03b163c276 Reviewed-on: https://code.wireshark.org/review/3299 Reviewed-by: Martin Kaiser commit 43a81b6 Author: Guy Harris Date: Thu Jul 31 13:55:56 2014 -0700 Add some information on running from the build directory. Change-Id: I6c01141cd02af358152d007175ec0b51357e42b3 Reviewed-on: https://code.wireshark.org/review/3298 Reviewed-by: Guy Harris commit 9505d3a Author: Guy Harris Date: Thu Jul 31 11:38:48 2014 -0700 Need to make Windows installer packages as well. Change-Id: I5e5483ead229ff74fb7bacba72459e324f9bd510 Reviewed-on: https://code.wireshark.org/review/3294 Reviewed-by: Guy Harris commit b98537a Author: Guy Harris Date: Thu Jul 31 11:37:28 2014 -0700 We need to support building against an SDK on OS X. Change-Id: I1fe9390e450dcb3669653a94d95339bce3182799 Reviewed-on: https://code.wireshark.org/review/3293 Reviewed-by: Guy Harris commit 8531f88 Author: Guy Harris Date: Thu Jul 31 11:30:28 2014 -0700 Include OS X installer dmgs as a package type we need to support. Change-Id: I419fa4889d1fc2a9fd12ec19385543bd085e6b1e Reviewed-on: https://code.wireshark.org/review/3292 Reviewed-by: Guy Harris commit a91dbf7 Author: Jeff Morriss Date: Wed Jul 30 16:16:27 2014 -0400 proto_add_subtree_format(): initialize tree_item to 'tree' rather than NULL. ... As would be the case if proto_tree_add_text() + proto_item_add_subtree() were used. (This initialization value is only used when TRY_TO_FAKE_THIS_ITEM() shortcuts us out.) As reported/discussed on -dev: https://www.wireshark.org/lists/wireshark-dev/201407/msg00031.html Change-Id: I4af63e3cf0a70607d58b4641597b2ce7907fbb8b Reviewed-on: https://code.wireshark.org/review/3271 Reviewed-by: Michael Mann Tested-by: Martin Kaiser Reviewed-by: Evan Huus commit 3762440 Author: Jeff Morriss Date: Thu Jul 31 09:20:03 2014 -0400 cmake also needs to learn to build SVR4 packages. Change-Id: I030e84b9247b273b01890a47d92109dd603e3247 Reviewed-on: https://code.wireshark.org/review/3288 Reviewed-by: Jeff Morriss commit a69a63f Author: Peter Wu Date: Fri Jul 25 13:19:14 2014 +0200 ssl: fix SSL keylog file live-capture use case Patch "ssl,dtls: simplify keyfile handling" did not account for the use case where packets are captured and decrypted on the fly using SSLKEYLOGFILE. This patch restores that functionality by reading additional lines from the keylog file when needed (to preserve the benefit of not having to read the full file) and by watching the open file for deletions. "Deletion" is detected by comparing st_dev and st_ino. Since these may be useless on Windows, the size is also checked. Change-Id: Ieadaef1426a9270587293db28f4dda33b3d17334 Reviewed-on: https://code.wireshark.org/review/3190 Reviewed-by: Peter Wu Reviewed-by: Evan Huus Petri-Dish: Evan Huus Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 7939d32 Author: Peter Wu Date: Sat Jul 19 11:06:25 2014 +0200 ssl,dtls: simplify keyfile handling Previously, the keylog file would be fully parsed when an encrypted pre-master secret is encountered or in the ChangeCipherSpec stage. There was also a lot of duplication in the key logfile parsing. This patch simplifies the key logfile parsing by using regular expressions. Rather than scanning the key logfile for a specific key, do this scan once at ssl init and save the results to a hashtable. The map for session ID/tickets to master keys already existed, another one for client random to master key and encrypted pre-master to pre-master was added. This could later also be wired to the "Export SSL Keys" menu item for improved reliability (when no session ID or tickets are available, the client random could be used). The ssl_{save,restore}_session{,_ticket} functions have been converted to a single function that looks up a key (sid / client random / encr. pre-master) to a (pre-)master secret. Other minor changes: return booleans for some functions that can only fail/pass. Remove some functions from the ssl-utils header that have become private a few commits ago. Remove some outstanding issues from the comments in packet-ssl as they are already done, add myself to the ssl-utils header. These changes pass the test suite and the sample Session Ticket-enabled capture from https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5963 On-the-fly decryption are broken with this patch since keylog files are read once at the start of a capture. This will be solved in a future patch. Change-Id: Idb343abe161950b5f3ff61bee093d0f4ef9655bd Reviewed-on: https://code.wireshark.org/review/3057 Reviewed-by: Evan Huus Petri-Dish: Evan Huus Petri-Dish: Alexis La Goutte Reviewed-by: Michael Mann commit a1032fa Author: Michael Mann Date: Wed Jul 30 23:31:13 2014 -0400 Convert hf_packetbb_error filter (packetbb.error) to expert info. Also make dissector "new style" using it's already built in basic heuristics. Change-Id: I8b9b02d1f32cec96a1104c99647795d6fbda4804 Reviewed-on: https://code.wireshark.org/review/3275 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit acea064 Author: Guy Harris Date: Thu Jul 31 01:56:51 2014 -0700 Missing end-of-line backslash. Change-Id: I99b72e4d38b12e0356f27d29f919484e40b7443b Reviewed-on: https://code.wireshark.org/review/3287 Reviewed-by: Guy Harris commit 3ac49be9 Author: Guy Harris Date: Thu Jul 31 01:55:22 2014 -0700 Add more files to the release tarball. Change-Id: I02ce275154979ff56f8f8929e5909f3035f62c47 Reviewed-on: https://code.wireshark.org/review/3286 Reviewed-by: Guy Harris commit 7f3d97c Author: Guy Harris Date: Thu Jul 31 01:26:50 2014 -0700 Include the gnm dissector. Change-Id: Icc6090cdc8a6321677aaa82df7dd2bb408166c91 Reviewed-on: https://code.wireshark.org/review/3285 Reviewed-by: Guy Harris commit 7e2dc50 Author: Guy Harris Date: Thu Jul 31 00:52:05 2014 -0700 Nobody uses packet-t125.h, so don't bother building it, and delete it. Change-Id: I10f8889a64024114106cd8058525cb21c6078279 Reviewed-on: https://code.wireshark.org/review/3284 Reviewed-by: Guy Harris commit 067beb0 Author: Guy Harris Date: Thu Jul 31 00:41:08 2014 -0700 Add a bunch of missing files to the distribution. Files from the debian directory, documents from the doc directory, graphics from the docbook/wsug_graphics directory, and the echld Makefile.nmake. Change-Id: Iccccc58811753581b0b180053defd937aea22f95 Reviewed-on: https://code.wireshark.org/review/3283 Reviewed-by: Guy Harris commit 54c55bb Author: Joerg Mayer Date: Thu Jul 31 07:55:36 2014 +0200 Add a missed -template.h file Change-Id: I83f4680b3b258daf0fdad9f896be5f854b8dc3de Reviewed-on: https://code.wireshark.org/review/3282 Reviewed-by: Jörg Mayer commit 5dd83af Author: Guy Harris Date: Wed Jul 30 21:45:19 2014 -0700 Add some missing CMake files to the distribution. Change-Id: I67ca59bb77766f4625e64b9042cdcb5d03cd7994 Reviewed-on: https://code.wireshark.org/review/3281 Reviewed-by: Guy Harris commit 278b762 Author: Bill Meier Date: Thu Jul 31 00:35:06 2014 -0400 addr_resolution_dlg.c: "OK" button should *do* something: treat as cxl. Also: remove vestigial line of commented-out code. Change-Id: Ieb41a0e39a4e0ec14031b1dbd38fc0d7ad47a635 Reviewed-on: https://code.wireshark.org/review/3278 Reviewed-by: Bill Meier commit 0a12f7d Author: Bill Meier Date: Thu Jul 31 00:06:37 2014 -0400 addr_resolution_dlg.c: Fix crash when 'Statistics ! Show address resolution' is invoked. (Introduced when the ipv4_hash_table key format was changed in 5d98ab67) Change-Id: Ie5d1314f7c7cc8bc71dca8a2db05e34a0a7776d7 Reviewed-on: https://code.wireshark.org/review/3277 Reviewed-by: Bill Meier commit 791d93a Author: Guy Harris Date: Wed Jul 30 21:30:41 2014 -0700 Add more files to the distribution. If it's checked into asn1 or a subdirectory thereof, put it into the distribution. (If it's not useful, why is it in Git?) Change-Id: I4dac8a0d19a770db1513729cf71069a37f1d83fc Reviewed-on: https://code.wireshark.org/review/3276 Reviewed-by: Guy Harris commit 4d90d6e Author: Guy Harris Date: Wed Jul 30 16:41:51 2014 -0700 Add some files under asn1 to the distribution. Include CMakeLists.txt files and the gnm subdirectory, along with the top-level Makefile.inc and Makefile.preinc files. Don't explicitly include Custom.make, as automake does that automatically given that it's included by asn1/Makefile.am. Add some files to EXTRA_DIST lists. Move some .asn files to EXTRA_DIST; they don't need to be in SRC_FILES, as SRC_FILES always includes EXTRA_DIST, and they *do* need to be in EXTRA_DIST so that they're in the distribution. Change-Id: Id91df577260fa57028d40fe098be1d79c59398e6 Reviewed-on: https://code.wireshark.org/review/3273 Reviewed-by: Guy Harris commit 3f0430d Author: Gerald Combs Date: Wed Jul 30 16:03:27 2014 -0700 Add libgpg-error6-0 to the GCRYPT_ERROR_LIBRARY search list. (Does FIND_LIBRARY support wildcards?) Change-Id: I240e93070091e445446478b082ad284267c977a6 Reviewed-on: https://code.wireshark.org/review/3272 Reviewed-by: Gerald Combs commit e6a2fab Author: Gerald Combs Date: Wed Jul 30 11:20:39 2014 -0700 Fix dist. Add ui/cli/tshark-tap.h and packaging/nsis/windeployqt-to-nsis.ps1. Change-Id: I00465aed3f33595ad50be0ba5d0ed0eae54e1137 Reviewed-on: https://code.wireshark.org/review/3268 Reviewed-by: Gerald Combs commit 304388a Author: Gerald Combs Date: Wed Jul 30 09:33:43 2014 -0700 Install our Qt DLL directories recursively. Qwindows.dll at least needs to be in the "platforms" subdirectory. Use a PowerShell script to convert the output of windeployqt to its equivalent NSIS instructions. Give the Qt DLL manifest a .nsh extension. Make sure we uninstall known Qt DLL directories. DLLs now load correctly according to Dependency Walker. Install and uninstall our .qm files while we're here. Change-Id: I06ed279809e6fce0e008c5f278a56b1ae34c8f21 Reviewed-on: https://code.wireshark.org/review/3267 Reviewed-by: Gerald Combs commit 8d05e85 Author: Jeff Morriss Date: Wed Jul 30 13:03:08 2014 -0400 Fix the build: add a few more G_GINT64_MODIFIER's when printing 64-bit numbers. Also use %u instead of %d for these unsigned numbers. Change-Id: I3d1df3bdcc3c68193b49ba8daf1dc56171356290 Reviewed-on: https://code.wireshark.org/review/3266 Reviewed-by: Jeff Morriss commit 482dcf8 Author: Joerg Mayer Date: Wed Jul 30 18:37:36 2014 +0200 Remove empty variable SHARK_COMMON_CAPTURE_SRC. It's not present for the other build systems as well. Small whitespace fix. Change-Id: I071ee4ae0fa85306435d2d82d36265973181b71c Reviewed-on: https://code.wireshark.org/review/3263 Reviewed-by: Jörg Mayer commit 5894b55 Author: Hannes Mezger Date: Wed Jul 30 12:34:58 2014 +0200 fix encodingmask of DiagnosticInfo In 2008, before the OpcUa specification was released, the EncodingMask was changed to include the Locale after the LocalizedText. This commit applies the changes necessary to display DiagnosticInfo correctly. Change-Id: Iad35ff0557eac62a259a63505ebce3e637095136 Reviewed-on: https://code.wireshark.org/review/3259 Reviewed-by: Alexis La Goutte Reviewed-by: Michael Mann commit 9ed85d1 Author: Peter Wu Date: Wed Jul 30 15:07:24 2014 +0200 Fix use of uninitialized field ssl_print_string uses out->data_len to determine the length of the printed data, but this was not set. Use ssl_data_set for that and add an additional DISSECTOR_ASSERT just in case we change something here. Reported by Alexis La Goutte, found by Clang static analyzer. Change-Id: I630a9193ff1ece86a0a46924dd86591fedf5c595 Reviewed-on: https://code.wireshark.org/review/3261 Reviewed-by: Alexis La Goutte Reviewed-by: Michael Mann commit dcf6d44 Author: Michael Mann Date: Sat Jul 26 12:41:27 2014 -0400 Apply refactored "conversation" (tap) data to TShark. I intentionally left the fields displayed alone (so they don't exactly match Wireshark GUI), because as Guy points out in bug 6310, not sure its A Bug or A Feature. But at least all types of conversations allowed are in sync with Wireshark GUI. Bug:6310 Change-Id: I722837df510a39dadc1f9a07a99275509516698c Reviewed-on: https://code.wireshark.org/review/3212 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 54777bf Author: Peter Wu Date: Tue Jul 29 12:52:12 2014 +0200 Fix cmake build for portaudio V18 Note that the cache file (CMakeCache.txt) must be cleared when the include or library paths change, otherwise the cached result of CHECK_FUNCTION_EXISTS will be re-used. Change-Id: Ia18ed4f1b6b162499aeae6e66f612a4945390c2a Reviewed-on: https://code.wireshark.org/review/3245 Reviewed-by: Jörg Mayer commit ede5a9d Author: Michael Mann Date: Wed Jul 30 09:58:53 2014 -0400 Convert tvb_get_ptr buffer access macros to use much safer tvb access macros. Added a few filterable fields in the process of trying to figure out the macros. Much more can be done to add many more filterable fields (and remove proto_tree_add_text calls hidden in the macros), but that'll be done some other time. bug:10281 Change-Id: I9788f176c0e721ff4f243d4ecb79d7d0114fffc0 Reviewed-on: https://code.wireshark.org/review/3262 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 82bb800 Author: Pascal Quantin Date: Wed Jul 30 10:44:45 2014 +0200 GED125: remove a wrong comment regarding the default TCP port Change-Id: I53aa2053c65280385e13da875979ed09b37fb725 Reviewed-on: https://code.wireshark.org/review/3258 Reviewed-by: Pascal Quantin commit 054bff4 Author: Jeff Morriss Date: Tue Jul 29 22:46:32 2014 -0400 Fix up some white space. Change-Id: Ie8f1006d6b3a27fe0c8187ce99051c09dea09b66 (cherry picked from commit a3a5c33dad8669e37502f2ce4d0687f7ff7e87a1) Reviewed-on: https://code.wireshark.org/review/3257 Reviewed-by: Jeff Morriss commit 50c10c0 Author: Gerald Combs Date: Tue Jul 29 18:45:47 2014 -0700 The Visual C++ 2013 redistributable uses /quiet instead of /q. Change-Id: I130b1af814b843638498feaecacc7092bacd3b72 Reviewed-on: https://code.wireshark.org/review/3255 Reviewed-by: Gerald Combs commit 1f08f87 Author: Gerald Combs Date: Tue Jul 29 17:24:14 2014 -0700 Dont force qt-dll-manifest.txt. Change-Id: I06781f9b0b89561a96b00c27f938005ebf5b915f Reviewed-on: https://code.wireshark.org/review/3254 Reviewed-by: Gerald Combs commit 9a897d5 Author: Gerald Combs Date: Tue Jul 29 15:51:57 2014 -0700 Use windeployqt with NSIS. If we find windeployqt, use it to create a DLL manifest for NSIS. Fall back to the previous manual lists if we don't. This assumes that your copy of windeployqt works. New bug: The Windows installer is huge when using the official Digia DLLs (around 43 MB for the win 64 package). Change-Id: I1f662381b7a2c5474595b05177dbdfd3138c7e60 Reviewed-on: https://code.wireshark.org/review/3253 Reviewed-by: Gerald Combs commit 9d0e4f6 Author: Martin Kaiser Date: Tue Jul 29 22:14:53 2014 +0200 don't add nonprinting \000 characters to tftp option strings Change-Id: I81e43fac5176fdd0805001636991efb7f588a3c0 Reviewed-on: https://code.wireshark.org/review/3252 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 5dd7cfe Author: Martin Kaiser Date: Tue Jul 29 18:23:48 2014 +0200 remove unnecessary return; statement Change-Id: Icefbaf632e888e84bcb2cc20ae3a6c4744b82fae Reviewed-on: https://code.wireshark.org/review/3251 Petri-Dish: Martin Kaiser Tested-by: Petri Dish Buildbot Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 54d5030 Author: Martin Kaiser Date: Mon Jul 28 09:54:11 2014 +0200 (trivial) modify, indent a comment Change-Id: I64bb64787c83ffe712ffd348cceb5449690dd6d0 Reviewed-on: https://code.wireshark.org/review/3247 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit cc0f354 Author: Alexis La Goutte Date: Tue Jul 29 14:15:01 2014 +0200 Fix Argument with 'nonnull' attribute passed null found by Clang Change-Id: I719d8adeb4bc6dbd1e34fe56f7cf68e4c6286dc9 Reviewed-on: https://code.wireshark.org/review/3246 Reviewed-by: Evan Huus commit dff0382 Author: Pascal Quantin Date: Sun Jul 27 22:10:23 2014 +0200 Ensure that QT5_BASE_DIR is known by QtShark.pro Otherwise the call to winqtdeploy will fail if it is not already in the PATH Change-Id: I74db604a6fd45204bda8d6ac9d9c98c0c12598ec Reviewed-on: https://code.wireshark.org/review/3218 Reviewed-by: Pascal Quantin Tested-by: Pascal Quantin Reviewed-by: Graham Bloice Tested-by: Graham Bloice Petri-Dish: Graham Bloice commit 3b11d22 Author: AndersBroman Date: Tue Jul 29 11:28:22 2014 +0200 Remove duplicated entry for AVP 258 Auth-Application-Id from HP.xml it was overiding the correct one from dictionary.xml Change-Id: Ic6073a550a15f56584e214eec8bd79057673c25c Reviewed-on: https://code.wireshark.org/review/3244 Reviewed-by: Anders Broman commit d786ed8 Author: Evan Huus Date: Mon Jul 28 21:55:37 2014 -0400 Remove unused variable Change-Id: I590d4c2d79ee44309cd512057c7eae6df15913e9 Reviewed-on: https://code.wireshark.org/review/3240 Reviewed-by: Evan Huus commit 0272b9c Author: Peter Wu Date: Tue Jul 29 00:04:00 2014 +0200 Fix heap-use-after-free via setlocale setlocale returns a statically-allocated memory which can be modified by subsequent calls of setlocale. This triggers a heap-use-after free in ASAN when the setlocale function is called again with the previous pointer. This was found when trying to use the "Show All Streams" option via the Telephony -> RTP menu. While at it, add some modelines Change-Id: Ide47e877ce828734fd8c5c1b064d9c505ba2b37a Reviewed-on: https://code.wireshark.org/review/3234 Reviewed-by: Peter Wu Reviewed-by: Evan Huus commit 3db115a Author: Jeff Morriss Date: Mon Jul 28 21:46:28 2014 -0400 Add a couple more dissector authors. Change-Id: Ib606efbcaf38803d98d3e755386eab3c4d35fdf7 Reviewed-on: https://code.wireshark.org/review/3238 Reviewed-by: Evan Huus commit b99d964 Author: Jeff Morriss Date: Mon Jul 28 20:04:28 2014 -0400 Document some new features (and API changes) since 1.12.0. Change-Id: I404f038a739ca41cb124a979fe6cf807a0b7e978 Reviewed-on: https://code.wireshark.org/review/3235 Reviewed-by: Evan Huus commit eece1c5 Author: Lukas Emersberger Date: Mon Jul 28 10:04:33 2014 +0200 EPL: Fix for Write Multiple by index Write multiple by index now correctly resolves OD names. Change-Id: I4d2aad584a47e3682716b95bdda0bc49c3a29d96 Signed-off-by: Lukas Emersberger Reviewed-on: https://code.wireshark.org/review/3223 Reviewed-by: Roland Knall Reviewed-by: Lukas Emersberger Reviewed-by: Evan Huus commit 4a1bd42 Author: Matthieu Texier Date: Mon Jul 28 15:18:56 2014 +0200 Bug 10302 - BGP attribute AIGP (draft-ietf-idr-aigp) not decoded - Fix Change-Id: Ib8b3c5666932777218e33b74cca33b791c883fc9 Reviewed-on: https://code.wireshark.org/review/3226 Reviewed-by: Evan Huus commit 0aa4cb2 Author: Evan Huus Date: Mon Jul 28 21:41:59 2014 -0400 Fix possible uninitialized session key in netlogin auth Bug:10312 Change-Id: Ia2be812e81b54d6df5a928312cca86ecd95aa6b2 Reviewed-on: https://code.wireshark.org/review/3236 Reviewed-by: Evan Huus commit 75c7b15 Author: Michal Labedzki Date: Mon Jul 28 13:53:11 2014 +0200 Bluetooth: Fix OBEX over L2CAP detection There are two cases: 1. btl2cap -> btrfcomm -> btobex 2. btl2cap -> btobex Case 2 is rare, so according to its name and to avoid confusion I based on it. Bug:10316 Change-Id: Ibeabeaf2f8376425460c56bad8fb980b460dd940 Reviewed-on: https://code.wireshark.org/review/3225 Reviewed-by: Evan Huus commit 82efb21 Author: Martin Kaiser Date: Mon Jul 28 23:11:28 2014 +0200 add 恵 to the AUTHORS file Change-Id: Iebddc7be48d6e6aeb3a8620e0cb902fb4d6206b2 Reviewed-on: https://code.wireshark.org/review/3233 Reviewed-by: Martin Kaiser commit c6a7190 Author: Martin Kaiser Date: Mon Jul 28 23:03:58 2014 +0200 From 竹下 恵 (Megumi Takeshita) update the japanese translation for the Qt user interface Change-Id: Ib4a0f6fc1d58cd71310703950c0f1e646b1d74ad Reviewed-on: https://code.wireshark.org/review/3232 Petri-Dish: Martin Kaiser Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 84edd1a Author: Bill Meier Date: Mon Jul 28 14:37:27 2014 -0400 (Trivial) config.nmake: fix a spelling error and add some punctuation. Change-Id: I326dbae8fe1d3593de00c9e78a124c1221b7314b Reviewed-on: https://code.wireshark.org/review/3231 Reviewed-by: Bill Meier commit 9ce04cb Author: Pascal Quantin Date: Sat Jul 26 15:11:04 2014 +0200 Fix download of 3rd party packages when WIRESHARK_TARGET_PLATFORM environment variable is not explicitly set Bug: 10317 Change-Id: Ic7b4ffe2bbe4f69928b91a5151d8cef1ae59f723 Reviewed-on: https://code.wireshark.org/review/3203 Reviewed-by: Bill Meier commit 0f85608 Author: AndersBroman Date: Mon Jul 28 20:18:49 2014 +0200 Use wmem for application Ids Remove soft deprecated APIs Change-Id: Iecd2f552c1abb7bb2c6969073b3c245af22f4fcd Reviewed-on: https://code.wireshark.org/review/3230 Reviewed-by: Anders Broman commit 3a9f126 Author: Bill Meier Date: Mon Jul 28 11:50:49 2014 -0400 config.nmake: Do some minor changes (mostly in comments). - Update comment: /O2 enables /Gs which is "Control Stack Checking Calls" not "Buffer Security Check" - Remove explicit setting of /GS (Buffer Security Check) since it's set by default. (The explicit setting did not apply to the CFLAGS used to compile Wireshark files because the setting was in the wrong place, but, fortunately, /GS is on by default. - Add a comment about /GS being on by default. - Remove some trailing whitespace. Change-Id: I6cf631ee1ba0fb8556171861c7e5eb6d959c8f0c Reviewed-on: https://code.wireshark.org/review/3228 Reviewed-by: Anders Broman commit ff01321 Author: AndersBroman Date: Mon Jul 28 19:35:02 2014 +0200 Sort diameter.applicationId fix a typo. Change-Id: Id585371df929cdff17f98dddbebf063fa000ff56 Reviewed-on: https://code.wireshark.org/review/3229 Reviewed-by: Anders Broman commit 083d6e7 Author: AndersBroman Date: Mon Jul 28 00:25:42 2014 +0200 Add a few mor application Ids Change-Id: I98d9735e2b54818a23c9a6e4086692d76f0713d5 Reviewed-on: https://code.wireshark.org/review/3227 Reviewed-by: Anders Broman commit 52629d8 Author: Pascal Quantin Date: Mon Jul 28 13:52:14 2014 +0200 Download the right User Guide... Change-Id: Icf1f9bd48f0624226c55a622b7b8f774d103e5ae Reviewed-on: https://code.wireshark.org/review/3224 Reviewed-by: Pascal Quantin commit 6ef2ad2 Author: Pascal Quantin Date: Mon Jul 28 07:12:14 2014 +0200 Fix MSVC2013 Lua package (previous one was linked against MSVC2012) Change-Id: I632eea7250e7e60482f62d9ea62ac407fc6506d1 Reviewed-on: https://code.wireshark.org/review/3222 Reviewed-by: Pascal Quantin commit 34e413f Author: Kevin Cox Date: Fri Jul 25 12:29:04 2014 -0400 Make value_string_ext const-correct. There is still some const-incorrect usage of them but those can be ironed out after this change has been made. Change-Id: Iba0631c804bdab34d7c0232b49967130e3370488 Reviewed-on: https://code.wireshark.org/review/3199 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit e21c429 Author: Pascal Quantin Date: Sun Jul 27 23:19:08 2014 +0200 Add PortableApps temporary files to .gitignore Change-Id: Ie76d2c5cc167a4d63f6c83b64cdf6d1ebb07afa9 Reviewed-on: https://code.wireshark.org/review/3221 Reviewed-by: Pascal Quantin commit dacf6e4 Author: Guy Harris Date: Sun Jul 27 13:30:44 2014 -0700 Don't fail if unmounting the CMake disk image fails. I don't know why, but sometimes it fails - the most recent failure was due to it having already been unmounted! Maybe the CMake installer unmounts it some times but not others. Just drive on if it fails. Change-Id: I1b31356f08695b8d3b9e425f8475a422e1da0783 Reviewed-on: https://code.wireshark.org/review/3220 Reviewed-by: Guy Harris commit 5b1106d Author: Guy Harris Date: Sun Jul 27 13:13:43 2014 -0700 Remove printing done for debugging/test purposes. Change-Id: Id6cdb34890c0f1d6c9e64d290ce72ca68183220e Reviewed-on: https://code.wireshark.org/review/3219 Reviewed-by: Guy Harris commit 2034c3e Author: Guy Harris Date: Sun Jul 27 13:12:30 2014 -0700 Fix the path to the "fix one .pc file" script. Change-Id: I1c16fe2076794e0b55b45417d9019440b0658037 Reviewed-on: https://code.wireshark.org/review/3217 Reviewed-by: Guy Harris commit 8807e6b Author: Guy Harris Date: Sun Jul 27 13:10:38 2014 -0700 Fix quoting. Change-Id: I54cb94b5c00b748100be22b10336a906da3c35b2 Reviewed-on: https://code.wireshark.org/review/3216 Reviewed-by: Guy Harris commit 8aa0507 Author: Guy Harris Date: Sun Jul 27 12:53:30 2014 -0700 Add some scripts to fix up Qt's OS X binary packages. You have to run macosx-support-lib-patches/qt-fix-pc-files manually, telling it where Qt was installed, but so it goes.... Change-Id: I8668a1fc4254cc002aee068749edb3cf3bdb854f Reviewed-on: https://code.wireshark.org/review/3215 Reviewed-by: Guy Harris commit 4658109 Author: Joerg Mayer Date: Sun Jul 27 21:08:31 2014 +0200 Fix incorrect whitespace. Why this wasn't spotted during review? Change-Id: I54be42e020e2febf2e15d5eb0e772153eae1ba32 Reviewed-on: https://code.wireshark.org/review/3213 Reviewed-by: Jörg Mayer commit ec08f34 Author: Graham Bloice Date: Thu Jul 17 22:28:21 2014 +0100 Added function dnp3_header_check() to check the validity of a DNP3 packet as far as possible, called from both dissect_dnp3_tcp and dissect_dnp3_udp. Bug: 10287 Change-Id: Iaa988258b3614cb1b408dec41a987fbd61c9727c Reviewed-on: https://code.wireshark.org/review/3096 Petri-Dish: Graham Bloice Reviewed-by: Pascal Quantin Reviewed-by: Graham Bloice commit b9183b9 Author: Pascal Quantin Date: Sun Jul 27 18:29:14 2014 +0200 Use a compatible Lua library when building with MSVC2013 Change-Id: If462dc45df9dbd418c4de2eb6bb9130a283d863c Reviewed-on: https://code.wireshark.org/review/3211 Reviewed-by: Pascal Quantin commit 8762c78 Author: Gerald Combs Date: Sun Jul 27 08:05:21 2014 -0700 [Automatic manuf, services and enterprise-numbers update for 2014-07-27] Change-Id: I07f7d2340c70fb3dbacf6d2792f5fab194212e22 Reviewed-on: https://code.wireshark.org/review/3208 Reviewed-by: Gerald Combs commit d95d775 Author: Evan Huus Date: Sat Jul 26 21:39:11 2014 -0400 Fix yet another openflow underflow issue. I thought I'd found all of these but I guess I hadn't; good thing the fuzz-bot kept looking. Bug:10314 Change-Id: I2cc209a6c87781d10cae28f2cb91400d759f5091 Reviewed-on: https://code.wireshark.org/review/3205 Reviewed-by: Evan Huus commit 2b71946 Author: Guy Harris Date: Sat Jul 26 15:33:47 2014 -0700 Download and install a binary package of CMake from Kitware. Change-Id: Ia7e5576ff64e1c31682006a023f1bd2ff1d3ccb1 Reviewed-on: https://code.wireshark.org/review/3204 Reviewed-by: Guy Harris commit 31ecdf5 Author: Michael Mann Date: Wed Jul 23 13:38:55 2014 -0400 Refactor "common" Conversation table functionality. Refactor (non-GUI) conversation table functionality from gtk/Qt to epan. Also refactor "common GUI" conversation table functionality. The idea is to not have to modify the GUI when a dissector adds a new "conversation type" Change-Id: I11f08d0d7edd631218663ba4b902c4a4c849acda Reviewed-on: https://code.wireshark.org/review/3113 Reviewed-by: Gerald Combs commit 507d07e Author: Michael Mann Date: Tue Jul 15 23:04:41 2014 -0400 Allow severity levels of expert info items to be configured by the user. UAT was the easiest way to do this and I like the "file format" of the data, but the presentation doesn't seem that great. Bug:10180 Change-Id: I7e6bc9e148bc47585a0a7eb8f96900a5c374e673 Reviewed-on: https://code.wireshark.org/review/3082 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 251ee71 Author: Jeff Morriss Date: Fri Jul 25 17:05:51 2014 -0400 Add OptoMMP to the Release Notes and NEWS. Add its author to AUTHORS. Change-Id: I899dafbdf0f1aa94b71ca1dcb93d1ef1b2039386 Reviewed-on: https://code.wireshark.org/review/3200 Reviewed-by: Michael Mann commit ab9dc4f Author: Guy Harris Date: Fri Jul 25 15:48:59 2014 -0700 Don't use capture_interface_list() in this dialog. Instead, if we have no interfaces in global_capture_opts.all_ifaces, use the refreshLocalInterfaces() method of the main WiresharkApplication to try to fetch them; that way, if we do find interfaces, a signal will be emitted to cause the rest of the UI to reflect their arrival. Change-Id: I59077ef855127fd6bddaa40126c1835a659ffc30 Reviewed-on: https://code.wireshark.org/review/3202 Reviewed-by: Guy Harris commit 0492921 Author: Peter Wu Date: Fri Jul 25 13:50:00 2014 +0200 Replace lseek/fstat by ws_lseek64/ws_fstat64 lseek returns an off_t type which is system-dependent. Use ws_lseek64 in favor of lseek as that supports 64-bit quanities. Use ws_fstat64 instead of stat to support 64-bit file sizes on Windows. For the majority of the changes, this makes no difference as they do not apply to Windows ("ifndef _WIN32"; availability of st_blksize). There are no other users of "struct stat" besides the portability code in wsutil. Forbid the use of fstat and lseek in checkAPIs. Change-Id: I17b930ab9543f21a9d3100f3795d250c9b9ae459 Reviewed-on: https://code.wireshark.org/review/3198 Reviewed-by: Guy Harris commit c3e42cc Author: John Miner Date: Fri Jul 18 15:17:26 2014 -0700 OptoMMP Dissector Change-Id: I754335b9944a9de169e37c16a3e37a86d35543a6 Reviewed-on: https://code.wireshark.org/review/3110 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit 788ff15 Author: Jakub Zawadzki Date: Fri Jul 25 09:50:02 2014 +0200 Empty proto_reg_handoff_* are not needed, remove some. Change-Id: I957b01aa00bbff3c48192388c7ad9e601d79c778 Reviewed-on: https://code.wireshark.org/review/3196 Reviewed-by: Bill Meier commit 7701650 Author: Bill Meier Date: Fri Jul 25 07:38:55 2014 -0400 Update documentaion for p_(add|get)_proto_data(); There's been a 'key' arg for a while. Change-Id: I1166a63d8896d0d5fc63b558ebb0df2e1e19bc63 Reviewed-on: https://code.wireshark.org/review/3197 Reviewed-by: Bill Meier commit 9ccf2e0 Author: Guy Harris Date: Fri Jul 25 00:44:50 2014 -0700 Make Capture -> Refresh Interfaces work. Add a "refresh the local interfaces" method to WiresharkApplication, which reloads the interface list and emits the "interface list changed" signal, and invoke it from the Capture -> Refresh Interfaces menu item. Change-Id: I9641e4b341eb44d773c556691d8bb9dac776ea9d Reviewed-on: https://code.wireshark.org/review/3195 Reviewed-by: Guy Harris commit 35b4487 Author: Guy Harris Date: Thu Jul 24 19:25:44 2014 -0700 Handle empty interface lists when the list changes. Don't assume that a change to the interface list is from a non-empty interface list to a different non-empty interface list. Change-Id: I94054ca0cf2661704aff1869385aa2155c19677d Reviewed-on: https://code.wireshark.org/review/3193 Reviewed-by: Guy Harris commit 0501465 Author: moraney.jalil Date: Thu Jul 24 22:34:29 2014 +0300 Fixing a bug in add_ff_action_public_fields(), by removing the start argument and defining it inside the function. Change-Id: I6205384b3bcf38128912baf413b4455357d25347 Reviewed-on: https://code.wireshark.org/review/3184 Reviewed-by: Evan Huus commit ebe7132 Author: Evan Huus Date: Thu Jul 24 22:57:30 2014 -0400 Remove valgrind suppression for old zlib version The fuzzbot has been upgraded, so hopefully this is no longer necessary. Change-Id: Ia2d8ae03180c6e0b81a4f7b69b72610d047307ff Reviewed-on: https://code.wireshark.org/review/3194 Reviewed-by: Evan Huus commit 05c0630 Author: Gerald Combs Date: Thu Jul 24 19:28:48 2014 -0700 Make HTML Help steps compliant with newer Nmakes. Nmake 12 seems to be more strict about spaces in commands. Add the hhc.exe path to PATH and use a bare command instead. Change-Id: I9fbd9abdabf7f51ac7bac2cbe8d938ae7bb0640e Reviewed-on: https://code.wireshark.org/review/3192 Reviewed-by: Gerald Combs commit 5688c8a Author: Gerald Combs Date: Thu Jul 24 17:27:33 2014 -0700 Add the default directores used by the Qt Online Installer for Qt 5.3. Change-Id: Ia81ce10318b34f6af68862622a63c64e2883a937 Reviewed-on: https://code.wireshark.org/review/3191 Reviewed-by: Gerald Combs commit cca0fd3 Author: Martin Kaiser Date: Thu Jul 24 21:44:58 2014 +0200 add the flags to all FullBoxes Change-Id: I6e0109bc1d1acf200fd0c1a9f8ddd3a3d98f5908 Reviewed-on: https://code.wireshark.org/review/3189 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 0b15ec8 Author: Martin Kaiser Date: Thu Jul 24 21:39:48 2014 +0200 start dissecting the MP4 stsd box Change-Id: I589a6ced098d1d224e86386f028c92fc0797164e Reviewed-on: https://code.wireshark.org/review/3188 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit fb9851e Author: Martin Kaiser Date: Thu Jul 24 18:24:57 2014 +0200 dissect the MP4 url box Change-Id: Ibeaf5ba5d104e7f9bc9291e83923f8675abf0099 Reviewed-on: https://code.wireshark.org/review/3187 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 7d219fd Author: Martin Kaiser Date: Thu Jul 24 18:17:05 2014 +0200 dissect the MP4 dref box Change-Id: I342f283bbab3052337e00502769150cf3f4a8800 Reviewed-on: https://code.wireshark.org/review/3186 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 476f49c Author: Martin Kaiser Date: Thu Jul 24 12:12:31 2014 +0200 dissect the MP4 hdlr box Change-Id: I467bfae2db7d3a119b58505b43b3d9bb59615ee9 Reviewed-on: https://code.wireshark.org/review/3185 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 2c1b673 Author: Alexis La Goutte Date: Thu Jul 24 10:04:15 2014 +0200 IMAP: fix mixed indent (use 2spaces) Change-Id: Icaad98527c61cb5c87f84ec23d1d895079fe2515 Reviewed-on: https://code.wireshark.org/review/3182 Reviewed-by: Evan Huus commit c025152 Author: Jakub Zawadzki Date: Wed Jul 23 08:03:03 2014 +0200 Micro-optimize tvbuff: - compute_offset_and_remaining(...) is a little bit faster than check_offset_length(.., .length_val = -1); - tvb_find_guint8(), tvb_pbrk_guint8() - both function are limiting data to MIN((unsigned) maxlength, tvb_len) - do the same with less count of ifs. Change-Id: I7761d77b6282d800eea94852d5c6543aef4bc7ca Reviewed-on: https://code.wireshark.org/review/2829 Reviewed-by: Anders Broman commit 2944d8b Author: Peter Wu Date: Sun Jul 13 23:12:03 2014 +0200 ssl: clarify meaning of StringInfo, cleanup PRFs, master_secret It was not clear whether the data_len member of StringInfo refers to the allocated memory (as was done for session_ticket) or the length of the actual data. This is clarified in a comment. To keep the invariant "data_len refers to the length of meaningful data", some code has been moved just in case some intermediate code fails: - Setting session_ticket.data_len vs tvb_memcpy to session_ticket.data. - PRF functions would expect the data length as input to a paramter named "out". This is highly confusing, so another parameter has been added to signify the requested length, "out_len". This also helps holding up the invariant. - For prf() calls, out.data_len does not need to be initialized but passed as parameter. Other PRF-related changes: - Change the PRF functions to return a boolean instead of an int. - tls_hash: return void as it cannot fail and remove related error handling from callers. Fix a memleak of label_seed if tls_hash was successful. - tls_hash: add comments to clarify its functionality, whitespace. - ssl3_generate_export_iv could not fail, so make it void. Also added an out_len param to pass the target length. - In prf(), replaced if-conditions for SSL version by a switch. - In ssl_generate_keyring_material, the scope of some variable has been tightened. - ssl_session_init: explicitly set data_len to 0. This is strictly not necessary as the callers have already zeroed out the memory, but that has not been documented. Other changes related to master_secret (ssl_save_session[_ticket]): - Initialize master_secret.data_len to 0 in ssl_session_init as the master_secret is unusable at that point. - Remove the hack that tests whether master_secret.data is non-empty. - Replace hardcoded master_secret length (48) from wmem_alloc0(). - Introduce macro for master secret length, use this in SslDecryptSession, for parsing from keyfile and converting pre-master secret to master secret (prf). - Use (master_secret + 1) to refer to the part after the struct rather than adding the size manually to a gchar-casted master_secret. Change-Id: Ie1ea448db54e828b904568224486147a3d962522 Reviewed-on: https://code.wireshark.org/review/3030 Reviewed-by: Peter Wu Reviewed-by: Alexis La Goutte commit fc983cf Author: Peter Wu Date: Mon Jul 14 00:04:18 2014 +0200 ssl,dtls: move Finished dissection to ssl-utils Change-Id: Ib4bd5712cb85cd2671f67fe035747b88d5b4f186 Reviewed-on: https://code.wireshark.org/review/3034 Reviewed-by: Peter Wu Reviewed-by: Hauke Mehrtens Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 73c1810 Author: Alexis La Goutte Date: Wed Jul 23 17:49:20 2014 +0200 MySQL: Add Client can handle expried passwords extended Capability Change-Id: I9464e7d188d8e8c027db94c214e692ff233a13fd Reviewed-on: https://code.wireshark.org/review/3178 Reviewed-by: Alexis La Goutte Tested-by: Alexis La Goutte Reviewed-by: Daniël van Eeden Reviewed-by: Evan Huus commit 5e3b044 Author: Peter Wu Date: Sun Jul 13 11:37:08 2014 +0200 ssl,dtls: move Session Ticket to ssl-utils Changes: - dtls: also support saving session tickets. - Drop the length check and let proto_tree_add_item throw exceptions on length errors. - Use proto_tree_add_item instead of proto_tree_add_uint. - Drop "TLS" from header field descriptions, the RFC does not name it as such and DTLS can also use it (a draft is in progress that extends DTLS with Session Tickets, draft-hummen-dtls-extended-session-resumption-01). Change-Id: I11195217368b7200821d11289b1c5870a1ffe637 Reviewed-on: https://code.wireshark.org/review/3029 Reviewed-by: Evan Huus commit 90e46f4 Author: Alexis La Goutte Date: Tue Jul 22 18:29:08 2014 +0200 Fix (-W)documentation error found by Clang Change-Id: I2d2bbc211e98ad24a27c855031f670b7bdbd530e Reviewed-on: https://code.wireshark.org/review/3162 Reviewed-by: Michael Mann Reviewed-by: Alexis La Goutte commit d610ef2 Author: Evan Huus Date: Wed Jul 23 13:47:02 2014 -0400 Add some #includes to satisfy check-abi Change-Id: I705268d327b7dd96ed86bfdc8d7fe7d968e3e541 Reviewed-on: https://code.wireshark.org/review/3181 Reviewed-by: Evan Huus commit ae64e09 Author: Evan Huus Date: Wed Jul 23 13:41:54 2014 -0400 Add cast to satisfy win7 buildbot I really don't understand why MSVC would make the result of this computation an int64 then complain about down-casting to an int16 when *all* of the participating variables are int16 or smaller... Change-Id: I2d9c27ac22b51b10e4872a6640881c8d0ec566e7 Reviewed-on: https://code.wireshark.org/review/3180 Reviewed-by: Evan Huus commit 057ded8 Author: Peter Wu Date: Sun Jul 13 01:04:13 2014 +0200 ssl-utils: stop exporting some symbols Client/Server hello and Hello extensions are now dissected inside ssl-utils, no need to export them for the SSL or DTLS dissectors. Change-Id: I8f2405199f21616743fe74959f07cfa839565527 Reviewed-on: https://code.wireshark.org/review/3022 Reviewed-by: Peter Wu Reviewed-by: Evan Huus commit ee231c5 Author: Peter Wu Date: Sat Jul 19 10:54:19 2014 +0200 ssl,dtls: move ClientHello to ssl-utils Changes to ClientHello dissection: - Move ssl_find_private_key (and its pre-req, ssl_set_server) outside ssl_dissect_hnd_cli_hello. It has not really something to do with dissection, but state tracking and decoder param feeding. - dtls: add expert info for bad cipher suites len. - ssl: remove bad cipher suites len text label which is also available as expert info. Attach expert info to a the length proto item (which is converted to use add_item instead of add_uint). - Remove `if (tree || ssl)` since expert info seems not to apply otherwise (this also needs changes in common and handshake dissection). - ssl: remove tvb_ensure_bytes_exist so we can dissect more compression methods and cipher suites. - Since DTLS has an additional Cookie field which TLS does not have, pass these additional header fields through a struct whose type is defined in ssl-utils. Change-Id: I41bef04c1c3353e582e30f561d1d246a744e1d60 Reviewed-on: https://code.wireshark.org/review/3021 Reviewed-by: Evan Huus commit aa09fea Author: Peter Wu Date: Sat Jul 19 11:12:49 2014 +0200 ssl,dtls: move ServerHello to ssl-utils Changes to ServerHello: - Get rid of session parameter as the SslDecryptSession already provides a reference to SslSession. Done for the new ssl_dissect_hnd_srv_hello and ssl_dissect_hnd_hello_ext functions. - No need to generate the keyring here, decryption is only needed after ChangeCipherSpec and the keyring will be generated there provided that there are enough params (cipher, version, master-secret, etc.) - Get rid of labels and goto in favor of if/else. - DTLS: SSL_HAVE_SESSION_KEY is implicitly set when ssl_generate_keyring_material succeeds, no need to set it. Remove it. - Remove `if (tree || ssl)` since expert info seems not to apply otherwise (this also needs changes in common and handshake dissection). (Expert info from the TLS extensions, not the ServerHello itself.) Other changes: - ClientHello: renamed some fields shared with ServerHello. Change-Id: I466b905d990489e03250bac97bf9d862ff82ce6c Reviewed-on: https://code.wireshark.org/review/3020 Reviewed-by: Evan Huus commit fbcfe6e Author: Florian Lohoff Date: Wed Jul 23 16:42:07 2014 +0200 Fix email address and product name in Redback dissector Change-Id: I777c164d24282a1de3082b33d5e89272a78bde6b Reviewed-on: https://code.wireshark.org/review/3177 Reviewed-by: Alexis La Goutte commit 822d0ca Author: Florian Lohoff Date: Wed Jul 23 16:41:43 2014 +0200 Add dissecting of IPv6 in Redback Smartedge Captures Change-Id: I028d294235a4e1d55096df8face48c4a74710506 Reviewed-on: https://code.wireshark.org/review/3176 Reviewed-by: Alexis La Goutte commit 26e4b94 Author: Florian Lohoff Date: Wed Jul 23 16:41:14 2014 +0200 Fix decoding of PPP frames from Redback Smartedge trace Change-Id: I2eed4da20bc1f87dc1c4a3a6357a8f5692893939 Reviewed-on: https://code.wireshark.org/review/3175 Reviewed-by: Alexis La Goutte commit ccbf373 Author: Michal Labedzki Date: Thu Jul 10 13:11:41 2014 +0200 Logcat: Add support for conversion from Exported PDU Exported PDU may contains (Binary) Logcat, so it is possible to "export" logcat binary from it. Change-Id: Ic6607126e739ea3972b46c2bf19f064597d4e970 Reviewed-on: https://code.wireshark.org/review/3001 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki Tested-by: Michal Labedzki commit a760a7d Author: Guy Harris Date: Wed Jul 23 02:08:11 2014 -0700 Clean up indentation (consistent two-space indentation). Change-Id: I90210a051f820e70b8b41e5376f881f812c9539f Reviewed-on: https://code.wireshark.org/review/3173 Reviewed-by: Guy Harris commit 397ce1f Author: Guy Harris Date: Tue Jul 22 16:59:46 2014 -0700 Clean up indentation (consistent 4-space indentation). Change-Id: I16062c173ed72af266ff3b3d36f2afb92a49c60c Reviewed-on: https://code.wireshark.org/review/3171 Reviewed-by: Guy Harris commit 4028f56 Author: Guy Harris Date: Tue Jul 22 16:55:58 2014 -0700 Clean up indentation (get rid of tabs). Change-Id: I14917737db30c80af2d40e40efd79ceb6aea79f8 Reviewed-on: https://code.wireshark.org/review/3170 Reviewed-by: Guy Harris commit f6ce0cd Author: Guy Harris Date: Tue Jul 22 16:53:18 2014 -0700 Get rid of NO_INTERFACES_FOUND - it's not an error. It just means "pcap didn't give me any interfaces, and didn't report an error". Hopefully, in the future, there will be pcap APIs that distinguish between the (admittedly unlikely, these days) case of "there really *are* no interfaces on which *anybody* can capture" and "you don't have sufficient permission to capture", and we can report the latter as an error. (Given that pcap supports more than just "regular interfaces", though, there are cases where you don't have permission to capture on those but you have permission to capture raw USB traffic, for example, so perhaps what's really needed is per-interface indications of permissions.) Change-Id: I7b8abb0829e8502f5259c95e8af31655f79d36a1 Reviewed-on: https://code.wireshark.org/review/3169 Reviewed-by: Guy Harris commit 4261109 Author: Guy Harris Date: Tue Jul 22 11:51:15 2014 -0700 Don't return an error string for NO_INTERFACES_FOUND. Most callers of capture_interface_list() don't expect an error string for NO_INTERFACES_FOUND, because that's not really an error, it's just a statement of face (and perhaps an error of 0 should be returned), so they don't bother freeing the error string, causing a leak. Instead, have the one place that *did* expect it to return an error string just put "No interfaces found" itself. Also, have that place not check for an error string if interfaces *were* found, as no error code or string is returned in that case. Change-Id: I9cb8ed7ad22810b23e2251d2833d9b7ab02eec03 Reviewed-on: https://code.wireshark.org/review/3165 Reviewed-by: Guy Harris commit 7bc24ed Author: Joerg Mayer Date: Tue Jul 22 08:00:30 2014 +0200 Add back a 'dummy' comment I removed with commit e91121e1435d97c92 Change-Id: Ia21dc80c8b942fbc1a85a8990354bdaaf9dc8210 Reviewed-on: https://code.wireshark.org/review/3161 Reviewed-by: Jörg Mayer commit 2029c41 Author: Graham Bloice Date: Tue Jul 22 13:31:57 2014 +0100 Fixed C++ style comment Change-Id: Ife56bb2849b4384c8ea6af3b3913b1a0fbe9ff9e Reviewed-on: https://code.wireshark.org/review/3160 Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice commit faf3261 Author: Patrice Fournier Date: Wed Jul 16 13:50:11 2014 -0400 Makes the RTP Player graphs work with GTK3 Change-Id: I91c689eb3a35f02f8fa4de64fb6e3337d42c9190 Partial-bug: 9891 Reviewed-on: https://code.wireshark.org/review/3090 Reviewed-by: Balint Reczey Tested-by: Balint Reczey commit 7dcb1d7 Author: Daniel van Eeden Date: Sun Jul 20 21:11:19 2014 +0200 Update MySQL Capability flags Change-Id: I62d0a26ec1c81efa2ee8dbefcbdb308155f64ad5 Reviewed-on: https://code.wireshark.org/review/3136 Reviewed-by: Evan Huus commit dacb1f6 Author: Marcel Essig Date: Mon Jul 21 15:26:33 2014 +0200 better visibility for vx11 Change-Id: I18d51e15eb38f28cc7333f0adb17fbfd22ba09a5 Reviewed-on: https://code.wireshark.org/review/3150 Reviewed-by: Evan Huus commit f229aed Author: Gerald Combs Date: Mon Jul 21 17:33:38 2014 -0700 Our users are not particpants in a comedy sketch. In way too many places in the GTK+ code we wait for the user to do something wrong, leap out from behind the bushes, yell "AHA!", and hit them in the face with a herring^W error dialog. We really need to not do that. We also shouldn't carry that behavior over to the Qt UI. If the user shouldn't press a button it should be disabled. Do so for the "Compile BPF" and "Start" buttons. Change-Id: Iad9c15951d5ae640ea82ca74d5f0c26e88bd2554 Reviewed-on: https://code.wireshark.org/review/3156 Reviewed-by: Gerald Combs commit fdff1b3 Author: Guy Harris Date: Mon Jul 21 17:15:31 2014 -0700 Don't connect to non-existent slots. (Run-time warning, not compile-time error, alas.) Change-Id: I002ca132d2c7cbc2cfd802438edb4509ff76bcbc Reviewed-on: https://code.wireshark.org/review/3155 Reviewed-by: Guy Harris commit c7a2c89 Author: Guy Harris Date: Mon Jul 21 16:30:31 2014 -0700 Rename ifListChanged to localInterfaceListChanged. That better indicates that it reflects changes to the list of local interfaces on the system, as supplied by libpcap/WinPcap, not to any other interface list we maintain, such as lists of remote interfaces, or the list of non-hidden interfaces. Change-Id: Idf79b365e07f2e3eaa83c105ae9cd7ace54c435e Reviewed-on: https://code.wireshark.org/review/3154 Reviewed-by: Guy Harris commit 59ef97d Author: Gerald Combs Date: Tue Apr 29 11:10:27 2014 -0400 [WIP] Add a conversation dialog. Items are sorted by value. Move common conversation code to ui/conversation_hash.[ch]. Add a conversation_type_e enum along with convenience functions for fetching titles, tap names, etc. We have a single main dialog instead of a main dialog + individual protocol dialogs. It de-clutters the statistics menu and results in simpler code. Conversation type tabs can be added and removed within the dialog itself. The tab list is sticky and saved with the current profile when the dialog closes. Data can be copied as CSV or YAML. Add a FilterAction class and a corresponding filterAction slot to MainWindow. Use it for the Conversations context menu. Add an addressResolutionChanged signal and related plumbing. Get rid of the iterator members in the conversation item struct. Update the GTK+ code accordingly. Excercise for the reader: - Update TShark to use the common hash code. Ping-Bug: 9231 Ping-Bug: 8703 Ping-Bug: 6727 Change-Id: I8728d771fc5b1a85937bed9d898e53c3ecc3a544 Reviewed-on: https://code.wireshark.org/review/2987 Reviewed-by: Michael Mann commit d81a34c Author: Guy Harris Date: Mon Jul 21 16:14:53 2014 -0700 Have the interface "tree" directly connect to ifListChanged. Then have the capture interfaces dialog connect only *its* code to update *its* list of interfaces to ifListChanged, rather than connecting a routine that then emits interfaceListChanged. This makes it the responsibility of each widget that displays local interfaces to connect to the ifListChanged signal. Change-Id: Iff8e8ca4202c8784eed58c8f05175d986a16baea Reviewed-on: https://code.wireshark.org/review/3153 Reviewed-by: Guy Harris commit 48986f4 Author: Guy Harris Date: Mon Jul 21 12:06:25 2014 -0700 Make the Qt version update displays when interfaces appear or disappear. Change-Id: If1218baaae9dcd93ddb1cea81ac5457f90a57c6c Reviewed-on: https://code.wireshark.org/review/3152 Reviewed-by: Guy Harris commit 16daf0c Author: Joerg Mayer Date: Mon Jul 21 20:33:22 2014 +0200 Add a warning that not all command line options are implemented Change-Id: If1b12fed6d04623a4265131a2ff666d4a937d382 Reviewed-on: https://code.wireshark.org/review/3151 Reviewed-by: Jörg Mayer commit 700a474 Author: Gerald Combs Date: Wed Jul 16 18:38:42 2014 -0700 Start converting the User's Guide to AsciiDoc. Convert the preface and introduction. Update various makefiles. Change-Id: Id998cabadb6de458f04b7a43bdba4f98e4edb052 Reviewed-on: https://code.wireshark.org/review/3139 Reviewed-by: Gerald Combs Tested-by: Gerald Combs commit d52f4d5 Author: Martin Kaiser Date: Mon Jul 21 11:58:08 2014 +0200 simplify the tree handling a bit Change-Id: I887000ac2bb273a0cc0c41709e346e1cf52140d9 Reviewed-on: https://code.wireshark.org/review/3149 Reviewed-by: Martin Kaiser commit bcf0ea3 Author: Martin Kaiser Date: Mon Jul 21 11:43:39 2014 +0200 display unused bytes as raw bytes not as ASCII string Change-Id: I50c1ef94aff4d1067b6561c5a06a397216e49ee2 Reviewed-on: https://code.wireshark.org/review/3148 Reviewed-by: Martin Kaiser commit 13288b0 Author: Daniël van Eeden Date: Sun Jul 20 21:30:54 2014 +0200 Add auth plugin to server greeting info Change-Id: I862203c9be0cd10c72599609631629bf976a7a22 Reviewed-on: https://code.wireshark.org/review/3137 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 56a2411 Author: Joerg Mayer Date: Mon Jul 21 03:11:42 2014 +0200 Remove tools/win32-setup.sh and tools/win64-setup.sh Change-Id: Ifdc57304a0109f60260dc73d95b0598ddca81805 Reviewed-on: https://code.wireshark.org/review/3146 Reviewed-by: Jörg Mayer commit 494092a Author: Joerg Mayer Date: Mon Jul 21 03:09:22 2014 +0200 One more place with win32-setup.sh -> win-setup.sh Change-Id: Id6738d06470da81dd18d0e80e474c9ca64169d03 Reviewed-on: https://code.wireshark.org/review/3145 Reviewed-by: Jörg Mayer commit 075ac2e Author: Joerg Mayer Date: Mon Jul 21 02:47:45 2014 +0200 Obsolete tools/winXX-setup.sh: - Move DOWNLOAD_TAG into config.nmake - Call win-setup.sh directly instead of winXX-setup.sh - TODO: Remove tools/winXX-setup.sh files Change-Id: Ie02b6b468b4f3007f5e2b6a8282e2e6cdf7d1a70 Reviewed-on: https://code.wireshark.org/review/3144 Reviewed-by: Jörg Mayer commit c90b642 Author: Joerg Mayer Date: Mon Jul 21 02:21:49 2014 +0200 Pass the download tag as an argument to win-setup.sh instead as an enviroment variable Change-Id: Id2369cec93b82f182bab9046469796f51115accb Reviewed-on: https://code.wireshark.org/review/3143 Reviewed-by: Jörg Mayer commit 622f06b Author: Joerg Mayer Date: Mon Jul 21 01:34:44 2014 +0200 WIRESHARK_TARGET_PLATFORM is only used inside --download code path: Use it only there. Update comments wrt DOWNLOAD_PREFIX Remove trailing / at end of DOWNLOAD_PREFIX Change-Id: Ia161d4226ff3d463bceaaf4e01de70b2db98bf3c Reviewed-on: https://code.wireshark.org/review/3142 Reviewed-by: Jörg Mayer commit e91121e Author: Joerg Mayer Date: Sun Jul 20 22:25:17 2014 +0200 Change a comment to be slightly easier to read Reorder code to have all toplevel code in 'main' Change-Id: Ia99830ce2ee6af46249f533d64a328d2da2ed9b8 Reviewed-on: https://code.wireshark.org/review/3141 Reviewed-by: Jörg Mayer commit a3f7d19 Author: Guy Harris Date: Sun Jul 20 15:13:56 2014 -0700 Get rid of #if 0'ed out includes of capture-pcap-util.h. Change-Id: Ie3678a08ed9b3d46b22e7c59eef74e6e9636ae59 Reviewed-on: https://code.wireshark.org/review/3140 Reviewed-by: Guy Harris commit 3a451a8 Author: Guy Harris Date: Sun Jul 20 12:18:31 2014 -0700 Add qtshark_ja_JP.qm to the list of .qm files we distribute. Change-Id: I95a724c196bd5730af96439f8854169166c59e7a Reviewed-on: https://code.wireshark.org/review/3135 Reviewed-by: Guy Harris commit b1532b2 Author: Martin Kaiser Date: Mon Jul 7 08:12:29 2014 +0200 start support for the Japanese language in the Qt version just the framework and some simple translations Change-Id: I7653a9c6ab26b391bfe2942d088d233996030576 Reviewed-on: https://code.wireshark.org/review/3134 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit bb53fba Author: Gerald Combs Date: Sun Jul 20 08:05:35 2014 -0700 [Automatic manuf, services and enterprise-numbers update for 2014-07-20] Change-Id: Idba0c6dc0329be1ad41e3c38139c9ed69b4e45e5 Reviewed-on: https://code.wireshark.org/review/3131 Reviewed-by: Gerald Combs commit 696cb6c Author: Роман Донченко Date: Sat Jul 12 18:59:56 2014 +0400 Use forward slashes in paths to runlex.sh This gets rid of "MS-DOS style path detected" warnings from Cygwin. Change-Id: Id10429669704aa371dbf56a9398947c8002260ad Reviewed-on: https://code.wireshark.org/review/3024 Reviewed-by: Evan Huus Petri-Dish: Graham Bloice Tested-by: Wireshark Buildbot Reviewed-by: Graham Bloice commit 320c4f0 Author: Steev Klimaszewski Date: Thu Jun 19 16:54:57 2014 -0500 va_list can't be NULL on ARM. Bug: 10209 Change-Id: Ibd63a530450b7d2d4ec244e91c77caa731ba63aa Signed-off-by: Steev Klimaszewski Signed-off-by: Balint Reczey Reviewed-on: https://code.wireshark.org/review/2464 Reviewed-by: Evan Huus Reviewed-by: Michael Mann commit 450f491 Author: Martin Kaiser Date: Wed Jul 16 19:55:35 2014 +0200 use proto_tree_add_item() Change-Id: I7642295721e886eef4682c602ad96b61bc85b3b6 Reviewed-on: https://code.wireshark.org/review/3128 Reviewed-by: Martin Kaiser commit ab2922b Author: Martin Kaiser Date: Wed Jul 16 15:04:09 2014 +0200 simplify APPEND_OUI_NAME Change-Id: I83aef5ebc92a7218f59bd77338058d98ffa2ed6b Reviewed-on: https://code.wireshark.org/review/3127 Reviewed-by: Martin Kaiser commit 18dfb13 Author: Martin Kaiser Date: Wed Jul 16 15:05:57 2014 +0200 remove the NULL check in APPEND_BOOLEAN_FLAG Change-Id: I15742ce73d3445ec47369d35dd0da6715b7079cf Reviewed-on: https://code.wireshark.org/review/3126 Reviewed-by: Martin Kaiser commit 65873a9 Author: Martin Kaiser Date: Wed Jul 16 14:36:22 2014 +0200 add editor modelines reformat Change-Id: Idce9d34c41ce2bcbc4d5efa4699decd7f3068199 Reviewed-on: https://code.wireshark.org/review/3125 Reviewed-by: Martin Kaiser commit 8e4ae89 Author: Martin Kaiser Date: Wed Jul 16 14:26:26 2014 +0200 simplify the tree handling a bit Change-Id: Ie6a9c033d2de3231f810a33b032ab06fee3f68a0 Reviewed-on: https://code.wireshark.org/review/3124 Reviewed-by: Martin Kaiser commit 3023911 Author: Martin Kaiser Date: Thu Jul 17 23:26:37 2014 +0200 fix bug 9100 object and package containers may have multiple entries Change-Id: I032e78057aadbbe67925d07881da9f1182a24058 Reviewed-on: https://code.wireshark.org/review/3121 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit c21a8a7 Author: Martin Kaiser Date: Wed Jul 16 11:37:11 2014 +0200 remove some more unnecessary initializations Change-Id: I74b082b7644f36efc3dc220ff92f1bfff524c408 Reviewed-on: https://code.wireshark.org/review/3119 Reviewed-by: Martin Kaiser commit 7d0ad3f Author: Martin Kaiser Date: Wed Jul 16 11:20:10 2014 +0200 no need to initialize these pointers Change-Id: I0791ca2fc9a7a87dafbdf15f51d9f1a9d12aa89e Reviewed-on: https://code.wireshark.org/review/3118 Reviewed-by: Martin Kaiser commit 6885cc7 Author: Martin Kaiser Date: Tue Jul 15 00:57:08 2014 +0200 use gboolean for detected_drop Change-Id: Ice0c68541604c5566cc807c17faf534cd6628262 Reviewed-on: https://code.wireshark.org/review/3117 Reviewed-by: Martin Kaiser commit 831c1f2 Author: Martin Kaiser Date: Fri Jul 18 16:02:56 2014 +0200 add H.265 stream type Change-Id: Ic8e17f949f245ad6fe26fb8078e0545fe5b35daa Reviewed-on: https://code.wireshark.org/review/3116 Reviewed-by: Martin Kaiser commit f724cae Author: Guy Harris Date: Sat Jul 19 00:23:37 2014 -0700 Only ABI-check strncasecmp.h if strncasecmp() is part of the API/ABI. Some routines Wireshark uses are present in some, but not all, platforms; for routines that would be used on all platforms, libwsutil provides its own implementations on platforms that lack them. On platforms that provide a routine, that routine will not be part of the API and ABI, and, if we do an API or ABI check using the header libwsutil provides to declare the function on platforms that lack it, we may have a collision between the declaration in our header and the declaration in a system header. There's no guarantee that we can make them match, as the declaration might differ from platform to platform and from platform version to platform version, so we simply leave the header file out of the check if we have the function on the platform on which we're checking the API or ABI. Change-Id: I8a23e63d9e17e5c1f5a83304dbe14d1e7df22e7e Reviewed-on: https://code.wireshark.org/review/3115 Reviewed-by: Guy Harris commit bf514a5 Author: Guy Harris Date: Fri Jul 18 23:37:39 2014 -0700 Add casts to squelch compiler warnings. Change-Id: I100ec30e1e9ac204e3c9225278adc8a26992542a Reviewed-on: https://code.wireshark.org/review/3114 Reviewed-by: Guy Harris commit 4a182d4 Author: Evan Huus Date: Fri Jul 18 21:16:03 2014 -0400 Revert part of 5cc2ab74af486611def7bcc14105c1a0257b41de nghttp2ver.h is a local header, so use "" not <> Change-Id: I62d1aebdc7c4b66035fccbba71ec9ca2edf1f07f Reviewed-on: https://code.wireshark.org/review/3112 Reviewed-by: Evan Huus commit 644c1d5 Author: Guy Harris Date: Fri Jul 18 17:55:07 2014 -0700 Add extern "C", to let this be used from C++. Change-Id: I3c7d89b7aef301b49f3358ffb9b637acb00f720b Reviewed-on: https://code.wireshark.org/review/3111 Reviewed-by: Guy Harris commit 5cc2ab7 Author: Alexis La Goutte Date: Fri Jul 18 21:30:59 2014 +0200 HTTP2: Update to nghttp2 lib 0.5.0 Change-Id: Ia63c066e482f633ef5096f2341d74de749422102 Reviewed-on: https://code.wireshark.org/review/3104 Reviewed-by: Evan Huus commit 4b72069 Author: Fabian Raetz Date: Fri Jul 18 13:50:05 2014 -0700 Fix install_desktop_files non-portability and add out-of-tree support. Prepend $(srcdir)/ to the sources in install commands, and get rid of the -T flag, as it's GNU coreutils install-specific; some versions of install don't support -T at all, and FreeBSD's install has a -T flag that takes an argument and has a completely different meaning. Fixes bug 10292; fix came from http://marc.info/?l=openbsd-ports&m=140571104528980&w=2 Change-Id: I8e80d475a728a17848736be043f97d2b90a0be82 Reviewed-on: https://code.wireshark.org/review/3107 Reviewed-by: Guy Harris commit e28a8ff Author: Michael Mann Date: Mon Jul 14 07:04:33 2014 -0400 Add some expert info to the MAC Control dissector Partial-bug: 6121 Change-Id: If7a367671cf55793799e0d72f8846bd6fe2a2222 Reviewed-on: https://code.wireshark.org/review/3038 Reviewed-by: Evan Huus commit deb1d8d Author: Pascal Quantin Date: Fri Jul 18 00:02:27 2014 +0200 WebSocket: increase max unmask payload size to 256K and indicate that packet is truncated is going above the new limit Bug: 10283 Change-Id: Iea5401d02bcf50a3427dce5f2b817c3b73a7dc11 Reviewed-on: https://code.wireshark.org/review/3098 Reviewed-by: Alexis La Goutte Reviewed-by: Evan Huus commit 23f2571 Author: Alexis La Goutte Date: Fri Jul 18 14:28:01 2014 +0200 DNS: Add new opcode EDNS EXPIRE (9) for EDNS options (RFC7314) Change-Id: I2db7bf6a80a34540aa90a3362566ac399b1c3644 Reviewed-on: https://code.wireshark.org/review/3101 Reviewed-by: Evan Huus commit 01359be Author: Kevin Cox Date: Fri Jul 18 11:25:53 2014 -0400 Add better assertions for comparing integers. Adds DISSECTOR_ASSERT_CMPINT() family of assertions which show the value of each side of the comparison upon failure. Change-Id: Ie6f2ba46d62fc864c08eb432c403fab8f1932d91 Reviewed-on: https://code.wireshark.org/review/3103 Reviewed-by: Guy Harris Reviewed-by: Evan Huus commit 4a8b688 Author: AndersBroman Date: Fri Jul 18 10:51:04 2014 +0200 Add casts to make the buildbot happy. Change-Id: Ia77b86c83a6458210f913a691b707b7aa1b911d7 Reviewed-on: https://code.wireshark.org/review/3100 Reviewed-by: Anders Broman commit 7c3652d Author: David Ameiss Date: Thu Jul 10 10:11:23 2014 -0500 Split LBMR tap into 5 separate taps. Make the associated tap data use fixed-length fields. The idea is to allow user-written tap listeners easier access to the tap data. Also correct the conditions (in packet-lbmc.c) under which a subdissector would be called, if present. Change-Id: I5244cfbd17314058f7d3b9f42d647e0e6c375e14 Reviewed-on: https://code.wireshark.org/review/3007 Reviewed-by: Evan Huus Petri-Dish: Anders Broman Reviewed-by: Anders Broman commit e95083d Author: Matthieu Texier Date: Thu Jul 10 23:14:42 2014 +0200 Support of draft-ietf-idr-flow-spec-v6 and some cosmetic improvments Change-Id: Ieaf23c84d67ccdfdcb167afb382c86797bc1cd2b Reviewed-on: https://code.wireshark.org/review/3006 Reviewed-by: Evan Huus Petri-Dish: Anders Broman Reviewed-by: Anders Broman commit 1d079fd Author: Hauke Mehrtens Date: Sat Jul 12 13:45:32 2014 +0200 ssl-utils: change some references from ietf drafts to rfcs Change-Id: I41a93a2818228ff6e5f005df5135996e687498af Signed-off-by: Hauke Mehrtens Reviewed-on: https://code.wireshark.org/review/3097 Reviewed-by: Evan Huus commit 3e7ed3d Author: Michael Tüxen Date: Thu Jul 17 20:50:59 2014 +0200 Escape some characters like \n when appending text This patch escapes some characters like \n when showing text contained in a packet by appending it to a protocol item. Change-Id: Ice0040040ec7ab573dd9a412f8c0c197a566a031 Reviewed-on: https://code.wireshark.org/review/3095 Petri-Dish: Michael Tüxen Reviewed-by: Michael Tüxen commit e05a884 Author: Gerald Combs Date: Thu Jul 17 15:10:53 2014 -0700 Try to make tap operations in the Qt UI more responsive. Add single-shot timers to ramp up the tap update interval and update taps when we finish reading the capture file. Change-Id: Ia1694b47ffd2705b6a06aa50c21e675a64aefeac Reviewed-on: https://code.wireshark.org/review/3099 Reviewed-by: Gerald Combs commit b744f0e Author: AndersBroman Date: Thu Jul 17 18:05:11 2014 +0200 Add an Application Id. Change-Id: I239560637fb61a22cd4ef4700aeb28c82659a805 Reviewed-on: https://code.wireshark.org/review/3093 Reviewed-by: Anders Broman commit ed043d7 Author: Graham Bloice Date: Thu Jul 17 16:42:14 2014 +0100 When DNP3 heuristics are disabled, relax the conditions on accepting a packet as DNP3. Bug: 10287 Change-Id: I222ec885186447c8a72eaf11cebacff8b9b79fad Reviewed-on: https://code.wireshark.org/review/3092 Reviewed-by: Graham Bloice commit 1b8c4ba Author: Tatsuhiro Tsujikawa Date: Wed Jul 16 22:41:27 2014 +0900 Fix assertion error when no header field was decompressed bug: 10279 Change-Id: Ibf88b1622318692ccf3904aede5d964e6028bdc7 Reviewed-on: https://code.wireshark.org/review/3087 Reviewed-by: Pascal Quantin commit 09cb981 Author: Jim Young Date: Thu Jul 10 04:32:06 2014 -0400 Fix regression related to OSPF related enum order definitions bug: 10271 Change-Id: Id2de856104d7506583e94893501cff23de3ec212 Reviewed-on: https://code.wireshark.org/review/2976 Reviewed-by: Michael Mann commit 024c002 Author: Alexis La Goutte Date: Tue Jul 15 09:03:59 2014 +0200 TLS: Update to the final RFC (7301) for ALPN Change-Id: I16b3f6ec7cc4d356a6cb6090866691ddd2e708b6 Reviewed-on: https://code.wireshark.org/review/3056 Reviewed-by: Anders Broman commit 2dad308 Author: Guy Harris Date: Tue Jul 15 20:41:00 2014 -0700 Reflect the move of the buffer_ routines to libwsutil. We went with the whole WS_DLL_EXPORT thing so that we don't *have* to maintain lists of exported symbols; is there truly no way to automate the generation of *these* files? Change-Id: I77f240c77782ed634e4620833f951c4a02fb4390 Reviewed-on: https://code.wireshark.org/review/3083 Reviewed-by: Guy Harris commit 0e0d01d Author: Guy Harris Date: Tue Jul 15 19:28:12 2014 -0700 Allow the interface monitor routines to be called from C++. Change-Id: I2ae60c1b015a432f5df36bd623f1a4c69b02bef1 Reviewed-on: https://code.wireshark.org/review/3081 Reviewed-by: Guy Harris commit 4d71fb7 Author: Evan Huus Date: Tue Jul 15 22:00:27 2014 -0400 Mark unused parameter as such Change-Id: I6a7fa5943957712fbd9e4801702a57dbb2d21b81 Reviewed-on: https://code.wireshark.org/review/3079 Reviewed-by: Evan Huus commit 1387f54 Author: Evan Huus Date: Tue Jul 15 21:56:55 2014 -0400 Check for __func__ in checkAPIs.pl Change-Id: I649c69cbf545a8de32d9142c1156db6adb076b63 Reviewed-on: https://code.wireshark.org/review/3078 Reviewed-by: Evan Huus commit d8cff57 Author: Michael Mann Date: Fri Jun 20 02:47:03 2014 -0400 Allow expert info to show only items in the display filter. This was started by Chris Maynard before Qt was announced and I just polished it off for inclusion in GTK version of Wireshark. This also can be used as input into the Qt version of the Expert Info "dialog" since it hasn't been written yet. Personally I like the "template" the Qt statistics dialog has with the display filter built it. I think that would work well for the Expert Info dialog as well. bug:1860 Change-Id: Icaada6e7900f22b0a3d97c2a5656edfd8d8c8b7f Reviewed-on: https://code.wireshark.org/review/3035 Reviewed-by: Christopher Maynard Reviewed-by: Michael Mann commit fae3615 Author: Guy Harris Date: Tue Jul 15 18:26:46 2014 -0700 Move the monitor-for-interface-list-changes stuff to the caputils library. Change-Id: Ie0d4504688602c2aa8e9788643b079930ca7d305 Reviewed-on: https://code.wireshark.org/review/3076 Reviewed-by: Guy Harris commit bd30abf Author: Guy Harris Date: Tue Jul 15 18:10:22 2014 -0700 The plural is "PDUs", not "PDU:s". Change-Id: I4bef734ef17b02e254b742744e2debd3038e98a0 Reviewed-on: https://code.wireshark.org/review/3074 Reviewed-by: Guy Harris commit f862eaa Author: Guy Harris Date: Tue Jul 15 17:56:24 2014 -0700 "Export PDUs to File" pops up a dialog, so put "..." after it. Also, capitalize "File" in the GTK+ version (it's already capitalized in the Qt version). Change-Id: I27eb27022930b1c0e0321cd1a1446c3b9dc1bd17 Reviewed-on: https://code.wireshark.org/review/3072 Reviewed-by: Guy Harris commit b720f08 Author: Guy Harris Date: Tue Jul 15 17:23:26 2014 -0700 Don't use __func__, use G_STRFUNC. Not all compilers we use support __func__. Change-Id: I61194e1073c87e67f821e14698ea21b73d63983c Reviewed-on: https://code.wireshark.org/review/3071 Reviewed-by: Guy Harris commit 28971b2 Author: Guy Harris Date: Tue Jul 15 17:14:11 2014 -0700 Squelch a warning. In at least some versions of GLib, g_array_free() warns if passed a null pointer, rather than just silently returning. Change-Id: I1bfc0a81faa1eeebe288f6e0cc58ebfb64784958 Reviewed-on: https://code.wireshark.org/review/3068 Reviewed-by: Guy Harris commit d4dab16 Author: Guy Harris Date: Tue Jul 15 16:40:46 2014 -0700 Only one buffer.c, please. Otherwise, if you link with both libwiretap and libfiletap, it's anybody's guess which one you get. That means you're wasting memory with two copies of its routines if they're identical, and means surprising behavior if they're not (which showed up when I was debugging a double-free crash - fixing libwiretap's buffer_free() didn't fix the problem, because Wireshark happened to be calling libfiletap' unfixed buffer_free()). There's nothing *tap-specific about Buffers, anyway, so it really belongs in wsutil. Change-Id: I91537e46917e91277981f8f3365a2c0873152870 Reviewed-on: https://code.wireshark.org/review/3066 Reviewed-by: Guy Harris commit 61ac815 Author: Guy Harris Date: Tue Jul 15 16:28:11 2014 -0700 No more README.irix. Change-Id: I3c906451549d28040f1068356bf7e62bff9cd92a Reviewed-on: https://code.wireshark.org/review/3065 Reviewed-by: Guy Harris commit 7344cfc Author: Guy Harris Date: Tue Jul 15 16:22:34 2014 -0700 Have buffer_free() null out the buffer data pointer. That prevents some double-free issues (I got one when doing non-"Update list of packets in real time" captures, if I do one such capture and then another one). Change-Id: Ia08034d9d1640bad21b74960efade8926dbfc5de Reviewed-on: https://code.wireshark.org/review/3063 Reviewed-by: Guy Harris commit 2c772e3 Author: Peter Wu Date: Sat Jul 12 00:30:12 2014 +0200 ssl: move decoder init from ClientKeyExchange to ChangeCipherSpec My previous change removed master-key retrieval in the Server Hello. This broke decryption when ClientKeyExchange is missing. That was done because decryption is only needed after ChangeCipherSpec. This patch moves the remaining initialization in ClientKeyExchange to ChangeCipherSpec. In theory this could fix decryption of DTLS traffic when an abbreviated handshake is used (and thus keyring material is never generated in ClientKeyExchange since it is not called). It also avoids saving a session ticket with an empty key which can happen when no RSA key is present, but the NewSessionTicket message is received. This could lead to garbage decryption. Change-Id: If0f475232c270b1d7b006c1f9af0e8d8098c6b65 Reviewed-on: https://code.wireshark.org/review/3019 Reviewed-by: Hauke Mehrtens Reviewed-by: Evan Huus commit aecbb98 Author: Peter Wu Date: Sun Jul 13 13:21:41 2014 +0200 ssl: unify common Hello dissection to ssl-utils Based on DTLS code with changes merged from SSL. Changes: - Ignore large Session IDs, this was not harmful though since the backing storage was 256 bytes in size. - {ssl,dtls}.handshake.random: fixed description, it is not used like a SSLv2 random challenge. - dtls: also debug print client/server for random - SSL: the common dissector now returns an offset rather than dissected length. - dtls: display actual Session ID bytes in the UI rather than the text "Session ID (32 bytes)". The length field is already visible in the preceding field. Also changed is the handling of key material generation. The SSL dissector previously generated key material based on the Session ID, Session Ticket or a key logfile. (DTLS did not have this functionality.) As decryption is needed only after ChangeCipherSpec, I have removed it from the ServerHello handling. This will break decryption when a ClientKeyExchange message is missing, but it will be restored proper in a next patch. (By the way, there was an inverted if-condition bug in DTLS that could break decryption by not restoring the master key matching a SID. This is gone in the refactoring because the faulty code is removed.) Change-Id: Ida3de88adefe3f7691f85936c496977426c4d96e Reviewed-on: https://code.wireshark.org/review/3018 Reviewed-by: Peter Wu Reviewed-by: Hauke Mehrtens Reviewed-by: Evan Huus commit 8982e87 Author: Joerg Mayer Date: Sat Jul 12 22:06:25 2014 +0200 Looks like this file is completely outdated - at least the problems it mentions are. Change-Id: Idc8fd36bc605c9b79019285e1a259fa545cf72b5 Reviewed-on: https://code.wireshark.org/review/3026 Reviewed-by: Jörg Mayer Reviewed-by: Guy Harris Reviewed-by: Evan Huus commit 36548d7 Author: Alexis La Goutte Date: Tue Jul 15 08:52:31 2014 +0200 Fix Argument with 'nonnull' attribute passed null found by Clang Change-Id: I48f488a75f53d077a213f7b9379960985ce3bf08 Reviewed-on: https://code.wireshark.org/review/3055 Reviewed-by: Evan Huus commit aebce0b Author: Alexis La Goutte Date: Tue Jul 15 16:50:32 2014 +0200 HTTP2: Fix double free Found by Clang Analyzer Backport from https://github.com/tatsuhiro-t/nghttp2/commit/62423f5949001c375c8e325296c74c92d1be0965 Signed-off-by: Tatsuhiro Tsujikawa Change-Id: Ic70f74b55ab80ca0b8d5042f07a29c9d14af4fe2 Reviewed-on: https://code.wireshark.org/review/3058 Reviewed-by: Evan Huus commit 91f627b Author: Sean O. Stalley Date: Mon Jul 7 11:38:45 2014 -0700 MAUSB dissection of control transfer responses The MAUSB dissector can now dissect transfer responses for control endpoints. Change-Id: Ic488ccb308365d072bbbf0eaf128b198caf74eca Reviewed-on: https://code.wireshark.org/review/2960 Reviewed-by: Evan Huus commit 9335faa Author: Sean O. Stalley Date: Mon Jul 7 10:28:24 2014 -0700 Moved USB Setup Response Dissection into own function USB Setup Responses are now dissected in their own function. Before they were dissected inline in the usb_dissect_common() function. (just copied code). Also replaced proto_tree_add_text() with proto_tree_add_item() for generic setup response data. Change-Id: Ia3943334cccc0a1813e0c906196307f99561ad21 Reviewed-on: https://code.wireshark.org/review/2959 Reviewed-by: Evan Huus commit b33f777 Author: Alexis La Goutte Date: Tue Jul 15 08:47:40 2014 +0200 Fix Dereference of null pointer found by Clang analyzer Change-Id: I3e84e987ad26019d7536baf4d90d6b0c684f6ec1 Reviewed-on: https://code.wireshark.org/review/3054 Reviewed-by: Evan Huus commit 53f597d Author: Alexis La Goutte Date: Tue Jul 15 08:44:36 2014 +0200 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I908e08e491bae6c7532e02269d8ed004ad0cee91 Reviewed-on: https://code.wireshark.org/review/3053 Reviewed-by: Evan Huus commit ef1b11f Author: Alexis La Goutte Date: Tue Jul 15 08:41:57 2014 +0200 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I17dc2259e039586b9a06944bd1c2b552dd23855d Reviewed-on: https://code.wireshark.org/review/3052 Reviewed-by: Evan Huus commit f9f6fa7 Author: Guy Harris Date: Tue Jul 15 15:48:29 2014 -0700 Get rid of cf_reset_state() - it's only called from one place. Change-Id: I48521bbaa898c99286e6bb5e40281aba7701ed4d Reviewed-on: https://code.wireshark.org/review/3062 Reviewed-by: Guy Harris commit 9d43634 Author: Guy Harris Date: Tue Jul 15 13:54:54 2014 -0700 Make the state variable an enum, and add a case for the IN_SKIP value. Also indicate what the states mean. Change-Id: Ie1701bb2fb33334bcd66d325d1368c2a15cbb7e8 Reviewed-on: https://code.wireshark.org/review/3061 Reviewed-by: Guy Harris commit 9ba0a18 Author: Graham Bloice Date: Wed Jul 9 14:39:41 2014 +0100 Fix up library names when using CMake on Windows Change-Id: I3573e69eb54044bb915161756dbb8f18cc769061 Reviewed-on: https://code.wireshark.org/review/2957 Reviewed-by: Graham Bloice commit 4800894 Author: Guy Harris Date: Tue Jul 15 13:15:27 2014 -0700 Cleanup the "export PDU" common code. exp_pdu_file_open() isn't used outside ui/tap_export_pdu.c; make it static. do_export_pdu() isn't a tap routine, it's called *from* tap routines, so its last argument doesn't need to be a generic pointer; its last argument must be a pointer to an exp_pdu_t, so declare it as such. Clean up comments while we're at it. Change-Id: Iab51b54a0c272052d7876110a095f2fff66fa2c1 Reviewed-on: https://code.wireshark.org/review/3060 Reviewed-by: Guy Harris commit 52a4f3d Author: Guy Harris Date: Mon Jul 14 16:48:10 2014 -0700 Add application/atom+xml as an XML document type. Change-Id: I9fcf438f3cafcb3ab3a5b6dc0f72ed2561e5a94f Reviewed-on: https://code.wireshark.org/review/3049 Reviewed-by: Guy Harris commit 06e9b20 Author: Guy Harris Date: Mon Jul 14 12:14:46 2014 -0700 Treat CR-LF at the end of a line like LF. That way, if we're reading a Windows-format file on UN*X, we handle it the same way we'd handle a UN*X-format file. This handles bug 10272 for the cfilter and dfilter file; there are other configuration files that may need code changes as well. While we're at it, don't hand non-ASCII characters to isspace(). Change-Id: I4f5efeaa938bcb2d85737ab136c3ca19ea1ddb5b Reviewed-on: https://code.wireshark.org/review/3045 Reviewed-by: Guy Harris commit 338369e Author: Guy Harris Date: Mon Jul 14 11:26:24 2014 -0700 Treat CR-LF at the end of a line like LF. That way, if we're reading a Windows-format file on UN*X, we handle it the same way we'd handle a UN*X-format file. This handles bug 10272 for the preference file and the "recent" files; there are other configuration files that may need code changes as well. Change-Id: Iec15a8fac276929ce8b53ae16070e9f2855f574c Reviewed-on: https://code.wireshark.org/review/3042 Reviewed-by: Guy Harris commit e11db2e Author: Graham Bloice Date: Mon Jul 14 15:22:53 2014 +0100 Rename parameter if_index to stop clang warning: capture_opts.c:1017:61: error: declaration of 'index' shadows a global declaration [-Werror=shadow] Change-Id: Ie409b4fa7abeb85e460bea398735cdc98d9034b1 Reviewed-on: https://code.wireshark.org/review/3041 Reviewed-by: Graham Bloice commit 5607620 Author: Graham Bloice Date: Mon Jul 14 15:00:02 2014 +0100 Fix buildbot issues with commit f8f3239bb03487de1844ab0f6df0ba693322ce4b from change 3016. Change-Id: I67363462f1c4e1ca69695573892692c458c620c6 Reviewed-on: https://code.wireshark.org/review/3040 Reviewed-by: Graham Bloice commit f8f3239 Author: Martin Mathieson Date: Fri Jul 11 23:49:40 2014 +0100 Add default ciphering and integrity algorithms to use for when control messages are not available, e.g. when handing in to a target cell. Change-Id: I35830fe04df5e5778c15cdb782982b2fbcda67ea Reviewed-on: https://code.wireshark.org/review/3016 Reviewed-by: Evan Huus Reviewed-by: Martin Mathieson commit 082b46f Author: Gerald Combs Date: Sun Jul 13 08:05:27 2014 -0700 [Automatic manuf, services and enterprise-numbers update for 2014-07-13] Change-Id: I2aa66d261040f9f3e86103c820c914c371a70d1f Reviewed-on: https://code.wireshark.org/review/3031 Reviewed-by: Gerald Combs commit f85b52b Author: Роман Донченко Date: Sat Jul 12 22:19:57 2014 +0400 proto_register_zbee_zcl_appl_evtalt: correct formatting The original formatting, besides looking silly, also prevents the function from being picked up by make-dissector-reg. Change-Id: I06e37b0e862064275b07976295eca8f0288a0974 Reviewed-on: https://code.wireshark.org/review/3025 Reviewed-by: Anders Broman commit 87895d7 Author: Joerg Mayer Date: Sat Jul 12 16:31:13 2014 +0200 Remove some $Id$ lines Change-Id: Idec3769750f5a433b184e6e9fb44cbad23a29c60 Reviewed-on: https://code.wireshark.org/review/3023 Reviewed-by: Jörg Mayer commit 55733ea Author: Martin Kaiser Date: Fri Jul 4 18:18:07 2014 -0400 fix scan_local_interfaces() when we delete an interface from all_ifaces, delete it from ifaces as well remove its selected status if it was selected at the moment, an interface that was used for capturing before will never be removed from the list of interfaces even if it becomes unavailable as it remains in ifaces and will be re-added to all_ifaces in scan_local_interfaces() new helper function capture_opts_del_iface() to delete an entry from ifaces and free all its components Change-Id: Ie3271a7ed086367e511d3a971f3b68cfc014115d Reviewed-on: https://code.wireshark.org/review/2965 Reviewed-by: Evan Huus commit 5fda232 Author: Evan Huus Date: Sun Jul 6 12:22:03 2014 -0400 make unit-test suite work out-of-tree Change-Id: I638015a9b55712bb6843d6756c9c55915e142372 Reviewed-on: https://code.wireshark.org/review/2893 Reviewed-by: Peter Wu Reviewed-by: Evan Huus commit 9e5e43b Author: Peter Wu Date: Fri Jul 11 10:40:47 2014 +0200 dtls: fix faulty offsets and tvbuff references This could lead to problems for fragmented DTLS packets. Change-Id: I602c7e181ea3799a4a2e7bcfed05bfbb129f7df4 Reviewed-on: https://code.wireshark.org/review/3017 Reviewed-by: Peter Wu Reviewed-by: Evan Huus commit ea4b2f4 Author: Petr Štetiar Date: Thu Jul 10 13:08:34 2014 +0200 dissectors/llrp: Add support for Impinj's Hub extension Based on Impinj extension schema v1.4. Change-Id: Ica9493a4527ae800d6e5daaf2d86b8cfdf479ed1 Signed-off-by: Petr Štetiar Reviewed-on: https://code.wireshark.org/review/2981 Reviewed-by: Alexis La Goutte Tested-by: Alexis La Goutte Reviewed-by: Evan Huus commit 6b898e6 Author: Gerald Combs Date: Fri Jul 11 15:21:04 2014 -0700 Add back -Qunused-arguments for Clang++. When used with ccache it can result in warnings as described at http://petereisentraut.blogspot.com/2011/05/ccache-and-clang.html. Change-Id: Ibca4fd262ec8d1f16a450b1698ead10f57d52b06 Reviewed-on: https://code.wireshark.org/review/3015 Reviewed-by: Gerald Combs commit 8044097 Author: Graham Bloice Date: Fri Jul 11 22:30:25 2014 +0100 Fix the x64 builds after the commit:b3b1f7c3aa2233a147294bad833b748d38fba84d From Change: 2803 Change-Id: Ic57fb0e3c1e0450561aebe48a873a3fdb2e8e105 Reviewed-on: https://code.wireshark.org/review/3014 Reviewed-by: Graham Bloice commit e2038e0 Author: Gerald Combs Date: Fri Jul 11 14:01:26 2014 -0700 Add strlen casts. Change-Id: Icaf80f060c476dd7259c04c4cce4123025ef1dab Reviewed-on: https://code.wireshark.org/review/3012 Reviewed-by: Gerald Combs commit d1d88f5 Author: Gerald Combs Date: Wed Jul 9 10:50:51 2014 -0700 Add plumbing for stat commands ("-z ..."). Trigger dialog creation by passing a method name to QMetaObject::invokeMethod. I'm not entirely sure this is sane but it seems to work OK. Move getopt processing further down in the main initialization sequence to more closely match GTK+ and allow for stat command registration. Change-Id: I5cd5375fa71dbadac69d528b2ba3bb13598dc3f6 Reviewed-on: https://code.wireshark.org/review/2964 Reviewed-by: Gerald Combs commit 14f9434 Author: Bill Meier Date: Fri Jul 11 15:53:22 2014 -0400 Remove $Id$ Change-Id: Iae71c6e65000471f251717a172c5f4b812ac1bd3 Reviewed-on: https://code.wireshark.org/review/3011 Reviewed-by: Bill Meier commit 826bca0 Author: Pascal Quantin Date: Fri Jul 11 19:49:46 2014 +0200 GTP: allow empty Data Record Packet IE Bug: 10277 Change-Id: I4edf330fa1c44a52d985d70555c7756954fb9364 Reviewed-on: https://code.wireshark.org/review/3008 Reviewed-by: Pascal Quantin commit b3b1f7c Author: Peter Wu Date: Thu Jul 3 11:23:19 2014 +0200 logcat: improve (crash) robustness, improve names The logcat version detector would crash with ASAN enabled because it did not validate the payload length and hence a payload length of 0 would trigger out-of-bounds access. (This happened on non-logcat data.) This patch tries to get rid of all magic numbers by using a structure, improves the version detector to validate the payload length and prevents crashes due to missing nul-terminators in the input. Older Android kernels would create entries with __pad with random contents, so that cannot be used to determine version for v1. Instead, use heuristics on the priority, tag and maybe the msg field. Furthermore, Android is mostly (if not, always?) Little-Endian, so add conversions where necessary (just in case WS supports BE arches). "microseconds" has been renamed to "milliseconds" because that is what they are, actually. A duplicate logcat_log loop has been refactored such that one loop is sufficient, instead of separate buffers for each log part, a single one is now used. get_priority does not really need a pointer, just make it accept a character. The output has been validated against v1 and v2 logcat binary formats with __pad (hdr_size) equal to 0, and on attachment 9906. Change-Id: I46c8813e76fe705b293ffdee85b4c1bfff7d8362 Reviewed-on: https://code.wireshark.org/review/2803 Reviewed-by: Michal Labedzki Tested-by: Michal Labedzki commit aa0eb59 Author: Michael Mann Date: Fri Jul 11 03:19:08 2014 -0400 Restore some assignments of ti2 that were removed in the proto_tree_add_subtree[_format] conversion bug:10270 Change-Id: I40062065add1c6a08bdabc9dcbbe53afaafca035 Reviewed-on: https://code.wireshark.org/review/2997 Reviewed-by: Anders Broman commit 423b531 Author: AndersBroman Date: Fri Jul 11 09:34:38 2014 +0200 Try to fix the build. Change-Id: I06e813db6af41d9fa4effcf2b23cf91d72c8c0ec Reviewed-on: https://code.wireshark.org/review/2998 Reviewed-by: Anders Broman commit bc8e095 Author: Anish Bhatt Date: Thu Jul 10 20:41:15 2014 -0700 Update to fix for Bug 6302. There is no need to check block constraints as min length already guarantees this, this also fixes false positives for missing TOS metric blocks Change-Id: Icbe3067d2506fad1c7dbcb175d932a5f242fa5cd Signed-off-by: Anish Bhatt Reviewed-on: https://code.wireshark.org/review/2995 Reviewed-by: Anders Broman commit 71ebdb6 Author: Peter Wu Date: Fri Jul 11 00:58:35 2014 +0200 ssl: move CertificateRequest to ssl-utils Except for field/expert_info names, a redundant subtree assignment, a different !tree check, a type confusion in DTLS (proto_tree *ti), a check against a different DTLS/TLS version and a (void) retval cast, the functions are exactly the same. Extract them to ssl-utils. Change-Id: I2ca7089fe2cd23212ef78656506cb53768f55927 Reviewed-on: https://code.wireshark.org/review/2986 Reviewed-by: Anders Broman commit ba6d2e7 Author: Peter Wu Date: Fri Jul 11 00:35:04 2014 +0200 ssl: move Certificate handshake dissection to ssl-utils There are no dissection differences between DTLS and SSL, so move to ssl-utils. While at it, skip dissection when the tree is NULL, remove the plural from certificates length (the length is always larger than ome), fix type of "ti" for dtls, get rid of "failsafe" subtree assignment in ssl, get rid of tvb_ensure_bytes_exist in ssl. Unrelated changes: fix param (tvb vs sub_tvb) for DTLS KeyExchange handshake messages. Change-Id: Iecaa45a7a601e55a52aa16180cf219a122fbe95a Reviewed-on: https://code.wireshark.org/review/2985 Reviewed-by: Anders Broman commit 7248c24 Author: Peter Wu Date: Thu Jul 10 11:50:23 2014 +0200 ssl: add missing valid handshake types The DTLS dissector duplicated a handshake types check, this has been eliminated. Convert HandshakeType and ContentType to enums to get the benefit of compiler-checked switch cases. Move these checks to ssl-utils. Two default cases could never be reached since the dissector returns immediately on an invalid ContentType. Also fixed misleading debugging messages. Change-Id: I07a2062564e073004dcc0401cd82538e5659fa0c Reviewed-on: https://code.wireshark.org/review/2978 Reviewed-by: Alexis La Goutte Reviewed-by: Anders Broman commit c7b45d0 Author: Irene Ruengeler Date: Wed Jul 9 13:50:11 2014 +0200 GTK Remote Capturing Move the GTK files necessary for managing the recnet remote host from capture_dlg.c to recent.c in order to use them in QT, too. Change-Id: I3f3fd31ce928162de08c6db7309ef2a9b1e97760 Reviewed-on: https://code.wireshark.org/review/2955 Reviewed-by: Anders Broman commit 9ed99d5 Author: Bill Meier Date: Thu Jul 10 23:11:25 2014 -0400 Strip some trailing whitespace; Fix some indentation; Add editor-modelines as needed. Change-Id: I943153e28f468070d86535abad7be032e1386118 Reviewed-on: https://code.wireshark.org/review/2994 Reviewed-by: Bill Meier commit d96ff60 Author: Guy Harris Date: Thu Jul 10 17:44:10 2014 -0700 As opposed to *loudly* silently? Change-Id: I5c6843ac2c665a4c8c8822084377fee661405d34 Reviewed-on: https://code.wireshark.org/review/2992 Reviewed-by: Guy Harris commit 2585e6c Author: Guy Harris Date: Thu Jul 10 17:42:37 2014 -0700 Change comments to reflect current reality. Change-Id: If4e220457d2040eaa35dd5e55a0f43fc9da5e347 Reviewed-on: https://code.wireshark.org/review/2991 Reviewed-by: Guy Harris commit b5d4128 Author: Guy Harris Date: Thu Jul 10 17:27:49 2014 -0700 Avoid sign-extending bytes before handing them to macros. Pointed out by the Visual Studio code analyzer. Change-Id: Idd429b4d0fb3db11ce171c3a5b38bdc55cc53c15 Reviewed-on: https://code.wireshark.org/review/2988 Reviewed-by: Guy Harris commit 96f0585 Author: AndersBroman Date: Thu Jul 10 16:44:53 2014 +0200 Quick fix to handle IEPS token. Fix deorecated APIs Change-Id: Iad1f970b553f1655109b36364a1d37676582f608 Reviewed-on: https://code.wireshark.org/review/2984 Reviewed-by: Anders Broman commit a7fb1e5 Author: Alexis La Goutte Date: Thu Jul 10 14:33:45 2014 +0200 Fix Uninitialized argument value found by Clang Analyzer Change-Id: I3cdb7734302b3e879def71dfa48c4654999ae9d2 Reviewed-on: https://code.wireshark.org/review/2983 Reviewed-by: Anders Broman commit 09785b3 Author: AndersBroman Date: Thu Jul 10 13:21:54 2014 +0200 I don't see the point of inserting p_proto_data sorted use g_slist_prepend(). While there fix deprecated API. Change-Id: Id5241348927d904d859530fac3f43f2b301a1acb Reviewed-on: https://code.wireshark.org/review/2982 Reviewed-by: Anders Broman commit 4e64448 Author: Graham Bloice Date: Thu Jul 10 12:42:52 2014 +0100 Fix a small typo in the FindChocolatey.cmake module Change-Id: Idefea86a9f65f59432db4bf32b9f702298409cdb Reviewed-on: https://code.wireshark.org/review/2980 Reviewed-by: Graham Bloice commit 1bf4efd Author: Peter Wu Date: Tue Jul 8 18:34:04 2014 +0200 ssl,dtls: convert from tvb_length Every occurrence of tvb_length* has been converted to tvb_reported_length* except some dtls lines. Change-Id: I0faac315cdf5d17c0af18be177aacd076ff86cff Reviewed-on: https://code.wireshark.org/review/2977 Reviewed-by: Alexis La Goutte commit e1bad3c Author: Pascal Quantin Date: Thu Jul 10 09:29:22 2014 +0200 Remove a useless line now that nghttp2 library has moved to /epan Change-Id: I41c876620e691f2e217fc9249d6abae01ea81b7f Reviewed-on: https://code.wireshark.org/review/2975 Reviewed-by: Pascal Quantin commit e6c87fe Author: Michael Mann Date: Wed Jul 9 21:21:32 2014 -0400 convert to proto_tree_add_subtree[_format] for plugin dissectors Change-Id: I13924c5a2f056688a42cdee25654d82c056b5f97 Reviewed-on: https://code.wireshark.org/review/2974 Reviewed-by: Michael Mann commit 9b182b7 Author: Guy Harris Date: Thu Jul 10 00:59:23 2014 +0000 Revert "See if we can get rid of the "lib" in front of "wsutil" on Windows." This reverts commit c5a50df51f38e10e3a3618d9394364f60a1ca8af. Most of the change to remove "lib" seems to work, but the list of libraries to sign appears not to be in the source repository, so I can't make that step work. Change-Id: I6ead152fc308480d02266b0f3f0caaa873caf6d2 Reviewed-on: https://code.wireshark.org/review/2973 Reviewed-by: Guy Harris commit ea721b8 Author: Guy Harris Date: Thu Jul 10 00:59:01 2014 +0000 Revert "More needed to get rid of "lib" in "libwsutil" on Windows." This reverts commit 28719a4e4e01b478889dab9611fed517e506360e. Most of the change to remove "lib" seems to work, but the list of libraries to sign appears not to be in the source repository, so I can't make that step work. Change-Id: I32e400593e8a39f582cc702df34eea7f6e9e722a Reviewed-on: https://code.wireshark.org/review/2972 Reviewed-by: Guy Harris commit b1c9d0f Author: Guy Harris Date: Thu Jul 10 00:58:30 2014 +0000 Revert "A few more changes to remove "lib" from "libwsutil" on Windows." This reverts commit 2fbedef5d13194c693ed6d0e773de249a6698278. Most of the change to remove "lib" seems to work, but the list of libraries to sign appears not to be in the source repository, so I can't make that step work. Change-Id: I88245c046b1cf1c76c73fc8e4bc13868e0df4e44 Reviewed-on: https://code.wireshark.org/review/2971 Reviewed-by: Guy Harris commit 2fbedef Author: Guy Harris Date: Wed Jul 9 16:43:32 2014 -0700 A few more changes to remove "lib" from "libwsutil" on Windows. Change-Id: I4c694bb44ebced3d7ae66c16ec3a3ec58825d451 Reviewed-on: https://code.wireshark.org/review/2970 Reviewed-by: Guy Harris commit 28719a4 Author: Guy Harris Date: Wed Jul 9 16:29:04 2014 -0700 More needed to get rid of "lib" in "libwsutil" on Windows. Change-Id: Iffc12ce67a8245e96eac3cf253641a15385001a9 Reviewed-on: https://code.wireshark.org/review/2969 Reviewed-by: Guy Harris commit c5a50df Author: Guy Harris Date: Wed Jul 9 16:23:19 2014 -0700 See if we can get rid of the "lib" in front of "wsutil" on Windows. "libXXX" is a UN*X convention; see whether we can do without it on Windows. Change-Id: I03a377ed5121a8dff7a53203b34e441abffcbb85 Reviewed-on: https://code.wireshark.org/review/2968 Reviewed-by: Guy Harris commit b2bf078 Author: Britt McKinley Date: Wed Jul 9 10:45:32 2014 -0400 h264: Remove unneeded errata checks. Some Microsoft errata were caused by bad decoding and were not actually problems. Remove the unneeded tests and expert information. Add PRID ranges values to Layer Presence bytes. Change-Id: I0b2b555bc448f0b4ee142b2920ae4e37d54ccab4 Reviewed-on: https://code.wireshark.org/review/2958 Reviewed-by: Anders Broman commit bb9a251 Author: Gerald Combs Date: Wed Jul 9 15:02:56 2014 -0700 Add back actionFileQuit. Change-Id: I76cfe038c02a869fb71dc74b7c55fd932e2ccbb2 Reviewed-on: https://code.wireshark.org/review/2967 Reviewed-by: Gerald Combs commit da3634a Author: Gerald Combs Date: Wed Jul 9 14:31:44 2014 -0700 Fix a "recent items" crash. Use a QMutableListIterator instead of a foreach loop so that we can safely remove items from a list. While we're here, make sure that RecentFileStatus threads use a Qt::QueuedConnection when emitting signals across threads and try to isolate the filename string. Change-Id: I3fbb65a1727133f4557026decab5084a3faec2d4 Reviewed-on: https://code.wireshark.org/review/2966 Reviewed-by: Gerald Combs commit cdc1c16 Author: Sean O. Stalley Date: Wed Jul 9 09:45:07 2014 -0700 Print wIndex in decimal and hex wIndex often contains different fields in it's upper & lower byte. Printing in hex makes these seperate fields easier to read. Change-Id: I69fb7e14b4f5b5a1ecd61bcae34f6d100f1a94b6 Reviewed-on: https://code.wireshark.org/review/2961 Reviewed-by: Anders Broman commit 813aa93 Author: Alexis La Goutte Date: Wed Jul 9 00:16:48 2014 +0200 Cmake : (Find XLST Proc) fix indent (use 4spaces) Change-Id: Ic8abdc9aaae899dcc5d870bc023c52dc7a2bbfe6 Reviewed-on: https://code.wireshark.org/review/2952 Reviewed-by: Evan Huus commit a93d2ea Author: Alexis La Goutte Date: Wed Jul 9 00:14:40 2014 +0200 CMake : Set html viewer exe path in HTML_VIEWER variable (and no set or unset..), autotools only add exe name Change-Id: I552ef5d20fc80d341ce97da76b665e97df856d18 Reviewed-on: https://code.wireshark.org/review/2951 Reviewed-by: Evan Huus commit 2cb5937 Author: Alexis La Goutte Date: Wed Jul 9 00:13:12 2014 +0200 CMake : fix name of HTML Viewer to display also the exe path Change-Id: Id103ced59e0ae7e2cff272604f4cfe11d47fe957 Reviewed-on: https://code.wireshark.org/review/2950 Reviewed-by: Evan Huus commit 9f3c429 Author: Pascal Quantin Date: Wed Jul 9 20:01:12 2014 +0200 MAC LTE: interpret RAR TPC command Change-Id: I4e44124d5634e570917730084619e138a6e534af Reviewed-on: https://code.wireshark.org/review/2963 Reviewed-by: Pascal Quantin commit 4418986 Author: Pascal Quantin Date: Wed Jul 9 20:00:03 2014 +0200 HDMI: remove useless include Change-Id: Ia575fc8f3e80666a13dbc54220aa3931a1c505f0 Reviewed-on: https://code.wireshark.org/review/2962 Reviewed-by: Pascal Quantin commit 72e15f2 Author: Evan Huus Date: Wed Jul 2 17:50:38 2014 -0400 Merge capture->interfaces and capture->options Change-Id: I0a2976da97bd777abbf4701915551d9d481b0a13 Reviewed-on: https://code.wireshark.org/review/2785 Reviewed-by: Anders Broman commit 4b5967f Author: Graham Bloice Date: Wed Jul 2 14:10:02 2014 +0100 Moved nghttp2 to epan Cleaned up nghttp2 build Change-Id: I9f7adc12936155e0ffc01ec825b5aff95279f97d Reviewed-on: https://code.wireshark.org/review/2937 Reviewed-by: Pascal Quantin Reviewed-by: Alexis La Goutte Tested-by: Alexis La Goutte Reviewed-by: Evan Huus commit 5f0fd97 Author: Alexis La Goutte Date: Fri Apr 11 08:41:16 2014 +0200 Wireshark Qt: Fix recent (update the list of file when quit Wireshark) Change-Id: I2fac5178fca9675ffb70a942d094335323358d22 Reviewed-on: https://code.wireshark.org/review/2825 Reviewed-by: Evan Huus Reviewed-by: Anders Broman commit 6691293 Author: Michael Mann Date: Tue Jul 8 14:47:17 2014 -0400 convert to proto_tree_add_subtree[_format] Change-Id: I8d66b1bc7dbdfee3d4bf6fd3b3c21c6323b66f44 Reviewed-on: https://code.wireshark.org/review/2946 Reviewed-by: Michael Mann commit cfee201 Author: Pascal Quantin Date: Tue Jul 8 23:33:01 2014 +0200 LTE RRC: upgrade dissector to v11.8.0 Change-Id: I2bb0861029d0d30ae372b0b8085fbedeb4932217 Reviewed-on: https://code.wireshark.org/review/2949 Tested-by: Pascal Quantin Reviewed-by: Pascal Quantin commit b66f614 Author: Bill Meier Date: Tue Jul 8 15:32:39 2014 -0400 pre-commit: Add 'unset GREP_OPTIONS' (similar to Gerrit commit-msg) msysgit grep is fairly old and doesn't recognize certain grep options, e.g., '--color=auto'. I imagine there may possibly be other grep option issues on various platforms. (I also note that the various git scripts in libexec/git-core clear out GREP_OPTIONS before calling grep). Change-Id: I67bc148a77cfc0167064e61e8c47a5f091704eac Reviewed-on: https://code.wireshark.org/review/2945 Reviewed-by: Bill Meier commit 17872b5 Author: Yan Burman Date: Tue Jul 8 16:45:50 2014 +0300 Fix setting PT_IBQP type Without this patch, pinfo->ptype is PT_UNKNOWN Change-Id: Ia15b5115f874d0c9ff69be11ed7ee3dac1fadbd5 Signed-off-by: Yan Burman Reviewed-on: https://code.wireshark.org/review/2941 Reviewed-by: Anders Broman commit ac52c06 Author: Pascal Quantin Date: Tue Jul 8 17:06:21 2014 +0200 RRC: fix ASN.1 description by manually adding CR5591 Without it, dual-band DF-3C feature does not work Change-Id: I95d4a7320b77c6093f5d51efdbb2b21af0deab11 Reviewed-on: https://code.wireshark.org/review/2942 Reviewed-by: Pascal Quantin commit 32ae573 Author: Martin Kaiser Date: Mon Jul 7 05:28:37 2014 +0200 don't print the interface description if it's null (named pipes added with -i don't have such a description) Change-Id: I5986c607f5103b800c4353fd3cf01f24149e2e5c Reviewed-on: https://code.wireshark.org/review/2940 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit fdc7e5a Author: Martin Kaiser Date: Sun Jul 6 18:01:35 2014 -0400 better description of ifaces and all_ifaces Change-Id: I148beb52574b0f7d990722901b72653c71026cb8 Reviewed-on: https://code.wireshark.org/review/2939 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit a7e616d Author: Graham Bloice Date: Tue Jul 8 11:26:49 2014 +0100 Fix the flex wrapper to ensure Cygwin /bin is on the path for Windows. This is needed for CMake, as it doesn't add Cygwin to the path for the generated solutions. Change-Id: I9f05f24ccc741bfc851ecbb892f080f59d2acc2c Reviewed-on: https://code.wireshark.org/review/2938 Reviewed-by: Graham Bloice Tested-by: Graham Bloice commit b0a7251 Author: Alexis La Goutte Date: Tue Jul 8 11:58:31 2014 +0200 Fix Uninitialized argument value found by Clang Analyzer Change-Id: Ia39d7b258a888c188ae7d87c3c907e2a0ad1d3f0 Reviewed-on: https://code.wireshark.org/review/2936 Reviewed-by: Anders Broman commit 4e478aa Author: Alexis La Goutte Date: Tue Jul 8 11:51:47 2014 +0200 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I369c4620f47f92bf66722fa79582502c0897a316 Reviewed-on: https://code.wireshark.org/review/2935 Reviewed-by: Anders Broman commit 033249e Author: Alexis La Goutte Date: Tue Jul 8 11:50:32 2014 +0200 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: Idc6e9cf8f7f4b8e18a50723acbe5dee4c8cb786c Reviewed-on: https://code.wireshark.org/review/2934 Reviewed-by: Anders Broman commit 55ce1bc Author: Pascal Quantin Date: Tue Jul 8 08:20:26 2014 +0200 Upgrade LPP dissector to v11.5.0 Change-Id: I8c51cebec5b234b9d0667aaf3f70b0a48bb842f6 Reviewed-on: https://code.wireshark.org/review/2933 Reviewed-by: Anders Broman commit a6fc598 Author: Tatsuhiro Tsujikawa Date: Mon Jun 23 19:25:33 2014 +0900 Enhance HTTP/2 HPACK header decompression handling Previously we just call HPACK decompressor when dessecting packets. This is fine for the first linear scan. But later same packet may be dissected more than once and their header block data will be fed into decompressor again. This makes header compression context out-of-sync because HPACK decompressor only works when data is fed linearly. This change fixes this issue by caching decompressed headers in the first linear scan. On random packet dissecting, they are just looked up. This change adds support of changing header table size by inspecting SETTINGS frame and tracking its SETTINGS ACK. Change-Id: I9c75c67f8677063e443f9b131740f3ee94ff8a63 Reviewed-on: https://code.wireshark.org/review/2616 Reviewed-by: Evan Huus Reviewed-by: Anders Broman commit 36c3933 Author: Tatsuhiro Tsujikawa Date: Mon Jun 23 23:21:15 2014 +0900 Dissect HTTP/2 draft-13 Summary of changes since draft-12: * Pad High and Pad Low wereare replaced with single Pad Length field. * Padding was removed from CONTINUATION frame. * ALTSVC and BLOCKED frames were removed. * Per-frame compression and its associated SETTINGS flag were removed. * HPACK Huffman code table and static header table were updated. Change-Id: I9c4f05f8cd937bfadbb1b912f2b9ffb31e9c18d5 Reviewed-on: https://code.wireshark.org/review/2615 Reviewed-by: Evan Huus Reviewed-by: Anders Broman commit 46b3dda Author: Peter Wu Date: Fri Jul 4 22:11:49 2014 +0200 iscsi: automatically detect data segment digest Modelled after ccf7ed00b62dcb63cdb3a9851baa767acbb94013 which detects the header digest field, this patch adds auto-detection for the Data Digest field which comes after the data segment. Since the digest is now automatically detected, drop the three related preferences. Verified against scsi-osd-example-001.pcap (from SampleCaptures). Change-Id: Icd89f1be58889c7ab70aca9dff7d3f99c8fe04d6 Reviewed-on: https://code.wireshark.org/review/2882 Reviewed-by: Peter Wu Reviewed-by: Anders Broman commit 9d5bf53 Author: Evan Huus Date: Tue Jul 8 00:04:21 2014 -0400 udvm: free the buffer *before* throwing the exception Freeing it after the exception doesn't do much, for obvious reasons. Also move the allocation a bit later, and add modelines. This fixes one major memory leak, although on inspection this code still isn't safe since there are exception-throwing functions called all over the place with glib memory active. Outside the scope of this fix though. Bug: 10265 Change-Id: I1fe272e92b92cac6b99abb84866b8ae9b582e24c Reviewed-on: https://code.wireshark.org/review/2931 Reviewed-by: Anders Broman commit 8fbc0db Author: Peter Wu Date: Mon Jul 7 23:55:54 2014 +0200 conversion: do not free conversation memory on updates In commit 4afd70d ("Use g_hash_table_new_full to free some values"), the hashtable gained a destroy handler which frees memory. This inadvertently destroyed a conversation during key updates. Fix this by not calling _remove (and thereby calling the destroy handler), but use _steal instead. (Suggestion by Evan Huus). Bug: 10263 Change-Id: I9fa7f5a697599f42894d38718b00b9c0c1b57004 Reviewed-on: https://code.wireshark.org/review/2924 Reviewed-by: Peter Wu Reviewed-by: Evan Huus commit 9b4f16a Author: Peter Wu Date: Mon Jul 7 19:28:20 2014 +0200 gsmtap: do not abort if dissector is unavailable Encountered with the following attachments from bugs: 6575-test-dlmapc-wmx 6577-test-dlmapc-wmx 6579-test-dlmapc-wmx Also added modelines. Change-Id: I3859bed618830ad359bd0b2b1fdfc3c5fc13269e Reviewed-on: https://code.wireshark.org/review/2920 Reviewed-by: Evan Huus commit e82e137 Author: Alexis La Goutte Date: Mon Jul 7 08:07:52 2014 +0200 Fix Dereference of null pointer found by Clang analyzer after change of ga67b7f5b5 Change-Id: I03155b46dc35274915f7a7c16fad81f97e0dc5bf Reviewed-on: https://code.wireshark.org/review/2911 Reviewed-by: Evan Huus commit 390e9bb Author: Alexis La Goutte Date: Mon Jul 7 08:48:14 2014 +0200 Fix Dereference of null pointer found by Clang analyzer Change-Id: I050c187acdb4c97bb164cefee67f65b69d7e6782 Reviewed-on: https://code.wireshark.org/review/2914 Reviewed-by: Evan Huus commit cdf6d62 Author: Bill Meier Date: Mon Jul 7 11:02:56 2014 -0400 tools/pre-commit: Complete all checks on all files before exiting with Ok/Fail status. Change-Id: Iea6df6fbe5a977b282e823f87cd9f760e92a3e22 Reviewed-on: https://code.wireshark.org/review/2918 Reviewed-by: Bill Meier commit 858558e Author: Gerald Combs Date: Fri Jun 20 10:49:40 2014 -0700 Update README.qt and add todo items. Change-Id: I69c080253cf7e861c575573e74a66b83e014cbb0 Reviewed-on: https://code.wireshark.org/review/2925 Reviewed-by: Gerald Combs commit 1ff6213 Author: AndersBroman Date: Mon Jul 7 17:10:46 2014 +0200 Try to fix cast discards '__attribute__((const))' qualifier from pointer target type Change-Id: If7efc629247480fbfb231b965a358803b67e1504 Reviewed-on: https://code.wireshark.org/review/2919 Reviewed-by: Anders Broman commit 4ac9895 Author: AndersBroman Date: Mon Jul 7 16:27:51 2014 +0200 See if yhis fixes "cast discards '__attribute__((const))' qualifier from pointer target type" Change-Id: I0f97b119f1e6151622d360464f12ad399cbaf117 Reviewed-on: https://code.wireshark.org/review/2917 Tested-by: Anders Broman Reviewed-by: Anders Broman commit 7801a97 Author: Martin Mathieson Date: Mon Jul 7 11:06:27 2014 +0100 Trying to create and use an empty tvb now throws an exception. Just pass current tvb to mac-lte dissector. Change-Id: I4aa24342192ec079254f26e00317470377c3e20b Reviewed-on: https://code.wireshark.org/review/2916 Reviewed-by: Martin Mathieson commit 3c638d8 Author: Alexis La Goutte Date: Mon Jul 7 08:27:01 2014 +0200 Fix Branch condition evaluates to a garbage value found by Clang Analyzer Change-Id: I2cb4fb8064c80ee7985c3908820f09f5fa7e37fb Reviewed-on: https://code.wireshark.org/review/2913 Reviewed-by: Anders Broman commit 4ce4e3a Author: Роман Донченко Date: Sun Jul 6 20:59:56 2014 +0400 make-dissector-reg: minor tweaks * use grep -c instead of a grep/wc combo; * use cmp instead of diff, since we're only interested in whether the files are identical; * remove the temporary file if it's the same as the existing one. Change-Id: If61c5675535c483b9dc2aee179d7be58c7bd6e4f Reviewed-on: https://code.wireshark.org/review/2894 Reviewed-by: Evan Huus Reviewed-by: Anders Broman commit 4cdd17a Author: Gerald Combs Date: Sat May 31 09:56:35 2014 +0800 Qt: Cache packet list column strings. For each displayed packet list row, save a copy of or a pointer to column strings similar to ui/gtk/packet_list_store.c. This lets us call epan_dissect_run only once per row. Bug: 9511 Change-Id: I17e8ebeb5ed70518c9047413c3b2a46f01e904ef Reviewed-on: https://code.wireshark.org/review/2752 Reviewed-by: Anders Broman commit 5938782 Author: Guy Harris Date: Sun Jul 6 21:46:21 2014 -0700 Don't cast away constness if not necessary. Change-Id: I5f6ecd246e358edc3a2f4963c201b2435e4a1a42 Reviewed-on: https://code.wireshark.org/review/2910 Reviewed-by: Guy Harris commit e286acd Author: Guy Harris Date: Sun Jul 6 21:34:06 2014 -0700 Squelch compiler warning. Change-Id: I37c495cb4d68b95d8388c654bbf6a817167261ac Reviewed-on: https://code.wireshark.org/review/2909 Reviewed-by: Guy Harris commit 9dfb3e7 Author: Guy Harris Date: Sun Jul 6 21:31:43 2014 -0700 Wrong macro. Change-Id: I2e0e7c1a30c9fc2d5af7cbd53dae26ad9a619e71 Reviewed-on: https://code.wireshark.org/review/2908 Reviewed-by: Guy Harris commit eea2e15 Author: Guy Harris Date: Sun Jul 6 21:29:09 2014 -0700 G_GNUC_FORMAT encapsulates __attribute((format_arg(...))). Change-Id: I9513c187ae4ce8b8cf8f6a926072b215e26ec64f Reviewed-on: https://code.wireshark.org/review/2907 Reviewed-by: Guy Harris commit aa4066d Author: Peter Wu Date: Fri Jul 4 14:27:04 2014 +0200 skinny: fix retval, convert from tvb_length New dissectors return an integer, not a boolean, fix that. Change-Id: I79dea0cc4274d503d61ce8823dc783c542764f6b Reviewed-on: https://code.wireshark.org/review/2884 Reviewed-by: Peter Wu Reviewed-by: Evan Huus commit 0a2f6fc Author: Guy Harris Date: Sun Jul 6 17:11:25 2014 -0700 Squelch some compiler warnings. Change-Id: I768bf577b3871171ab33f080c5a0099ac06718ce Reviewed-on: https://code.wireshark.org/review/2906 Reviewed-by: Guy Harris commit 4d58904 Author: Michael Mann Date: Sun Jul 6 19:32:03 2014 -0400 convert to proto_tree_add_subtree[_format] Change-Id: Ie10ac4f5f04a23344d183e095bbafb23c6409144 Reviewed-on: https://code.wireshark.org/review/2904 Reviewed-by: Michael Mann commit 79fcc6a Author: Guy Harris Date: Sun Jul 6 16:48:06 2014 -0700 Squelch some compiler warnings. Change-Id: Ie39c7b0c1fef8f862cec016a3a1a5bd1451a3df2 Reviewed-on: https://code.wireshark.org/review/2905 Reviewed-by: Guy Harris commit f2b4daf Author: Peter Wu Date: Sun Jul 6 15:34:38 2014 +0200 Add printf-format annotations, fix garbage The WRETH dissector showed up some garbage in the column display. Upon further inspection, it turns out that the format string had a trailing percent sign which caused (unsigned)-1 to be returned by g_printf_string_upper_bound (in emem_strdup_vprintf). Then ep_alloc is called with (unsigned)-1 + 1 = 0 memory, no wonder that garbage shows up. ASAN could not even catch this error because EP is in charge of this. So, start adding G_GNUC_PRINTF annotations in each header that uses the "fmt" or "format" paramters (grepped + awk). This revealed some other errors. The NCP2222 dissector was missing a format string (not a security vuln though). Many dissectors used val_to_str with a constant (but empty) string, these have been replaced by val_to_str_const. ASN.1 dissectors were regenerated for this. Minor: the mate plugin used "%X" instead of "%p" for a pointer type. The ncp2222 dissector and wimax plugin gained modelines. Change-Id: I7f3f6a3136116f9b251719830a39a7b21646f622 Reviewed-on: https://code.wireshark.org/review/2881 Reviewed-by: Evan Huus commit ec6a22d Author: Peter Wu Date: Wed Jul 2 17:00:15 2014 +0200 Workaround for ASAN failure in _ws_mempbrk_sse42 When ASAN is enabled, a false buffer overflow warning is raised. It is a false positive since everything starting at '\0' will get ignored by the PCMPISTRI instruction (see Intel(r) SSE4 Programming Reference, 5.3.1.5 "Valid/Invalid Override of Comparisons", and 5.3.1.2 "Aggregrate Operation", case "Equal any"). Concerns about reading past the end of the page turns out to be false, there always seem to be a valid page after the current one (for static and heap memory at least). It is an non-issue since strlen also does not have issues with this. Rather than fully disabling SSE 4.2 and using the fallback implementation for ASAN-enabled builds, read the set of characters from 'a' into the mask without a 128-bit read and then still use SSE 4.2 for the actual query. Bug: 10214 Change-Id: Ie4a526e60b43bfc08dd1d821556766f14a49be4d Reviewed-on: https://code.wireshark.org/review/2618 Reviewed-by: Peter Wu Reviewed-by: Evan Huus commit 49bc104 Author: Peter Wu Date: Fri Jul 4 17:28:46 2014 +0200 whois,finger: fix retval, convert from tvb_length Fixes dissector bug: failed assertion "save_desegment_offset == pinfo->desegment_offset && save_desegment_len == pinfo->desegment_len" Change-Id: Ia475bea3726252530189a05ba4dbf69f3c2b7e6c Reviewed-on: https://code.wireshark.org/review/2886 Reviewed-by: Peter Wu Reviewed-by: Evan Huus commit 5bfc21c Author: Guy Harris Date: Sun Jul 6 14:02:39 2014 -0700 Clean up handling of missing functions. With autotools, CMake, and nmake, if we have a function, #define HAVE_{function_name_in_all_caps}, otherwise don't #define it. If we provide our own version of a function in libwsutil, make sure we have a header that declares it, and *ONLY* include that header if HAVE_{function_name_in_all_caps} is *NOT* defined, so that we don't have the system declaration and our declaration colliding. Check for inet_aton, strncasecmp, and strptime with CMake, just as we do with autotools. Simplify the addition of {function_name_in_all_caps}_LO to libwsutil in autotools. Change-Id: Id5be5c73f79f81919a3a865324e400eca7b88889 Reviewed-on: https://code.wireshark.org/review/2903 Reviewed-by: Guy Harris commit e649420 Author: Pascal Quantin Date: Sun Jul 6 21:41:45 2014 +0200 H264: mark a parameter as unused Change-Id: I564a0fefc263d909c9e478b64c5a816756d97377 Reviewed-on: https://code.wireshark.org/review/2902 Reviewed-by: Pascal Quantin commit 032c261 Author: Pascal Quantin Date: Sun Jul 6 20:36:25 2014 +0200 GTK: fix crash when closing Capture Options dialog box on Windows Introduced in g929afd2 Change-Id: I911994af2a210f00cd099f26e68d1e1f0fea577b Reviewed-on: https://code.wireshark.org/review/2901 Reviewed-by: Pascal Quantin commit 4e9802e Author: Britt McKinley Date: Mon Jun 23 14:32:34 2014 -0400 H264: Add support of packetization modes, SVC, MS-H264 Add support for Prefix, STAP, MTAP, NI-MTAP, and PACSI packet types. Add support for Microsoft SEI messages [MS-H264PF] Add support for dissecting scalable profiles SDP: Add profile-level-id decode for payload type H264-SVC MS-H264PF: http://msdn.microsoft.com/en-us/library/hh659565.aspx Update #1 - Fix Tabs -> Spaces, Reinsert accidentally removed entry 19 from h264_type_values Update #2 - Changed to using expert info for exceptions and Microsoft errata. Update #3: - Correct handling of truncated packets - Use guid functions and compare techniques - Correct ranges for expert info messages - Change to using reported_length from captured_length Change-Id: I520a3c9a6d85c78a976b520cf5a6a405064a48f1 Reviewed-on: https://code.wireshark.org/review/2580 Reviewed-by: Pascal Quantin commit c35b82c Author: Alexis La Goutte Date: Sun Jul 6 19:55:38 2014 +0200 RTCP: Make checkhf happy Change-Id: I5cdeb4a96bc9c4e11161836457a8689c904e13d4 Reviewed-on: https://code.wireshark.org/review/2899 Reviewed-by: Anders Broman commit 68daa66 Author: Alexis La Goutte Date: Sun Jul 6 19:47:23 2014 +0200 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I9946e55ee33ccbf57c6b268f725f5b1a537b61a9 Reviewed-on: https://code.wireshark.org/review/2897 Reviewed-by: Anders Broman commit 550f611 Author: Alexis La Goutte Date: Sun Jul 6 19:49:08 2014 +0200 RTCP: fix typo (double semicolon) Change-Id: Id1997c3c8f6d0460da7f0faa58798a72737dd667 Reviewed-on: https://code.wireshark.org/review/2898 Reviewed-by: Michael Mann commit 841b1d6 Author: Alexis La Goutte Date: Sun Jul 6 19:38:05 2014 +0200 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I5744a1c1efc65f9a7b3addf17c071b470fd2cced Reviewed-on: https://code.wireshark.org/review/2896 Reviewed-by: Anders Broman commit 84189de Author: Alexis La Goutte Date: Sun Jul 6 19:26:43 2014 +0200 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I82efd1c5f4280de2eec3dbe7bd1995fcd9a3174f Reviewed-on: https://code.wireshark.org/review/2895 Reviewed-by: Anders Broman commit c71e88e Author: Michael Mann Date: Sun Jul 6 14:21:40 2014 -0400 convert to proto_tree_add_subtree[_format] Change-Id: I3efa2a81ab2685cde6eae0a00b24520478a545ce Reviewed-on: https://code.wireshark.org/review/2900 Reviewed-by: Michael Mann commit be4d42c Author: Evan Huus Date: Sun Jul 6 08:53:48 2014 -0400 Widen openflow variables and check for underflows As suggested by Alexis reviewing change Ie76c5a810af927b, this issue was scattered throughout the v4/v5 openflow dissectors. Hopefully I got all of them. Original issue found in bug 10259. Change-Id: Idf87deea34132aec5cd4e8f83264906a29b15568 Reviewed-on: https://code.wireshark.org/review/2878 Reviewed-by: Evan Huus Reviewed-by: Alexis La Goutte commit 5886e45 Author: Peter Wu Date: Fri Jul 4 18:13:22 2014 +0200 iscsi: minor retval fix The return value of new dissectors is the number of bytes that were successfully dissected, not a boolean. Fix that and get rid of an unnecessary iSCSIPdusDissected variable. Change-Id: Ie31df393a1eb44f185d320a4c2d35f5e8b7d7bd9 Reviewed-on: https://code.wireshark.org/review/2889 Reviewed-by: Evan Huus commit d828b15 Author: Peter Wu Date: Fri Jul 4 17:46:56 2014 +0200 kismet: fix retval, add modelines new dissectors return an int, not a boolean... Change-Id: I88e19f7c0dc14da3649d1522ffe936538a867753 Reviewed-on: https://code.wireshark.org/review/2888 Reviewed-by: Evan Huus commit 2eae8bb Author: Peter Wu Date: Fri Jul 4 17:30:07 2014 +0200 mikey: do not request more data on proto violation Return value "-1" means that more data is requested. The dissector actually doesn't have any idea what to do with the data, so just return the data dissected so far. tcp stream 3182 from c05-http-reply-r1.pcap (SampleCaptures) was incorrectly detected as MIKEY, it was actually HTTP... Change-Id: Idca3d3e2f85e821df70436a675699b5834236f89 Reviewed-on: https://code.wireshark.org/review/2887 Reviewed-by: Evan Huus commit b54731d Author: Peter Wu Date: Fri Jul 4 15:43:53 2014 +0200 ms-mms: fix retval for short pkts, fix reading flags uint16 & 0xFF00 will always equal 0. Use tvb_get_guint8 instead. Convert from tvb_length to tvb_captured_length. Fix the return value of dissectors, 0 means reject but that cannot be combined with reassembly requests. Change-Id: I5fca66e2e809699392237aff5813eecdfb15857f Reviewed-on: https://code.wireshark.org/review/2885 Reviewed-by: Evan Huus commit 03d6f1b Author: Gerald Combs Date: Sun Jul 6 08:16:09 2014 -0700 [Automatic manuf, services and enterprise-numbers update for 2014-07-06] Change-Id: Idc1a85851a01b5b675465b659871cdf750845ace Reviewed-on: https://code.wireshark.org/review/2890 Reviewed-by: Gerald Combs commit 4afd70d Author: Evan Huus Date: Sun Jul 6 09:21:25 2014 -0400 Use g_hash_table_new_full to free some values Fixes a good 80-90KB of leaks in certain cases. Bug: 10261 Change-Id: I81d57ac67219e730b03649b9fdfc2306807bdb97 Reviewed-on: https://code.wireshark.org/review/2879 Reviewed-by: Anders Broman commit 6318a29 Author: Michael Mann Date: Sun Jul 6 09:49:27 2014 -0400 convert to proto_tree_add_subtree[_format] Change-Id: Ia2567695ffed30c990eda3740b08bfab101cea96 Reviewed-on: https://code.wireshark.org/review/2883 Reviewed-by: Michael Mann commit db530d8 Author: Guy Harris Date: Sun Jul 6 04:25:05 2014 -0700 Squelch casting-away-constness warnings. The pStr argument to dissect_mq_charv() isn't modified (and always points to a character string), so make it a "const char *", and eliminate the casts to "guint8 *" in calls to it. Change-Id: I21dad38c41324528be297a8ddc1854beff2276db Reviewed-on: https://code.wireshark.org/review/2877 Reviewed-by: Guy Harris commit 2a740bd Author: Guy Harris Date: Sun Jul 6 04:14:45 2014 -0700 Squash casting-away-constness warnings. BYTE2WORD() doesn't modify what its argument points to, so make that argument a const unsigned char *. This lets us get rid of casts that cast away constness. Change-Id: I44a58bd3d75fc77a022b7e8f7fa9b43990bcf81c Reviewed-on: https://code.wireshark.org/review/2876 Reviewed-by: Guy Harris commit afa8f21 Author: Роман Донченко Date: Fri Jun 27 22:10:28 2014 +0400 make-dissectors-reg: optimize by factoring out the loops Instead of calling the grep/sed pipelines for each file, build the list of files in the beginning and call each pipeline only once, passing the list to the first grep. This results in a massive speedup in Cygwin; in my test, the time it takes to run make-dissector-reg . dissectors packet-*.c in dissectors/epan is reduced from ~116 to ~3 seconds. I also tried it on NetBSD, where the time do to the same goes from ~6 to ~0.5 seconds. Amend makefile comments to elide mentions of invoking multiple processes per file. Change-Id: Iad441e7d2b6cc3669dada57646e2f8f6b987fd34 Reviewed-on: https://code.wireshark.org/review/2826 Reviewed-by: Anders Broman commit 3490bc6 Author: Michael Mann Date: Sat Jul 5 19:28:41 2014 -0400 Change display filters to prefix with ipmi.trace Change-Id: I7b4476cb0a06362941ef81707a9686f5546a4a54 Reviewed-on: https://code.wireshark.org/review/2868 Reviewed-by: Anders Broman commit 8481c43 Author: Guy Harris Date: Sat Jul 5 19:25:47 2014 -0700 Fix more errors revealed by enum-to-integer conversion warnings. Change-Id: Ib28af874cbac0623ed94e7558f3711e9a1b03a2d Reviewed-on: https://code.wireshark.org/review/2874 Reviewed-by: Guy Harris commit ab5d1cf Author: Guy Harris Date: Sat Jul 5 18:33:00 2014 -0700 Squelch a warning. Change-Id: Id27a6447dba9b6eda07933139a3f07edd71c8fd6 Reviewed-on: https://code.wireshark.org/review/2872 Reviewed-by: Guy Harris commit c654add Author: Guy Harris Date: Sat Jul 5 18:29:48 2014 -0700 Add consts to casts to suppress warnings. Pull the "cast this to a pointer to an __m128i" idiom into a macro, and use the macro; have that macro use "const" in the casts. Change-Id: Ife90b7daef2f09368790f3b2ffbb227d6d794dea Reviewed-on: https://code.wireshark.org/review/2871 Reviewed-by: Guy Harris commit 570d52a Author: Guy Harris Date: Sat Jul 5 18:13:13 2014 -0700 Pull the record processing into netmon_process_record(). That combines more common code from the read and seek-read code paths. Also, separate out the individual metadata record types, with a comment for each, to simplify the process of supporting some or all of them in the future. Change-Id: Ic8ded397d9550ec6013c1f5f138333b1ef5c37e5 Reviewed-on: https://code.wireshark.org/review/2869 Reviewed-by: Guy Harris commit 0335ae3 Author: Michael Mann Date: Sat Jul 5 18:29:13 2014 -0400 convert to proto_tree_add_subtree[_format] Change-Id: I66f0bffb987568c3d4c14a06bdc90465c877b27f Reviewed-on: https://code.wireshark.org/review/2867 Reviewed-by: Michael Mann commit 318205e Author: Guy Harris Date: Sat Jul 5 15:22:03 2014 -0700 Fix an error caught by enum-conversion warnings. (Strong typing is for weak minds. Human minds are weak. Therefore, strong typing is for human minds.) Change-Id: I099b85e98f3b9742b1addd8d260b3e94ca7add31 Reviewed-on: https://code.wireshark.org/review/2866 Reviewed-by: Guy Harris commit 42b537e Author: Evan Huus Date: Thu Jun 26 10:59:33 2014 -0400 Reset state when cycling ring-buffer files in tshark. This has several implications: - we match user expectations that a ring-buffered tshark capture will run forever without running out of resources (except where we still have leaks) - we lose reassembly and request/response matching when the relevant packets are split across files, but this actually makes our output more consistent with dissecting those files after-the-fact I have not made it configurable in this change because I'm not really sure there's a use case for the old behaviour - if you're running a ring-buffer capture in the first place it's because you're willing to discard old data to limit resource usage. If you want the full dissection without breaks, just don't use a ring buffer at all and take the resource hit in both disk and memory. Change-Id: I7d8f84b2e6040b430b7112a45538041f2c30f489 Reviewed-on: https://code.wireshark.org/review/2669 Reviewed-by: Jörg Mayer Reviewed-by: Evan Huus commit 286c191 Author: Peter Wu Date: Fri Jul 4 00:33:43 2014 +0200 9p: fix version detection, fix dissect_9P retval Fix version detection (detect against full string instead of prefix), properly dissect Tcreate extension field (9p2000.u only), dissect Tunlinkat flags (9p2000.L). Refactor pattern to dissect string[s] types for DRY. Convert to use tcp_dissect_pdus. I have not seen a fragmented case, but maybe that may happen in the future. The main motivation for touching 9p was that it returns bogus values for some types. This has been fixed by properly increasing offset, and always return the captured length. Change-Id: If2184204ae9c853b94aca8ade3763d7fe523fa86 Reviewed-on: https://code.wireshark.org/review/2836 Reviewed-by: Christopher Maynard Reviewed-by: Evan Huus commit fc63343 Author: Michael Mann Date: Sat Jul 5 15:25:32 2014 -0400 convert to proto_tree_add_subtree[_format] Change-Id: I8df48b25de784a48a25f0e48aac1e1545ed92c35 Reviewed-on: https://code.wireshark.org/review/2865 Reviewed-by: Michael Mann commit 3f77251 Author: Guy Harris Date: Sat Jul 5 12:32:27 2014 -0700 Fix an error caught by enum-conversion warnings. (Strong typing is for weak minds. Human minds are weak. Therefore, strong typing is for human minds.) Change-Id: I2a973b6168235d5d1c7f2a5f8ac79b97b963d846 Reviewed-on: https://code.wireshark.org/review/2863 Reviewed-by: Guy Harris commit c8bcdd5 Author: Guy Harris Date: Sat Jul 5 11:48:52 2014 -0700 Fix whitespace issues. Change-Id: I69f84ca8b947be8e06005c82526559e3bc8f6387 Reviewed-on: https://code.wireshark.org/review/2861 Reviewed-by: Guy Harris commit 599b880 Author: Guy Harris Date: Sat Jul 5 11:45:18 2014 -0700 Handle the UTC timestamps in NetMon 2.3 files. This addresses part of, but not all of, the issues in bug ten thousand, one hundred, and ninety: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10190 (I'm spelling it out to make sure Gerrit doesn't think this change *does* address all the issues in that bug, and mark it as RESOLVED FIXED; I feel like I have to treat Gerrit as a dog or small child from whom I'm trying to keep a secret - "honey, I'm taking the dog to the vee eee tee".) Change-Id: Ic234130c1ea84cfaf47901485dca775e168f71d0 Reviewed-on: https://code.wireshark.org/review/2859 Reviewed-by: Guy Harris commit 3686713 Author: Alexis La Goutte Date: Wed Jun 11 21:23:29 2014 +0200 Update libnghttp2 to latest master (add support for draft-13) Bug:10256 Change-Id: I24275f1b67120f69cfd673f7e5598a50b3c7566f Reviewed-on: https://code.wireshark.org/review/2145 Reviewed-by: Pascal Quantin Reviewed-by: Alexis La Goutte commit c92bf7e Author: Evan Huus Date: Fri Jul 4 21:45:15 2014 +0000 Expand a variable from 16 to 32 bits (and make it signed). Fixes an overflow leading to infinite loop. Bug: 10259 Change-Id: Ie76c5a810af927ba092f4067268bd789b3a7d7bf Reviewed-on: https://code.wireshark.org/review/2856 Reviewed-by: Evan Huus commit e398c8e Author: Pascal Quantin Date: Fri Jul 4 21:29:44 2014 +0200 ETSI CAT: upgrade dissector to Release 12 Change-Id: Id1988551ca94a862195eb1de1de399e428132b21 Reviewed-on: https://code.wireshark.org/review/2855 Reviewed-by: Pascal Quantin commit 09511c2 Author: Guy Harris Date: Fri Jul 4 10:22:33 2014 -0700 Build libcaputils PIE, so it can be linked with dumpcap when it's built PIE. Change-Id: Ic1a64252e913f668676a3d8b69c10cc4789156b3 Reviewed-on: https://code.wireshark.org/review/2854 Reviewed-by: Guy Harris commit c7a6e6f Author: Michael Mann Date: Tue Jul 1 18:31:05 2014 -0400 convert to proto_tree_add_subtree[_format] Change-Id: I621f2e2cad9403449cb78f45302388f0c874d3bc Reviewed-on: https://code.wireshark.org/review/2852 Reviewed-by: Michael Mann commit 9351704 Author: Michael Mann Date: Fri Jul 4 11:51:09 2014 -0400 convert to proto_tree_add_subtree[_format] Change-Id: Idd1b20ab32c0960ea52c6f3bc5346462c37c5684 Reviewed-on: https://code.wireshark.org/review/2853 Reviewed-by: Michael Mann commit dd424c6 Author: AndersBroman Date: Thu Jul 3 13:46:32 2014 +0200 Handle the case where the previous PDU has left an extra CRLF in the stream.RFC 2626 In the interest of robustness, servers SHOULD ignore any empty line(s) received where a Request-Line is expected. In other words, if the server is reading the protocol stream at the beginning of a message and receives a CRLF first, it should ignore the CRLF. Change-Id: I97ba94f451463c8facd2c20bf6b7364f095119e7 Reviewed-on: https://code.wireshark.org/review/2808 Reviewed-by: Anders Broman commit 34d09f7 Author: AndersBroman Date: Fri Jul 4 14:05:39 2014 +0200 Add missing / Change-Id: I84758200bce592f84547bff84f02d743327baa03 Reviewed-on: https://code.wireshark.org/review/2848 Reviewed-by: Anders Broman commit fc52dc6 Author: Guy Harris Date: Fri Jul 4 01:09:21 2014 -0700 rawshark needs libcaputils. Change-Id: I38409f5ceef1c906dccb13284d2fe2dfd2383b67 Reviewed-on: https://code.wireshark.org/review/2845 Reviewed-by: Guy Harris commit d3a7176 Author: Guy Harris Date: Fri Jul 4 01:06:07 2014 -0700 Reflect the rename of get_XXX_pcap_version() to get_XXX_caplibs_version(). Change-Id: I55108e39d9d5a3fc5e1e3e0ec0040c08c92cc576 Reviewed-on: https://code.wireshark.org/review/2844 Reviewed-by: Guy Harris commit 17995db Author: Guy Harris Date: Fri Jul 4 01:01:03 2014 -0700 Fix the no-libpcap build. Change-Id: I2443ab22d423508641ac199262238e5fbafc95df Reviewed-on: https://code.wireshark.org/review/2843 Reviewed-by: Guy Harris commit 7e970c3 Author: Evan Huus Date: Thu Jul 3 23:33:43 2014 -0400 wmemify some nfs functions, fixing much leaked memory Bug: 10257 Change-Id: Ia36c03b2be727a37f91eca38af4faf48d1d65436 Reviewed-on: https://code.wireshark.org/review/2840 Reviewed-by: Anders Broman commit 3fb1124 Author: Guy Harris Date: Fri Jul 4 00:35:22 2014 -0700 capture_ifinfo.h moved to caputils. Change-Id: Id313fa6d0510ece7d13c6ffe941374ba0873e574 Reviewed-on: https://code.wireshark.org/review/2842 Reviewed-by: Guy Harris commit 9e6487f Author: Guy Harris Date: Fri Jul 4 00:24:02 2014 -0700 Move utility routines for capturing into a libcaputils static library. Some of those routines are used only in dumpcap; others are used in TShark and Wireshark as well. Change-Id: I9d92483f2fcff57a7d8b6bf6bdf2870505d19fb7 Reviewed-on: https://code.wireshark.org/review/2841 Reviewed-by: Guy Harris commit c5643a3 Author: Evan Huus Date: Thu Jul 3 23:08:48 2014 -0400 Remove accidental trailing \ Change-Id: I84e6aa71e31528b2949e68f0f07778fb9e26379e Reviewed-on: https://code.wireshark.org/review/2839 Reviewed-by: Evan Huus commit fb4ee24 Author: Alexis La Goutte Date: Thu Jul 3 19:26:29 2014 +0200 Sort by name list of file fix also indent (use spaces) Change-Id: I06234936c3128f7aa21a345415d7e420135dd601 Reviewed-on: https://code.wireshark.org/review/2824 Reviewed-by: Evan Huus commit 7464415 Author: Evan Huus Date: Thu Jul 3 11:23:04 2014 -0400 Fix infinite loop in RTCP dissector Bug: 10248 Change-Id: I630bc1ab2520c2861b817ba5813f5f7680e96056 Reviewed-on: https://code.wireshark.org/review/2820 Reviewed-by: Evan Huus commit bbb3e2f Author: Sean O. Stalley Date: Thu Jul 3 14:05:24 2014 -0700 Add Bus ID to USB Address Column USB Addresses are now in the format of: bus_id.device_address.endpoint This makes it much easier to read traces that captured traffic on more than one bus. Change-Id: I264db2ceea712d94632d5d08d05d3af22a4a03fe Reviewed-on: https://code.wireshark.org/review/2833 Reviewed-by: Evan Huus commit 212df87 Author: Sean O. Stalley Date: Thu Jul 3 07:29:48 2014 -0700 (trivial) moved 'is request' comment in dissect_usb_common() Change-Id: I759f64920284a35ea55bc68624570def51dfd72a Reviewed-on: https://code.wireshark.org/review/2832 Reviewed-by: Evan Huus commit 4e74546 Author: Bill Meier Date: Thu Jul 3 19:28:21 2014 -0400 packet-vnc.c: Fix a bug in displaying a set of FT_BOOLEAN bit fields (found by checkAPIs). Change-Id: Ie5252d20db5826f3e48aba11da1bf85d00630db2 Reviewed-on: https://code.wireshark.org/review/2838 Reviewed-by: Bill Meier commit 3e325b1 Author: Bill Meier Date: Thu Jul 3 18:18:03 2014 -0400 packet-vnc.c: Restore tvb_get_string() --> tvb_get_string_enc() changes lost in gdf6bdcc These changes were originally done in g971ffd6 Change-Id: I9de28ba7089f99e8058207f3b6d34de931decf76 Reviewed-on: https://code.wireshark.org/review/2835 Reviewed-by: Bill Meier commit df6bdcc Author: Bill Meier Date: Thu Jul 3 17:35:58 2014 -0400 packet-vnc.c: Improve dissection - Properly dissect multiple VNC PDUs in one (or more) TCP segment(s). - Dissect additional message types ('Fence' and 'Enable Continuous Updates'). - Handle "num_rects" field = 0xFFFF (TightVNC). - Add some more info as to sources of information about the VNC protocol. - Add an XXX note as to the (incorrect) reassembly method being used. - Add some notes as to possible ToDo's. Change-Id: Id4942c50b3d1373bd2e72c0131614835dc39ba90 Reviewed-on: https://code.wireshark.org/review/2834 Reviewed-by: Bill Meier commit 60a6f85 Author: Jakub Zawadzki Date: Thu Jul 3 21:24:34 2014 +0200 Manually revert "Make COMPUTE_OFFSET and COMPUTE_OFFSET_AND_REMAINING macros." This reverts commit b136182ad41b0552421992f36f3b70fa497fd658 This function are already marked inline, and profiler don't show much difference in performance, revert as previous version is cleaner. Change-Id: I1ac2c30a91b46278730ceee127efa086c7fbc6d6 Reviewed-on: https://code.wireshark.org/review/2828 Reviewed-by: Anders Broman commit c62a905 Author: Guy Harris Date: Thu Jul 3 13:31:15 2014 -0700 Sometimes Git can be a real pain. Change-Id: Ib93575d9977162b468f171038915c1eb8a612660 Reviewed-on: https://code.wireshark.org/review/2831 Reviewed-by: Guy Harris commit 1c29777 Author: Guy Harris Date: Thu Jul 3 13:30:12 2014 -0700 Rename and move ui/stat_menu.h to epan/stat_groups.h. The groups are, technically, independent of the notion of a menu, and, if we have mechanisms by which taps that are not only GUI toolkit-independent but independent of the *existence* of a GUI can be registered, they might want to register themselves in a group just in case they're running in a program that has a GUI. Also, this might fix the Debian package build. Change-Id: I29435681e79748fd4f2e0c5ac872cd11f831d172 Reviewed-on: https://code.wireshark.org/review/2830 Reviewed-by: Guy Harris commit 7dd27db Author: Guy Harris Date: Thu Jul 3 12:19:13 2014 -0700 stat_menu.h moved to libui. Change-Id: I09227699afa8306d4a699dad5e12efc11f6597ea Reviewed-on: https://code.wireshark.org/review/2827 Reviewed-by: Guy Harris commit 06bd804 Author: Guy Harris Date: Thu Jul 3 10:16:25 2014 -0700 Make wsutil depend on gitversion. wsutil contains the only code that uses version.h; make the dependency explicit, to see whether that fixes the current build issues with Debian packaging. Also, get rid of all *other* dependencies on gitversion. Change-Id: I89fa5e4112633b83a1a7dfa349bc337e3688575f Reviewed-on: https://code.wireshark.org/review/2823 Reviewed-by: Guy Harris commit 66b02c7 Author: Guy Harris Date: Thu Jul 3 08:22:09 2014 -0700 Include to get _LINUX_CAPABILITY_VERSION defined. It's no longer used in version_info.c, but is used in the main source files of TShark and Wireshark (it's already included in dumpcap). Change-Id: I2169a2bbed678baf26fc8711d7c13d95cce3ee2a Reviewed-on: https://code.wireshark.org/review/2819 Reviewed-by: Guy Harris commit f3c62ed Author: Guy Harris Date: Thu Jul 3 08:09:46 2014 -0700 Move the GLib version info string stuff to get_glib_version_info(). Change-Id: I1013ad9a0a98bcbf07fe597f9e932f2ea1a5cd28 Reviewed-on: https://code.wireshark.org/review/2818 Reviewed-by: Guy Harris commit 87cf043 Author: AndersBroman Date: Thu Jul 3 15:38:33 2014 +0200 Fix bulding of reordercap Change-Id: I9898685d20c684c05f505275804d9c6588bba645 Reviewed-on: https://code.wireshark.org/review/2811 Reviewed-by: Anders Broman commit 16f8ba1 Author: Peter Wu Date: Thu Jul 3 11:25:21 2014 +0200 catapult,irda: Fix ASAN crashes due to buffer underrun The catapult dissector tripped on this random file I had. A quick look at other dissectors which use a construct like "-1] *= '*\\[rn]" showed packet-irda too, so fix that as well. Change-Id: I4b5fadcacd0b09d0fb29bdefc3dd1f28aef9b593 Reviewed-on: https://code.wireshark.org/review/2802 Reviewed-by: Evan Huus Reviewed-by: Michael Mann commit 6ed9540 Author: Yan Burman Date: Thu Jul 3 14:51:03 2014 +0300 Fix type-o left over from cut-and-paste Change-Id: I80b24cd8b75999454c1767bd3044ecc569f57d98 Signed-off-by: Yan Burman Reviewed-on: https://code.wireshark.org/review/2805 Reviewed-by: Anders Broman commit 1657423 Author: AndersBroman Date: Thu Jul 3 14:18:33 2014 +0200 Try to fix the build by adding version_info.obj to the link stage of text2pcap and in both lines for mergecap. Follow up of https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=1a165b9be8a122ee1d5c0a60ca441d2c9198b3fd Change-Id: I4b44965604eec92415b8bb6e9267dadbb2937f7a Reviewed-on: https://code.wireshark.org/review/2807 Reviewed-by: Anders Broman commit 470994d Author: Guy Harris Date: Thu Jul 3 02:53:13 2014 -0700 Needs wsutil/wsgetopt.h if the platform doesn't have getopt_long(). This includes Windows (which doesn't even have getopt()). Change-Id: I01a3a9a00014176875ddad6760c387bf7aa9de84 Reviewed-on: https://code.wireshark.org/review/2804 Reviewed-by: Guy Harris commit 1a165b9 Author: Guy Harris Date: Thu Jul 3 02:21:18 2014 -0700 We have to include version_info.obj manually in the dependencies for text2pcap. Add a comment indicating why we're not generating text2pcap_OBJECTS from text2pcap_SOURCES and using that. Change-Id: I8235080c3ea2bb31861a9c4f5aee9e6ce6a0808c Reviewed-on: https://code.wireshark.org/review/2801 Reviewed-by: Guy Harris commit 1692c52 Author: Guy Harris Date: Thu Jul 3 02:16:12 2014 -0700 Include "capture-pcap-util.h" even if we don't have libpcap. The routines to get libpcap version information just say "no pcap here" if we don't have it, so they're called regardless of whether we were compiled with it. Change-Id: I4e58cce83f7c0e36aa6ef9b40ec7075732402f3b Reviewed-on: https://code.wireshark.org/review/2800 Reviewed-by: Guy Harris commit edc6736 Author: Guy Harris Date: Thu Jul 3 02:08:48 2014 -0700 Add --help and --version support. Make the output for them resemble the output for other programs. Change-Id: I45dbee32ad403b8fedc2350ac9096ac1a5820cbe Reviewed-on: https://code.wireshark.org/review/2799 Reviewed-by: Guy Harris commit f0ed0e6 Author: AndersBroman Date: Thu Jul 3 10:53:40 2014 +0200 Get rid of soft-deprecated API:s Change-Id: Ieb4a3f07a7831c141ba8ce9c075e72091ef909be Reviewed-on: https://code.wireshark.org/review/2798 Reviewed-by: Anders Broman commit a1ec669 Author: Guy Harris Date: Thu Jul 3 01:57:50 2014 -0700 Clean up printf() argument list. Splitting %s from \n makes it clearer that the %s's in question take arguments that already include a newline, and that the subsequent \n adds a blank line. Change-Id: I5bac8ca80b42f7de980ad29480042cae3166ff7e Reviewed-on: https://code.wireshark.org/review/2797 Reviewed-by: Guy Harris commit 35c4721 Author: Guy Harris Date: Thu Jul 3 01:55:34 2014 -0700 Get rid of an extra blank line. Change-Id: I321ef1404e37ebb13a456d18eeb81285b7ba477f Reviewed-on: https://code.wireshark.org/review/2796 Reviewed-by: Guy Harris commit 6264b8a Author: Guy Harris Date: Thu Jul 3 01:54:13 2014 -0700 Use get_*_int() from wsutil, rather than defining our own. Change-Id: I4811d87a903cc3cea93e12883edf25bcd1271a53 Reviewed-on: https://code.wireshark.org/review/2795 Reviewed-by: Guy Harris commit b4ce352 Author: Guy Harris Date: Thu Jul 3 01:45:32 2014 -0700 Make --help and --version information a bit more uniform. Have --version print the version number, the copyright information, the "compiled with" information, the "running on/with" information, and the compiler information. Have --help print the version number, a one-line summary of what the program does, a reference to http://www.wireshark.org for more information, a Usage: line, and a list of command-line options. This means programs doing that don't need to include version.h; that's left up to get_ws_vcs_version_info() to do. Change-Id: Idac641bc10e4dfd04c9914d379b3a3e0cc5ca8cb Reviewed-on: https://code.wireshark.org/review/2794 Reviewed-by: Guy Harris commit d70e56a Author: Evan Huus Date: Wed Jul 2 17:42:48 2014 -0400 Revert to 3ms if we don't have the handshake Change-Id: I96b23677f3050e9c62edd49f26d50d8b4addcf58 Reviewed-on: https://code.wireshark.org/review/2784 Reviewed-by: Anders Broman commit 2dbab6d Author: Pascal Quantin Date: Wed Jul 2 23:04:58 2014 +0200 GTP: add dissection of Extended End User Address Bug: 10251 Change-Id: I174b5a2b3e2ec8ff2ead9f290b452ee468f6fe66 Reviewed-on: https://code.wireshark.org/review/2783 Reviewed-by: Alexis La Goutte Reviewed-by: Anders Broman commit 5889d4b Author: Guy Harris Date: Thu Jul 3 00:28:24 2014 -0700 More getopt_long(), for --help and --version. Change-Id: Ia02d7b1fbeaa8e581e85ad8b87afabd576515434 Reviewed-on: https://code.wireshark.org/review/2792 Reviewed-by: Guy Harris commit 8afe331 Author: Guy Harris Date: Wed Jul 2 21:50:54 2014 -0700 More getopt_long, to add --help and --version support. Change-Id: I946067b972a70154f02ab561bc0fd029a7a5abc4 Reviewed-on: https://code.wireshark.org/review/2791 Reviewed-by: Guy Harris commit a4304de Author: Guy Harris Date: Wed Jul 2 19:33:27 2014 -0700 Add long-option support. That way, --help and --version, as well as -h and -v, work. Change-Id: I095e0dcef9f6181d6fbe6337f9f33e80bc44f11a Reviewed-on: https://code.wireshark.org/review/2790 Reviewed-by: Guy Harris commit 6b3391c Author: Guy Harris Date: Wed Jul 2 19:29:21 2014 -0700 Regularize the help output of programs. Only print to the standard output, and only give the version information, if a "print help" command-line option is specified. Otherwise, leave out the version information, and print to the standard error. Leave out the copyright information; it's extra cruft, and http://www.gnu.org/prep/standards/html_node/_002d_002dhelp.html doesn't say anything about it (and bash, at least, doesn't print it). Change-Id: Ic5029ccf96e096453f3bd38383cc2dd355542e8a Reviewed-on: https://code.wireshark.org/review/2789 Reviewed-by: Guy Harris commit 66c342e Author: Guy Harris Date: Wed Jul 2 19:03:07 2014 -0700 Regularize the first line of version output. For Wireshark, say "Wireshark", not "wireshark". For other programs, put "(Wireshark)" after the program name, as per http://www.gnu.org/prep/standards/html_node/_002d_002dversion.html ("If the program is a subsidiary part of a larger package, mention the package name in parentheses, like this"). Change-Id: I68558f64cfa6ee4423e42f3d6b120633ef1b2716 Reviewed-on: https://code.wireshark.org/review/2788 Reviewed-by: Guy Harris commit 0e4e825 Author: Guy Harris Date: Wed Jul 2 18:28:35 2014 -0700 Add license information to the copyright information. See http://www.gnu.org/prep/standards/html_node/_002d_002dversion.html Change-Id: I19c1cf560a1bb7ed7d7312bea727550977d66120 Reviewed-on: https://code.wireshark.org/review/2787 Reviewed-by: Guy Harris commit f3c5f14 Author: Irene Ruengeler Date: Tue Jun 24 11:36:51 2014 +0200 Manage Interfaces - Add dialog to manage interfaces - Add and delete pipes - Hide local interfaces Change-Id: I08323c306c2ea736f99e57c28e2fe3170a0c2216 Reviewed-on: https://code.wireshark.org/review/2613 Tested-by: Anders Broman Reviewed-by: Anders Broman Reviewed-by: Alexis La Goutte Reviewed-by: Michael Tüxen commit 2c9d2be Author: Guy Harris Date: Wed Jul 2 13:27:00 2014 -0700 Fail if any of the install-exec-hook commands fails. Hopefully, this will mean that somebody doing a set-UID/set-GID/setcap installation as themselves rather than as root will not "succeed" but leave dumpcap installed without enhanced privileges, so the underlying problem in bugs such as bug 10247 will be more obvious. Change-Id: I34393bc2c9ea4dc59854a08524edb4f65e79730b Reviewed-on: https://code.wireshark.org/review/2781 Reviewed-by: Guy Harris commit 980893a Author: Michael Mann Date: Wed Jul 2 09:32:20 2014 -0400 NDPS dissector is the poster child for proto_tree_add_subtree[_format]. NDPS dissector is also the poster child for not being considered "that naughty" by checkAPIs because most of its proto_tree_add_text calls don't have printf-style arguments (which is what checkAPIs really keys off of) Fixed both cases and removed about 370 proto_tree_add_text calls from the dissector. Change-Id: I721678c39d4a0544e5e7212e622c0c2eebfd04f7 Reviewed-on: https://code.wireshark.org/review/2775 Reviewed-by: Evan Huus commit a3bac6d Author: Evan Huus Date: Wed Jul 2 10:37:10 2014 -0400 kafka: fully dissect offset request/response messages Change-Id: I641a3dbece6f822144f6740dde6801b1be202db5 Reviewed-on: https://code.wireshark.org/review/2777 Reviewed-by: Michael Mann Reviewed-by: Evan Huus commit 0041f36 Author: Joerg Mayer Date: Wed Jul 2 17:43:17 2014 +0200 Make the flag testing logic for linker flags work like the compiler flag testing. Change-Id: I2478417cbcd395247215f149978c5f0c874c9b3a Reviewed-on: https://code.wireshark.org/review/2779 Reviewed-by: Jörg Mayer commit 65e3f5c Author: Balint Reczey Date: Mon Jun 30 17:56:28 2014 +0200 Allow overriding C/C++ flags from CMake command line Append user's flags to our flags instead of prepending them to make user flags higher priority. Change-Id: I3ead33ee5fa06a2395d9197a027306ef99a704a2 Reviewed-on: https://code.wireshark.org/review/2722 Reviewed-by: Jörg Mayer commit 956c440 Author: Evan Huus Date: Tue Jul 1 22:48:49 2014 -0400 RSVP checksum is not required if integrity object is present Bug: 10219 Change-Id: I2da62ee184327b2bc42a264e1782db927460f5cf Reviewed-on: https://code.wireshark.org/review/2773 Reviewed-by: Alexis La Goutte Reviewed-by: Anders Broman commit 09839e3 Author: Tim Furlong Date: Fri Jun 20 12:07:58 2014 -0700 Update WSDG win32/win64 quick start guide to include dependencies and instructions for building QtShark; note alternate cygwin package for 'patch' utility; update example setup script to add Qt bin directory to PATH, and extract out paths as variables. Change-Id: Id404b8757dbfd0dc1119b89e01bbe2fa139e2b38 Reviewed-on: https://code.wireshark.org/review/2751 Reviewed-by: Evan Huus Reviewed-by: Anders Broman commit af75289 Author: Jakub Zawadzki Date: Wed Jul 2 00:49:09 2014 +0200 Optimize sip dissector: avoid calling tvb_get_string_enc() Fetch header value, only when we need to parse it. Change-Id: I3c170ef8ab03985c8111a1b84ac1afc87bc8b5ca Reviewed-on: https://code.wireshark.org/review/2767 Reviewed-by: Evan Huus Reviewed-by: Anders Broman commit f737381 Author: Tim Furlong Date: Tue Jul 1 21:13:09 2014 -0400 Add a note to Doc/docbook-xml42 requirement in docbook/README.txt indicating that a later version may be required; e.g. my a2x (from cygwin64) generates a developer-guide.xml that needs docbook-xml45. Change-Id: Iea9d4b45e32157a9317e3fcf6794668e3a810c54 Reviewed-on: https://code.wireshark.org/review/2750 Reviewed-by: Evan Huus commit 98d8dec Author: Guy Harris Date: Tue Jul 1 18:01:38 2014 -0700 See if this forces version.h to be built. (It's not being built by the Ubuntu buildboth when it's building the Debian package.) Change-Id: Id7866e13ce72cdda4bb7d5cf0362ba7295ff766b Reviewed-on: https://code.wireshark.org/review/2772 Reviewed-by: Guy Harris commit 096aca6 Author: Guy Harris Date: Tue Jul 1 17:47:55 2014 -0700 Make some inconsistent configuration options errors. This way, if you ask for both setuid and setcap installation of dumpcap, it will fail, rather than silently (other than a message you might miss) ignoring the request for setuid installation. See bug 10246. Also: if you ask for setuid or setcap installation of dumpcap, but dumpcap isn't built, it'll let you know that there's nothing to make setuid/setcap, and fail; if you ask for setcap installation of dumpcap, but setcap wasn't found, it'll let you know that it can't install it setcap, and fail; so that it won't silently (other than a message you might miss) ignore those requests, either. Change-Id: Ibc01593e59fd1cd1be8c68d8cdacbfdca863efa0 Reviewed-on: https://code.wireshark.org/review/2771 Reviewed-by: Guy Harris commit 4cdfc5c Author: Guy Harris Date: Tue Jul 1 17:34:46 2014 -0700 AUTHORS-SHORT is build in ${CMAKE_BINARY_DIR}, not ${CMAKE_SOURCE_DIR}. Make the dependencies list indicate that. Change-Id: I88416e1239130b7661bbd9deccfb289e0b0fd627 Reviewed-on: https://code.wireshark.org/review/2770 Reviewed-by: Guy Harris commit ae26b12 Author: Guy Harris Date: Tue Jul 1 17:20:17 2014 -0700 If -fvisibility=hidden isn't supported, try -xldscope=hidden. That's the option for newer versions of Sun^WOracle C. Change-Id: I62c12d5870d84587f81a8789732675021523e9ed Reviewed-on: https://code.wireshark.org/review/2769 Reviewed-by: Guy Harris commit ab1e6f3 Author: Evan Huus Date: Tue Jul 1 19:46:54 2014 -0400 Bump (again) the amount of work we do for wmem's timing test Apparently the new win8 vm has a *very* low-resolution timer, and the allocators are indistinguishable at the previous amount of work. Change-Id: If4e5bb8f85b1f0d39658f54001c88f42ffddfc47 Reviewed-on: https://code.wireshark.org/review/2768 Reviewed-by: Evan Huus commit 22ea889 Author: Guy Harris Date: Tue Jul 1 16:03:34 2014 -0700 For Sun C with linker scoping specifiers, define WS_DLL_PUBLIC_DEF. This may let us, at least for those compilers, make the default "hidden" with -xldscope=hidden. Change-Id: I94e10733c2aba0ff8d77a8bf4f1dc8ecc8b2a47f Reviewed-on: https://code.wireshark.org/review/2766 Reviewed-by: Guy Harris commit a4a624e Author: Jeff Morriss Date: Tue Jul 1 18:28:26 2014 -0400 Get rid of rpath when we're building RPMs. Fedora prohibits it, we don't need it, and it gets in the way some times. Change-Id: I92cee959f471866ff90efe9f96e4fa519c357dd9 Reviewed-on: https://code.wireshark.org/review/2763 Reviewed-by: Jeff Morriss commit 5f682f1 Author: Jeff Morriss Date: Tue Jul 1 17:22:46 2014 -0400 Fix buildroot. Change-Id: I902db6c69ae5966da1102e4fbcfd9f46867c0b4f Reviewed-on: https://code.wireshark.org/review/2762 Reviewed-by: Jeff Morriss commit 2a306f4 Author: Malcolm Walters Date: Tue Jul 1 13:38:47 2014 +0100 Fix for Bug 10240. Include padding length in calculation of correct attribute length Change-Id: I569c6a9e1be39e3bb997e797a094b80cdcba6b07 Reviewed-on: https://code.wireshark.org/review/2747 Reviewed-by: Evan Huus Reviewed-by: Pascal Quantin commit a73199e Author: Guy Harris Date: Tue Jul 1 13:39:25 2014 -0700 Use G_GNUC_PRINTF() for simple_message_box(). We don't need to do the right __attribute__ magic ourselves; GLib does it for us. Change-Id: Id31943a8413f0272237be4f868659b5bd5e70626 Reviewed-on: https://code.wireshark.org/review/2758 Reviewed-by: Guy Harris commit 852d5da Author: Jakub Zawadzki Date: Tue Jul 1 22:23:53 2014 +0200 Remove executable bit, from not executable files. Change-Id: I36b303b9c2bf4d6bb717261cdbf39ea16532fe06 Reviewed-on: https://code.wireshark.org/review/2757 Reviewed-by: Alexis La Goutte commit e696d0f Author: Guy Harris Date: Tue Jul 1 13:18:06 2014 -0700 Fix the checks for the Cygwin path. I.e., do if we have 32-bit Cygwin CYGWIN_PATH=path to it else if we have 64-bit Cygwin CYGWIN_PATH=path to it else fail endif rather than CYGWIN_PATH=standard path for 32-bit Cygwin if we don't have 32-bit cygwin and we do have 64-bit Cygwin CYGWIN_PATH=path to 64-bit cygwin else fail endif as the latter will fail if we *do* have 32-bit Cygwin. Change-Id: I42d607a1319263edcc1d6e546b813862b7d33ffa Reviewed-on: https://code.wireshark.org/review/2756 Reviewed-by: Guy Harris commit aa0f809 Author: Guy Harris Date: Tue Jul 1 12:46:38 2014 -0700 Don't check for -Wl,{option} support. Not all AC_WIRESHARK_LDFLAGS_CHECK flags are -Wl,{option} flags, so don't check for that first. If we want to check for specific compilers and linkers, we should do that, not for -Wl,{option} support. Change-Id: Ib9581d4a1573a1ffa2493ce08e6d5845d2601352 Reviewed-on: https://code.wireshark.org/review/2755 Reviewed-by: Guy Harris commit b378f72 Author: Guy Harris Date: Tue Jul 1 12:26:35 2014 -0700 Fix comments to reflect reality. Change-Id: Id56f5844932371a89785f4ddce87eb66789acdc8 Reviewed-on: https://code.wireshark.org/review/2754 Reviewed-by: Guy Harris commit 27d3201 Author: Guy Harris Date: Tue Jul 1 12:21:02 2014 -0700 Pick up stuff from GLib to hide symbols with Sun C. Note why we don't use G_GNUC_INTERNAL, but duplicate what GLib does, and don't use G_HAVE_GNUC_VISIBILITY to determine whether we can use __attribute__ ((visibility (...))). Change-Id: I0b8d40f40d04e821352522320626173806787214 Reviewed-on: https://code.wireshark.org/review/2753 Reviewed-by: Guy Harris commit 2211813 Author: Tim Furlong Date: Mon Jun 30 22:54:46 2014 -0400 Add logic to config.nmake to find 64-bit cygwin, and a note warning about forward slashes in the QT5_BASE_PATH if the recommended qmake command is used; both of these issues will cause annoyingly non- obvious errors. Change-Id: I6f9a662969d1fc1887e75e8b0fde3520bbbea416 Reviewed-on: https://code.wireshark.org/review/2749 Reviewed-by: Evan Huus Reviewed-by: Anders Broman commit e1e7dd0 Author: Graham Bloice Date: Mon Jun 30 23:53:56 2014 +0100 Fix the QT build on Qt 5.3 or later to use the windeployqt tool to copy the rquired Qt files into the runtime directory Qt 5.2 is broken as windeployqt doesn't take the required --release flag Also fix the passing of GCC_DLL and GPGERROR_DLL into config.pri so that the Qt build copies the required files instead of the entire gnutls bin dir twice (the variables expanded to nothing). Add support for autodetection of Qt 5.3.0 with msvc2013 Change-Id: I1e9c70a5ff5d1fdfdce88ba15d324f1899c8129c Reviewed-on: https://code.wireshark.org/review/2734 Reviewed-by: Pascal Quantin Tested-by: Graham Bloice Reviewed-by: Graham Bloice Reviewed-by: Anders Broman commit b5e266f Author: Balint Reczey Date: Tue Jul 1 13:09:16 2014 +0200 Keep VS Code Analysis happy Change-Id: I4ef92f715d7a0a1449f1b509ce7ed59651cd1a6a Reviewed-on: https://code.wireshark.org/review/2745 Reviewed-by: Evan Huus commit bd79dae Author: Graham Bloice Date: Tue Jul 1 12:52:09 2014 +0100 Remove debugging info from protocol tree for frame Change-Id: Id7f02087e536964bfa6d01a3646c20035a3ab6cb Reviewed-on: https://code.wireshark.org/review/2746 Reviewed-by: Graham Bloice Tested-by: Graham Bloice Reviewed-by: Anders Broman commit 147db82 Author: Balint Reczey Date: Tue Jul 1 12:29:38 2014 +0200 Log2() and exp2() are missing on Windows Change-Id: I8a970f9030fafd8fdcb4e2a24620033ec8005da7 Reviewed-on: https://code.wireshark.org/review/2744 Reviewed-by: Balint Reczey commit 0cf54e7 Author: Guy Harris Date: Tue Jul 1 03:11:18 2014 -0700 Drop privileges even earlier. Do it at the same point at which Wireshark does so. Do some other things in the same order as well. Change-Id: I2925366d49d14271ceffa1a938b5e3450337c772 Reviewed-on: https://code.wireshark.org/review/2743 Reviewed-by: Guy Harris commit 9485392 Author: Guy Harris Date: Tue Jul 1 03:05:38 2014 -0700 Add a comment that appears in other programs. Change-Id: Ife885779d339fbb706c9d6cfd931833afba25277 Reviewed-on: https://code.wireshark.org/review/2742 Reviewed-by: Guy Harris commit deeb1de Author: Guy Harris Date: Tue Jul 1 03:02:47 2014 -0700 Squelch some warnings. Make some arguments and structure members gsize, as that's what stored into them or passed to them. (And move a newly-widened-on-LP64 item, to avoid extra structure padding.) Add a cast, which also appears necessary to squelch a warning. Clean up indentation while we're at it. Change-Id: I0cc92e7d2904c5af1f3f3d93f51b6ecb3aed464d Reviewed-on: https://code.wireshark.org/review/2741 Reviewed-by: Guy Harris commit f90bf8a Author: Balint Reczey Date: Fri Jun 27 17:36:32 2014 +0200 Increase space allocated for IO Graph slower after 1 million items Change-Id: I691070b572e519f412a80db5d7415331f07e8e50 Reviewed-on: https://code.wireshark.org/review/2689 Reviewed-by: Graham Bloice Reviewed-by: Balint Reczey commit 5245832 Author: Balint Reczey Date: Thu Jun 26 23:33:32 2014 +0200 GTK: Unlimited, dynamically allocated IO Graph Bug: 8460 Change-Id: Id9aad3f5f69bee9e5a62601ecac28a6a7019e623 Reviewed-on: https://code.wireshark.org/review/2672 Reviewed-by: Evan Huus Reviewed-by: Graham Bloice Reviewed-by: Balint Reczey commit eb23994 Author: Joerg Mayer Date: Tue Jul 1 08:21:39 2014 +0200 Generate version.h before adding subdirs (especially wsutil). Otherwise build could fail in wsutil because of missing version.h Change-Id: If6fdf1080c6de9ca1581bcc126506e78ec03a1d8 Reviewed-on: https://code.wireshark.org/review/2740 Reviewed-by: Jörg Mayer commit a452d16 Author: Evan Huus Date: Mon Jun 30 19:46:58 2014 -0400 Optimize epan_new/init_dissection As Anders correctly pointed out in I7d8f84b2e, constantly resetting state will turn init_dissection into a bit of a hot path. Especially as we will already bear the overhead of switching files, we don't want to fall any further behind than we have to. This change includes three unrelated optimizations that reduce the cost of init_dissection by about 40% as measured by callgrind: - only initialize ares/ADNS if that preference is enabled (this of course only applies if you specify -n to tshark or otherwise disable the preference) - use memcpy instead of a loop in sigcomp UDVM init - use memcpy instead of a loop in bootp dissector The only remaining obvious hot spot in this path is reassembly_table_init since it is called by so many dissectors. Suggestions (perhaps to get rid of the GPtrArray) welcome. Oh, and one other change to use g_strerror instead of strerror as insisted upon by the API pre-commit hook. Change-Id: I18a74f2b64b25498116079bd4e7fc2b335c7703a Reviewed-on: https://code.wireshark.org/review/2738 Reviewed-by: Anders Broman commit 659d0ef Author: Jakub Zawadzki Date: Fri Jun 20 21:04:34 2014 +0200 sip optimization: avoid calling tvb_get_guint8. Use tvb_pbrk_guint8, tvb_find_guint8 when possible. Change-Id: If8090d9b9b92146e9c216f139c056130d6b04e78 Reviewed-on: https://code.wireshark.org/review/2569 Reviewed-by: Anders Broman commit 94e6bbe Author: Joerg Mayer Date: Tue Jul 1 04:22:50 2014 +0200 Put each option on a line of its own. Change-Id: Ibec60300306e8af7ee230080b113111f93d850dc Reviewed-on: https://code.wireshark.org/review/2739 Reviewed-by: Jörg Mayer commit 4e9e043 Author: Balint Reczey Date: Mon Jun 30 14:38:01 2014 +0200 Init session id to avoid warning using GCC 4.9 Change-Id: I2091f7eb86c64fd086f44a7cf15e7c5483f9b44c Reviewed-on: https://code.wireshark.org/review/2716 Reviewed-by: Evan Huus commit c12f269 Author: Balint Reczey Date: Mon Jun 30 18:24:30 2014 +0200 Fix access to uninitialised value Change-Id: I4c8a15fce631051edd39e7d29c8f0a5e00fcde26 Reviewed-on: https://code.wireshark.org/review/2724 Reviewed-by: Evan Huus commit 9a676ac Author: Balint Reczey Date: Mon Jun 30 18:10:32 2014 +0200 Fix access to uninitialised values Change-Id: Id3592fed0cca5133d493f26d3b8ce27a3cf8505c Reviewed-on: https://code.wireshark.org/review/2723 Reviewed-by: Evan Huus commit bb6f5ea Author: Guy Harris Date: Mon Jun 30 16:19:59 2014 -0700 Reflect the move of filters.c to libui. Change-Id: Ic1099927e3fb63c020c622e0a92e99a376908f4e Reviewed-on: https://code.wireshark.org/review/2737 Reviewed-by: Guy Harris commit efafca7 Author: Guy Harris Date: Mon Jun 30 16:11:58 2014 -0700 Drop privileges very early on. TShark relies on dumpcap to capture packets, and TFShark doesn't even do packet capturing (it dissects files, not network traffic), so neither of them need, or should run with, special privileges. If you *must* run with special privileges in order to capture, grant those privileges to dumpcap, which has a *lot* fewer lines of code than libwireshark and TShark/TFShark. Change-Id: I8f8fedead355ca163895e025df37240d2f232ba4 Reviewed-on: https://code.wireshark.org/review/2736 Reviewed-by: Guy Harris commit ac88f71 Author: Guy Harris Date: Mon Jun 30 16:02:57 2014 -0700 Clean up a comment. SetProcessDEPPolicy() is the API; PSetProcessDEPPolicy is just a local pointer variable that either points to that API's implementation (if it's available) or is null (if it isn't). Change-Id: I676fbb75019e32af511cefa6f1c7b7124ac9d8e8 Reviewed-on: https://code.wireshark.org/review/2735 Reviewed-by: Guy Harris commit 62fa030 Author: Guy Harris Date: Mon Jun 30 15:51:20 2014 -0700 Do startup things in an order more like that of gtkshark. Get credential information and drop privileges *very* early on. Get the pathname of the executable right after that, then initialize the 802.11 decryption, then, on Windows, load WinPcap and, if available, AirPcap. *Then* we can get the version information and set the crash information. We should drop privileges as early as possible. We have to load WinPcap and AirPcap before getting the run-time information, as the run-time information includes the *pcap versions. Change-Id: Ib40e5a848cc7f42fcb424faa15a91868eaa0b9a4 Reviewed-on: https://code.wireshark.org/review/2733 Reviewed-by: Guy Harris commit 0a2de4f Author: Guy Harris Date: Mon Jun 30 15:27:39 2014 -0700 Always set the crash information. There's no reason to do it only on Windows - and, in fact, the only platform where we currently do anything with the information is OS X. Every other program in the Wireshark suite that does it at all does it on all platforms. Change-Id: I8ab29fd86656dd44322991d0d7263c6bb4fcd425 Reviewed-on: https://code.wireshark.org/review/2730 Reviewed-by: Guy Harris commit a07dc8b Author: Guy Harris Date: Mon Jun 30 15:11:01 2014 -0700 Add echld_test to the list of files we ignore (built with --enable-echld). Change-Id: Idca036db408e4caf6c84a67b4c36145568921ca5 Reviewed-on: https://code.wireshark.org/review/2729 Reviewed-by: Guy Harris commit fe1ef6c Author: Guy Harris Date: Mon Jun 30 14:49:19 2014 -0700 Get rid of trailing blank line. Change-Id: Id7d134b1d217ef319e3162ae007432fdbe87d0c1 Reviewed-on: https://code.wireshark.org/review/2728 Reviewed-by: Guy Harris commit c1d2b29 Author: Guy Harris Date: Mon Jun 30 14:47:22 2014 -0700 Move filters.[ch] to libui. Change-Id: I32f04016498dfe8f54b0480f30a84ffe5ef7868f Reviewed-on: https://code.wireshark.org/review/2727 Reviewed-by: Guy Harris commit 5e28386 Author: Guy Harris Date: Mon Jun 30 14:36:40 2014 -0700 Move stat_menu.h to libui. Change-Id: I7bed7f7931845bc41035535cc62e1fe17c71047d Reviewed-on: https://code.wireshark.org/review/2726 Reviewed-by: Guy Harris commit f1ff663 Author: Evan Huus Date: Sun Jun 29 08:50:21 2014 -0400 Warn about unencrypted HTTP traffic over port 443 At the suggestion of Toralf Förster. This includes an expert info, as well as making SSL a new-style dissector and rejecting traffic that looks like unencrypted text. Change-Id: Ib09ea0d97952330f092590ff3fc6488807cdbb81 Reviewed-on: https://code.wireshark.org/review/2693 Reviewed-by: Peter Wu Reviewed-by: Evan Huus commit 60d0faf Author: Guy Harris Date: Mon Jun 30 14:08:24 2014 -0700 Move proto_hier_stats.[ch] to libui. Change-Id: Ib7c0617d88bf92cad0ac877176001d29960f1cd8 Reviewed-on: https://code.wireshark.org/review/2725 Reviewed-by: Guy Harris commit 073bf49 Author: AndersBroman Date: Mon Jun 30 16:36:52 2014 +0200 From Johan Whahl: Added dissection of the SIP Service-Route header. Change-Id: Ic4523edb374ae03492af5853863dde501a0c30e0 Reviewed-on: https://code.wireshark.org/review/2721 Reviewed-by: Anders Broman commit 9387979 Author: AndersBroman Date: Mon Jun 30 16:04:50 2014 +0200 Fix the display of AVP:s that are not fully dissected fixes Bug #10237 Change-Id: I3c38bb4af4440f1e5087f21ef022bf2cd3a66002 Reviewed-on: https://code.wireshark.org/review/2720 Reviewed-by: Anders Broman commit 099bc93 Author: Michal Labedzki Date: Mon Jun 23 08:25:15 2014 +0200 Logcat: Remove commented code "g_strlcpy" guarante that "dest" to be null-terminated. Also cosmetic change from file_subtype to encap. Change-Id: If188a08cf34dd9def4203404962571c273740636 Reviewed-on: https://code.wireshark.org/review/2718 Reviewed-by: Michal Labedzki commit 3b15891 Author: Michal Labedzki Date: Mon Jun 30 15:12:18 2014 +0200 Bluetooth: Add missing connection_handle This initialize previously uninitialized variable (and nice fixing everything) Change-Id: I943102510fc45735f40db7899884d2c0fe6ffb40 Reviewed-on: https://code.wireshark.org/review/2717 Reviewed-by: Michal Labedzki commit 9cf40b6 Author: Bill Meier Date: Mon Jun 30 01:48:16 2014 -0400 Fix Bug #10238: Display filter expression dialog items do not expand/display properly. Unfortunately, certain proto_hier_tree_model.c functions assume/require that a cookie generated by proto_(first|next)_protocol_field() will never have a NULL value. Bug introduced in gd47ae54. Change-Id: I42763d02f700e15ca9b3ab9980943d4f8d933ca9 Reviewed-on: https://code.wireshark.org/review/2712 Reviewed-by: Evan Huus commit 01c9ac8 Author: Guy Harris Date: Mon Jun 30 01:13:57 2014 -0700 Get rid of another unused routine. Change-Id: I58943faaf6e77023ab1fb7bd7a22324a713659da Reviewed-on: https://code.wireshark.org/review/2714 Reviewed-by: Guy Harris commit 241862a Author: Guy Harris Date: Mon Jun 30 00:34:47 2014 -0700 Get rid of unused routine. Change-Id: Iaf12ba7f13804a6d351ea85c0daa52d4489e8c57 Reviewed-on: https://code.wireshark.org/review/2713 Reviewed-by: Guy Harris commit ad1391a Author: Guy Harris Date: Sun Jun 29 22:38:29 2014 -0700 Move capture.[ch] to libui. Change-Id: I86e7e781cc9e14abab0374a18b95438529b046f0 Reviewed-on: https://code.wireshark.org/review/2711 Reviewed-by: Guy Harris commit 7d1a93f Author: Guy Harris Date: Sun Jun 29 22:29:42 2014 -0700 Make a routine unused outside capture_ui_utils.c static. Change-Id: I63f1e5fb119a44edf4ee489683e79cb39a746c08 Reviewed-on: https://code.wireshark.org/review/2710 Reviewed-by: Guy Harris commit e2801d0 Author: Pascal Quantin Date: Sun Jun 29 23:12:05 2014 +0200 Windows: fix update of version information in wireshark and tshark Broken since gc46329c Change-Id: I00146675d16db021e2cbb7b16841ea9ecb1439b9 Reviewed-on: https://code.wireshark.org/review/2703 Reviewed-by: Evan Huus Reviewed-by: Pascal Quantin commit b33512b Author: Guy Harris Date: Sun Jun 29 22:08:59 2014 -0700 Move capture_session.h to capchild; what it declares is defined there. Change-Id: I8b1407839390b7ac0b45bf6f583c1a509073f002 Reviewed-on: https://code.wireshark.org/review/2709 Reviewed-by: Guy Harris commit df58337 Author: Guy Harris Date: Sun Jun 29 18:36:22 2014 -0700 Move capture_ui_utils.[ch] to libui. Change-Id: Id0f3d4d60a1acc7aa64fd3737b8f16df5bca4e5a Reviewed-on: https://code.wireshark.org/review/2708 Reviewed-by: Guy Harris commit fe8661a Author: Guy Harris Date: Sun Jun 29 17:03:34 2014 -0700 clopts_common.c is now part of wsutil. Change-Id: I474443567e83cab83e4859a4d89a19a8904e08f8 Reviewed-on: https://code.wireshark.org/review/2707 Reviewed-by: Guy Harris commit 53c2a4d Author: Guy Harris Date: Sun Jun 29 16:35:30 2014 -0700 clopts_common.c is now part of wsutil. Change-Id: I0fa773bfc6364689d6e4f97ee89a6508622d2b2a Reviewed-on: https://code.wireshark.org/review/2706 Reviewed-by: Guy Harris commit 8599b72 Author: Guy Harris Date: Sun Jun 29 16:28:49 2014 -0700 Put in missing forward declaration. Change-Id: I734b07beaecf0c180f4423a6e59c8040207e0c31 Reviewed-on: https://code.wireshark.org/review/2705 Reviewed-by: Guy Harris commit fe42762 Author: Guy Harris Date: Sun Jun 29 14:37:21 2014 -0700 Move some more stuff into wsutil. Move the routines to parse numerical command-line arguments there. Make cmdarg_err() and cmdarg_err_cont() routines in wsutil that just call routines specified by a call to cmdarg_err_init(), and have programs supply the appropriate routines to it. Change-Id: Ic24fc758c0e647f4ff49eb91673529bcb9587b01 Reviewed-on: https://code.wireshark.org/review/2704 Reviewed-by: Evan Huus Reviewed-by: Guy Harris commit dd63ae2 Author: Michael Mann Date: Sun Jun 29 17:00:12 2014 -0400 proto_tree_add_subtree[_format] Change-Id: Id00f456479415adf0a219af6c9a2108d4b3642d0 Reviewed-on: https://code.wireshark.org/review/2702 Reviewed-by: Michael Mann commit e39e44d Author: Pascal Quantin Date: Sun Jun 29 15:13:43 2014 +0200 GSM MAP: ensure that p2p_dir is always initialized before calling GSM SMS dissector Bug: 10234 Change-Id: Ie340b849015febe46f91836440d44d4cfde005a4 Reviewed-on: https://code.wireshark.org/review/2695 Reviewed-by: Evan Huus Reviewed-by: Pascal Quantin commit 60ffafd Author: Bill Meier Date: Sun Jun 29 13:39:24 2014 -0400 Fix compile error when building w/o GNUTLS Specifically: is aleays needed (for create_app_running_mutex()) Change-Id: I78e5a767f62bc2af67b6407539742dc245259f56 Reviewed-on: https://code.wireshark.org/review/2699 Reviewed-by: Bill Meier commit f174370 Author: Gerald Combs Date: Sun Jun 29 08:04:51 2014 -0700 [Automatic manuf, services and enterprise-numbers update for 2014-06-29] Change-Id: Ife61b2e2c53f1faba34940035ac84a2b5ced3b71 Reviewed-on: https://code.wireshark.org/review/2696 Reviewed-by: Gerald Combs commit e8a8d62 Author: Michael Mann Date: Sun Jun 29 09:13:51 2014 -0400 proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann commit fe4b7ee Author: Michael Mann Date: Thu Jun 26 20:33:02 2014 -0400 convert to proto_tree_add_subtree[_format] Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann commit e1a8c95 Author: David Ameiss Date: Thu Jun 26 10:33:37 2014 -0500 Standardize the names of, and document, the taps and heuristic dissector tables made avaialble by these dissectors. Change-Id: If3a143eb9546c9de63cd32b2347000b09e0e3c93 Reviewed-on: https://code.wireshark.org/review/2688 Reviewed-by: Evan Huus Reviewed-by: Michael Mann commit 78e328c Author: Balint Reczey Date: Sat Jun 28 18:07:50 2014 +0200 Fix missing g_list_next() with GLib < 2.32 Change-Id: I825e74de378acc9d35e4b620a3eeb4807fe7accd Reviewed-on: https://code.wireshark.org/review/2690 Reviewed-by: Evan Huus commit 5b9ceae Author: Graham Bloice Date: Sat Jun 28 18:33:57 2014 +0100 Remove unused variables post commit 7bf6862ecf0d0a508bf097f3b52d07bd19128272 Change-Id: Id583ab1742241deb9325dcb1dbba8a8cb3df3b90 Reviewed-on: https://code.wireshark.org/review/2691 Reviewed-by: Graham Bloice commit 7bf6862 Author: Michael Mann Date: Thu Jun 26 22:51:11 2014 -0400 convert to proto_tree_add_subtree[_format] Change-Id: Ia7014003a3cff5181295172978d6c613c3b83b0b Reviewed-on: https://code.wireshark.org/review/2676 Tested-by: Michael Mann Reviewed-by: Michael Mann commit 929afd2 Author: Irene Ruengeler Date: Fri Jun 27 14:11:14 2014 +0200 Fix several GTK warnings in Windows. Change-Id: I300137319129c3e188884e1240c025d92e34e410 Reviewed-on: https://code.wireshark.org/review/2687 Reviewed-by: Evan Huus Reviewed-by: Anders Broman commit 18e14a4 Author: AndersBroman Date: Wed Jun 25 14:18:40 2014 +0200 Have the makefile run windepoyqt if it exists to copy the required dlls to the install dir. Change-Id: If87c2670e1ffef116d4497241f070fa41a70015b Reviewed-on: https://code.wireshark.org/review/2644 Reviewed-by: Anders Broman commit d894c2e Author: Balint Reczey Date: Fri Jun 27 12:00:11 2014 +0200 Use g_queue_free_full() only on GLib > 2.32 Change-Id: I7a72fe8243fc809b444f1b026ed872cd2aa92245 Reviewed-on: https://code.wireshark.org/review/2686 Reviewed-by: Balint Reczey Tested-by: Balint Reczey commit a67b7f5 Author: Balint Reczey Date: Sun Jun 22 12:53:48 2014 -0700 Use GQueue for generating statistics This makes reversing the list back and forth to keep adding data at O(n) complexity obsolete. Bug: 9696 Change-Id: Ice77328b8f6c5bf72bbfcfd82e08d09d4f986d3f Reviewed-on: https://code.wireshark.org/review/2571 Reviewed-by: Balint Reczey Tested-by: Balint Reczey commit 9ef47ae Author: Guy Harris Date: Fri Jun 27 01:43:53 2014 -0700 Report more information on a sync_xxx_open() call failure. Trying to get more information for http://ask.wireshark.org/questions/34057/waitpid-error-starting Change-Id: Ifc0eb58f5b69c2c4a4638aa95f6b5f8f628bef02 Reviewed-on: https://code.wireshark.org/review/2685 Reviewed-by: Guy Harris commit efc0a00 Author: Guy Harris Date: Fri Jun 27 00:39:52 2014 -0700 We're not currently using dissect_rtcp_psfb_remb(); #if 0 it out. Also, note that we need to determine how to handle Application Layer Feedback messages based on the SDP setup traffic for the session; recent changes disabled dissection of REMB Application Layer Feedback messages in favor of MS-RTP Application Layer Feedback messages. (This is why we shouldn't remove dissect_rtcp_psfb_remb() unless REMB isn't being used any more.) Change-Id: Ib320bdf4a64263fdef29fc4ea2583eaae1cc4bee Reviewed-on: https://code.wireshark.org/review/2684 Reviewed-by: Guy Harris commit f0d291b Author: AndersBroman Date: Fri Jun 27 06:21:36 2014 +0200 In function 'dissect_rtcp_psfb': packet-rtcp.c:1232: warning: unused parameter 'top_item' Change-Id: I76522a9c6094473ce0eeeb7cc929a66e6da21909 Reviewed-on: https://code.wireshark.org/review/2683 Reviewed-by: Anders Broman commit f36db97 Author: Britt McKinley Date: Mon Jun 23 16:18:04 2014 -0400 RTCP: Add support for MS-RTP Support for Profile Specific Extensions from MS-RTP Support for RTCP Feedback Messages Support for Application Layer Feedback Messages. MS-RTP: Real-time Transport Protocol (RTP) Extensions http://msdn.microsoft.com/en-us/library/office/cc431492.aspx Change-Id: I1f1e6e60b5f9d09b1dffd7e308426c0b67914441 Reviewed-on: https://code.wireshark.org/review/2586 Reviewed-by: Anders Broman commit a87e292 Author: Evan Huus Date: Thu Jun 26 23:43:51 2014 -0400 Tighten the dump-glossary test. 1. The only indication we get of an out-of-order value string is a message on STDERR, so check that and fail the test if STDERR wasn't empty. 2. This exposes an out-of-order value string in packet-stun.c; fix it. 3. This triggered the pre-commit hook on packet-stun.c, which noticed an API error (ENC_ASCII -> ENC_ASCII|ENC_NA); fix that too. Change-Id: I36f87a2a87b40537119562f22a7e3012716ff239 Lesson: automated testing/tooling is both wonderful and scary. Reviewed-on: https://code.wireshark.org/review/2682 Reviewed-by: Evan Huus commit 8d2eaaa Author: Evan Huus Date: Thu Jun 26 23:25:08 2014 -0400 If we have no fields, don't try to iterate through them. Otherwise glib throws an assertion since the array we pass it is NULL. Change-Id: I9159c1f5ad99b280c040cd790df3cf352738601f Reviewed-on: https://code.wireshark.org/review/2680 Reviewed-by: Evan Huus commit 1560b67 Author: Martin Kaiser Date: Wed Jun 25 23:30:13 2014 -0400 show an expert info if a non-control urb contains a setup packet Change-Id: I9339869defa47a862b6174d8821cdd8e6186f5c5 Reviewed-on: https://code.wireshark.org/review/2678 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 06ba7b4 Author: Martin Kaiser Date: Mon Jun 23 23:21:29 2014 -0400 a USB urb of an unknown transfer type does not contain a setup packet Change-Id: Iac6a259a1081b907149c49023614a5053440e560 Reviewed-on: https://code.wireshark.org/review/2677 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 9d4af5f Author: Jeff Morriss Date: Wed Jun 25 15:37:36 2014 -0400 Check the validity of fields given to tshark with "-e": complain and exit if they aren't valid. Should help avoid confusion like that in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10201 Bug: 10201 Change-Id: Iff7f51ae042ca1a92d1c803b6cb61aa5d81ce205 Reviewed-on: https://code.wireshark.org/review/2654 Reviewed-by: Michael Mann Reviewed-by: Evan Huus commit 4742fc8 Author: Graham Bloice Date: Wed Jun 25 00:05:08 2014 +0100 Fixed linker flags for MSVC to not attempt to make and link a manifest Added solution "folder" for tests. Change-Id: I96dfb4a28fb7aaf3e84cea026e1f5d15afe6c0c6 Reviewed-on: https://code.wireshark.org/review/2635 Tested-by: Graham Bloice Reviewed-by: Evan Huus Reviewed-by: Graham Bloice commit c9b03b4 Author: Evan Huus Date: Thu Jun 26 11:37:06 2014 -0400 add a cast, the mask makes it safe (stupid compiler) Change-Id: Iaf24c62295a93a1abd4fe3daf7e4c9587c3ef76b Reviewed-on: https://code.wireshark.org/review/2670 Reviewed-by: Evan Huus commit 1f724bc Author: Yan Burman Date: Wed Jun 11 10:29:01 2014 +0300 iSER: Add iSER dissector support Bug: 10189 Change-Id: Ie99d99a1736b3c6446d5a00edf201a49dfcd4780 Reviewed-on: https://code.wireshark.org/review/2247 Reviewed-by: Michael Mann Reviewed-by: Evan Huus commit a09de61 Author: Michael Mann Date: Thu Jun 26 09:57:13 2014 -0400 Fix Function call argument is an uninitialized value Change-Id: I716e80e53477edd419164c61937800795a550869 Reviewed-on: https://code.wireshark.org/review/2651 Reviewed-by: Michael Mann Reviewed-by: Evan Huus commit 7c1b5e9 Author: Pascal Quantin Date: Thu Jun 26 14:52:58 2014 +0200 Fix several compilation warnings Followup of gf798709 Change-Id: I0afddfe2e9b9ac454377f2358a29b4ecdd011b91 Reviewed-on: https://code.wireshark.org/review/2668 Reviewed-by: Anders Broman commit f798709 Author: Michael Mann Date: Wed Jun 25 22:59:50 2014 -0400 convert to proto_tree_add_subtree[_format] Change-Id: I525ac2aae2bdbfd5f3a2f3b35f1bf10dde053f66 Reviewed-on: https://code.wireshark.org/review/2667 Tested-by: Michael Mann Reviewed-by: Michael Mann commit 732656c Author: Britt McKinley Date: Mon Jun 23 14:22:35 2014 -0400 STUN: Add support of MS-ICE2 (Used by Lync) Interactive Connectivity Establishment ICE Extensions 2.0 http://msdn.microsoft.com/en-us/library/office/cc431504.aspx Change from review: 1) Change encoding for foundation to ASCII 2) Move case for MS_IMPLEMENTATION_VER. Change-Id: Ic524a2fe811695478aba81af9cbb3dbd031bbce3 Reviewed-on: https://code.wireshark.org/review/2579 Reviewed-by: Evan Huus Reviewed-by: Alexis La Goutte commit c63cd9f Author: Basil Date: Tue Jun 24 18:08:17 2014 +0400 New HP DTD dictionary file Bug: 10206 Change-Id: Ibe056ed37d3619aabfb17d3c2c5e85e67deae4e5 Reviewed-on: https://code.wireshark.org/review/2617 Reviewed-by: Jeff Morriss Reviewed-by: Evan Huus commit 06cf499 Author: Alexis La Goutte Date: Wed Jun 25 21:27:55 2014 +0200 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: Icec39c64d952ccc9739df95135ed79b3196a427a Reviewed-on: https://code.wireshark.org/review/2652 Reviewed-by: Jeff Morriss commit b632c23 Author: Alexis La Goutte Date: Wed Jun 25 21:28:23 2014 +0200 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I5c66a456b7986e3fd7672deaf7ce773467873324 Reviewed-on: https://code.wireshark.org/review/2653 Reviewed-by: Jeff Morriss commit 81963e7 Author: Gerald Combs Date: Wed Jun 25 16:00:11 2014 -0700 Decrease TRAFFIC_CAPTURE_DURATION from 60s to 15s. Change-Id: Ie6d6ac0489f0fcb506360a3900d33c44cb3477e9 Reviewed-on: https://code.wireshark.org/review/2664 Reviewed-by: Gerald Combs commit 765405d Author: Guy Harris Date: Wed Jun 25 14:05:36 2014 -0700 Update a comment. Also, make the block of code containing that comment intended consistently with spaces. Change-Id: I8e8eb346833662f15c53ece5869b12cc430bad11 Reviewed-on: https://code.wireshark.org/review/2661 Reviewed-by: Guy Harris commit 474b90e Author: Guy Harris Date: Wed Jun 25 13:42:36 2014 -0700 Boost the maximum snapshot length to 262144, for USBPcap. Change-Id: I104bd9d1519298a0e4ff818f1cf821df594b3491 Reviewed-on: https://code.wireshark.org/review/2658 Reviewed-by: Guy Harris commit 8cde7a7 Author: Guy Harris Date: Wed Jun 25 13:26:39 2014 -0700 Boost the maximum packet size to 131072. Libpcap 1.6/tcpdump 4.6 will support up to 131072, as the MTU on the Linux loopback device is 65536 on at least some versions of the kernel, and that doesn't count the fake Ethernet header, so the maximum packet size is 65549; they went to the next power of 2 up. Change-Id: Ibfc66d01ef8ef7387887a75c2b567159bb78ac0f Reviewed-on: https://code.wireshark.org/review/2655 Reviewed-by: Guy Harris commit fd5b077 Author: Pascal Quantin Date: Wed Jun 25 20:15:32 2014 +0200 DLSw: better fix, as suggested by Evan Change-Id: I82556c40cc4f0618e9e1c927beafa19ea4659683 Reviewed-on: https://code.wireshark.org/review/2650 Reviewed-by: Pascal Quantin commit e0461ec Author: Jeff Morriss Date: Wed Jun 25 11:03:12 2014 -0400 Indicate tshark can read (-r) from stdin and named pipes now. (Though it works only with certain formats.) As requested in: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2874#c4 Change-Id: I2ce0509d8750b21ae0167d12459074ba0f9506f8 Reviewed-on: https://code.wireshark.org/review/2646 Reviewed-by: Evan Huus commit a8652ea Author: Pascal Quantin Date: Wed Jun 25 19:50:57 2014 +0200 DLSw: ett2 proto_item variable is an input parameter for dissect_dlsw_capex() Regression introduced in g888f22d Change-Id: I6ae451ef31b188540db4e4687c9fa492e8aa195e Reviewed-on: https://code.wireshark.org/review/2649 Reviewed-by: Pascal Quantin commit 4224e35 Author: Peter Wu Date: Wed Jun 25 10:54:57 2014 +0200 ssl-utils: add missing ett registration Fixes the dissector bug warning: "epan/proto.c:4657: failed assertion "idx >= 0 && idx < num_tree_types" Add some comments to avoid future mistakes, add folding markers and fix alignment of curves hf. Change-Id: Ibcb57bfeb09a9777324682704a86f1ce260d345e Reviewed-on: https://code.wireshark.org/review/2642 Reviewed-by: Alexis La Goutte commit 13a972b Author: Pascal Quantin Date: Wed Jun 25 19:03:36 2014 +0200 DTPT: remove unused variables Change-Id: I9c8e26af6e0d71012b010dee24a0d0d7220b49f7 Reviewed-on: https://code.wireshark.org/review/2648 Reviewed-by: Pascal Quantin commit 888f22d Author: Michael Mann Date: Tue Jun 24 23:24:14 2014 -0400 convert to proto_tree_add_subtree[_format] Change-Id: I2ea1892b5963cc5578cbdd2b03029ca8424f2267 Reviewed-on: https://code.wireshark.org/review/2640 Tested-by: Michael Mann Reviewed-by: Michael Mann commit 8ac87dc Author: James Coleman Date: Thu Jun 19 17:47:49 2014 +0100 fix_bug_10199: enhancement Telephony VoIP Call add ability to show all SIP Flows. Add SIP Flows menu option beside VoIP Calls. Flow for all SIP message types (which have a call-id) is shown in SIP Flow. Add useful info(original flow method, response code, cseq) to comment field in conversation and flow dialogs. Change-Id: I4801a633ed9b6594b2d89629c9d6fec6352da150 Reviewed-on: https://code.wireshark.org/review/2479 Reviewed-by: Evan Huus Reviewed-by: James Coleman Reviewed-by: Anders Broman commit 03f7a4b Author: Jeff Morriss Date: Wed Jun 25 10:26:33 2014 -0400 Remove wiretap/AUTHORS (after ensuring all names are present in the top-level AUTHORS file). Change-Id: Ic3aa46c770f373541572e8507ec08b3439f3077f Reviewed-on: https://code.wireshark.org/review/2645 Reviewed-by: Evan Huus commit 3f43688 Author: Irene Ruengeler Date: Wed Jun 25 09:59:50 2014 +0200 List elided_label.h only once. Change-Id: Ibd00e55fb31d571b0b1f6f1c4595a35835e22d4d Reviewed-on: https://code.wireshark.org/review/2641 Reviewed-by: Anders Broman commit a11879e Author: Guy Harris Date: Tue Jun 24 19:38:02 2014 -0700 Get rid of an unused variable. Change-Id: I8e436b7e4724c85943200087783d3cf7dd7c1535 Reviewed-on: https://code.wireshark.org/review/2639 Reviewed-by: Guy Harris commit 5aa6cf9 Author: Jeff Morriss Date: Tue Jun 24 22:14:41 2014 -0400 Update my email address in a couple more spots. Change-Id: I787ae2651a8083bc3082e5cb85dbd849823a16ca Reviewed-on: https://code.wireshark.org/review/2638 Reviewed-by: Jeff Morriss commit 3a943e9 Author: Evan Huus Date: Tue Jun 24 18:30:23 2014 -0400 Reduce maximum permitted leakage to 100KB Down from 500KB. The old value only triggered once that I can recall, and the "average" leakage I'm seeing on most captures is only a few KB now, so this shouldn't flood us with issues (which was the original concern leaving it so high). Change-Id: Ie4c98696b3fb7a533a7dc4f83c7ac8c458b499c8 Reviewed-on: https://code.wireshark.org/review/2633 Reviewed-by: Michael Mann commit 29ecd11 Author: Michael Mann Date: Mon Jun 23 20:39:28 2014 -0400 convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann Reviewed-by: Michael Mann commit 83da877 Author: Evan Huus Date: Tue Jun 24 18:25:15 2014 -0400 Add back initializers dropped in g9356d5c689fa They were actually necessary. Bug:10224 Change-Id: I9973bf7bab670d12e5b90bb2a57e99f9125d6a07 Reviewed-on: https://code.wireshark.org/review/2632 Reviewed-by: Evan Huus commit 09b86bd Author: Balint Reczey Date: Tue Jun 24 14:58:46 2014 +0200 GTK3: Fix changing filter expression's bg color based on validity Bug: 8598 Change-Id: Id5a52c05cab25df9e228b1b4d2caf07335c1f4c8 Reviewed-on: https://code.wireshark.org/review/2614 Reviewed-by: Anders Broman Reviewed-by: Evan Huus commit 2a1e3d1 Author: Evan Huus Date: Tue Jun 24 15:38:15 2014 -0400 Fix two bugs in kafka dissection - Respect the length field when dissecting message sets - Don't "wrap around" in capture when doing request/response matches Also convert one instance to proto_tree_add_subtree, as an experiment. Change-Id: Id161687865afa7ca83e6943a643bc54582f65554 Reviewed-on: https://code.wireshark.org/review/2624 Reviewed-by: Evan Huus commit 0fb9369 Author: Guy Harris Date: Tue Jun 24 13:48:40 2014 -0700 Support -w even if we're not built with pcap. You can, for example, do tshark -r file1 -Y filter -w file2 to read a file, apply a read filter, and write the packets that match the filter to another file even if you can't capture traffic. Change-Id: Ifd5e1d5c0e745edef5e98ec4babc720bfbcee6d9 Reviewed-on: https://code.wireshark.org/review/2627 Reviewed-by: Guy Harris commit deda668 Author: Guy Harris Date: Tue Jun 24 13:10:56 2014 -0700 Add the capchild directory to some lists of rules. Change-Id: Ic06cf8005a16cc61c8e3ae506dba4c4916ab6471 Reviewed-on: https://code.wireshark.org/review/2626 Reviewed-by: Guy Harris commit 5a3632e Author: Guy Harris Date: Tue Jun 24 13:04:22 2014 -0700 Load WinPcap before we get the run-time information string. That way, we can include the WinPcap version in that string. Change-Id: I01fa0defce158e122d1c602fdfbc81916a9e80ef Reviewed-on: https://code.wireshark.org/review/2625 Reviewed-by: Guy Harris commit b4d4218 Author: Anish Bhatt Date: Fri Jun 20 01:48:47 2014 -0700 OSPF Cleanup. Remove unnecessary TFS declarations Change-Id: I9b4205f6d579ea9e707d83baf81f77393e3098b4 Signed-off-by: Anish Bhatt Reviewed-on: https://code.wireshark.org/review/2478 Reviewed-by: Anders Broman commit 00212e5 Author: Balint Reczey Date: Tue Jun 24 16:53:58 2014 +0200 Fix sorting RTP Streams by jitter Bug: 9460 Change-Id: I80d991053eb47b8650561e8af4cc8dec512e2c9c Reviewed-on: https://code.wireshark.org/review/2619 Reviewed-by: Anders Broman Reviewed-by: Michael Mann commit 830d1b1 Author: Ben Burwell Date: Tue Jun 24 11:34:40 2014 -0400 Add quotes around MAKEDIR. Bug: 7870 Change-Id: I6cea057c4953f5ecc0a146a24570d089e79f8352 Reviewed-on: https://code.wireshark.org/review/2620 Reviewed-by: Michael Mann commit 2a9cc7a Author: Роман Донченко Date: Tue Jun 24 21:33:41 2014 +0400 Correct indentation in make-dissector-reg The indented portions are inside an if. Change-Id: I3343a7aa7e777466ec9f40e8a02a8218bef62017 Reviewed-on: https://code.wireshark.org/review/2622 Reviewed-by: Alexis La Goutte Reviewed-by: Michael Mann commit 65b7521 Author: Michael Mann Date: Tue Jun 24 14:07:10 2014 -0400 Ensure proto_item from subtree is initialized bug:10223 Change-Id: I40ed92bcf436723ad3927a93181f7c732cf4690f Reviewed-on: https://code.wireshark.org/review/2623 Reviewed-by: Michael Mann Reviewed-by: Evan Huus commit eaf6bf3 Author: Pascal Quantin Date: Tue Jun 24 16:17:09 2014 +0200 MBIM: add an option to force SMS PDU decoding format if MBIM_DEVICE_CAPS_INFO message was not captured Change-Id: Iff78a00b463a7a33e1705c76ea49618af532f3aa Reviewed-on: https://code.wireshark.org/review/2621 Tested-by: Pascal Quantin Reviewed-by: Pascal Quantin commit dbd409d Author: Guy Harris Date: Tue Jun 24 00:07:38 2014 -0700 Fix OS X CMake build. I have ***NO*** idea why this makes a difference, but, without this change, APPLE_CORE_FOUNDATION_LIBRARY is apparently *not* set correctly for wsutil/CMakeLists.txt, and, with this change, it is. I guess there's something magic involved here with "global" CMake variables or something crazy such as that. Change-Id: I7a0046b9c249568cd666720838104f48e854e203 Reviewed-on: https://code.wireshark.org/review/2612 Reviewed-by: Guy Harris commit 4f1d20a Author: Guy Harris Date: Mon Jun 23 23:56:59 2014 -0700 proto_tree_add_uint() takes a value, not an encoding, as an argument. Change-Id: Ie2c0523e32b54cd13506501d98215934a8d1304e Reviewed-on: https://code.wireshark.org/review/2611 Reviewed-by: Guy Harris commit 4105c48 Author: Guy Harris Date: Mon Jun 23 20:53:48 2014 -0700 Another capchild.lib -> libcapchild.lib. Change-Id: I4c7750f05c831f12d0d34e2edf0d982d501d90d8 Reviewed-on: https://code.wireshark.org/review/2610 Reviewed-by: Guy Harris commit b671551 Author: Guy Harris Date: Mon Jun 23 20:35:20 2014 -0700 Another file to generate in the configure script. Change-Id: I6dafc9ab9fafd465cb2ad83e5e56e4d22b36d41b Reviewed-on: https://code.wireshark.org/review/2609 Reviewed-by: Guy Harris commit e978cad Author: Joerg Mayer Date: Tue Jun 24 05:18:37 2014 +0200 Create capchild/doxygen.cfg Change-Id: I215a9d9849c752f9e8e3216c0f6479d1ba1cfafd Reviewed-on: https://code.wireshark.org/review/2608 Reviewed-by: Jörg Mayer commit e68638f Author: Martin Kaiser Date: Sat Jun 21 16:10:43 2014 -0400 usb iso urbs on linux can't possibly contain a setup packet see mon_bin_event() in the linux kernel where the setup_flag is set only for control urbs clean up various things related to this assertion: remove type_2 parameter show the iso descriptors in any case calculate the end offset correctly, the end offset is the byte after the iso data Change-Id: Iebfbe6443c224a958a1697563aa8fb853d7aa8c2 Reviewed-on: https://code.wireshark.org/review/2541 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 0f76609 Author: Joerg Mayer Date: Tue Jun 24 04:27:04 2014 +0200 Remove unneeded include Change-Id: I3be8f29d2b4fba2cb1d7ee2f29bdb27e42dd40a5 Reviewed-on: https://code.wireshark.org/review/2607 Reviewed-by: Jörg Mayer commit 243fc40 Author: Guy Harris Date: Mon Jun 23 19:12:34 2014 -0700 Add libcapchild, remove the files that are now in it. Change-Id: I79c16bbea47e507859c904e4142fc06fa6bfc127 Reviewed-on: https://code.wireshark.org/review/2606 Reviewed-by: Guy Harris commit baf3e81 Author: Guy Harris Date: Mon Jun 23 19:08:11 2014 -0700 Get rid of trailing blanks. Change-Id: Idee9c273a74d37f1e754fcada0a06dcd67f306c3 Reviewed-on: https://code.wireshark.org/review/2605 Reviewed-by: Guy Harris commit 836feeb Author: Joerg Mayer Date: Tue Jun 24 04:06:07 2014 +0200 Remove unneeded sys/types.h Change-Id: I03cd66cb9a2d01ea40308b338955756d08a36516 Reviewed-on: https://code.wireshark.org/review/2604 Reviewed-by: Jörg Mayer commit f71a6d0 Author: Guy Harris Date: Mon Jun 23 19:06:33 2014 -0700 capture_ifinfo.c and capture_sync.c are now in libcapchild. Change-Id: I8203a3a1a77f231c4286fd32fcc6372a2ac9db48 Reviewed-on: https://code.wireshark.org/review/2603 Reviewed-by: Guy Harris commit 4976d67 Author: Michael Mann Date: Mon Jun 23 21:54:48 2014 -0400 Restore correct tree assignment. Change-Id: Id06bd486114a80fb899f8dc148d48928e99e775e Reviewed-on: https://code.wireshark.org/review/2602 Reviewed-by: Michael Mann commit 0cf591c Author: Guy Harris Date: Mon Jun 23 18:47:23 2014 -0700 Add a doxygen.cfg.in file for the capture child library. Change-Id: I79c83c8583b86e1d05b7f486078a0e0a4ca5dbdd Reviewed-on: https://code.wireshark.org/review/2599 Reviewed-by: Guy Harris commit 9fe540c Author: Guy Harris Date: Mon Jun 23 17:55:26 2014 -0700 dos2unix is now in Utils, not Base. Change-Id: Ib430582270a2b788843785fd5aa7148ebe0f8871 Reviewed-on: https://code.wireshark.org/review/2597 Reviewed-by: Guy Harris commit 7fe1f82 Author: Guy Harris Date: Mon Jun 23 17:47:45 2014 -0700 Fix name of library. Change-Id: I463637a6218a86ed6dbd95019f33d8b999bcaaf2 Reviewed-on: https://code.wireshark.org/review/2596 Reviewed-by: Guy Harris commit 7bbf35b Author: Guy Harris Date: Mon Jun 23 17:35:57 2014 -0700 Fix some more capchild includes. Change-Id: I6d6cd79ee9e630fe81eb6deca9691249b44bdaf4 Reviewed-on: https://code.wireshark.org/review/2595 Reviewed-by: Guy Harris commit adf6b1a Author: Guy Harris Date: Mon Jun 23 17:27:28 2014 -0700 For capchild headers, include . Change-Id: I780c69ee637dcd9846756a2e2d6a35baf02d826d Reviewed-on: https://code.wireshark.org/review/2594 Reviewed-by: Guy Harris commit a442d7b Author: Guy Harris Date: Mon Jun 23 17:03:56 2014 -0700 Include ZLIB_CFLAGS so we file zlib.h. Change-Id: I9026f99397b1dfbc550af550d0c71597b3c87950 Reviewed-on: https://code.wireshark.org/review/2592 Reviewed-by: Guy Harris commit 213189e Author: Guy Harris Date: Mon Jun 23 16:48:41 2014 -0700 Move the routines to talk to dumpcap into a static libcapchild. This pulls some stuff out of the top-level directory, and means we don't have to build them once for every program using them. Change-Id: I37b31fed20f2d5c3563ecd2bae9fd86af70afff5 Reviewed-on: https://code.wireshark.org/review/2591 Reviewed-by: Guy Harris commit e22d3c9 Author: Peter Wu Date: Mon Jun 23 23:14:06 2014 +0200 ssl: fix ClientKeyExchange, fix TLSv1.2 SKE for DH Since DTLS and TLS do not differ in handling ClientKeyExchange and ServerKeyExchange, its dissection got moved to ssl-utils. The code is based on the SSL dissector, with header field names adjusted to the DTLS ones (those got capitalized). Besides a version difference (for signatures), the header field and function names, the DTLS and SSL code are equal (this is verified). This patch refactors the dissectors for DHE_RSA and ECDHE to make use of a common function to dissect the signed_params field. All offset tracking is also removed in favor of exception handling by the proto_tree_add_item function. Occurrences of proto_tree_add_uint are also replaced by proto_tree_add_item for simplicity. After those changes, the SKE dissector for DH key exchanges is updated to handle the mandatory signature field in TLSv1.2, using the newly added function. (bug 9208) Another bug occurred after the length check removal, pre-TLS and OpenSSL's old DTLS implemenation do not include a vector length in the CKE. This is now also fixed. (bug 10222) Other minor changes: comments added/corrected, renamed keyex_dh -> keyex_dhe (includes DHE_RSA and DHE_DSS). Bug: 9208 Bug: 10222 Change-Id: I76e835d56a65c91facce46840d79c1c48ce8d5dd Reviewed-on: https://code.wireshark.org/review/2542 Reviewed-by: Evan Huus commit 8702a6b Author: Joerg Mayer Date: Mon Jun 23 18:51:28 2014 +0200 Remove some unneeded includes Change-Id: I4327ead0451244daa0d876ae3a770cbbf80760c8 Reviewed-on: https://code.wireshark.org/review/2590 Reviewed-by: Jörg Mayer commit 9cdbb25 Author: Guy Harris Date: Mon Jun 23 15:49:11 2014 -0700 Don't report the run-time version of pcap if we weren't built with pcap. Change-Id: Ib879290b72938cc999e00b6e044f917161ba5801 Reviewed-on: https://code.wireshark.org/review/2589 Reviewed-by: Guy Harris commit 1d92195 Author: Guy Harris Date: Mon Jun 23 14:55:56 2014 -0700 Have individual programs get libpcap and libz version info. That way, the code that constructs the runtime version string doesn't itself have to call libpcap and libz, and could be usable in programs that don't call them. While we're at it, add "with" to the run-time version information for GnuTLS and libgcrypt, to match the compile-time version information, and add the version information from libwireshark to TShark. Change-Id: I3726a027d032270b032292da9314c1cec535dcd2 Reviewed-on: https://code.wireshark.org/review/2587 Reviewed-by: Guy Harris commit dd7134d Author: Pascal Quantin Date: Mon Jun 23 22:06:05 2014 +0200 Initialize whole buffer in GPRS Mobility and Session Management dissector Bug: 10216 Change-Id: I572a7a6ce0f816063f02397b667dd46c990cf73e Reviewed-on: https://code.wireshark.org/review/2583 Reviewed-by: Pascal Quantin commit 59e860c Author: Michal Labedzki Date: Wed Oct 30 13:31:53 2013 +0100 [WIP] qt: Add support for Polish language Change-Id: Ib63937e741b737f171a9b383a9cbabb55dfdd8ef Reviewed-on: https://code.wireshark.org/review/2553 Reviewed-by: Jörg Mayer commit 858c48a Author: Guy Harris Date: Mon Jun 23 10:04:11 2014 -0700 Point the user at http://www.cygwin.com/install.html for downloads. That page gives a bit more information. Change-Id: Id0c708ede50aa9e6c6583f6957c355a630fa7e7e Reviewed-on: https://code.wireshark.org/review/2578 Reviewed-by: Guy Harris commit 54cc0d8 Author: Joerg Mayer Date: Mon Jun 23 18:44:14 2014 +0200 Replace AF_ values by COMMON_AF_ values. Remove no longer needed system includes Change-Id: Id9ffffaa7da5185041db63fa7611d348a1cc4b68 Reviewed-on: https://code.wireshark.org/review/2577 Reviewed-by: Jörg Mayer commit cb04fd5 Author: Joerg Mayer Date: Mon Jun 23 18:39:43 2014 +0200 Add all AF_ types for Windows that are in WinSock.h or WinSock2.h Change-Id: Ia45f4aaea75d8cb08bb9016f9147f47db4434b06 Reviewed-on: https://code.wireshark.org/review/2576 Reviewed-by: Jörg Mayer commit 02edc33 Author: Evan Huus Date: Mon Jun 23 16:21:49 2014 +0000 Revert "Optimize sip_is_known_sip_header()" This reverts commit c9a5fbeb1da9b5566ac9ac36bfdcdee6172ef5c8. Change-Id: Ic2e5d531f719ed1107ef7bb1de12175d4601fd6d Reviewed-on: https://code.wireshark.org/review/2574 Reviewed-by: Evan Huus commit 520190c Author: Evan Huus Date: Mon Jun 23 16:22:05 2014 +0000 Revert "Cheat and try to fix the generated file manually." This reverts commit 9079e3ad1d32c594309a52ccef5936d11a93a55d. Change-Id: I0430408e139ff8de068c970d02e36122552614fe Reviewed-on: https://code.wireshark.org/review/2575 Reviewed-by: Evan Huus commit 9079e3a Author: AndersBroman Date: Mon Jun 23 17:28:36 2014 +0200 Cheat and try to fix the generated file manually. Change-Id: Iabf1821aa0ef676ac4d1d7f2983460b2e671a98a Reviewed-on: https://code.wireshark.org/review/2573 Reviewed-by: Anders Broman commit c9a5fbe Author: Jakub Zawadzki Date: Tue Jun 10 23:17:01 2014 +0200 Optimize sip_is_known_sip_header() Profling SIP shows that gperf generated hashing code, is 3 times faster than using GHashTable & g_str_hash/_equal() This result in about 1% improve of whole dissection (sip traffic with filter). Change-Id: Id6bf64bacd872e2d1c30a1b6356db444b25ba326 Reviewed-on: https://code.wireshark.org/review/2116 Reviewed-by: Anders Broman commit eaf6e55 Author: AndersBroman Date: Mon Jun 23 10:21:14 2014 +0200 Fix a typo. Change-Id: I6874a6f4a340c2b8e82d1ca5333cbeb31ff27f2d Reviewed-on: https://code.wireshark.org/review/2570 Reviewed-by: Anders Broman commit 6e0be01 Author: Jakub Zawadzki Date: Sat Jun 21 23:06:54 2014 +0200 Add col_append_lstr(), speedup column generation for TCP. When dissecting with columns TCP dissector spends around 1/4 time in col_append_fstr(), add col_append_lstr() and do formatting by ourselves. Change-Id: If90bc26242761884b4991e8db0db62c8f9e32690 Reviewed-on: https://code.wireshark.org/review/2527 Reviewed-by: Evan Huus Reviewed-by: Anders Broman commit ab6a45a Author: Guy Harris Date: Sun Jun 22 15:17:48 2014 -0700 Get rid of set-but-not-used variable. Change-Id: Ic0f2c79b4bd9fc737bf33ef64512f4142d74de6b Reviewed-on: https://code.wireshark.org/review/2568 Reviewed-by: Guy Harris commit 6896def Author: Guy Harris Date: Sun Jun 22 14:48:51 2014 -0700 Get rid of some unused variables. Change-Id: I2a806af639e5f0519ba93b0048ec7a4624fa33fc Reviewed-on: https://code.wireshark.org/review/2567 Reviewed-by: Guy Harris commit 9c35a5d Author: Guy Harris Date: Sun Jun 22 14:41:09 2014 -0700 Make dissect_lltd() a new-style dissector and register it as such. Presumably that was the intent. Change-Id: Icf8529a23a9a36e7f12e446d67f3867771b221d8 Reviewed-on: https://code.wireshark.org/review/2566 Reviewed-by: Guy Harris commit 9356d5c Author: Michael Mann Date: Fri Jun 20 21:35:40 2014 -0400 convert to proto_tree_add_subtree[_format] for ASN.1 dissectors Change-Id: I753ca95e2e1b38bad2c09955317e648c525e40ef Reviewed-on: https://code.wireshark.org/review/2509 Tested-by: Michael Mann Reviewed-by: Michael Mann commit 2c0214e Author: Michael Mann Date: Sat Jun 21 14:07:27 2014 -0400 LLTD dissector bug: 6071 Change-Id: If7b544a762df10ffc13aeaf8886cf74a1757c37c Reviewed-on: https://code.wireshark.org/review/2512 Tested-by: Michael Mann Reviewed-by: Michael Mann commit 188aa9a Author: Michael Mann Date: Sun Jun 22 16:01:36 2014 -0400 convert to proto_tree_add_subtree[_format] Change-Id: Ib60ca75b7da8cfa21cfe2999c9b9448a02c332df Reviewed-on: https://code.wireshark.org/review/2560 Tested-by: Michael Mann Reviewed-by: Michael Mann commit 3fc441e Author: Evan Huus Date: Sun Jun 22 16:53:35 2014 -0400 Initialize whole buffer in GTP dissector Bug:10216 Change-Id: Ib7de616d50937eb43b16daa4067ee0de9edc8ec7 Reviewed-on: https://code.wireshark.org/review/2562 Reviewed-by: Evan Huus commit ce99d8a Author: Evan Huus Date: Sun Jun 22 15:33:06 2014 -0400 Fix leak in nbap init function Change-Id: I9a70d4da936ad5fd847fc1ba0b29b7220030b977 Reviewed-on: https://code.wireshark.org/review/2558 Reviewed-by: Evan Huus commit dfe7e71 Author: Evan Huus Date: Sun Jun 22 15:31:01 2014 -0400 Fix a leak in the SCTP dissector use wmem instead of glib Change-Id: I326d2dd71b13ae45b4434c86fdacf9f3cec6c069 Reviewed-on: https://code.wireshark.org/review/2557 Reviewed-by: Evan Huus commit 38e0ad0 Author: Guy Harris Date: Sun Jun 22 11:48:57 2014 -0700 Replace C++-style comments with "#if 0"/"#endif". checkapi complains about C++-style comments, as some C compilers (IBM XLC, for one) reject them by default, and gcc -pedantic might do so as well. Change-Id: I1719da03d2fed0fe97574e200dd79434b3d760cd Reviewed-on: https://code.wireshark.org/review/2556 Reviewed-by: Guy Harris commit d51faaa Author: Guy Harris Date: Sun Jun 22 11:38:44 2014 -0700 Point to the Cygwin mirrors page. If you choose to install from the Intertubes, you probably want to choose a nearby mirror site, rather than downloading from halfway across the world; the list of download sites in setup*.exe's UI gives no indication of where the mirror sites are, so you could end up picking one to which you have a slow Internet path. Tell the user about the list of mirror sites on the Cygwin Web site, as that list *does* give geographical locations. Change-Id: Idf035d288885ee45db7b3627af969e64270487a1 Reviewed-on: https://code.wireshark.org/review/2555 Reviewed-by: Guy Harris commit a59d62e Author: Guy Harris Date: Sun Jun 22 11:32:09 2014 -0700 64-bit Cygwin's dependencies for Bison are wrong; it doesn't require m4. Change-Id: Id6a6c0a7c09ed1d9eb1e1d522930e3f94e7b20d6 Reviewed-on: https://code.wireshark.org/review/2554 Reviewed-by: Guy Harris commit 0a96087 Author: Michal Labedzki Date: Sun Jun 22 14:47:02 2014 +0200 Logcat: Set data-text-lines dissectors for log Some binary logcat packets has more then one line, show them in a convenient form. Change-Id: I008aac6fe5589f2b10db51f7221853f9d79bbc7a Reviewed-on: https://code.wireshark.org/review/2549 Reviewed-by: Michal Labedzki commit 4a3d0b8 Author: Michal Labedzki Date: Mon Jun 9 16:07:22 2014 +0200 Logcat: Fix dump formats Some dump formats are not exactly what should be done, so fix them and try to little improve them (mostly by space padding %-8s) Change-Id: I8ee38479c848abc0a2eaff30ce733e4b60930ac4 Reviewed-on: https://code.wireshark.org/review/2550 Reviewed-by: Michal Labedzki commit 10fc6e2 Author: Michal Labedzki Date: Wed Jun 18 17:10:09 2014 +0200 Bluetooth: A2DP: Fix fuzz failture Fix invalid structure casting by using defaults values, this also fix DecodeAs for A2DP. Do the same for VDP. Change-Id: I360787af648ed65205eb54732ab6d88f8532cf15 Reviewed-on: https://code.wireshark.org/review/2551 Reviewed-by: Michal Labedzki commit 164af00 Author: Michal Labedzki Date: Mon Jun 2 17:05:31 2014 +0200 Bluetooth: Complete sessions Some interfaces support multiple Bluetooth adapters with events like add/remove. We must support that to distinquish adapters streams in case that new adapter has the same id that old one. Next one is create session for "Connection Handle", so next layer will now when it is connected and disconnected. This is also used to distinguish streams. Change-Id: I9e062c8e4cc9c033b75f1a596e8351a215169843 Reviewed-on: https://code.wireshark.org/review/2548 Reviewed-by: Michal Labedzki commit 58bbfa5 Author: Guy Harris Date: Sun Jun 22 09:41:20 2014 -0700 When setting entry_tree, set entry_item as well. Hopefully, this will fix the warnings from the buildbot that entry_item was used without being set. Change-Id: Ibfd921bfbbad68cd8eafd1e3ad3d178cfca03d6e Reviewed-on: https://code.wireshark.org/review/2547 Reviewed-by: Guy Harris commit b587740 Author: Gerald Combs Date: Sun Jun 22 08:04:37 2014 -0700 [Automatic manuf, services and enterprise-numbers update for 2014-06-22] Change-Id: Idb1ac02fe97a2d6b3603467d482a9a9040843704 Reviewed-on: https://code.wireshark.org/review/2543 Reviewed-by: Gerald Combs commit f5e2b42 Author: Michael Mann Date: Fri Jun 20 17:34:10 2014 -0400 convert to proto_tree_add_subtree[_format] Change-Id: I358bfaa4e5d40cd01b766f614f8bd0dbaf611dd0 Reviewed-on: https://code.wireshark.org/review/2508 Reviewed-by: Evan Huus Reviewed-by: Michael Mann commit 08bd012 Author: Martin Kaiser Date: Sat Jun 21 15:55:31 2014 -0400 minor cleanups Change-Id: Ieaa0fa5cdbe8dc8f50cf5b9ee432c786a8f9fc9a Reviewed-on: https://code.wireshark.org/review/2540 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 3e5e18f Author: Guy Harris Date: Sat Jun 21 20:54:41 2014 -0700 Build version.h before trying to build wsutil. Code in wsutil includes it. Change-Id: I02cb49c3a672955b74a183996d2e815b8d55b668 Reviewed-on: https://code.wireshark.org/review/2539 Reviewed-by: Guy Harris commit 4c740dc Author: Martin Kaiser Date: Sat Jun 21 11:23:09 2014 -0700 the tree that we use in the iso transfer function in is the urb_tree Change-Id: Ia32c2f24df9392d1102fa1121ac93b1071bae7ca Reviewed-on: https://code.wireshark.org/review/2538 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 6b90679 Author: Martin Kaiser Date: Sat Jun 21 11:18:57 2014 -0700 no need to check the parent tree when we create the iso descriptor tree Change-Id: I6cbc5047b8d58ecbe41bf5392d31dc0adc81d5d5 Reviewed-on: https://code.wireshark.org/review/2537 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 2b6ce23 Author: Martin Kaiser Date: Sat Jun 21 11:13:08 2014 -0700 rename the ti variable Change-Id: Iec3bdfcb3cb14e97045789aec1e11288357d379d Reviewed-on: https://code.wireshark.org/review/2536 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 2aae7ca Author: Martin Kaiser Date: Sat Jun 21 10:09:58 2014 -0700 create the iso descriptor tree's title in a simpler way Change-Id: I4e60295208c2ac35a452f5fb3dffd090cc151473 Reviewed-on: https://code.wireshark.org/review/2535 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit dfa7337 Author: Martin Kaiser Date: Sat Jun 21 09:51:44 2014 -0700 create a new function that dissects the usb linux iso transfer (just copied the existing code) Change-Id: Ia6dd9be9b39c3c16408e22181225c18d56ac6016 Reviewed-on: https://code.wireshark.org/review/2534 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit c935411 Author: Guy Harris Date: Sat Jun 21 19:53:13 2014 -0700 Remove trailing white space, copyedit, add a missing period. Change-Id: I300d723a6f93293ebdf97c5ef6ac3e9b72c692ee Reviewed-on: https://code.wireshark.org/review/2533 Reviewed-by: Guy Harris commit e088923 Author: Guy Harris Date: Sat Jun 21 19:50:40 2014 -0700 Update to reflect current reality. Cygwin has both 32-bit and 64-bit versions, with separate installers. Change-Id: I02b2699b9b3dbd3b3c65f7a372c6d423829f449b Reviewed-on: https://code.wireshark.org/review/2532 Reviewed-by: Guy Harris commit 376dfe8 Author: Guy Harris Date: Sat Jun 21 18:54:53 2014 -0700 Fix build errors for tfshark and echld. Some come from the recent version information changes, some were broken before that. Change-Id: I9429f7d45d3c51c579aef592b37c79130a443299 Reviewed-on: https://code.wireshark.org/review/2531 Reviewed-by: Guy Harris commit 7ba4aef Author: Guy Harris Date: Sat Jun 21 18:11:03 2014 -0700 Don't declare CFString_to_C_string() if we don't have OS X frameworks. You shouldn't be including cfutils.h if you don't have CF, but this may be tripping up the ABI checker. Change-Id: Ib736a33013c6ab0f416ebbedaa4ebf112bade6f7 Reviewed-on: https://code.wireshark.org/review/2530 Reviewed-by: Guy Harris commit c46329c Author: Guy Harris Date: Sat Jun 21 18:02:27 2014 -0700 Add a routine to return a version string including VCS information. Add a routine get_ws_vcs_version_info() that, for builds from a tree checked out from Wireshark's version control system, returns a string that includes both the Wireshark version number and an indication of what particular VCS version was checked out, and just returns Wireshark's version number for other builds. Use that routine rather than manually gluing VERSION and the Git version number together. ("vcs", not "git", just in case we do something bizarre or mercurial some day. :-)) Change-Id: Ie5c6dc83b9d3f56655eaef30fec3ec9916b6320d Reviewed-on: https://code.wireshark.org/review/2529 Reviewed-by: Guy Harris commit a70dea1 Author: Guy Harris Date: Sat Jun 21 14:32:45 2014 -0700 Move get_os_major_version() to wsutil and rename it to get_windows_major_version(). It's Windows-specific, so name it appropriately. Change-Id: Ic518cbfabebf95757f6b308a4d547a6cabed6a5e Reviewed-on: https://code.wireshark.org/review/2528 Reviewed-by: Guy Harris commit 3c979e6 Author: Joerg Mayer Date: Sat Jun 21 11:10:38 2014 +0200 Reorder some statements to avoid unused build-type directories Change-Id: I4209eff78faa619030d3cacdc759fd143a238247 Reviewed-on: https://code.wireshark.org/review/2526 Reviewed-by: Jörg Mayer commit 73c7add Author: Guy Harris Date: Sat Jun 21 13:31:13 2014 -0700 Move the routine to get memory information to wsutil. Change-Id: I94717cec5a464166585b258a83f8ccdaccf8d5ff Reviewed-on: https://code.wireshark.org/review/2525 Reviewed-by: Guy Harris commit 3c96970 Author: Guy Harris Date: Sat Jun 21 13:21:46 2014 -0700 Get rid of trailing blank lines. Change-Id: Ie28a9904fd8befe98677c9f9f169beffe4df1d5d Reviewed-on: https://code.wireshark.org/review/2524 Reviewed-by: Guy Harris commit 00f23a4 Author: Guy Harris Date: Sat Jun 21 13:20:18 2014 -0700 Move the routine to get a CPU information string to wsutil. Change-Id: Ibf6e57d7382cbbd831a0367fd48d684118712408 Reviewed-on: https://code.wireshark.org/review/2523 Reviewed-by: Guy Harris commit 9e8fb87 Author: Guy Harris Date: Sat Jun 21 12:54:01 2014 -0700 Clean up inclusion of cfutils.h. Change-Id: I7da381f12db6721448e15d30d441a943127cbca1 Reviewed-on: https://code.wireshark.org/review/2522 Reviewed-by: Guy Harris commit 8960430 Author: Guy Harris Date: Sat Jun 21 12:45:11 2014 -0700 cfutils.c is now part of libwsutils. Change-Id: I86ab5f5890a10cc8475f5e9bee4c4f7c89dfb8bc Reviewed-on: https://code.wireshark.org/review/2521 Reviewed-by: Guy Harris commit 83d832c Author: Guy Harris Date: Sat Jun 21 12:36:57 2014 -0700 Get rid of trailing blank lines. Change-Id: Ib806d07aea8e4d903f084171ce2021c6f3c3fc07 Reviewed-on: https://code.wireshark.org/review/2520 Reviewed-by: Guy Harris commit d99d1b9 Author: Guy Harris Date: Sat Jun 21 12:34:26 2014 -0700 Add a get_compiler_info() routine in libwsutil to get compiler information. Change-Id: I8ccb6187f2ee0255460f448aee170768b6fa3f5d Reviewed-on: https://code.wireshark.org/review/2519 Reviewed-by: Guy Harris commit e5abf34 Author: Guy Harris Date: Sat Jun 21 12:08:35 2014 -0700 Is necessary here? Change-Id: Ibfe4fa8b2c1f092781c4137cde7febe2d6f49e81 Reviewed-on: https://code.wireshark.org/review/2518 Reviewed-by: Guy Harris commit f13f70d Author: Guy Harris Date: Sat Jun 21 12:06:17 2014 -0700 Need for string routines. Change-Id: I828bb29953727eb43e169fa9b06837c9657ca051 Reviewed-on: https://code.wireshark.org/review/2517 Reviewed-by: Guy Harris commit aeed656 Author: Guy Harris Date: Sat Jun 21 12:02:17 2014 -0700 We need the Unicode utilities, at least on Windows. Multiple UTFs FTW! Change-Id: Ib50dda4577f0038b11179be92dc6fb321b033618 Reviewed-on: https://code.wireshark.org/review/2516 Reviewed-by: Guy Harris commit ac53439 Author: Guy Harris Date: Sat Jun 21 11:38:36 2014 -0700 cfutils.c is now part of libwsutil. Change-Id: I2105ace8575e93d79e10dfdd33e1523461c3f03e Reviewed-on: https://code.wireshark.org/review/2514 Reviewed-by: Guy Harris commit d0a567e Author: Guy Harris Date: Sat Jun 21 11:33:44 2014 -0700 We need on Windows. Change-Id: I54c9991b3322d14966913367f951900cc7e54c4e Reviewed-on: https://code.wireshark.org/review/2513 Reviewed-by: Guy Harris commit e02c66f Author: Anish Bhatt Date: Mon Jun 16 22:57:31 2014 -0700 Check constraints for OSPFv2 LSAs: 1 Router LSA: >= 24 bytes (>= 0 link descriptor(s) required) 2 Network LSA: >= 28 bytes (>= 1 router-ID(s) required) 3 Summary LSA: >= 28 bytes (>= 1 TOS metric block(s) required) 4 Summary LSA: >= 28 bytes (>= 1 TOS metric block(s) required) 5 AS-External LSA: >= 36 bytes (>= 1 TOS forwarding block(s) required) 7 NSSA LSA: >= 36 bytes (>= 1 TOS forwarding block(s) required) 9 Opaque Link LSA: >= 20 bytes 10 Opaque Area LSA: >= 20 bytes 11 Opaque AS LSA: >= 20 bytes as described in Bug 6302 for all other types including unknown, check for minimum length of 20 Change-Id: I93451d99a93213b4ded8157cecd54b0a6221d351 Signed-off-by: Anish Bhatt Reviewed-on: https://code.wireshark.org/review/2292 Reviewed-by: Evan Huus Reviewed-by: Michael Mann commit 554c902 Author: Graham Bloice Date: Sat Jun 21 00:37:58 2014 +0100 Move the Windows build target OS definitions to Win XP This doesn't preclude use on < XP but does potentially allow use of API's that don't exist on Win2K, and doing so would then stop the exe from running on 2K. Change-Id: I08b58bd510b832ddabbb717dd73eb7a89264048e Reviewed-on: https://code.wireshark.org/review/2504 Reviewed-by: Evan Huus Reviewed-by: Michael Mann commit a111224 Author: Guy Harris Date: Sat Jun 21 11:01:19 2014 -0700 Move get_os_version_info() to libwsutil. This mean we also have to move CFString_to_C_string() there for OS X. Change-Id: Ic91ad872e9d5290cf34f842503ededd5452e4337 Reviewed-on: https://code.wireshark.org/review/2511 Reviewed-by: Guy Harris commit 43443af Author: Guy Harris Date: Sat Jun 21 10:32:12 2014 -0700 Move get_copyright_info() to wsutil. Change-Id: I75c1c747cd2b4a9845c659636582d54b2caecf1a Reviewed-on: https://code.wireshark.org/review/2510 Reviewed-by: Guy Harris commit 37b903d Author: Evan Huus Date: Fri Jun 20 17:36:59 2014 -0700 batch of tvb-length conversions Change-Id: I76ca4d075756e3ac691070e0c05344a410ea2498 Reviewed-on: https://code.wireshark.org/review/2507 Reviewed-by: Evan Huus commit 3773a75 Author: Jeff Morriss Date: Fri Jun 20 14:48:27 2014 -0400 Add command-line argument to request the version to a number of the utilities. In some cases "-v" was already used so "-V" is the option. Note that the version information in these utilities is much shorter than what is presented by the big programs. As requested by https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5804 Bug: 5804 Change-Id: I35db35a4eace2797afd895f9be7322ef39928480 Reviewed-on: https://code.wireshark.org/review/2489 Reviewed-by: Guy Harris commit c11ae8a Author: Joerg Mayer Date: Sat Jun 21 01:33:57 2014 +0200 Add .rc files to the sources to have them included in the build Change-Id: I84dda519e617b24d92fcf374670a4a6ee6f488ee Reviewed-on: https://code.wireshark.org/review/2506 Reviewed-by: Jörg Mayer commit b2622e1 Author: Guy Harris Date: Fri Jun 20 16:43:13 2014 -0700 Move the "capture-comment" long option to LONGOPT_CAPTURE_COMMON. Change-Id: I55884d48911de307cde52accfebbda69f2989526 Reviewed-on: https://code.wireshark.org/review/2505 Reviewed-by: Guy Harris commit 235d3a2 Author: Guy Harris Date: Fri Jun 20 16:26:11 2014 -0700 Fix build without pcap. The files that use LONGOPT_CAPTURE_COMMON and OPTSTRING_CAPTURE_COMMON include capture_opts.h unconditionally, so there's no need to define them if we don't have pcap. In addition, we want the capture options "available" even if we don't have pcap, so we can tell the user "you're using a version of *shark without pcap, but you gave a capture option". Change-Id: I0bd3893b73d3d903610d0bc6cacb60bfb37096f4 Reviewed-on: https://code.wireshark.org/review/2503 Reviewed-by: Guy Harris commit 5d65e02 Author: Joerg Mayer Date: Sat Jun 21 01:05:27 2014 +0200 More .in files to handle Change-Id: I55a04fe6f72c22f1a936ef45b215a8813f7a02db Reviewed-on: https://code.wireshark.org/review/2502 Reviewed-by: Jörg Mayer commit 84df8eb Author: Joerg Mayer Date: Sat Jun 21 01:03:44 2014 +0200 relnotes got updated again Change-Id: I1f006805548829435710b1d86297aa9168afe7f9 Reviewed-on: https://code.wireshark.org/review/2501 Reviewed-by: Jörg Mayer commit fd8bf42 Author: Joerg Mayer Date: Sat Jun 21 00:38:07 2014 +0200 Process all .in files, not only the ones needed for Unix'ish systems. Change-Id: I265367f07253be4379efbb6689ec944f04ef6134 Reviewed-on: https://code.wireshark.org/review/2500 Reviewed-by: Jörg Mayer commit dc5d0ed Author: Graham Bloice Date: Fri Jun 20 22:59:29 2014 +0100 Add flags required for VS2013 to Cmake Change-Id: I666d819fdee67d945dd46bd03749f190eb2873b4 Reviewed-on: https://code.wireshark.org/review/2499 Reviewed-by: Graham Bloice Tested-by: Graham Bloice commit b3885a9 Author: Guy Harris Date: Fri Jun 20 14:51:10 2014 -0700 Fix builds without pcap. Change-Id: I6c67f9ea9d115a8396af0904ef9a73d2c528dcaa Reviewed-on: https://code.wireshark.org/review/2498 Reviewed-by: Guy Harris commit 85ad72c Author: Guy Harris Date: Fri Jun 20 14:47:41 2014 -0700 Add long names for -a, -b, and -p. (The name for -p matches what's in the tcpdump trunk.) Change-Id: If4f1824518aee1f0213f140d884db9c676dd15c4 Reviewed-on: https://code.wireshark.org/review/2497 Reviewed-by: Guy Harris commit cc4710a Author: Guy Harris Date: Fri Jun 20 14:38:39 2014 -0700 Also define LONGOPT_CAPTURE_COMMON as nothing if we don't have pcap. While we're at it, simplify the #ifdefs and #defines in capture_opts.h - don't do the same tests twice. Change-Id: I2079167f31789470ef77120054d769d5914745e3 Reviewed-on: https://code.wireshark.org/review/2496 Reviewed-by: Guy Harris commit 5537c53 Author: Guy Harris Date: Fri Jun 20 14:31:47 2014 -0700 "-d" isn't common to all capturing programs, it's dumpcap-specific. Change-Id: I827615d45051c9d66407516b311d3de448de6d07 Reviewed-on: https://code.wireshark.org/review/2495 Reviewed-by: Guy Harris commit 13b5d9b Author: Guy Harris Date: Fri Jun 20 14:29:01 2014 -0700 Use OPTSTRING_CAPTURE_COMMON here as well. Change-Id: If0078797a2e7b14edbd1b64863c4961c9b198168 Reviewed-on: https://code.wireshark.org/review/2494 Reviewed-by: Guy Harris commit 9a50b0f Author: Guy Harris Date: Fri Jun 20 14:14:02 2014 -0700 Define OPTSTRING_CAPTURE_COMMON as nothing if we don't have pcap. No capturing, no capture options. Change-Id: I0023184b9c358d5876f19a098590f34d641c8649 Reviewed-on: https://code.wireshark.org/review/2493 Reviewed-by: Guy Harris commit 26bbee3 Author: Guy Harris Date: Fri Jun 20 13:59:45 2014 -0700 Add some long options for capture short options. The names match tcpdump trunk's names for the corresponding options. Also have capture_opts.h provide a #define for the part of the short option string that corresponds to the capture short options that all our programs that take capture short options take (those are largely the ones we have in common with tcpdump). Change-Id: Ia209425959c801725850b56a7d63441ee99b5001 Reviewed-on: https://code.wireshark.org/review/2492 Reviewed-by: Guy Harris commit 312ed10 Author: Guy Harris Date: Fri Jun 20 12:18:48 2014 -0700 Add --help and --version long options. Also, make the convention for long-only options be that their case-statement values start at 128, so they avoid colliding with any ASCII code points, including control characters. Make the tables of long options "static const" while we're at it, and get rid of unnecessary casts. Change-Id: I55702a85e9bc078b1cd0f2803ebb68a710405bab Reviewed-on: https://code.wireshark.org/review/2491 Reviewed-by: Guy Harris commit 6808afd Author: Pascal Quantin Date: Fri Jun 20 20:43:48 2014 +0200 TCP: update the list of options and put Kind and Length items in the right subtree Bug: 10211 Change-Id: Ide37f2a2b33f0d6d7cdff897eed02a8c1ea24f7d Reviewed-on: https://code.wireshark.org/review/2488 Reviewed-by: Alexis La Goutte commit 7186b8a Author: Pascal Quantin Date: Fri Jun 20 19:37:04 2014 +0200 Fix documentation generation on Windows Change-Id: I7166528e312c99b8477361140869ebeb2b7c03b9 Reviewed-on: https://code.wireshark.org/review/2487 Reviewed-by: Pascal Quantin commit 2ab2921 Author: Stig Bjørlykke Date: Fri Jun 20 18:50:00 2014 +0200 Revert part of svn revision 52045 (git b38ee917) This fix does change the format printed for values using bitmasks (because the bit values are printed first) and is not always wanted in this dissectors (because of readability). We should have a better way of doing what I want in this dissectors, so I'll have a look at this later. Change-Id: I2477aa6b1d0c42a7ad5848bba3cb74dce3bba1f0 Reviewed-on: https://code.wireshark.org/review/2485 Reviewed-by: Stig Bjørlykke commit e9424fa Author: Guy Harris Date: Fri Jun 20 09:48:08 2014 -0700 One more change to dissector_add_for_decode_as. Change-Id: Icd272fc9ae749728a601966de573843390e278ab Reviewed-on: https://code.wireshark.org/review/2484 Reviewed-by: Guy Harris commit ce3d2ff Author: Guy Harris Date: Fri Jun 20 09:43:28 2014 -0700 Rename dissector_add_handle() to dissector_add_for_decode_as(). Hopefully that name makes it clear what the routiner's purpose is, and will encourage people to use it rather than using dissector_add_uint() with a bogus integer value. Change-Id: Ic5be456d0ad40b176aab01712ab7b13aed5de2a8 Reviewed-on: https://code.wireshark.org/review/2483 Reviewed-by: Guy Harris commit 4df6b51 Author: Martin Kaiser Date: Thu Jun 19 16:49:07 2014 -0700 remove duplicate offset=0 Change-Id: I6653b733dfd2c587909371e50fd0c2efc4649dcd Reviewed-on: https://code.wireshark.org/review/2482 Reviewed-by: Martin Kaiser commit ffccb9c Author: Martin Kaiser Date: Thu Jun 19 16:40:49 2014 -0700 no need for if(tree) Change-Id: I5762fb30f57d0f9bc3e5fc786577ed1cc49b64d7 Reviewed-on: https://code.wireshark.org/review/2481 Reviewed-by: Martin Kaiser commit d91953f Author: Evan Huus Date: Fri Jun 20 00:12:38 2014 -0700 fix printf argument index Change-Id: I56aae95d61930c74ac9962225e1bcda72079595e Reviewed-on: https://code.wireshark.org/review/2477 Reviewed-by: Evan Huus commit 28e8ce5 Author: Michael Mann Date: Fri Jun 20 02:52:37 2014 -0400 Add proto_tree_add_subtree and proto_tree_add_subtree_format This is intended as a replacement for all of the proto_tree_add_text followed by proto_item_add_subtree calls. Change-Id: I892136d7b9d8b4e100996097eff62ce7af9512d2 Reviewed-on: https://code.wireshark.org/review/2472 Reviewed-by: Michael Mann commit ee2885f Author: Evan Huus Date: Thu Jun 19 23:13:43 2014 -0700 add cast to fix buildbot Change-Id: I945830a6dd9c34adf9802fa9e9948e2e90d8aba8 Reviewed-on: https://code.wireshark.org/review/2476 Reviewed-by: Evan Huus commit 80c070f Author: Evan Huus Date: Thu Jun 19 23:05:53 2014 -0700 Don't hide tcp option kind/len fields Hidden fields are deprecated, and we were hiding them inconsistently anyways. Bug:10211 Change-Id: Iaf1576ae7bc04c0c0bd896c096b117f1b8af2e9e Reviewed-on: https://code.wireshark.org/review/2474 Reviewed-by: Evan Huus commit 980f5f6 Author: Evan Huus Date: Thu Jun 19 21:41:35 2014 -0700 batch of tvb-length conversions Change-Id: I5e40df8af6841e3dad71c41d7e43c7971611b15f Reviewed-on: https://code.wireshark.org/review/2473 Reviewed-by: Evan Huus commit 4560881 Author: Michael Mann Date: Thu Jun 19 15:39:39 2014 -0400 Cleanup display filters reported by checkfiltername.pl Also ensured some files have their correct names at the top so they are more easily grepped Change-Id: Ib0f5ddf14eb1616a93dee496107dc0eb09048825 Reviewed-on: https://code.wireshark.org/review/2452 Reviewed-by: Michael Mann commit df93705 Author: Michael Mann Date: Thu Jun 19 15:42:51 2014 -0400 Improve the tolerance of checkfiltername.pl so it can be added to the pre-commit script. 1. Correctly identify ASN.1 dissectors (so checkfiltername.pl can be more lenient on them) 2. "Whitelist" known (good) filters Change-Id: Iea662190b6655a1919bf08bc35e7978eb2693509 Reviewed-on: https://code.wireshark.org/review/2453 Reviewed-by: Michael Mann commit 728e5a1 Author: Bill Meier Date: Thu Jun 19 21:35:46 2014 -0400 packet-vnc.c: Improve re-assembly. Essentially: When more data is needed to continue dissecting a PDU, use DESEGMENT_ONE_MORE_SEGMENT instead of repeatedly requesting additional bytes (for one or a few more fields). - Improves the efficiency of the dissection; - Prevents 'one-pass' tshark dissection from redissecting the PDU repeatedly many, many times with each time dissecting the PDU with one or a few more additional fields. This generated *lots* of (repeated) output since a reassembled VNC PDU can contain many fields (each of short length). - (A comment in packet-tcp.c states, in effect, that repeatedly requesting a specific amount of more bytes to dissect a PDU will "break reassembly" although I note that the reassembly did seem to work (in-efficiently)). Note: Although this patch improves the handling of reassembly, the dissector has significant issues. For example. see Bug #5366. I expect this fixes the Bug #10134 issue: "Cannot allocate memory"; Before the fix, 'tshark -nVxr' for the input file generated trees with multiple hundreds of thousands of entries and generated reassembled PDUs consisting of many, many small fragments. Change-Id: I970037c346fbaa4bffa5726fd5bee5f69396eabf Reviewed-on: https://code.wireshark.org/review/2471 Reviewed-by: Bill Meier commit 0c3e1a2 Author: Evan Huus Date: Thu Jun 19 16:55:28 2014 -0700 Add casting and license info to fix buildbots Change-Id: Iea53b17480d758c16822d80778fa4f186a188a91 Reviewed-on: https://code.wireshark.org/review/2470 Reviewed-by: Evan Huus commit cdb6802 Author: Joerg Mayer Date: Fri Jun 20 01:48:07 2014 +0200 Make cmake build work for msvc 2013 (Graham Bloice) Change-Id: I8e026dd75085723b95eb2542e102b4383379dfc8 Reviewed-on: https://code.wireshark.org/review/2469 Reviewed-by: Jörg Mayer commit b6d20a2 Author: Jakub Zawadzki Date: Fri Jun 20 00:41:49 2014 +0200 Optimize reseting epan_dissect_t when filtering. Don't destroy interesting_hfids hash table, just remove all values. Change-Id: I119aaebf91aca8916aea0f15376ff2cb9d3fbc35 Reviewed-on: https://code.wireshark.org/review/2467 Reviewed-by: Anders Broman commit db0e534 Author: dameiss Date: Thu Jun 19 15:43:21 2014 -0700 Changed a cast (from guint to guint64) in a call to gtk_tree_store_set(). The data is actually 64-bit, and was being fetched that way - but not stored that way - leading to some very strange (and large) values. Change-Id: I2235ae7f1bab7f48f99afac70109a7d8f9b38e2b Reviewed-on: https://code.wireshark.org/review/2468 Reviewed-by: Pascal Quantin commit 84777a6 Author: Dario Lombardo Date: Tue Jun 17 15:33:15 2014 +0200 Removed SVN Id tag Change-Id: I41931121ab8854e4737aeb565b4f51be87426fa9 Reviewed-on: https://code.wireshark.org/review/2375 Reviewed-by: Alexis La Goutte Reviewed-by: Anders Broman commit e9bce9d Author: Michael Mann Date: Thu Jun 19 15:38:11 2014 -0400 Add dissectors to match the groups of display filters they represent instead of all coming from proto_zbee_nwk. Change-Id: I8049e84af4670b3dec436d2bab143d59557c07aa Reviewed-on: https://code.wireshark.org/review/2450 Reviewed-by: Anders Broman commit e07b795 Author: Chris Maynard Date: Thu Jun 19 12:40:11 2014 -0700 Save the size and position of the expert info dialog Set initialize position to center on parent bug: 3817 Change-Id: Iad48aa762d892908d50f742606160c8305084f48 Reviewed-on: https://code.wireshark.org/review/2459 Reviewed-by: Balint Reczey Tested-by: Balint Reczey commit f5e072a Author: Michael Mann Date: Wed Jun 18 15:39:46 2014 -0400 Remove "pkg" prefix from display filters. Also rename base protocol filter name to match prefix of all other fields Change-Id: Iff234c1443252b9f8e6d87fd7a76925746b5e513 Reviewed-on: https://code.wireshark.org/review/2449 Reviewed-by: Anders Broman commit b98dc77 Author: Michael Mann Date: Wed Jun 18 10:16:24 2014 -0400 Cleanup filter fields that checkdisplayfilter.pl was complaining about. Cleaned up filter names that were shared, but had different types (which can cause problems in a display filter compare) Also cleaned up many [FIELDDESCR] that effectively mimicked the field name. Even more could probably be done (and/or rename field name to be more descriptive), but I was being conservative. Change-Id: I2e072b4f411c390b9430a0a0d903133d6decae5e Reviewed-on: https://code.wireshark.org/review/2448 Reviewed-by: Anders Broman commit 158a329 Author: Pascal Quantin Date: Fri Jun 20 00:16:52 2014 +0200 Update User Guide Change-Id: I947085e2bffa3141dac20e3fe92077c515801297 Reviewed-on: https://code.wireshark.org/review/2466 Reviewed-by: Pascal Quantin commit a45ce57 Author: Jakub Zawadzki Date: Wed Jun 18 16:48:52 2014 +0200 Optimize dissect_sip_route_header() Don't manually fetch each character to find ',' use tvb_find_guint8() Change-Id: I29711421469e868a86bf2edd7adf8dcc85ed26eb Reviewed-on: https://code.wireshark.org/review/2446 Reviewed-by: Michael Mann Reviewed-by: Anders Broman commit 8b12768 Author: Michael Mann Date: Thu Jun 19 15:38:54 2014 -0400 calling subdissectors shouldn't be conditional on a tree Change-Id: I59ad726c16d4a85dd065f4a21bdf5d86e47c82cd Reviewed-on: https://code.wireshark.org/review/2451 Reviewed-by: Martin Kaiser Reviewed-by: Michael Mann commit 88b0d0a Author: dameiss Date: Thu Jun 19 13:45:42 2014 -0700 Cleaned up some CLang dead assignment warnings. Change-Id: Ibd2fa6c791253e4dbac9a21532e894db3327ce57 Reviewed-on: https://code.wireshark.org/review/2465 Reviewed-by: Michael Mann commit 1e9bc6e Author: Martin Kaiser Date: Thu Jun 19 14:32:55 2014 -0700 handle TS packet reassembly for PES packets with 0 length field (unknown length) this fixes bug 9527 Change-Id: I255ae9662dfeea06e61e4b0891e0ea8eaa254d0f Reviewed-on: https://code.wireshark.org/review/2462 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 0c0bd54 Author: Martin Kaiser Date: Wed Jun 18 10:33:15 2014 -0700 no need to initialize these two vars Change-Id: Ie1a71046b791bcbbf3cf02ddd1c4ddc88b388302 Reviewed-on: https://code.wireshark.org/review/2461 Reviewed-by: Martin Kaiser commit a32dbae Author: Jeff Morriss Date: Thu Jun 19 17:42:37 2014 -0400 Don't crash when closing the Summary window if the file has been closed. Yes, this is a Gtk-UI fix but it's a one-liner and easy enough. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8715 Bug: 8715 Change-Id: I554b6c953e83ff3d8cb57029e844f2f481b751dd Reviewed-on: https://code.wireshark.org/review/2460 Reviewed-by: Jeff Morriss commit b936dbd Author: Guy Harris Date: Thu Jun 19 14:22:54 2014 -0700 Protocols sending the OS's AF_INET6 value are OS-specific or broken. Check for all the different AF_INET6 values that are on various OSes. If Totem is, and will forever be, used *ONLY* on one particular OS, feel free to remove the uses of other _AF_INET6 values (but do *not* change back to using the OS's AF_INET6; this should dissect the protocol correctly on *all* OSes). Add a common AF_INET definition to epan/aftypes.h while we're at it, and use that; as most OSes picked up 4.2BSD's AF_INET value, most if not all of them use 2, but IPv6 came out after 4.2BSD, and various OSes all picked their own values for AF_INET6. Change-Id: Iae15dfdd15203ed3ecd078a6499821dc09139a98 Reviewed-on: https://code.wireshark.org/review/2458 Reviewed-by: Guy Harris commit 9e81d58 Author: Alexis La Goutte Date: Thu Jun 19 21:43:16 2014 +0200 Fix indent (use 4 spaces) and add modelines Change-Id: Ieb231d9f551f3e157197f56378088fb0069388d3 Reviewed-on: https://code.wireshark.org/review/2455 Reviewed-by: Michael Mann commit 15a0a63 Author: Evan Huus Date: Thu Jun 19 19:55:27 2014 +0000 batch of manual tvb_length conversions Change-Id: Ifea45514bdba8be5f62b9dc560027077297f631e Reviewed-on: https://code.wireshark.org/review/2456 Reviewed-by: Evan Huus commit 78a5f0c Author: dameiss Date: Thu Jun 19 10:33:25 2014 -0700 gtk_table_new is deprecated in GTK3. Change to use grid instead, and use ws_gtk_grid_attach_extended() to do the heavy lifting. Change-Id: I1c9d12556857196f53fadbce70f206a3cc41f7a5 Reviewed-on: https://code.wireshark.org/review/2433 Reviewed-by: Alexis La Goutte Tested-by: Alexis La Goutte commit 5ed05dd Author: Evan Huus Date: Thu Jun 19 19:27:47 2014 +0000 batch of manual tvb_length conversions Change-Id: Ib3a1ddc4342a7a8648d6ed8bfcb35aa229c56a27 Reviewed-on: https://code.wireshark.org/review/2445 Reviewed-by: Michael Mann commit 627de38 Author: Dario Lombardo Date: Wed Jun 18 17:30:58 2014 +0200 Removed SVN Id from epan dir. Change-Id: I487a3451344796447f0d5621b993cc89c29e93b5 Reviewed-on: https://code.wireshark.org/review/2383 Reviewed-by: Alexis La Goutte Reviewed-by: Michael Mann commit 0a3b1d8 Author: Pascal Quantin Date: Thu Jun 19 21:40:20 2014 +0200 Kerberos: fix dissection of packets when Record Mark is present Bug: 10200 Change-Id: Ied8db64120131c029e276d66aeff8b81a45a7286 Reviewed-on: https://code.wireshark.org/review/2447 Reviewed-by: Evan Huus Reviewed-by: Pascal Quantin commit e1c0674 Author: Pascal Quantin Date: Thu Jun 19 21:13:17 2014 +0200 Long and short names are inverted Change-Id: Ief3c86562d5eadb845b5a32dc704a61ccd27fdf6 Reviewed-on: https://code.wireshark.org/review/2443 Reviewed-by: Pascal Quantin commit 1257446 Author: Guy Harris Date: Thu Jun 19 12:09:18 2014 -0700 address_to_str() *does* take a const pointer. At least now it does. (So does ep_address_to_str().) Change-Id: I5fdf15ca42faac802fd21b4b6f5b750ed402bd05 Reviewed-on: https://code.wireshark.org/review/2442 Reviewed-by: Guy Harris commit 592c367 Author: Evan Huus Date: Thu Jun 19 19:06:59 2014 +0000 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 commit 08a318a Author: Guy Harris Date: Thu Jun 19 12:05:00 2014 -0700 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 commit 46ecf18 Author: Guy Harris Date: Thu Jun 19 11:58:21 2014 -0700 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 commit 83762f9 Author: Evan Huus Date: Thu Jun 19 18:54:11 2014 +0000 Add sys/socket.h which should fix solaris Change-Id: Ic6f9e8dce860c2bd54bb4c5e0f2d0526178fc720 Reviewed-on: https://code.wireshark.org/review/2437 Reviewed-by: Evan Huus commit 39f6a8b Author: Pascal Quantin Date: Thu Jun 19 20:31:32 2014 +0200 Revert "Update PIDL source files with the API changes done in g021e7af" This reverts commit e09d127a9a08b587903a957145d3df655b190954. Change-Id: Id34b9f5875b1d63aaeed96b3ffdc8ece63ab4134 Reviewed-on: https://code.wireshark.org/review/2436 Reviewed-by: Pascal Quantin commit d0ac937 Author: Pascal Quantin Date: Thu Jun 19 20:31:08 2014 +0200 Revert "Update ASN.1 source files with the API changes done in g021e7af" This reverts commit e308e7c4de81c2ff7159e444b865ac59de4faa2b. Change-Id: I079616d63f643f79f1bc03ef5fdf724f36df4071 Reviewed-on: https://code.wireshark.org/review/2435 Reviewed-by: Pascal Quantin commit 7398779 Author: Evan Huus Date: Thu Jun 19 18:27:07 2014 +0000 rename variable to avoid shadow warning Change-Id: I5934120da2dddf9076972ea3a471191f7dc9596a Reviewed-on: https://code.wireshark.org/review/2434 Reviewed-by: Evan Huus commit b0bc4d5 Author: Michael Mann Date: Thu Jun 19 14:10:00 2014 -0400 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 7fea55a0541bcc5059f767970b6f6291f81d7b9c. Change-Id: I4bf29b206e5e1f5daefcec131309a8f6e78e1eb1 Reviewed-on: https://code.wireshark.org/review/2428 Reviewed-by: Michael Mann commit 14824e6 Author: Michael Mann Date: Thu Jun 19 17:18:16 2014 +0000 Revert "Fixup: tvb_* -> tvb_captured" 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 commit 3557ac4 Author: Evan Huus Date: Thu Jun 19 18:19:09 2014 +0000 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 commit c95ff6b Author: Jesse Gross Date: Mon Jun 16 15:40:37 2014 -0700 Add dissector for Generic Network Virtualization Encapsulation (Geneve). Change-Id: I3ecf655d8e49bb7b519c4ba95d4e45c7b114bdd6 Reviewed-on: https://code.wireshark.org/review/2359 Reviewed-by: Evan Huus commit 53594f3 Author: Michael Mann Date: Tue Mar 18 08:17:28 2014 -0400 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 commit 0b245a4 Author: Anish Bhatt Date: Thu Jun 12 23:54:31 2014 -0700 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 Reviewed-on: https://code.wireshark.org/review/2193 Reviewed-by: Evan Huus commit 3adc5b8 Author: Guy Harris Date: Thu Jun 19 10:54:01 2014 -0700 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 commit daa70fe Author: Michael Mann Date: Thu Jun 19 17:17:16 2014 +0000 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 021e7afc9fcba09094d0e2143cc434a34e3b09dc. Change-Id: I0640eabce5ce8c4ff3a88ebf848b499f8bb8ed2f Reviewed-on: https://code.wireshark.org/review/2429 Reviewed-by: Michael Mann commit 46a808a Author: dameiss Date: Wed Jun 18 16:44:31 2014 -0700 Add GTK modules for existing LBM dissectors. bug: 10204 Change-Id: Ie21cc07b0ac9a56648ec72062ce58a1ac800318e Reviewed-on: https://code.wireshark.org/review/2420 Reviewed-by: Michael Mann commit bcff3c5 Author: Pascal Quantin Date: Thu Jun 19 02:42:47 2014 +0200 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 commit 5a6366c Author: Balint Reczey Date: Wed Jun 18 12:07:20 2014 -0700 Generate xz compressed archives instead of .bz2-s Change-Id: Iad47516ae617f5ecac5b03f2d7e800208c499d4a Reviewed-on: https://code.wireshark.org/review/2403 Reviewed-by: Gerald Combs commit 85499fb Author: Balint Reczey Date: Wed Jun 18 11:43:08 2014 -0700 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 Reviewed-by: Gerald Combs commit 43c64c0 Author: Pascal Quantin Date: Thu Jun 19 00:35:24 2014 +0200 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 Reviewed-by: Pascal Quantin commit 5844e12 Author: Jakub Zawadzki Date: Wed Jun 18 17:37:15 2014 +0200 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 commit 153793a Author: Pascal Quantin Date: Thu Jun 19 00:47:34 2014 +0200 Remove svn $Id$ keyword in Lua scripts Change-Id: I5c5f8659338aed36ba020a771a8b8222f2f7e025 Reviewed-on: https://code.wireshark.org/review/2416 Reviewed-by: Evan Huus Reviewed-by: Alexis La Goutte commit 4d1e1e7 Author: Guy Harris Date: Wed Jun 18 14:25:38 2014 -0700 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 commit 13597c9 Author: Joerg Mayer Date: Wed Jun 18 22:57:15 2014 +0200 Rename the filtername to initial_rtt Change-Id: I64af535dc07eb4310b212077bb4c52032e97ecdb Reviewed-on: https://code.wireshark.org/review/2413 Reviewed-by: Jörg Mayer commit 6da6bf7 Author: Guy Harris Date: Wed Jun 18 13:54:33 2014 -0700 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 commit 461c6a0 Author: Joerg Mayer Date: Wed Jun 18 21:57:47 2014 +0200 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 commit 67dac59 Author: Joerg Mayer Date: Wed Jun 18 21:51:33 2014 +0200 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 commit 681d823 Author: AndersBroman Date: Wed Jun 18 21:37:32 2014 +0200 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 commit 72078cf Author: Joerg Mayer Date: Wed Jun 18 21:25:12 2014 +0200 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 commit ff5c968 Author: Guy Harris Date: Wed Jun 18 12:22:23 2014 -0700 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 Tested-by: Evan Huus Reviewed-by: Guy Harris commit 8dabe00 Author: Guy Harris Date: Wed Jun 18 11:58:04 2014 -0700 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 commit c6007e8 Author: Guy Harris Date: Wed Jun 18 11:55:02 2014 -0700 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 commit 5e5e201 Author: Guy Harris Date: Wed Jun 18 11:45:44 2014 -0700 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 commit fca7b3f Author: Evan Huus Date: Wed Jun 18 10:24:23 2014 -0700 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 commit 77e3473 Author: Guy Harris Date: Wed Jun 18 11:30:51 2014 -0700 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 commit 08063d8 Author: Evan Huus Date: Wed Jun 18 11:06:04 2014 -0700 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 commit 009bebb Author: Shoichi Sakane Date: Wed Jun 18 10:40:19 2014 -0700 Fix copy-paste probem in COAP dissector Bug:8070 Change-Id: I7a86a37f7de6b3e4e12fe1c47980a9a6604488d6 Reviewed-on: https://code.wireshark.org/review/2390 Reviewed-by: Pascal Quantin commit 248a503 Author: Pascal Quantin Date: Wed Jun 18 19:58:34 2014 +0200 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 commit e09d127 Author: Pascal Quantin Date: Wed Jun 18 19:51:54 2014 +0200 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 commit f99aaf8 Author: Pascal Quantin Date: Wed Jun 18 19:48:35 2014 +0200 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 commit cc37b50 Author: Pascal Quantin Date: Wed Jun 18 18:54:31 2014 +0200 Get rid of obsolete references to nettle Bug: 2089 Change-Id: Ie3337a1b750d8d95f6291c77dfd19cd1b0c57e83 Reviewed-on: https://code.wireshark.org/review/2388 Tested-by: Pascal Quantin Reviewed-by: Pascal Quantin commit c6324a0 Author: Joerg Mayer Date: Wed Jun 18 19:46:27 2014 +0200 Get rid of some ancient qualityreview comments... Change-Id: If25bdd594b20b656c345dcfe62765379f5dd9c5e Reviewed-on: https://code.wireshark.org/review/2392 Reviewed-by: Jörg Mayer commit 54819e5 Author: Guy Harris Date: Wed Jun 18 10:02:26 2014 -0700 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 commit f2dd6c0 Author: Pascal Quantin Date: Wed Jun 18 18:12:01 2014 +0200 SABP: fix an error spotted by pre-commit hook Change-Id: I733e2e72b52293b3c7c15f4e0c240f7e01f4b98c Reviewed-on: https://code.wireshark.org/review/2386 Reviewed-by: Pascal Quantin commit e308e7c Author: Pascal Quantin Date: Wed Jun 18 18:09:58 2014 +0200 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 commit b5a462b Author: Evan Huus Date: Tue Jun 17 23:12:58 2014 -0700 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 commit cd56eb9 Author: Martin Kaiser Date: Fri Jun 13 09:16:11 2014 -0700 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 Tested-by: Martin Kaiser commit 7fea55a Author: Dario Lombardo Date: Wed Jun 18 12:18:58 2014 +0200 Fixup: ep_address_to_str -> address_to_str Change-Id: Id49ba07e32a71357b50b32de7cecfd80e412d508 Reviewed-on: https://code.wireshark.org/review/2379 Reviewed-by: Anders Broman commit 021e7af Author: Dario Lombardo Date: Tue Jun 17 17:49:26 2014 +0200 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 commit 246fe2c Author: Dario Lombardo Date: Tue Jun 17 17:45:00 2014 +0200 Fixup: tvb_* -> tvb_captured Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f Reviewed-on: https://code.wireshark.org/review/2377 Reviewed-by: Anders Broman commit 971ffd6 Author: Dario Lombardo Date: Tue Jun 17 17:30:58 2014 +0200 Fixup: tvb_get_string(z) -> tvb_get_string(z)_enc Change-Id: I63a3704effe3fcab01a193dc39b6a22e9f1cf3fe Reviewed-on: https://code.wireshark.org/review/2376 Reviewed-by: Anders Broman commit 421d817 Author: Guy Harris Date: Wed Jun 18 02:49:57 2014 -0700 Don't compile anything with -msse4.2 unless the compiler supports it. 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 commit 7939f68 Author: Joerg Mayer Date: Wed Jun 18 09:30:10 2014 +0200 Don't put c-comments into cmake files. Won't work at midnight either. Change-Id: I80efce78a044f477af56f82cc9d8e85c8544ffbc Reviewed-on: https://code.wireshark.org/review/2372 Reviewed-by: Jörg Mayer commit 4aad9d3 Author: Yan Burman Date: Wed Jun 18 10:18:39 2014 +0300 Fix compilation warning Change-Id: Ia7922415d8b22ba0c5a04ad6940c7e10bc205d57 Reviewed-on: https://code.wireshark.org/review/2371 Reviewed-by: Evan Huus commit 5440665 Author: Joerg Mayer Date: Wed Jun 18 08:51:15 2014 +0200 Fix building uiqt on Windows with the cmake build system: 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 commit 666127f Author: Pascal Quantin Date: Wed Jun 18 08:14:27 2014 +0200 PDCP LTE: do not try to decipher PDCP control messages (like ROHC feedback) Change-Id: I4a1596fd45bbc78ed8e90accf69ac048e7053161 Reviewed-on: https://code.wireshark.org/review/2366 Reviewed-by: Pascal Quantin commit 6aa1470 Author: Evan Huus Date: Tue Jun 17 22:18:35 2014 -0700 Replace glib memory with wmem memory Fixes potential memory leaks. Bug:8102 Change-Id: I88f9a74e3f782232d2da0bc7d83727dc3253f376 Reviewed-on: https://code.wireshark.org/review/2364 Reviewed-by: Anders Broman commit 6e6bd90 Author: Evan Huus Date: Tue Jun 17 22:07:24 2014 +0000 Convert the obvious emem to wmem in lua code. Bug:9927 Change-Id: Ibf0dd45d3b54e489b70a4fde193b825ec703379e Reviewed-on: https://code.wireshark.org/review/2349 Reviewed-by: Anders Broman commit 04c9009 Author: Pascal Quantin Date: Wed Jun 18 01:30:35 2014 +0200 TCP: do desegmentation sanity checks for all sub dissectors types Change-Id: I02fe9827d8c1618f7dc6696e7d8667681a48d4a9 Reviewed-on: https://code.wireshark.org/review/2355 Reviewed-by: Evan Huus Reviewed-by: Pascal Quantin commit 57b27ec Author: Jakub Zawadzki Date: Wed Jun 18 01:44:44 2014 +0200 Optimize tvbparse character set checking. This patch makes tvbparse_[not_]chars() to generate array of characters which is accepted, later this array is checked in cond_chars_common(). This results in nice speedup of XML dissector (~33% for my file). Change-Id: I62a5585f8bccaaea1a0c49fc70c7552531493442 Reviewed-on: https://code.wireshark.org/review/2356 Reviewed-by: Anders Broman commit c507304 Author: Guy Harris Date: Tue Jun 17 22:46:56 2014 -0700 If we don't check for something, don't print a result. This caues a bunch of bogus "no"s to be printed when testing for various compiler options when the compiler isn't GCC-like enough to accept GCC-style -W, -f, and -m flags. Change-Id: I16cf45729c61d166644cbddccfbaeb9b7770b045 Reviewed-on: https://code.wireshark.org/review/2365 Reviewed-by: Guy Harris commit 7bae85a Author: Jakub Zawadzki Date: Wed Jun 18 07:14:24 2014 +0200 Fix x86 buildbots, revert sse4.2 AM_CONDITIONAL logic Change-Id: I0b594089753980b58f702e86293028c8dc7e4e54 Reviewed-on: https://code.wireshark.org/review/2363 Reviewed-by: Guy Harris commit 20accf3 Author: Guy Harris Date: Tue Jun 17 21:58:11 2014 -0700 Don't do the check for clang/clang++. Adding -Qunused-arguments to CXXFLAGS causes the checks for -f and -m flags not to fail with clang++, causing the configure script to warn about -f flags supported by clang but not clang++ indicating that the compilers are a mismatched pair. The checks we do for flags should eliminate "unused" -f/-m flags, suppressing the warnings that way. Change-Id: I749d6f499a3d34300518cc0ba539f355377359af Reviewed-on: https://code.wireshark.org/review/2362 Reviewed-by: Guy Harris commit 4cebb06 Author: Guy Harris Date: Tue Jun 17 21:27:31 2014 -0700 Add -Werror when testing -m compiler flags. As with -f flags, some compilers need -Werror to force the compiler to fail when passed an unknown -m flag. Also, if it's not a -W or -f or -m flag, don't forget to add it to CFLAGS and/or CXXFLAGS. And propagate a comment to the C++ flag testing. Change-Id: I53e0e59b34b10b9477c60ddd4f2e047b3b8be77f Reviewed-on: https://code.wireshark.org/review/2361 Reviewed-by: Guy Harris commit 237669a Author: Balint Reczey Date: Tue Jun 17 17:26:48 2014 -0700 Update debian/symbols for the changed library ABIs Change-Id: I942a92569472e3cecfaee004778561986aee3e69 Reviewed-on: https://code.wireshark.org/review/2357 Reviewed-by: Anders Broman commit 8241b87 Author: Guy Harris Date: Tue Jun 17 20:22:13 2014 -0700 Get rid of the Python stuff, as we've gotten rid of Python plugin support. Also, update a comment to more accurately describe what a loop is doing, and get rid of an unused variable. Change-Id: I948fc4ad758152b483450bf74f653087c892ad3a Reviewed-on: https://code.wireshark.org/review/2360 Reviewed-by: Guy Harris commit a61ebef Author: Guy Harris Date: Tue Jun 17 18:22:58 2014 -0700 Set the conditional SSE42_SUPPORTED in all circumstances. This might fix the Solaris/SPARC build error configure: error: conditional "SSE42_SUPPORTED" was never defined. Usually this means the macro was only invoked conditionally. (not all the world's a VAX^Wx86). Change-Id: Ib189ce70b203875188cee3266b8652c02ca34237 Reviewed-on: https://code.wireshark.org/review/2358 Reviewed-by: Guy Harris commit 6664030 Author: Jakub Zawadzki Date: Thu Jun 12 23:42:18 2014 +0200 Rewrite check for ws_mempbrk_sse42.c compilation - check only for -msse4.2 - check if there's nmmintrin.h header - don't check if current CPU support -msse4.2 (fix cross compilation) Change-Id: Iba8d291fdf5602937ab540a69b7608a81427ad25 Reviewed-on: https://code.wireshark.org/review/2189 Reviewed-by: Anders Broman commit 91f58d6 Author: Martin Kaiser Date: Tue Jun 17 15:48:17 2014 -0700 check for correct ftype Change-Id: I2274b97c74a845e6514e8acff136e55f721f11a8 Reviewed-on: https://code.wireshark.org/review/2354 Reviewed-by: Martin Kaiser commit c9dd677 Author: Martin Kaiser Date: Mon Jun 16 12:00:23 2014 -0700 make dissect_ipmi_cmd() static Change-Id: Ie494a52fa73f7b91bc65da1bc36516f799ef4967 Reviewed-on: https://code.wireshark.org/review/2353 Reviewed-by: Martin Kaiser commit ed38e69 Author: Gerald Combs Date: Tue Jun 17 15:38:29 2014 -0700 Make sure we hide columns for live captures as well. Remove some dependencies on having an open capture file. Change-Id: Iad5d03e0a45ed31c83781861ef1ed7fdeb92e4a5 Reviewed-on: https://code.wireshark.org/review/2352 Reviewed-by: Gerald Combs commit d5e2782 Author: Joerg Mayer Date: Wed Jun 18 00:35:04 2014 +0200 Update a comment about how to better identify retransmissions Change-Id: Iec83f7e713a3077f1f4569aa86a55a69684b3097 Reviewed-on: https://code.wireshark.org/review/2351 Reviewed-by: Jörg Mayer commit 93b5a31 Author: Guy Harris Date: Tue Jun 17 15:05:43 2014 -0700 When building an OS X package for GTK+, put the libraries in lib. This reverts to the way we did it prior to the switch to Qt; with GTK+, Contents/MacOS/Wireshark is just a launcher, and the Wireshark binary is in Contents/Resources/bin/wireshark-bin, and the appropriate rpath entry would be @executable_path/../lib - @executable_path/../Frameworks, which works for the Qt version, in which Contents/MacOS/Wireshark is the actual executable, doesn't work for the GTK+ version. This should fix bug 10185. Change-Id: I4e50a4ead8f29a742c97a9001c821aabe1fa5e65 Reviewed-on: https://code.wireshark.org/review/2347 Reviewed-by: Guy Harris commit ba6eb5c Author: Evan Huus Date: Tue Jun 17 21:43:49 2014 +0000 Set the rlc len field before we try to use it in an expert info. Bug:9795 Change-Id: I740a9fe36278995cf6e590206f600c037789f0eb Reviewed-on: https://code.wireshark.org/review/2344 Reviewed-by: Evan Huus commit f4b9ea4 Author: Evan Huus Date: Tue Jun 17 21:25:14 2014 +0000 Initialize smb ioctl_function struct member Bug:10020 Change-Id: I415a29dd36697887cb06485d6ed3a2b799a93464 Reviewed-on: https://code.wireshark.org/review/2342 Reviewed-by: Evan Huus commit 74fec38 Author: Tim Furlong Date: Mon Jun 16 17:57:05 2014 -0400 Get QtShark building on Win7 with Qt 5.3.0 using Qt Creator. Several header file references in .ui files needed to be changed to not be global, and the path to stats_tree_dialog.ui needed a "../qt" path prepended to be found from the build...-Release directory. Change-Id: I51c0bb15eed706f483085020ce2b3cea3c1cdc95 Reviewed-on: https://code.wireshark.org/review/2281 Reviewed-by: Alexis La Goutte Tested-by: Alexis La Goutte Reviewed-by: Evan Huus commit 4179383 Author: Evan Huus Date: Tue Jun 17 18:26:01 2014 +0000 Initialize rq_hdr.session Bug:10168 Change-Id: Ida4d82d102421152785ce680aa47bcb5cf8692f6 Reviewed-on: https://code.wireshark.org/review/2334 Reviewed-by: Dmitry Bazhenov Reviewed-by: Evan Huus commit 43d9a4b Author: Joerg Mayer Date: Tue Jun 17 21:44:07 2014 +0200 Simplify obtaining the absolute path of the build dir Change-Id: If0fabce21d7d12435f4f78768f7193564eeb2bb8 Reviewed-on: https://code.wireshark.org/review/2339 Reviewed-by: Jörg Mayer commit 55cdf03 Author: Joerg Mayer Date: Tue Jun 17 21:38:05 2014 +0200 ip version and header-length are not full byte values. Show the bit decoding for these values. Change-Id: I7ab6c4badf5b66d6f434a47523e2b35730ecb65d Reviewed-on: https://code.wireshark.org/review/2338 Reviewed-by: Jörg Mayer commit 17a5526 Author: Evan Huus Date: Tue Jun 17 18:13:51 2014 +0000 fix underflow in BER constrained bitstrings this can happen and cause invalid memory accesses with incorrectly-large padding values Bug:10187 Change-Id: Ib9b2a2fa10766efb4d95d588f57354a56373c626 Reviewed-on: https://code.wireshark.org/review/2325 Reviewed-by: Evan Huus commit c30df31 Author: Evan Huus Date: Tue Jun 17 10:24:05 2014 -0700 lua_pushstring takes a copy of its argument free the value we pass it, fixing a memory leak Change-Id: I446cb85d82a0697c24035461ad03450855b68884 Reviewed-on: https://code.wireshark.org/review/2304 Reviewed-by: Evan Huus commit 7067e3a Author: Hannes Mezger Date: Thu Jun 12 17:36:32 2014 +0200 Create and register subtree identifiers for all opcua array types Currently for all arrays, the generic ett_opcua_array is used, instead we want to be more selective for storing the expanded state of subtrees. This commit adds subtree identifiers for all array types. Change-Id: Idcec51a200d1109cdb557d3366021d3b066b453d Reviewed-on: https://code.wireshark.org/review/2176 Reviewed-by: Anders Broman commit 8c0d3ae Author: Stig Bjørlykke Date: Sun Jun 15 21:53:47 2014 +0200 Return number of bytes dissected in dissector:call This does not work for old-style dissectors as they always return the number of bytes in incoming buffer and not the number of bytes dissected. This is noted in the documentation. Change-Id: I5b236a73952cac3efc830e40276283bed9af1f87 Reviewed-on: https://code.wireshark.org/review/2237 Reviewed-by: Evan Huus Reviewed-by: Anders Broman commit 647255d Author: Hannes Mezger Date: Thu Jun 12 16:54:25 2014 +0200 Unify how opcua arrays are displayed - Display 'Array of ' instead of 'Array of Simple Type' - Display array indexes for simple types - Display data type in simple type arrays Change-Id: Id2cc746898f97ce329c6afb9cc49f1907a9f18e4 Reviewed-on: https://code.wireshark.org/review/2161 Reviewed-by: Anders Broman commit 91c29ec Author: Hannes Mezger Date: Tue Jun 17 13:40:29 2014 +0200 Add myself as author for the opcua dissector plugin Change-Id: If8349e778fd91426a6a4b6d6e98d3ab870d188d5 Reviewed-on: https://code.wireshark.org/review/2302 Reviewed-by: Anders Broman commit 9991f43 Author: Hannes Mezger Date: Thu Jun 12 16:49:40 2014 +0200 Add dissect_nt_64bit_time_ex for retrieving the created proto_item Using dissect_nt_64bit_time it is not possible to access the created proto_item afterwards, hence the new function. Change-Id: I39aca92536a53841045c30b601b6ec1a7d8bfb4e Reviewed-on: https://code.wireshark.org/review/2160 Reviewed-by: Anders Broman commit d1cdbd7 Author: Alex Badea Date: Tue Jun 17 13:12:34 2014 +0300 isakmp: add support for IKEv1 AES decryption Select an appropriate gcrypt cipher based on ISAKMP encryption ID and key length attribute. Fixes bug 10128. Bug:10128 Change-Id: Ie74fc51eb9bfe6d68340056d3ef2ef28c7677fb8 Signed-off-by: Alex Badea Reviewed-on: https://code.wireshark.org/review/2296 Reviewed-by: Evan Huus Reviewed-by: Alexis La Goutte commit f9b05dc Author: Alex Badea Date: Tue Jun 17 13:55:06 2014 +0300 isakmp: allow IKEv1 decryption with non-PSK authentication There is a check that disables decryption for non-PSK authentication. It has been around ever since its introduction in commit acfe071e (svn r17229). As suggested in bug 7951, remove this check to allow decryption for e.g. certificates authentication. Bug: 7951 Change-Id: I5e98407d0f8dbabac2cdaf632cf0af403192872b Signed-off-by: Alex Badea Reviewed-on: https://code.wireshark.org/review/2297 Reviewed-by: Anders Broman commit f847b92 Author: Joerg Mayer Date: Tue Jun 17 16:20:56 2014 +0200 It's so simple: If we require a package but provide alternative methods of finding the package don't allow the first method to fail terminally. Todo: Fix this in all other places as well. Change-Id: I5a343fac33f6a5d6e50ff353d739459b2e36711a Reviewed-on: https://code.wireshark.org/review/2300 Reviewed-by: Jörg Mayer commit 5ca64ca Author: Anish Bhatt Date: Sun Jun 15 18:39:51 2014 -0700 Add support for WRITE_LONG16 & REPORT_REFERRALS to scsi dissector Picking up leftover work on https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8843 Change-Id: Ie3df55ae3309cf68f64b2aa184fb2904d1200cb5 Signed-off-by: Anish Bhatt Reviewed-on: https://code.wireshark.org/review/2239 Reviewed-by: Anders Broman commit a9a73a8 Author: Jeff Morriss Date: Mon Jun 16 21:30:39 2014 -0400 Get the Windows doc builds going again: define top_srcdir because it's used in Makefile.common. Change-Id: I4e8905b28bd6fb8c7bf3d38dbf3882c393732bcf Reviewed-on: https://code.wireshark.org/review/2291 Reviewed-by: Anders Broman commit 289aa37 Author: Joerg Mayer Date: Tue Jun 17 02:44:05 2014 +0200 Remove detection of Python libraries: They are not used anymore. Change-Id: If42bb16d5c6202889ff933af6c9d974866d2a950 Reviewed-on: https://code.wireshark.org/review/2290 Reviewed-by: Jörg Mayer commit 11243e3 Author: Alexis La Goutte Date: Tue Jun 17 00:20:16 2014 +0200 Qt: fix loading of language translation But need always restart to apply change... Based on http://qt-project.org/wiki/How_to_create_a_multi_language_application Change-Id: I0f95afb68aa5b125e0707b0af1ce096dab9c29e4 Reviewed-on: https://code.wireshark.org/review/2286 Reviewed-by: Alexis La Goutte commit 923cf41 Author: Jakub Zawadzki Date: Tue Jun 17 00:01:00 2014 +0200 Fix copy/paste errors in value_string. Also make repetition_coding_indications[] standard terminated. Change-Id: Ice20e1f27f5ab4d111f893608a230b83899efc9f Reviewed-on: https://code.wireshark.org/review/2288 Reviewed-by: Alexis La Goutte Reviewed-by: Evan Huus commit e047e3a Author: Evan Huus Date: Mon Jun 16 12:30:43 2014 -0700 Convert tcap dissector to wmem As far as I can tell these calls were just missed in the first initial pass, they're not in a weird scope. Close review from somebody else please to verify that! Change-Id: Ic3188879124dcb8fdf42e79d200d4f244200aa7b Reviewed-on: https://code.wireshark.org/review/2266 Reviewed-by: Anders Broman commit 6c79a71 Author: Gerald Combs Date: Mon Jun 16 16:54:57 2014 -0700 Column visibility fixups. Move visibility to its own method and call it when we show ourselves and when we thaw. Change-Id: I936cd33e5ccabddb32061ea347a465ac12f1be87 Reviewed-on: https://code.wireshark.org/review/2289 Reviewed-by: Gerald Combs commit 1567820 Author: Joerg Mayer Date: Tue Jun 17 01:36:09 2014 +0200 Add a FIXME referring to bug 4096 Change-Id: I4263d791e7bc7dc410d2735e94bc765aee2d84bc Reviewed-on: https://code.wireshark.org/review/2287 Reviewed-by: Jörg Mayer commit f113306 Author: Jeff Morriss Date: Mon Jun 16 18:25:33 2014 -0400 More Python-bindings removal. Change-Id: I4d82175781e65c73179f4c8e737a7900cb050bce Reviewed-on: https://code.wireshark.org/review/2283 Reviewed-by: Jeff Morriss commit 048646d Author: Guy Harris Date: Mon Jun 16 15:57:16 2014 -0700 More Python removal. Fix a duplicate @HAVE_LUA@ while we're at it. Change-Id: I21acf388498a996701adea401551a65c9ba4f5f0 Reviewed-on: https://code.wireshark.org/review/2285 Reviewed-by: Guy Harris commit d58ac9a Author: Guy Harris Date: Mon Jun 16 15:53:59 2014 -0700 Get rid of the last bits of Python, as they break the build. Bereft of life, it rests in peace. Change-Id: I8b9bc8c6cef0635d5526aa6b389aa33bc41fbc66 Reviewed-on: https://code.wireshark.org/review/2284 Reviewed-by: Guy Harris commit 1777f60 Author: AndersBroman Date: Tue Jun 17 00:12:56 2014 +0200 The broken python support is beeing removed. Change-Id: I5f4d3d381d8629158c9d1bea344b5a2e64a0f462 Reviewed-on: https://code.wireshark.org/review/2282 Reviewed-by: Anders Broman commit f5476e9 Author: AndersBroman Date: Tue Jun 17 00:00:23 2014 +0200 Explicitly declare/cast 'unsigned ' as 'unsigned int ' Applying part of Bug 7825 Change-Id: I460b5c61b04d793ccc27c25debbd5e8f08bc6974 Reviewed-on: https://code.wireshark.org/review/2280 Reviewed-by: Anders Broman commit 319ad97 Author: Jeff Morriss Date: Mon Jun 16 17:45:57 2014 -0400 Add a cast to satisfy the buildbots. Change-Id: I1c128db8a8b0cbbef01a26f7b3a50ed2b59af229 Reviewed-on: https://code.wireshark.org/review/2279 Reviewed-by: Jeff Morriss Tested-by: Jeff Morriss commit 7f6ebec Author: Gerald Combs Date: Mon Jun 16 13:56:06 2014 -0700 Hide hidden columns in Qt. Change-Id: I1da0d95c606eb2f17c03874f20d38b9a7ba9e8ee Reviewed-on: https://code.wireshark.org/review/2278 Reviewed-by: Gerald Combs commit aeb1888 Author: Jeff Morriss Date: Mon Jun 16 17:17:52 2014 -0400 Remove the (old, broken) Python bindings option to ./configure (and a few other references). Change-Id: I470502bfae6617a798d0c2538f0f04ff7d36fee5 Reviewed-on: https://code.wireshark.org/review/2277 Reviewed-by: Jeff Morriss commit a82c8d1 Author: Gerald Combs Date: Mon Jun 16 14:08:59 2014 -0700 More wspython removal. Change-Id: I09b7bac7906f0e134459c4a81a7ef626e6590d5b Reviewed-on: https://code.wireshark.org/review/2276 Reviewed-by: Gerald Combs commit 1496111 Author: Joerg Mayer Date: Mon Jun 16 23:04:38 2014 +0200 Fix a whitepace error that got committed in the last change Change-Id: I5344d04916998263710c16b506250062c1c11b37 Reviewed-on: https://code.wireshark.org/review/2275 Reviewed-by: Jörg Mayer commit bbc7293 Author: Evan Huus Date: Mon Jun 16 14:04:05 2014 -0700 fix format string typos Change-Id: I470463ecfdd2d8facef93e09d6265a9d7ed868c8 Reviewed-on: https://code.wireshark.org/review/2274 Reviewed-by: Evan Huus commit d5fb63a Author: Jakub Zawadzki Date: Mon Jun 16 22:55:07 2014 +0200 Fix copy/paste errors in stun attributes value_string[] array. Found thanks to warning: ** (process:20239): WARNING **: Extended value string 'attributes' forced to fall back to linear search: entry 53, value 32858 [0x805a] < previous entry, value 32861 [0x805d] Change-Id: I12396380b42bbcb90dd139775c4b8d0bfdc79972 Reviewed-on: https://code.wireshark.org/review/2273 Reviewed-by: Evan Huus commit 3a3b36f Author: Evan Huus Date: Mon Jun 16 14:00:57 2014 -0700 kill one last python remnant Change-Id: I21ec54e59acc799ccb0799f06e95713a60f8e86d Reviewed-on: https://code.wireshark.org/review/2272 Reviewed-by: Evan Huus commit ad97c1e Author: Evan Huus Date: Mon Jun 16 11:43:27 2014 -0700 kill unmaintained python bindings Change-Id: I1fa4f0d76b6b29d2935723b83b5ea7165039c807 Reviewed-on: https://code.wireshark.org/review/2258 Reviewed-by: Michael Mann Reviewed-by: Evan Huus commit a279fa7 Author: Michael Mann Date: Mon Jun 16 13:23:28 2014 -0400 Have ipmi "dissectors" register through the build process instead of "manually" Change-Id: I6d6d32e8a1bc21dee9bf52b502e1a02e9511ecb2 Reviewed-on: https://code.wireshark.org/review/2253 Reviewed-by: Dmitry Bazhenov Reviewed-by: Evan Huus Reviewed-by: Michael Mann commit cf99e6b Author: Michael Mann Date: Sun Jun 15 12:36:06 2014 -0400 packet-ipdc.c: proto_tree_add_text -> something filterable. This appears to be a TLV architecture, not sure if the T and L should be broken up and filtered separately. Right now, just filtering on value. Change-Id: Ic5853d2216b6b5f845587e4b789435bed5fe60ff Reviewed-on: https://code.wireshark.org/review/2252 Reviewed-by: Evan Huus Reviewed-by: Michael Mann commit ee137c4 Author: Stig Bjørlykke Date: Mon Jun 16 22:23:20 2014 +0200 Register P_Mul as new-style dissector Change-Id: Ic1f85475223d5ba36d9aa4ae617d6db450940fae Reviewed-on: https://code.wireshark.org/review/2268 Reviewed-by: Stig Bjørlykke commit 87aed58 Author: Stig Bjørlykke Date: Mon Jun 16 22:24:22 2014 +0200 Register DMP as new-style dissector Change-Id: I0491c9c5e817e31011e64aebc9010437581ba718 Reviewed-on: https://code.wireshark.org/review/2269 Reviewed-by: Stig Bjørlykke commit b2b7a6b Author: Stig Bjørlykke Date: Mon Jun 16 22:15:55 2014 +0200 Do not handle P_Mul packet as ASCII string when calculating checksum. This bug was introduced when rewriting tvb_get_string() to handle encoding (and thus handling ASCII string different). Change-Id: Ic107d7b9e2f63aea33fdf55b9c20c22202f7b458 Reviewed-on: https://code.wireshark.org/review/2270 Reviewed-by: Stig Bjørlykke (cherry picked from commit fb0266fb244bf444a2801ee7ffc983f5a58621de) Reviewed-on: https://code.wireshark.org/review/2267 commit 4c0d8fd Author: Bill Meier Date: Mon Jun 16 15:28:41 2014 -0400 Ignore 'docbook/ws?g_chm/' Change-Id: If6529b7cfce199de2f3f54ab0ccf2aa26fe8ec19 Reviewed-on: https://code.wireshark.org/review/2265 Reviewed-by: Bill Meier commit 27c5eaf Author: Bill Meier Date: Mon Jun 16 15:14:34 2014 -0400 Update info as to packages needed for Windows and Fedora. Change-Id: Ie477760abd8232eb646526aeb7cd0eab377ce541 Reviewed-on: https://code.wireshark.org/review/2264 Reviewed-by: Bill Meier commit 67a924b Author: Joerg Mayer Date: Mon Jun 16 21:12:30 2014 +0200 The visibility warning is only valid on non-msvc platforms Change-Id: Iec90ac8654d08b63cfda7d14c370f3c800c74038 Reviewed-on: https://code.wireshark.org/review/2263 Reviewed-by: Jörg Mayer commit b166553 Author: Evan Huus Date: Mon Jun 16 11:21:18 2014 -0700 remove more unused code Change-Id: I7275aafe7d7216b85bbb34ba959b74358d102a91 Reviewed-on: https://code.wireshark.org/review/2255 Reviewed-by: Evan Huus commit e0aabd9 Author: Evan Huus Date: Mon Jun 16 10:54:20 2014 -0700 Convert more time_to_str functions to wmem Change-Id: Ibaae0e79935dc62f12f713f2df5b57d0f3f799b9 Reviewed-on: https://code.wireshark.org/review/2254 Reviewed-by: Evan Huus commit 9301c5b Author: Joerg Mayer Date: Mon Jun 16 21:07:53 2014 +0200 NEWS was updated again Change-Id: I3e00f8222784b4c138bdf63453bf08ec5723dbb1 Reviewed-on: https://code.wireshark.org/review/2262 Reviewed-by: Jörg Mayer commit caf5e59 Author: Joerg Mayer Date: Mon Jun 16 20:51:33 2014 +0200 Undo Graham's change to find the "correct" fix Change-Id: Ifc368687da972231298ab5935d071a84edd3e56e Reviewed-on: https://code.wireshark.org/review/2261 Reviewed-by: Jörg Mayer commit c607a3f Author: AndersBroman Date: Mon Jun 16 20:47:44 2014 +0200 Add a preference to use Japanese ISUP TTC version with 13 bit CIC. Change-Id: I98cb9f803378d69048ef94b7e3ad7d35b393733a Reviewed-on: https://code.wireshark.org/review/2260 Reviewed-by: Anders Broman commit 452b8de Author: Bill Meier Date: Mon Jun 16 14:43:30 2014 -0400 Use correct dependencies for 'release_notes' target so that 'nmake ... release_notes' will work. Change-Id: I8397c2b9c635996744d119e67ffc4fedf63493ef Reviewed-on: https://code.wireshark.org/review/2259 Reviewed-by: Bill Meier commit c62d6e5 Author: Joerg Mayer Date: Mon Jun 16 20:42:41 2014 +0200 Undo Graham's change to move find-package down. Fix detection of Homebrew on APPLE Change-Id: I96506bb57d4772c5c90b1117c37e8350cda376ee Reviewed-on: https://code.wireshark.org/review/2257 Reviewed-by: Jörg Mayer commit 6653289 Author: Joerg Mayer Date: Mon Jun 16 20:31:37 2014 +0200 Detecting gmodule2 on Homebrew almost worked... it behaves more like non-apple platforms Change-Id: I1acf8d05c918121fe1a76c8fbd3ac119f624ee8b Reviewed-on: https://code.wireshark.org/review/2256 Reviewed-by: Jörg Mayer commit de00c49 Author: Evan Huus Date: Sun Jun 15 23:42:14 2014 -0700 Convert a bunch of time_to_str functions to wmem Change-Id: I24fe3cc4a3589dadc4528a77fe7ff13d06b1a983 Reviewed-on: https://code.wireshark.org/review/2245 Reviewed-by: Michael Mann commit b71b68c Author: Alexis La Goutte Date: Mon Jun 16 18:49:46 2014 +0200 Fix indent (Use 4spaces like end of the file and modelines info Change-Id: I80e0193240032e62c685c5b976df921ea1e6a581 Reviewed-on: https://code.wireshark.org/review/2251 Reviewed-by: Graham Bloice Tested-by: Graham Bloice commit faac494 Author: Alex Badea Date: Mon Jun 16 18:55:45 2014 +0300 isakmp: support decryption for SHA-2 hash algorithms Simply map ISAKMP hash IDs for sha256, sha384 and sha512 to gcrypt MDs. Fixes bug 10181. Change-Id: I9c8265bf3c5c8f8d2fd6d251cc0f267964e3be8e Signed-off-by: Alex Badea Reviewed-on: https://code.wireshark.org/review/2250 Reviewed-by: Alexis La Goutte commit 9ac8052 Author: Niels de Vos Date: Thu May 29 11:21:56 2014 +0200 glusterfs: correctly decode GFIDs that are passed in a dict When a dict structure is passed by GlusterFS, the values are not encoded normally. We now assume that the GFID in the dict is in network-order, but this will be incorrect for Big Endian systems. The majority of Gluster deployments are on Little Endian, and the GFID is displayed correctly for this case. I am sorry for the few users on Big Endian Gluster environments, they will see some GFIDs in Wireshark that don't exist on the Gluster volume. With this change, it is also made possible to filter on the GFID that is contained inside of the dict. Change-Id: I62a265eca34df23a507403397012cf652d43ca54 Reported-by: Vikhyat Umrao Signed-off-by: Niels de Vos Reviewed-on: https://code.wireshark.org/review/1856 Reviewed-by: Evan Huus Reviewed-by: Michael Mann commit 2f369b2 Author: Hannes Mezger Date: Thu Jun 12 12:22:35 2014 +0200 Cleanup subtree types in opcua plugin - make ett_opcua_transport static, is only used locally - format code grouping extern ett variables - add subtree variables for encodingmasks of simple types Change-Id: Ia044ca6ca0ff19e940a03d21610db67fe3679b01 Reviewed-on: https://code.wireshark.org/review/2157 Reviewed-by: Anders Broman commit 0bb0b62 Author: Hannes Mezger Date: Thu Jun 12 10:11:06 2014 +0200 Display status code info bits if set Checks if a StatusCode has any of the additional info bits set and displays them accordingly. Change-Id: Ic584233083174d3fd30c6ec6684f308e0e5ae22e Reviewed-on: https://code.wireshark.org/review/2127 Reviewed-by: Evan Huus commit a9b18ef Author: Hannes Mezger Date: Tue Jun 10 13:36:06 2014 +0200 Display text representation of status codes Adds a table containing all known StatusCodes and displays them if found. The list of StatusCodes is in a separate file for easy generating of the list if necessary. Change-Id: Iab74b22b7fc4fb53d8f072c4e3a4cea4ae18196c Reviewed-on: https://code.wireshark.org/review/2126 Reviewed-by: Evan Huus commit 39d7c9d Author: Evan Huus Date: Sun Jun 15 12:40:42 2014 -0400 Remove emem in SNMP UAT, use glib instead Change-Id: Ieea8c09d6a82285b0ba20f669c35394fbf195f50 Reviewed-on: https://code.wireshark.org/review/2241 Reviewed-by: Michael Mann Reviewed-by: Evan Huus commit c76b70f Author: Evan Huus Date: Sun Jun 15 12:07:10 2014 -0400 Remove last remaining call to se_strdup get_filter_from_packet_list_row_and_column now returns glib memory Change-Id: I24361670322ff4a936c157a842b07f32c474089e Reviewed-on: https://code.wireshark.org/review/2240 Reviewed-by: Evan Huus commit 83f9cc6 Author: Evan Huus Date: Sun Jun 15 15:06:50 2014 -0400 Remove last caller of se_strdup_printf Also remove that function as it is now unused. Fix what appeared to be a memory leak in the manual address resolution dialog while in the neighbourhood. Change-Id: I75128ab0f95e5a7673f92bfeea45191f00581c25 Reviewed-on: https://code.wireshark.org/review/2244 Reviewed-by: Michael Mann commit e46c1af Author: Evan Huus Date: Sun Jun 15 14:56:51 2014 -0400 Remove emem from ssl utils, use glib instead. No exceptions can be thrown when loading a key from a file, so it's safe. Change-Id: I14ee8569bb516fcb45b72f07f76d28ef4b32065c Reviewed-on: https://code.wireshark.org/review/2243 Reviewed-by: Michael Mann commit 39a14ab Author: Evan Huus Date: Sun Jun 15 12:44:01 2014 -0400 Remove now-unused functions. Change-Id: Iecf230d493b31ecab25b33c67323987459b23bd7 Reviewed-on: https://code.wireshark.org/review/2242 Reviewed-by: Michael Mann commit dd596db Author: Alexis La Goutte Date: Thu Jun 5 08:33:57 2014 +0200 STUN: Add support of MS-TURNBWM Traversal using Relay NAT (TURN) Bandwidth Management Extensions http://msdn.microsoft.com/en-us/library/ff595670.aspx Change-Id: I58c7b758ae96226a45095243939b2ad2b4a91d4d Reviewed-on: https://code.wireshark.org/review/1973 Reviewed-by: Anders Broman commit 066a9f3 Author: Stig Bjørlykke Date: Sun Jun 15 19:39:09 2014 +0200 Support out-of-source docbook build Change-Id: I273a6317c459664a247d3f5623ef54b0a70a9ab8 Reviewed-on: https://code.wireshark.org/review/2232 Reviewed-by: Anders Broman commit 0a29589 Author: Yan Burman Date: Mon Jun 16 11:54:24 2014 +0300 Fix SDP dissector crash during fuzz testing Change-Id: Ic133dd9440feb61964d197fa0aaacd86241f229d Signed-off-by: Yan Burman Reviewed-on: https://code.wireshark.org/review/2248 Reviewed-by: Michael Mann commit 2274b28 Author: Yan Burman Date: Wed Jun 11 10:28:00 2014 +0300 iSCSI: Register iscsi dissector, so it can be used by iSER Change-Id: I78e487c14859b82d7e1d79f99a92c759c73fbda2 Signed-off-by: Yan Burman Reviewed-on: https://code.wireshark.org/review/2246 Reviewed-by: Michael Mann commit 92fbff2 Author: Stig Bjørlykke Date: Sun Jun 15 22:02:16 2014 +0200 Register BER dissector as new. This makes it possible to dissect part of a package as ASN.1. Change-Id: I53dd6bc916fa0d2c932d77fef437c2094fdd29ed Reviewed-on: https://code.wireshark.org/review/2238 Reviewed-by: Evan Huus commit 1f47e27 Author: Stig Bjørlykke Date: Sun Jun 15 21:41:46 2014 +0200 Use tfs_f1_3_override_state to avoid unused variable error Change-Id: I211f1bd2dcf61f27034e1e42e00ab3c1dc0c4c89 Reviewed-on: https://code.wireshark.org/review/2236 Reviewed-by: Evan Huus commit ac5479b Author: Alexis La Goutte Date: Sun Jun 15 16:52:03 2014 +0200 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I781c7eec381d3296d15e666385f549e44f62e3f1 Reviewed-on: https://code.wireshark.org/review/2226 Reviewed-by: Evan Huus commit 53c0d78 Author: Alexis La Goutte Date: Sun Jun 15 16:51:46 2014 +0200 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I17b5f3af2c4822805705fae9fdbb0375ba04acdd Reviewed-on: https://code.wireshark.org/review/2225 Reviewed-by: Evan Huus commit 2919633 Author: Dario Lombardo Date: Sat Jun 14 23:06:20 2014 +0200 New dissector for Character Generator Protocol (chargen). Change-Id: I01e0508adc79dda11b3eaee51fa01110b8c83e39 Bug: 10178 Reviewed-on: https://code.wireshark.org/review/2220 Reviewed-by: Bill Meier commit 2356173 Author: Stig Bjørlykke Date: Sun Jun 15 19:50:34 2014 +0200 Fix documentation for DissectorTable_get_dissector Change-Id: Ic8db06249c6326505b7f5c4518c3af2c6961066a Reviewed-on: https://code.wireshark.org/review/2234 Reviewed-by: Stig Bjørlykke commit b3054c2 Author: Stig Bjørlykke Date: Sun Jun 15 19:42:59 2014 +0200 Added some type values Change-Id: I99a2203968dfb9fb0bb7e2052c2bf5aa0994f9ca Reviewed-on: https://code.wireshark.org/review/2233 Reviewed-by: Stig Bjørlykke commit fae6b0b Author: Stig Bjørlykke Date: Sun Jun 15 19:37:04 2014 +0200 Add missing --git-dir=$srcdir/.git for ls-remote Change-Id: I848b80cd8126d93cbf3ce02a333345f4ea6b4e92 Reviewed-on: https://code.wireshark.org/review/2231 Reviewed-by: Stig Bjørlykke Tested-by: Stig Bjørlykke commit 14903d6 Author: Balint Reczey Date: Wed Jun 11 16:52:56 2014 +0200 Depend on docbook-xml and drop obsoleted 0005-...patch Change-Id: I4c849a1e8205b65ba05959213967bac5f378c96c Reviewed-on: https://code.wireshark.org/review/2137 Reviewed-by: Evan Huus Reviewed-by: Balint Reczey Tested-by: Balint Reczey commit 3081fe0 Author: Gerald Combs Date: Sun Jun 15 08:04:37 2014 -0700 [Automatic manuf, services and enterprise-numbers update for 2014-06-15] Change-Id: Idb28b18adc99e7ba5cd1a3995986774d75ddb3aa Reviewed-on: https://code.wireshark.org/review/2227 Reviewed-by: Gerald Combs commit 310d5ab Author: Alexis La Goutte Date: Sun Jun 15 16:34:16 2014 +0200 OSPF: Remove unused code (will be never reused) Change-Id: I7cd22fd1524b6eeaf5a1384d6a43acc5411370f9 Reviewed-on: https://code.wireshark.org/review/2224 Reviewed-by: Alexis La Goutte commit 237fa1c Author: Joerg Mayer Date: Sun Jun 15 15:56:35 2014 +0200 Fix warnings turning errors (also fixes buildbot) These fixes are superficial. Michael: Please review and either remove the unneeded stuff or put in the correct use. Change-Id: I15e0f8c746af5bd76f57965ddcbf06d9e4ac80ca Reviewed-on: https://code.wireshark.org/review/2223 Reviewed-by: Jörg Mayer commit 9e4cb64 Author: Michael Mann Date: Sun Jun 15 08:27:57 2014 -0400 packet-ospf.c : proto_tree_add_text -> something filterable Change-Id: I9769e1d93ff99c4081dd028d79c0cead75e0e36c Reviewed-on: https://code.wireshark.org/review/2221 Reviewed-by: Michael Mann commit dc4d370 Author: Michael Mann Date: Sat Jun 14 23:09:28 2014 -0400 packet-ipmi-se.c : proto_tree_add_text -> something filterable. Also did some minor cleanup noticed while doing the filter conversion Change-Id: Iea61b395c0eeb6fbcaac4c09964da2cb3cdccda5 Reviewed-on: https://code.wireshark.org/review/2184 Reviewed-by: Dmitry Bazhenov Reviewed-by: Michael Mann commit e9dea85 Author: Michael Mann Date: Sat Jun 14 23:11:12 2014 -0400 acknowledge BASE_RANGE_STRING Change-Id: I3e899f79a3d58b8a2e72b88253a7e9ec51a314b5 Reviewed-on: https://code.wireshark.org/review/2222 Reviewed-by: Michael Mann commit 4c261cf Author: Joerg Mayer Date: Sat Jun 14 16:32:48 2014 +0200 Policy CMP020 was being set twice. Remove my original clumsy implementation. Set CMP0015 to NEW Change-Id: Idea76f365f27e59eb6f56c7edec6d96224668c0d Reviewed-on: https://code.wireshark.org/review/2219 Reviewed-by: Jörg Mayer commit d4c6b2a Author: Dario Lombardo Date: Wed Jun 11 14:27:43 2014 +0200 Added monlist support Change-Id: Ia96bfb71449624ff75c694080fef30d57300b30d Bug: 10174 Reviewed-on: https://code.wireshark.org/review/2131 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit a1a5f65 Author: Martin Kaiser Date: Tue Jun 10 23:56:23 2014 +0200 limit the scope of setup_tvb Change-Id: Id3fc3f017c02c2df3b0578c28f187b106c3ad2ed Reviewed-on: https://code.wireshark.org/review/2218 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 548d8aa Author: Martin Kaiser Date: Tue Jun 10 23:40:48 2014 +0200 limit the scope of new_offset Change-Id: Ib7f57696e40df770f5ae21ca066b27d28c13b57b Reviewed-on: https://code.wireshark.org/review/2217 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 04b3118 Author: Martin Kaiser Date: Tue Jun 10 23:37:54 2014 +0200 let the subfct fill win32_data_len Change-Id: I39012cf467b27eb0be4c63bbc648a72f831d9068 Reviewed-on: https://code.wireshark.org/review/2216 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 7d5821f Author: Martin Kaiser Date: Tue Jun 10 17:04:00 2014 +0200 mark both transfer header and payload bytes for usbpcap iso packets Change-Id: I2aadbde82b59ac0135230e5e370a9a3f81951365 Reviewed-on: https://code.wireshark.org/review/2215 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 4cb8488 Author: Martin Kaiser Date: Tue Jun 10 16:56:26 2014 +0200 more descriptive names for tree variables Change-Id: I3eaa39784be9c00de834325dbfe9be4c545dcec7 Reviewed-on: https://code.wireshark.org/review/2214 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 29a25d2 Author: Martin Kaiser Date: Tue Jun 10 16:23:42 2014 +0200 rename tree_ti to urb_tree_ti Change-Id: I2cda4c90de1be774d80cc2cd044ce2609a350c3e Reviewed-on: https://code.wireshark.org/review/2213 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit f1523a6 Author: Martin Kaiser Date: Tue Jun 10 16:45:41 2014 +0200 remove unnecessary tree variable Change-Id: Ie3eb6f91a99e82c9068074aa20e99ca5b2525882 Reviewed-on: https://code.wireshark.org/review/2212 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 2c9b7c5 Author: Martin Kaiser Date: Tue Jun 10 16:21:39 2014 +0200 simplify the detection of iso data start offset Change-Id: Idcae64accda9d812fdeb21b71bed35601cfbcd89 Reviewed-on: https://code.wireshark.org/review/2211 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 09784a9 Author: Martin Kaiser Date: Fri Jun 13 15:20:20 2014 +0200 rename dissect_win32_usb_pseudo_header() to dissect_usbpcap_buffer_packet_header() only process the generic part of the usbpcap pseudo header in this function, the transfer-specific parts are handled in dissect_usb_common() Change-Id: I1e97db9905ef1d14f04b53624e82feed7270912f Reviewed-on: https://code.wireshark.org/review/2210 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 464c263 Author: Martin Kaiser Date: Tue Jun 10 15:56:45 2014 +0200 dissect the usbpcap_buffer_control_header in dissect_usb_common() Change-Id: I605908619b5d87c846810016c15cccfce9da858e Reviewed-on: https://code.wireshark.org/review/2209 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit e143570 Author: Irene Ruengeler Date: Thu Jun 12 09:22:01 2014 +0200 Define INET6 for all platforms. Show the addresses as a tooltip in capture interfaces. Change-Id: I911784e09ed9479229a7d6f8a7f1476e2e1e6224 Reviewed-on: https://code.wireshark.org/review/2155 Reviewed-by: Evan Huus Reviewed-by: Alexis La Goutte commit 30480da Author: Joerg Mayer Date: Sat Jun 14 10:48:22 2014 +0200 Match for contents of WIRESHARK_SIMD_FLAGS only if non-empty Change-Id: I99e15b237c74783b455461ce58ba32f1f8202990 Reviewed-on: https://code.wireshark.org/review/2208 Reviewed-by: Jörg Mayer commit b70bb46 Author: Joerg Mayer Date: Sat Jun 14 09:36:45 2014 +0200 Make it harder to miss that this is also about Win builds Change-Id: Id4fd7a4672ed32dfcb57a4435a6b3e5cf2e5ca3d Reviewed-on: https://code.wireshark.org/review/2207 Reviewed-by: Jörg Mayer commit 9352803 Author: Joerg Mayer Date: Fri Jun 13 17:59:02 2014 +0200 Backport autofoo simd optimization Change-Id: I5d58154bf8266eabedf550b54f18845612f514c6 Reviewed-on: https://code.wireshark.org/review/2206 Reviewed-by: Jörg Mayer commit a4a7d2c Author: Joerg Mayer Date: Fri Jun 13 17:55:38 2014 +0200 Small whitespace fixes Change-Id: I44c6c193ec2a7d88cda56ba34c2f17c03f7e121d Reviewed-on: https://code.wireshark.org/review/2205 Reviewed-by: Jörg Mayer commit 21b08ba Author: Joerg Mayer Date: Fri Jun 13 17:14:25 2014 +0200 Rename WIRESHARK_C_FLAGS to WIRESHARK_COMMON_FLAGS Change-Id: If78801de797264c0924e81abaf8cd49cc5715a83 Reviewed-on: https://code.wireshark.org/review/2204 Reviewed-by: Jörg Mayer commit a6993d3 Author: Gerald Combs Date: Fri Jun 13 12:51:29 2014 -0700 Fix package version stamping. Change-Id: I1615364071563c4f56b071d7d68e4660dd989296 Reviewed-on: https://code.wireshark.org/review/2198 Reviewed-by: Gerald Combs (cherry picked from commit fd017eeae358fbcbb3f51f2765bd31777aa513d1) Reviewed-on: https://code.wireshark.org/review/2201 commit 4dfbb79 Author: Jeff Morriss Date: Tue Jun 10 14:29:46 2014 -0400 From Gisle Vanem on -dev: don't print modelines info when run with -h. Also remove trailing white space. Change-Id: Ic56140f617a2cbf9fa93fb427282eab0b6cff9c6 Reviewed-on: https://code.wireshark.org/review/2113 Reviewed-by: Evan Huus commit 51750be Author: Pascal Quantin Date: Thu Jun 12 23:22:31 2014 +0200 RTP: fix invalid memory access Bug: 10176 Change-Id: If54e4a5a118ea10befeeed5278394665df99425e Reviewed-on: https://code.wireshark.org/review/2187 Reviewed-by: Pascal Quantin commit a972e8f Author: Guy Harris Date: Thu Jun 12 11:54:21 2014 -0700 Try to fix a used-but-not-set warning. I'm guessing that GCC is complaining because "device" isn't guaranteed to be set (if there are no interfaces, the body of the loop will never be executed), so do with the list of link-layer header types what's done for the buffer size and snapshot length. But should the column-setting code be executed if the interface isn't found? Change-Id: I8c365a482b8af44cdd1c1a7f41ca611141387c86 Reviewed-on: https://code.wireshark.org/review/2180 Reviewed-by: Guy Harris commit c246513 Author: Guy Harris Date: Thu Jun 12 11:28:58 2014 -0700 Don't check "&(device.if_info)" to see if it's null. It would be null only with a horribly buggy C implementation. Change-Id: I880747e9993a8b087d2b177ee0bed63644ecd646 Reviewed-on: https://code.wireshark.org/review/2179 Reviewed-by: Guy Harris commit 1dead2b Author: Peter Harris Date: Wed Jun 11 17:59:58 2014 -0400 X11: Update generated dissector Change-Id: Id3fbc64b4d797d50e935223c40c5c2321a1c8198 Signed-off-by: Peter Harris Reviewed-on: https://code.wireshark.org/review/2148 Reviewed-by: Anders Broman commit 515b78c Author: Peter Harris Date: Wed Jun 11 17:55:15 2014 -0400 X11: Support XCB's new Change-Id: I0a45380ffcfb3be7e3190d0875626ed0fe046c4e Signed-off-by: Peter Harris Reviewed-on: https://code.wireshark.org/review/2147 Reviewed-by: Jeff Morriss commit d17aa36 Author: Martin Mathieson Date: Thu Jun 12 13:42:35 2014 +0100 Fix a regression, as -1 can no longer means until the end of the tvb Change-Id: I2bbb9c5f62984f0365a3cad6b60401ee70418e74 Reviewed-on: https://code.wireshark.org/review/2158 Reviewed-by: Martin Mathieson commit 5a49913 Author: Guy Harris Date: Thu Jun 12 02:15:31 2014 -0700 Make sure image/expert_ok.png ends up in a source tarball. Change-Id: I7ad2b53d706d953d443ef935f1edb84c46d7fa16 Reviewed-on: https://code.wireshark.org/review/2156 Reviewed-by: Guy Harris commit df8c4bf Author: Irene Ruengeler Date: Wed Jun 4 11:03:59 2014 +0200 Capture Interfaces Dialog: - allow to change the interface options in the table - save the options to preferences when the dialog is left - add a field for setting a capture filter for all selected interfaces - add a "Compile BPF" button and a window to show the compiled filter output - try to address Alexis' and Evan's comments Change-Id: Ic1272e29183ec80e2d2f4b3e494c79dabe2c3b6f Reviewed-on: https://code.wireshark.org/review/1946 Reviewed-by: Alexis La Goutte Tested-by: Alexis La Goutte Reviewed-by: Anders Broman commit 428c5b9 Author: Martin Kaiser Date: Wed Jun 11 20:49:06 2014 -0400 function to parse the usbpcap pseudo-header and fill the conversation struct Change-Id: I8917fae39458568ab980ece1e819cb83719e3baf Reviewed-on: https://code.wireshark.org/review/2077 Reviewed-by: Michael Mann commit 8ff7729 Author: Sean O. Stalley Date: Fri Jun 6 15:07:00 2014 -0700 Fix USB Class-Specific Control URB requests Fixes Bug 10165. (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10165) The condition that caused the bug is a non-standard URB where the length of the tvb is less than the reported length. It will pass the tvb_reported_length_remaining() != 0, but fail the assertion in tvb_composite_append() (which checks the length value, not reported_length). This condition appears in a few other locations (where the if statement checks reported_length, but the code inside the if statement uses the length value). This patch also fixes them. Also removes depricated calls to tvb_length() & tvb_length_remaining() with tvb_captured_length() & tvb_captured_length_remaining(), respectively. Change-Id: Ie8d50cfb24af62558c905c23c37ec603ce76366f Reviewed-on: https://code.wireshark.org/review/2011 Reviewed-by: Michael Mann commit 95065da Author: Guy Harris Date: Wed Jun 11 16:56:55 2014 -0700 Some more SVN->Git. Change-Id: Iba5274ab5e653a0a3c0a56e62ee168ac957daf27 Reviewed-on: https://code.wireshark.org/review/2152 Reviewed-by: Guy Harris commit 7db2135 Author: Guy Harris Date: Wed Jun 11 16:49:05 2014 -0700 A Subversion->Git change that we missed. Change-Id: I651d25cb0a59f9ec350d4c482062077833c8f278 Reviewed-on: https://code.wireshark.org/review/2149 Reviewed-by: Guy Harris commit 97a46ff Author: Vladimir Kondratiev Date: Wed Jun 11 19:02:12 2014 +0300 Fix bit fields definition in the "DMG Capability" IE Bits in the byte was counted wrong direction; bit0 should be LSB (0x01) and bit7 - MSB (0x80) Also, all fields are interpreted as little-endian Change-Id: I3485e8743a156e2e8cb84e726045211f1d332598 Signed-off-by: Vladimir Kondratiev Reviewed-on: https://code.wireshark.org/review/2138 Reviewed-by: Alexis La Goutte Tested-by: Alexis La Goutte Reviewed-by: Michael Mann commit 4a60a30 Author: Anish Bhatt Date: Wed Jun 11 02:39:08 2014 -0700 Rename temp variables to a more human readable form Change-Id: Idafe97df6be71d885203e2e3426fdb6a133862c4 Signed-off-by: Anish Bhatt Reviewed-on: https://code.wireshark.org/review/2140 Reviewed-by: Evan Huus commit 508d16b Author: Anish Bhatt Date: Wed Jun 11 02:19:33 2014 -0700 Use offset instead of tempOffset, return offset instead of calculating (len + n) where possible Change-Id: I91ef4ec59698903cb2a7be00e7e0ece478fc26a8 Signed-off-by: Anish Bhatt Reviewed-on: https://code.wireshark.org/review/2139 Reviewed-by: Evan Huus commit 803d47d Author: AndersBroman Date: Wed Jun 11 16:25:06 2014 +0200 opcua_simpletypes.c:94:12: error: static declaration of 'hf_opcua_NamespaceUri' follows non-static declaration Change-Id: I2cae9691408c22a64144f5482cc536a5dc88ec6c Reviewed-on: https://code.wireshark.org/review/2135 Reviewed-by: Anders Broman commit 5e67c45 Author: Hannes Mezger Date: Tue Jun 10 18:05:46 2014 +0200 Remove unused array length fields The NoOf... fields are not used at all in the dissector. Change-Id: I1f20a9992eab5d47c7e0ad34dabeaed07efa4a80 Reviewed-on: https://code.wireshark.org/review/2130 Reviewed-by: Anders Broman commit abf1b5e Author: Hannes Mezger Date: Tue Jun 10 18:01:27 2014 +0200 Regenerate all sources using latest OPC UA specification - HistoryUpdateEventResult has been removed - Fixes two enums - Removes unused identifier defines Change-Id: I39c65c1eca1701b60dfaa3541cd7a5d1b479fb9b Reviewed-on: https://code.wireshark.org/review/2129 Reviewed-by: Anders Broman commit 2ab3b2a Author: Hannes Mezger Date: Tue Jun 10 13:09:24 2014 +0200 Improve display of Open/CloseSecureChannel requests and responses - Return the ServiceId of the service calls for displaying if it's a request or response - Add the missing parsing code for CloseSecureChannel, some fields were missing Change-Id: Id9b1e1986e222a77ad979fb615adc6ac62a4ced8 Reviewed-on: https://code.wireshark.org/review/2125 Reviewed-by: Alexis La Goutte commit baa5888 Author: Hannes Mezger Date: Tue Jun 10 12:27:34 2014 +0200 Move ServiceFault from ComplexType- to ServiceParser ServiceFaults are always sent as a service response and never as value, this moves the parsing code to the correct location. Change-Id: Ida9cb561aa40fcbfc3c0429aed732d108b295138 Reviewed-on: https://code.wireshark.org/review/2124 Reviewed-by: Alexis La Goutte commit fabee43 Author: Hannes Mezger Date: Tue Jun 10 11:47:07 2014 +0200 Unify displaying of NodeId Adds hf_register_info for all possible NodeId identifier types for unified displaying. Change-Id: Ic7a8077a32f435d5acfb1a956117d21a0b51b43b Reviewed-on: https://code.wireshark.org/review/2123 Reviewed-by: Alexis La Goutte commit af687c5 Author: AndersBroman Date: Wed Jun 11 14:16:51 2014 +0200 Fix Warn Dissector bug, protocol LPP, in packet 1: proto.c:3403: failed assertion "DISSECTOR_ASSERT_NOT_REACHED" redifine FT of NavModel-GLONASS-ECEF/gloP1 Change-Id: Id865c39b8d15528417075f9e7ed0378704aa98dc Reviewed-on: https://code.wireshark.org/review/2132 Reviewed-by: Anders Broman commit e2ae387 Author: Hannes Mezger Date: Tue Jun 10 11:46:05 2014 +0200 Fix NodeId and ExpandedNodeId encoding mask display There are no 'URI' NodeIds, removed this option and changed GUID/Opaque to their correct values as stated in the UA specification. Change-Id: Ibf9afdbd72f8ad336f5eb83ece5adbcce51e8365 Reviewed-on: https://code.wireshark.org/review/2122 Reviewed-by: Alexis La Goutte commit ddc275c Author: Hannes Mezger Date: Tue Jun 10 11:25:30 2014 +0200 Unify variable and identifier names according to the UA specification - Rename Uri to NamespaceUri for clarity - Correct NsId to NsIndex - ByteString NodeIds are called 'Opaque' Change-Id: I622d408ef9e19a2a899906b4127bae497735d402 Reviewed-on: https://code.wireshark.org/review/2121 Reviewed-by: Alexis La Goutte commit 6ddf081 Author: Hannes Mezger Date: Tue Jun 10 10:51:52 2014 +0200 Fix switch case on ExpandedNodeId encoding mask Only the bits 0-3 are significant for the type of the NodeId contained in the ExpandedNodeId. The other bits are a mask telling if a NamespaceUri and/or a ServerIndex is set. Change-Id: I17948524f8a1bf6cb9dffc5f66ec5cddee580bcd Reviewed-on: https://code.wireshark.org/review/2120 Reviewed-by: Alexis La Goutte commit d8a21c8 Author: Anish Bhatt Date: Tue Jun 10 23:49:48 2014 -0700 Use expert info for Invalid length/type where possible, other minor fixes Change-Id: I4a0421bf918439261f31f4bfc2cb5519b38f1711 Signed-off-by: Anish Bhatt Reviewed-on: https://code.wireshark.org/review/2118 Reviewed-by: Alexis La Goutte Reviewed-by: Michael Mann commit 3fcd016 Author: Anish Bhatt Date: Tue Jun 10 18:27:53 2014 -0400 Fix bug in dissect_lldp_port_id, support all port id subtypes Change-Id: I8b44e0d55701ba5d583e3e734e19d4d2aa024b25 Reviewed-on: https://code.wireshark.org/review/2049 Reviewed-by: Michael Mann commit b6f8aea Author: AndersBroman Date: Tue Jun 10 18:04:43 2014 +0200 See if this version works better on OSX 10.5 AX_EXT has been extended to deal with a situation where AX_GCC_X86_CPUID(0x00000001) returns 'unknown'. Further details can be found at . Change-Id: I0b8173789ddfc1670e9896408f5d022c30a1d0a9 Reviewed-on: https://code.wireshark.org/review/2112 Reviewed-by: Anders Broman commit fcb019a Author: AndersBroman Date: Tue Jun 10 14:47:09 2014 +0200 Change HAVE_SSE42 to HAVE_SSE4_2 add $(SIMD_FLAGS) Add autotools macros to distribution Call AX_EXT to define HAVE_SSE4_2 Change-Id: I9ff085d923dfafb32510cdd14290e74a2aaea302 Reviewed-on: https://code.wireshark.org/review/2110 Tested-by: Anders Broman Reviewed-by: Jeff Morriss Reviewed-by: Anders Broman commit 94dcbfd Author: Michał Orynicz Date: Mon Jun 9 11:28:13 2014 +0200 Fix annoying warnings that a variable is uninitialized in checkfiltername.pl Change-Id: Ibb291747570e48af6306357cc13fd3a149ca88c9 Reviewed-on: https://code.wireshark.org/review/2071 Reviewed-by: Michael Mann commit 99d8c1c Author: AndersBroman Date: Tue Jun 10 14:19:20 2014 +0200 Add macros to make it possible to define HAVE_SSE4_2 Change-Id: I63ecfde72f33350d15c430da71fa11ac4923a121 Reviewed-on: https://code.wireshark.org/review/2109 Reviewed-by: Anders Broman commit e7fbf05 Author: Pascal Quantin Date: Tue Jun 10 12:34:18 2014 +0200 3GPP NAS: add dissection of MSISDN in PCO Change-Id: Ie8dac8c898ff94e955a4c0fdde7f4ffff496e97f Reviewed-on: https://code.wireshark.org/review/2098 Reviewed-by: Pascal Quantin commit 5d7b59a Author: Alexis La Goutte Date: Tue Jun 10 10:59:55 2014 +0200 Fix Buildbot Mac OS: /wsutil/ws_cpuid.h:56: warning: unused parameter 'CPUInfo' Change-Id: Ic0b0d5392ff049cc51f05b79fc5feae190064ce8 Reviewed-on: https://code.wireshark.org/review/2097 Reviewed-by: Alexis La Goutte commit e1f0ee4 Author: AndersBroman Date: Tue Jun 10 10:56:36 2014 +0200 Mark an unused parameter as such. Change-Id: Ia319d7b8523ab9b9e9d8ec8533ebdcf4a506a69e Reviewed-on: https://code.wireshark.org/review/2096 Reviewed-by: Anders Broman commit 5cff2b6 Author: Alexis La Goutte Date: Tue Jun 10 08:58:39 2014 +0200 CAPWAP: Fix soft-deprecated APIs warning tvb_length_remaining => tvb_reported_length_remaining Change-Id: Ie1fa09e00e098c41df2e87771300e3842659dad6 Reviewed-on: https://code.wireshark.org/review/2095 Reviewed-by: Anders Broman commit 2f13ccc Author: Alexis La Goutte Date: Tue Jun 10 08:48:27 2014 +0200 CAPWAP: Display incorrect value for Wireless IEEE802.11 RSSI and Data Rate * Wireless data ieee80211 RSSI (dBm) is a signed integer. In the wireless radio the dBm value is negative. * Wireless data ieee80211 Data Rate (Mbps) is a 100Kbps. You need divide this value by 10. Issue found by Massimo Vellucci (SmartCAPWAP) Change-Id: I04dd8a9e38a5f60ee5bf64cd304db1b11413c809 Reviewed-on: https://code.wireshark.org/review/2094 Reviewed-by: Anders Broman commit dc904a1 Author: Alexis La Goutte Date: Mon Jun 9 19:44:35 2014 +0200 rlc lte graph: Assigned value is garbage or undefined (clang analyzer) Change-Id: Ia371c26299aa62566a63bc1a4d4f6df827fdf5b9 Reviewed-on: https://code.wireshark.org/review/2085 Reviewed-by: Anders Broman commit d041b1e Author: Alexis La Goutte Date: Mon Jun 9 19:28:02 2014 +0200 WS mempbrk SEE4.2: Fix indent (use 2spaces) and add Modelines info Change-Id: I50c71401f46846a459b18347ef0b9793a2a05ea7 Reviewed-on: https://code.wireshark.org/review/2084 Reviewed-by: Anders Broman commit 4571283 Author: Jakub Zawadzki Date: Mon Jun 9 23:18:24 2014 +0200 CPUID improvements - Make ws_cpuid() return boolean when CPUID is support or no, this way it's easier for caller to determinate if it works (and can use cpuinfo[X] or no). - Add function ws_cpuid_sse42(), use it in ws_mempbrk() [cached] & version information. Change-Id: I4e77699f9f3d11bb9b2e8ea599e48d3c5ad84ed7 Reviewed-on: https://code.wireshark.org/review/2088 Reviewed-by: Anders Broman commit 8878d77 Author: Anish Bhatt Date: Mon Jun 9 17:10:44 2014 -0700 Current test for GIT_DIR introduced in changeset Ie1560c372e23e58fb0e310f681388b5e1a65ba5b doesn't seem to be working correctly on bash 4.3.18 : .git/hooks/pre-commit: line 11: .git: command not found This test works correctly in bash/dash/zsh Change-Id: Ic89fc2764d1a70e9e5d112c7928cee6ed783f50f Signed-off-by: Anish Bhatt Reviewed-on: https://code.wireshark.org/review/2092 Reviewed-by: Evan Huus commit 9516675 Author: Anish Bhatt Date: Mon Jun 9 14:42:30 2014 -0700 Add modelines Change-Id: Ib8e157e2744198eaa1a5a69732bd8e977b146026 Signed-off-by: Anish Bhatt Reviewed-on: https://code.wireshark.org/review/2089 Reviewed-by: Evan Huus commit 26ad824 Author: Alexis La Goutte Date: Mon Jun 9 12:43:40 2014 +0200 Add Modelines info Change-Id: If3e77cbdfdeab75766984b10b3356b8343100602 Reviewed-on: https://code.wireshark.org/review/2065 Reviewed-by: Evan Huus commit f627ee8 Author: Alexis La Goutte Date: Mon Jun 9 12:43:34 2014 +0200 Add Modelines info Change-Id: I2364104145518d484c2e5fb0ae5d5d80cce0982d Reviewed-on: https://code.wireshark.org/review/2064 Reviewed-by: Evan Huus commit 8c4a139 Author: Alexis La Goutte Date: Mon Jun 9 12:38:09 2014 +0200 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I08f4860a97d8406fef878887887b6537bf7600ee Reviewed-on: https://code.wireshark.org/review/2063 Reviewed-by: Evan Huus commit a08cbe7 Author: Balint Reczey Date: Mon Jun 9 14:53:00 2014 +0700 Use only dpkg-buildpackage for building .debs This makes .deb generation not depending on autotools and also removes debian-package target from autotools-generated Makefile. Change-Id: Ia684cd310d85906763af1035fddf39c1fbaed984 Reviewed-on: https://code.wireshark.org/review/2052 Reviewed-by: Evan Huus Reviewed-by: Gerald Combs commit 9538d1c Author: Tomasz Moń Date: Mon Jun 9 22:01:31 2014 +0200 Fix CMake build. Change-Id: I749c6f1e978e385a9f1340f315c670404a2470ad Reviewed-on: https://code.wireshark.org/review/2087 Reviewed-by: Gerald Combs commit 3c37630 Author: Sean O. Stalley Date: Thu Jun 5 17:01:46 2014 -0700 Dissection of USB setup data in MA USB data packets This patch adds support for dissection of USB setup data contained inside of MA USB data packets. The MAUSB Dissector calls the same function used by the USB dissector to dissect the setup data. This patch also (and a bit unintentionally) adds transfer following. TransferReq & TransferAck packets now show a link & a time delta to their TransferReq (ie [Request in: XXX] & [Time from request: XXX]. TransferReq packets have a [Response in: XXX] tag, but it erronously points to the TransferAck, not the TransferResponse. Change-Id: I01041de3c38ea6248e9d34506b0b012518a1e6d8 Reviewed-on: https://code.wireshark.org/review/1548 Reviewed-by: Evan Huus commit c9621e2 Author: AndersBroman Date: Mon Jun 9 21:28:32 2014 +0200 We must include config.h to have HAVE_SSE42 Change-Id: I2b882b05b2864edbfef0ea03bc086efeaac84ad2 Reviewed-on: https://code.wireshark.org/review/2086 Reviewed-by: Anders Broman commit 618187a Author: AndersBroman Date: Mon Jun 9 18:33:41 2014 +0200 Hopfully thiw will make the Solaris build going. Change-Id: I44b93494f6d3cb0504517ab4581afeef180f1513 Reviewed-on: https://code.wireshark.org/review/2079 Reviewed-by: Anders Broman commit c2a187f Author: AndersBroman Date: Mon Jun 9 18:20:34 2014 +0200 Try to fix OSX build Change-Id: Iab664f349e7604b99368f4a986dfe98db48aea84 Reviewed-on: https://code.wireshark.org/review/2078 Reviewed-by: Anders Broman commit f9254e5 Author: AndersBroman Date: Mon Jun 9 17:58:50 2014 +0200 Fix a copy paste error. Change-Id: I9a153b3e89886c7de943226dd5313c90e8be1b7b Reviewed-on: https://code.wireshark.org/review/2075 Reviewed-by: Anders Broman commit 8e8a4ce Author: AndersBroman Date: Mon Jun 9 17:30:08 2014 +0200 Try to fix the builds. Change-Id: I3ccb5c1b40504cd9314da5a09b225e3e2bf991b8 Reviewed-on: https://code.wireshark.org/review/2073 Reviewed-by: Anders Broman commit 9dbf2ff Author: Martin Kaiser Date: Sun Apr 13 20:16:35 2014 +0200 fill the conversation info struct in dissect_linux_usb_pseudo_header() Change-Id: I9743a6fe57ff3197baa0c084dae428df8c31b24d Reviewed-on: https://code.wireshark.org/review/2068 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit bea4106 Author: Martin Kaiser Date: Tue Apr 22 16:05:24 2014 +0200 use the direction info from the conversation struct Change-Id: I2345fae33333568ffeaaa3aa3329cb8371a444e1 Reviewed-on: https://code.wireshark.org/review/2067 Reviewed-by: Alexis La Goutte commit d3104c2 Author: Alexis La Goutte Date: Mon Jun 9 15:32:59 2014 +0200 Make buildbot Happy about shadow index variable... Change-Id: I4c93af520883235828a4bb1881c74035eace995d Reviewed-on: https://code.wireshark.org/review/2070 Reviewed-by: Alexis La Goutte commit fcb710b Author: Jakub Zawadzki Date: Thu May 22 23:04:40 2014 +0200 Add sse4.2 optimized function ws_mempbrk_sse42() In text protocols, like SIP, lot of time is spend guint8_pbrk(), assume that text is not binary (no NULs), and use SSE4.2 pcmpistri instruction. Also move & rename guint8_pbrk() from tvbuff.c as _ws_mempbrk. HAVE_SSE42 must be defined to use _ws_mempbrk_sse42() only activaded for Windows currently. Change-Id: Ic853d84805bdb6492c4f45d2bcc79a973fd9804e Reviewed-on: https://code.wireshark.org/review/1730 Reviewed-by: Anders Broman commit 6669566 Author: AndersBroman Date: Mon Jun 9 12:50:46 2014 +0200 Try to fix acket-tftp.c:207: error: \u2018data_tvb\u2019 may be used uninitialized in this function. Change-Id: I92a344b8ec86fc71b64903c2e6edc74f8ed7a330 Reviewed-on: https://code.wireshark.org/review/2066 Reviewed-by: Anders Broman commit f33ead5 Author: Anish Bhatt Date: Sun Jun 8 19:35:44 2014 -0700 remove all checks for if (tree) Change-Id: I82617c0a396fdf42735ba39a5ed266a3f5240854 Signed-off-by: Anish Bhatt Reviewed-on: https://code.wireshark.org/review/2048 Tested-by: Alexis La Goutte Reviewed-by: Alexis La Goutte commit 05fcdc3 Author: AndersBroman Date: Mon Jun 9 10:57:05 2014 +0200 Windows does not allow data copy between dlls, declare the true_false_string locally. Change-Id: I5470475164fd649b664e888ced089aec56a45c59 Reviewed-on: https://code.wireshark.org/review/2055 Reviewed-by: Anders Broman commit 39ac6f2 Author: U-beauty\bdn Date: Mon Jun 9 14:29:06 2014 +0600 HPM.2 IPMI Trace Data encapsulation format Added a mapping between DLT_IPMI_HPM_2 link-layer header type to the IPMI Trace Wiretap encapsulation. Change-Id: I458d44ad0f51beecfe5589e0e9cb75f4771d866b Reviewed-on: https://code.wireshark.org/review/2054 Reviewed-by: Alexis La Goutte commit 8996051 Author: Pascal Quantin Date: Sun Jun 8 22:46:45 2014 +0200 IEEE 80211: fix dissection of HT Capabilities Bug: 10166 Change-Id: Iafe789968bd5b9a6e593b682f8d42ba42db5fce9 Reviewed-on: https://code.wireshark.org/review/2046 Reviewed-by: Alexis La Goutte Reviewed-by: Evan Huus commit c2f3e0a Author: Adrian Simionov Date: Sun Jun 8 14:47:06 2014 +0200 Added TLV 16 for MDD message Change-Id: Ia48056b5680d86d343dc106cd511cd5ed5e889e8 Reviewed-on: https://code.wireshark.org/review/2034 Reviewed-by: Evan Huus commit e04f321 Author: Balint Reczey Date: Mon Jun 9 01:02:08 2014 +0700 Fix make debian-package Change-Id: I3474889d18036c239b22c7a21d8e949072250fbb Reviewed-on: https://code.wireshark.org/review/2042 Reviewed-by: Evan Huus commit 1fcc673 Author: Chugzilla Date: Sun Jun 8 08:30:28 2014 -0400 Bugfix pdml2html.xsl fails to expand multiple identical 'proto' tags bug:10106 Change-Id: Iaeb63325ddd7a67345c538c0688b5efc332f1963 Reviewed-on: https://code.wireshark.org/review/2032 Reviewed-by: Michael Mann commit 7de3d23 Author: Balint Reczey Date: Mon Jun 9 01:28:44 2014 +0700 Fix Wireshark's name in Vietnamese translation Change-Id: Idf07c767587815d2cb2c8c094fd820983302b043 Reviewed-on: https://code.wireshark.org/review/2043 Reviewed-by: Michael Mann commit 4f6e021 Author: Evan Huus Date: Mon Dec 23 15:19:25 2013 +0000 Add GPLv2+ license header to headers-check.c as per private email from the author. svn path=/trunk/; revision=54384 Change-Id: I464197c19316700457a5575b370600db38ce4962 Reviewed-on: https://code.wireshark.org/review/2041 Reviewed-by: Evan Huus Reviewed-by: Balint Reczey Tested-by: Balint Reczey commit 671d6c9 Author: Balint Reczey Date: Sun Jun 8 23:38:21 2014 +0700 Fix make dist Change-Id: I96e25a3be6db53fcfacb631fdc48c03a63f195f2 Reviewed-on: https://code.wireshark.org/review/2040 Reviewed-by: Evan Huus Reviewed-by: Balint Reczey Tested-by: Balint Reczey commit fc3a804 Author: Gerald Combs Date: Sun Jun 8 08:04:37 2014 -0700 [Automatic manuf, services and enterprise-numbers update for 2014-06-08] Change-Id: I28963e69c7bd6bdca031635e3e59a8060f52bd3b Reviewed-on: https://code.wireshark.org/review/2036 Reviewed-by: Evan Huus commit cb4ec16 Author: Balint Reczey Date: Fri Jun 6 22:54:50 2014 +0700 .deb package format is 'native' Change-Id: I2b52648c74290df0e98e4be31ac6c51db309eaaf Reviewed-on: https://code.wireshark.org/review/2001 Reviewed-by: Evan Huus Reviewed-by: Balint Reczey Tested-by: Balint Reczey commit 6d783f2 Author: Balint Reczey Date: Fri Jun 6 20:58:20 2014 +0700 Don't ship libfiletap in the .deb packages yet Change-Id: I5b179d2b84bc95e540def544a8b710f81fb0fccb Reviewed-on: https://code.wireshark.org/review/2000 Reviewed-by: Michael Mann Reviewed-by: Balint Reczey Tested-by: Balint Reczey commit 97e1491 Author: Balint Reczey Date: Thu Jun 5 17:30:41 2014 +0700 Sync .deb packaging from Debian The sync makes CMake the build system for the .deb package and starts providing wireshark-qt in the wireshark-qt package. The package structure, i.e. the libraries are shipped in separate packages is also sync-ed. Wireshark-qt uses the Qt 4 libraries, but it is easy to switch it to Qt 5. Change-Id: I849d18bdb8ca6ebf4072cf1d73d749080ac5dac2 Reviewed-on: https://code.wireshark.org/review/1986 Reviewed-by: Gerald Combs Reviewed-by: Balint Reczey Tested-by: Balint Reczey commit 9b49910 Author: Joerg Mayer Date: Sun Jun 8 16:35:29 2014 +0200 Linking against libgettext and libm got broken by commit 561460160a4ae73bda9b92751ae5c35d4324bb87 Author: Graham Bloice Date: Fri May 16 20:43:17 2014 +0100 Update CMake build for win32 to build QT again, and to find GLib and GThread libs Fix that (basically it put them into the packagelist which got *replaced* by the next set of things to test). Change-Id: I0f43a17a7c7eb087c530f6336dc61f93b121fda8 Reviewed-on: https://code.wireshark.org/review/2035 Reviewed-by: Jörg Mayer commit 5614601 Author: Graham Bloice Date: Fri May 16 20:43:17 2014 +0100 Update CMake build for win32 to build QT again, and to find GLib and GThread libs Change-Id: If7e8ebc46f42389d174959303e13cde20687ae8a Reviewed-on: https://code.wireshark.org/review/2010 Reviewed-by: Graham Bloice Tested-by: Graham Bloice Reviewed-by: Evan Huus commit 39cdb98 Author: Guy Harris Date: Sat Jun 7 12:00:31 2014 -0700 PEEKREMOTE packets don't appear to have Atheros padding. Call the without-Atheros-padding dissector for the payload. Fixes bug 10139. Change-Id: I883bf4e58899aa78b07fae63d8c0376a31bda444 Reviewed-on: https://code.wireshark.org/review/2027 Reviewed-by: Guy Harris commit 39ca18d Author: Guy Harris Date: Sat Jun 7 10:44:17 2014 -0700 Only nuke the startup item once we've installed the launch daemon. That way, if we crash in the middle, there's still something installed that will try to set the permissions on the BPF devices. Change-Id: Ie0c32f9eaca08bdbb359d07e47f20c664bc66411 Reviewed-on: https://code.wireshark.org/review/2023 Reviewed-by: Guy Harris commit 09f53d8 Author: Sean O. Stalley Date: Fri Jun 6 16:03:52 2014 -0700 Per Spec update, SetUSBDevAddrReq now contains data Per MAUSB Spec (1.0), the SetDevAddrReq packet now contains data in addition to the packet header. Change-Id: I4d2c6bb2530edf5de33ef69c0e6af0441e197fa4 Reviewed-on: https://code.wireshark.org/review/2014 Reviewed-by: Pascal Quantin commit 78bc006 Author: Sean O. Stalley Date: Fri Jun 6 15:53:27 2014 -0700 Removed MAUSB DWORD-Aligned Length Check Removed a check to see if the Packet is in DWORDs. I misread section 6.2 of the spec, which states that all _headers_ mausb be DWORD-aligned, not all _packets_. Change-Id: I11e320e6e2592930024ffa8143e4d8f470de13ba Reviewed-on: https://code.wireshark.org/review/2013 Reviewed-by: Pascal Quantin commit 0c62f06 Author: Pascal Quantin Date: Sat Jun 7 19:18:27 2014 +0200 USB: put back URB setup to parent tree like it was before g3169939 Change-Id: I645fb04c8039bd7bf43848c14d163aa0990cc977 Reviewed-on: https://code.wireshark.org/review/2022 Reviewed-by: Pascal Quantin commit b8e40b6 Author: Sean O. Stalley Date: Thu Jun 5 15:53:00 2014 -0700 Added usb_get_trans_info() function Moved code in usb_dissect_common() for getting/creating transfer info into it's own function. This is part of an effort to make dissect_usb_common() more modular so that code can be shared between the USB & the MAUSB dissector. Change-Id: I70f4f98536a6355e57b33eb01a9b5d8688183635 Reviewed-on: https://code.wireshark.org/review/1993 Reviewed-by: Pascal Quantin commit 73217d9 Author: Michael Mann Date: Fri Jun 6 10:35:50 2014 -0400 tvb_new_subset -> tvb_new_subset_length when length parameters are equal. tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is. Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d Reviewed-on: https://code.wireshark.org/review/1999 Reviewed-by: Pascal Quantin commit a048dc1 Author: Anish Bhatt Date: Fri Jun 6 16:35:49 2014 -0700 Updates as requested Change-Id: I447b2c1f713710820ce81dda40992b5311285d09 Signed-off-by: Anish Bhatt Reviewed-on: https://code.wireshark.org/review/2015 Reviewed-by: Anders Broman commit b319a67 Author: Guy Harris Date: Fri Jun 6 23:41:51 2014 -0700 When installing the launch daemon, get rid of the old startup item. Only one is necessary; get rid of the startup item. Change-Id: I0bd2dabb3fc286ccd0e6634bc112e20602624c86 Reviewed-on: https://code.wireshark.org/review/2016 Reviewed-by: Guy Harris commit b69642d Author: Anish Bhatt Date: Fri Jun 6 15:54:07 2014 -0700 Misc lldp cleanup. I'm cheating a bit here, hf_media_loc_long & hf_media_loc_lat need a 5byte bitmask, but the bitmask field in hf is restricted to guint32 Change-Id: I7e044fc680bb947973e437fc66057488a8deee67 Signed-off-by: Anish Bhatt Reviewed-on: https://code.wireshark.org/review/2012 Reviewed-by: Evan Huus commit 3169939 Author: Sean O. Stalley Date: Thu Jun 5 10:53:32 2014 -0700 Moved dissection of setup field to own function Dissection of all setup field types (standard & nonstandard) are handled in a seperate function. Before, nonstandard dissection was handled in dissect_usb_common. This is part of an effort to make dissect_usb_common() more modular so that code can be shared between the USB & the MAUSB dissector. Change-Id: I15d7e3691afc29cd569aa5d3770d2aa569630b12 Reviewed-on: https://code.wireshark.org/review/1992 Reviewed-by: Evan Huus commit 63dc129 Author: Guy Harris Date: Fri Jun 6 14:40:16 2014 -0700 Get rid of some stuff left over from the days of drag-install. We're not using the Utilities directory; don't create it and don't fill it in. Change-Id: I7ba66b415a2e5a6aff77d4bdb57b2ca176bcd789 Reviewed-on: https://code.wireshark.org/review/2009 Reviewed-by: Guy Harris commit 2b2fbff Author: Guy Harris Date: Fri Jun 6 12:14:27 2014 -0700 Switch to a launch daemon for ChmodBPF. "Ah finally blew that varmint to Kingdom Come!" Change-Id: I4ef5f8692924772189af4158eddbc125c1c7d521 Reviewed-on: https://code.wireshark.org/review/2004 Reviewed-by: Guy Harris commit 6ec0909 Author: Gerald Combs Date: Fri Jun 6 11:39:55 2014 -0700 Comment out an empty section. Change-Id: I2c98e5c70e5443eb927dbdc5525c67b463b837bf Reviewed-on: https://code.wireshark.org/review/2003 Reviewed-by: Gerald Combs commit dbb9453 Author: Pascal Quantin Date: Fri Jun 6 19:21:36 2014 +0200 Q.2931: sort extended value string 'q2931_message_type_vals' in increasing order Change-Id: I003d55b338c79b9841dd16d0947e4734f118f7c6 Reviewed-on: https://code.wireshark.org/review/2002 Reviewed-by: Pascal Quantin commit 60ce7bc Author: Alexis La Goutte Date: Mon Jun 2 11:24:58 2014 +0200 Add TFTP export for Qt too Change-Id: I056829d48aa49eb106c76c8f572c0f8b6e1a4245 Reviewed-on: https://code.wireshark.org/review/1916 Reviewed-by: Evan Huus commit ad7b538 Author: Pascal Quantin Date: Wed Jun 4 19:17:44 2014 +0200 Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0 Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4 Reviewed-on: https://code.wireshark.org/review/1978 Reviewed-by: Pascal Quantin commit 97f0fb0 Author: Sean O. Stalley Date: Wed Jun 4 12:07:26 2014 -0700 Fixed Fencing for Multiple MAUSB Packets in 1 TCP Packet. Packet info for all MAUSB packets in a single TCP packet is now displayed in the info column. Before, only info on the last packet was displayed. See conversation for change Ib20e5e30474d93270dd24e203ab96f64f5cc77ad. Patch 3 had fencing, I messed up and left it out of patches 4-6. This patch adds it back in. Change-Id: I37f0e028a8f9b5a8500700f03ac36f8bf1c4f63c Reviewed-on: https://code.wireshark.org/review/1958 Reviewed-by: Michael Mann commit bd84767 Author: Sean O. Stalley Date: Thu Jun 5 14:42:41 2014 -0700 Added tap queue helper function to USB dissector Added a helper function which handles all the USB-Specific tap data. This is part of an effort to make dissect_usb_common() more modular so that code can be shared between the USB & the MAUSB dissector. Change-Id: If0f0b5542203ddaed28009d8a8a1bb8660fa5d70 Reviewed-on: https://code.wireshark.org/review/1990 Reviewed-by: Alexis La Goutte Tested-by: Alexis La Goutte Reviewed-by: Evan Huus commit ed2bb85 Author: Alexis La Goutte Date: Fri Jun 6 14:46:22 2014 +0200 Fix Dereference of null pointer found by Clang analyzer packet-q931.c:2532:25: warning: Access to field 'message_type' results in a dereference of a null pointer (loaded from variable 'q931_pi') Change-Id: I7533ff60c541e31efe4522e710f86175c1c0ccf4 Reviewed-on: https://code.wireshark.org/review/1997 Reviewed-by: Evan Huus commit be23f16 Author: Alexis La Goutte Date: Fri Jun 6 14:45:00 2014 +0200 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: Iada015df96b8c1b5070699589bb4b4f759217ecd Reviewed-on: https://code.wireshark.org/review/1996 Reviewed-by: Evan Huus commit e27a24c Author: Alexis La Goutte Date: Fri Jun 6 14:44:45 2014 +0200 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I2e7e32f618f709739948b2b5ebd1db0e775bfaed Reviewed-on: https://code.wireshark.org/review/1995 Reviewed-by: Evan Huus commit 52fe0aa Author: Sean O. Stalley Date: Thu Jun 5 14:57:36 2014 -0700 (trivial) changed when transfer info is set usb_conv_info->usb_trans_info is set to the same thing regardless of the branch taken, to pull it out of the condition. Change-Id: Ieabf0a6e796b942d7bafedbeba18d9e0fa113e17 Reviewed-on: https://code.wireshark.org/review/1991 Reviewed-by: Alexis La Goutte commit 38fc8ba Author: Pascal Quantin Date: Fri Jun 6 15:19:37 2014 +0200 WiMAX: fix incorrect type for include_cor2_changes variable Issue found while playing with MSVC /GL option Change-Id: I1f734eb4054349c706b529d8080036b00e66397a Reviewed-on: https://code.wireshark.org/review/1998 Reviewed-by: Pascal Quantin commit 65abca6 Author: Anish Bhatt Date: Thu Jun 5 01:26:49 2014 -0700 LLDP-MED Cleanup Co-ordinate based LCI is untested, as the sample capture does not have this, could not find one anywhere. Change-Id: Id0b52c234d6a36ee430ab9a7265bcd84f151c80c Signed-off-by: Anish Bhatt Reviewed-on: https://code.wireshark.org/review/1929 Reviewed-by: Alexis La Goutte commit 977a811 Author: U-beauty\bdn Date: Fri Jun 6 09:41:07 2014 +0600 IPMI trace dissector (without PCAP-dependent part). Added KCS and TMode protocol dissectors. Request/response logic has been revised. Saved request data logic has been revised. Added Get Message command response dissector. Added missing PICMG command dissectors. Added new PICMG command dissectors. Added new PPS OEM command entries. Added VITA 46.11 command dissectors. From: Bill Meier: - refs to value_strings/range_strings in hf[] entries, by convention, should use VALS/RVALS macros; - refs to true_false_strings should use TFS(&...) macro. also: true_false_string definitions should not be defined as arrays. - remove some unneeded #includes (packet-ipmi.c). - Do some re-indentation. - Add editor-modelines as needed. bug: 10004 Change-Id: Ib269b35784c0b70892d1e0111bcfb483ea64092c Reviewed-on: https://code.wireshark.org/review/1185 Reviewed-by: Anders Broman commit a537b3f Author: Gerald Combs Date: Thu Jun 5 16:19:22 2014 -0700 Windows packaging and release note updates. For now, use "Wireshark" and "Wireshark 2 Preview" instead of "Wireshark (GTK+)" and "Wireshark (Qt)" respectively to match the 1.12 installer. Shorten the descriptions of the command line tools. Warn against (but don't prohibit) installing on XP. Change-Id: Ica37ffa5b04eb48cadf41842b6fb9b1431c69803 Reviewed-on: https://code.wireshark.org/review/1988 Reviewed-by: Gerald Combs (cherry picked from commit 25bb29a1d65896959bc3f73bcf20b400fe0d32dd) Reviewed-on: https://code.wireshark.org/review/1989 commit 17b98ad Author: Martin Mathieson Date: Thu Jun 5 22:51:49 2014 +0100 Add a missing header file, and add new file to cmake build Change-Id: I3be8bef8c7542e7bcb11f3696783ca68c3920082 Reviewed-on: https://code.wireshark.org/review/1987 Reviewed-by: Martin Mathieson commit 29222ab Author: Martin Mathieson Date: Wed Jun 4 23:35:38 2014 +0100 Add Object (file) export for files transferred over TFTP. Updated following review comments. Change-Id: I56e70d8f8e332d2aea604ceec16c980ad890fa58 Reviewed-on: https://code.wireshark.org/review/1885 Reviewed-by: Martin Mathieson commit 6ac68b1 Author: Martin Mathieson Date: Thu Jun 5 18:58:22 2014 +0100 When have more than one SDU in the same RLC PDU, make sure output from all of them stays in the INFO column Change-Id: I7b2555101f3a1a596a4108a13240d21786054671 Reviewed-on: https://code.wireshark.org/review/1985 Reviewed-by: Martin Mathieson commit 7e77631 Author: AndersBroman Date: Thu Jun 5 16:26:12 2014 +0200 Add a handle to dissect sip userinfo. Change-Id: Ia8c15b710d79f12e8f62a49b17f057b746f31f0c Reviewed-on: https://code.wireshark.org/review/1980 Reviewed-by: Anders Broman commit 5c48774 Author: Jakub Zawadzki Date: Thu Jun 5 09:02:02 2014 +0200 sip: avoid calling tvb_format_text() when tree is not visible. sip dissector when filtering spends ~5% of Ir in tvb_format_text(), avoid calling. Change-Id: I1de8e970b300354c0536aead65178401f140f509 Reviewed-on: https://code.wireshark.org/review/1974 Reviewed-by: Anders Broman commit 5234972 Author: AndersBroman Date: Thu Jun 5 13:23:14 2014 +0200 Make socpe a local variable, can be used if we change the g_slist to a wmem_list. Change-Id: I176a2acc5ae334916978f543c959287bf0d8541e Reviewed-on: https://code.wireshark.org/review/1979 Reviewed-by: Anders Broman commit 6db547f Author: Alexis La Goutte Date: Thu Jun 5 08:39:00 2014 +0200 STUN: Add error code from MS-ICE2BWM Interactive Connectivity Establishment (ICE) 2.0 Bandwidth Management Extensions http://msdn.microsoft.com/en-us/library/ff595756.aspx Change-Id: I218229225ea5c64cfe2d5f269625deafe7eb8292 Reviewed-on: https://code.wireshark.org/review/1972 Reviewed-by: Anders Broman commit cd6e2ea Author: Alexis La Goutte Date: Wed Jun 4 08:47:57 2014 +0200 STUN: Add support of MS-TURN (Used by Lync) MS-TURN: Traversal Using Relay NAT (TURN) Extensions http://msdn.microsoft.com/en-us/library/cc431507.aspx Change-Id: I2a6f28f5f7db4da45543816caecce1da7cf03c35 Reviewed-on: https://code.wireshark.org/review/1971 Reviewed-by: Anders Broman commit c49fcec Author: Sean O. Stalley Date: Wed Jun 4 16:41:41 2014 -0700 Moved dissection of standard setup responses to own function Standard USB setup responses are now handled by a seperate function. Before, dissection was handled in the dissect_usb_common(). This is part of an effort to make dissect_usb_common() more modular so that code can be shared between the USB & the MAUSB dissector. Change-Id: Ibfbcd915d8cef881a6ae0f0312e5a8070984f465 Reviewed-on: https://code.wireshark.org/review/1968 Reviewed-by: Alexis La Goutte commit 5c03010 Author: Sean O. Stalley Date: Wed Jun 4 15:57:44 2014 -0700 Moved dissection of standard setup requests to own function Standard USB setup requests are now handled by a seperate function. Before, dissection was handled in the dissect_usb_common(). This is part of an effort to make dissect_usb_common() more modular so that code can be shared between the USB & the MAUSB dissector. Change-Id: I51944c688cc0715887abd4c8e5a7e3639c06821b Reviewed-on: https://code.wireshark.org/review/1967 Reviewed-by: Alexis La Goutte commit eaa571a Author: Sean O. Stalley Date: Wed Jun 4 14:26:17 2014 -0700 Added generic setup dissector for USB control transfers Added helper function to remove inline duplicate code. Change-Id: I898f1157bfa5f77613be2e82b29bfb21660124eb Reviewed-on: https://code.wireshark.org/review/1962 Reviewed-by: Alexis La Goutte commit 653dd75 Author: Martin Kaiser Date: Tue Jun 3 17:16:18 2014 +0200 simplify PCR calculation Change-Id: I892088e158519e331cba89be3c8d7c71f38a8925 Reviewed-on: https://code.wireshark.org/review/1964 Reviewed-by: Anders Broman commit fc13d22 Author: Joerg Mayer Date: Thu Jun 5 01:16:53 2014 +0200 Fix typo that would have hit once conversion of the users guide to asciidoc would have started Change-Id: Ie4f79bbf65a56a83995c70eb864d2476885c9170 Reviewed-on: https://code.wireshark.org/review/1966 Reviewed-by: Jörg Mayer commit 5defb48 Author: Joerg Mayer Date: Thu Jun 5 01:03:56 2014 +0200 Do not rebuild developers-guide.xml on each run. Do this only when required. Change-Id: I525c09e78c385593a7132ad3bfbca1114ea0de8b Reviewed-on: https://code.wireshark.org/review/1965 Reviewed-by: Jörg Mayer commit 95b694f Author: Joerg Mayer Date: Thu Jun 5 00:11:48 2014 +0200 Fix message about detection of asciidoc package (would always report not found before). Change-Id: Iaac974e5db3e605e0b9f7256d2724ae777eaebc3 Reviewed-on: https://code.wireshark.org/review/1963 Reviewed-by: Jörg Mayer commit 68a1b55 Author: Bill Meier Date: Wed Jun 4 15:18:16 2014 -0400 tshark.c: 'tshark -F pcap -w ...' should create a pcap (not pcapng) file; fixes Bug #9991. Change-Id: I182357fc57d6e57033319afc762549d805c2c10c Reviewed-on: https://code.wireshark.org/review/1954 Reviewed-by: Bill Meier commit dc02627 Author: Bill Meier Date: Wed Jun 4 15:15:42 2014 -0400 tshark.c: Change "Live captures can only be saved in libpcap format" to "[...] in pcap or pcapng format" Change-Id: I18dd0d15e261ecbc1ec086b4870a994afc7665ee Reviewed-on: https://code.wireshark.org/review/1953 Reviewed-by: Bill Meier commit 3d23cbd Author: Bill Meier Date: Wed Jun 4 14:59:41 2014 -0400 (Trivial) Fix a typo. Change-Id: I111d3af8d9f1a96ebbe3f4b19ab1597a93348058 Reviewed-on: https://code.wireshark.org/review/1952 Reviewed-by: Bill Meier commit 91afb5a Author: Michael Tüxen Date: Wed Jun 4 19:20:20 2014 +0200 The subtype_seek_read() functions populate *phdr, not wth->phdr. So don't use the values. This problem show up on pcapng files resulting from captures of multiple interfaces. Change-Id: I30b0598602b0b69233107d35be4360475d8648d8 Reviewed-on: https://code.wireshark.org/review/1950 Reviewed-by: Guy Harris commit a4c3061 Author: Pascal Quantin Date: Wed Jun 4 16:27:44 2014 +0200 Use -O2 option when compiling with MSVC Change-Id: Ia2c14b782b1a73ecab41c25ed21e4fcf356f5ee3 Reviewed-on: https://code.wireshark.org/review/1948 Reviewed-by: Anders Broman commit 4b9b29b Author: ruengeler Date: Wed Jun 4 13:05:26 2014 +0200 Clang complained about non initialized variable. Change-Id: Idc4c1a8db4d5f1b6f2b01428ea283c4a975723f2 Reviewed-on: https://code.wireshark.org/review/1947 Reviewed-by: Anders Broman commit 963a498 Author: AndersBroman Date: Wed Jun 4 09:33:53 2014 +0200 Fix packet-q931.c:604:25: error: 'ti' may be used uninitialized in this function [-Werror=uninitialized] Change-Id: I936a56aec7ff448d403f84a370b3cd3e9b73a718 Reviewed-on: https://code.wireshark.org/review/1945 Reviewed-by: Anders Broman commit c44c1536 Author: AndersBroman Date: Wed Jun 4 09:25:25 2014 +0200 Try to please the OSX build bot Change-Id: I4c7d5c6b91df2baae74f6970d0e333346be47238 Reviewed-on: https://code.wireshark.org/review/1944 Reviewed-by: Anders Broman commit f0cf649 Author: Roland Knall Date: Tue May 27 13:50:00 2014 +0200 EPL: Reassemble the splitted payload The data that is sent when downloading or uploading from a server is sent in segments to the client.To clearly display all the segments belonging together the splitted payload needs to be reassembled. The behaviour is described in the powerlink specification 301 v1.2.0 chapter 6.3.2.4.1.1 Download Protocol and chapter 6.3.2.4.2 Upload Protocol. The payload of the download/upload is now reassembled. Signed-off-by: Lukas Emersberger Change-Id: I17c30f15e75da47bcaba8f1fda1e412849ec268c Reviewed-on: https://code.wireshark.org/review/1120 Reviewed-by: Evan Huus Reviewed-by: Anders Broman commit 09b5361 Author: Richard Sharpe Date: Sat May 31 16:27:34 2014 -0700 This fix now allows SASL/GSS-API with integrity only to be properly dissected in that we now properly indicate the checksum and provide the wrapped token to the LDAP dissector to dissect. There is still a problem in that the wrong parts of the SASL packet can be indicated when users click on some parts. I am committing it for review and because it is much better than the current code. Bug:9398 Change-Id: I552fc249db26835b79abfc8793438a95f221663a Signed-off-by: Richard Sharpe Reviewed-on: https://code.wireshark.org/review/1905 Reviewed-by: Evan Huus Reviewed-by: Alexis La Goutte commit 1f17d0c Author: AndersBroman Date: Tue Jun 3 16:40:44 2014 +0200 Use the -Ox compiler option. Change-Id: I5d216d132485f6d2f8c63fa5a10b22e884e26b02 Reviewed-on: https://code.wireshark.org/review/1937 Reviewed-by: Evan Huus Reviewed-by: Alexis La Goutte commit a3ebd0d Author: Michael Mann Date: Tue Jun 3 10:11:01 2014 -0400 packet-q2931.c: proto_tree_add_text -> something filterable. Parts of this dissector have TLV design, but the identifier is "hidden" by the field. I left that behavior in and used more proto_tree_add_uint than proto_tree_add_item because of it. But at least the fields themselves are more filterable. Change-Id: I94f38d0063e32f6f3f682b380e0ce7bd051121c6 Reviewed-on: https://code.wireshark.org/review/1934 Reviewed-by: Evan Huus Reviewed-by: Anders Broman commit 3bdc0f9 Author: Michael Mann Date: Tue Jun 3 10:06:45 2014 -0400 packet-ansi_801.c: proto_tree_add_text -> somthing filterable Change-Id: I780c270f58ad0e8f8fabd121ad0cb5fdcfd593a2 Reviewed-on: https://code.wireshark.org/review/1933 Reviewed-by: Evan Huus Reviewed-by: Anders Broman commit 4e5424a Author: Michael Mann Date: Tue Jun 3 10:49:33 2014 -0400 packet-q931.c: proto_tree_add_text -> something filterable. Change-Id: I576f8d7fcf01a4c1dc6e486f7dd0a5b46edce502 Reviewed-on: https://code.wireshark.org/review/1935 Reviewed-by: Anders Broman commit c94d2e6 Author: Sean O. Stalley Date: Tue Jun 3 16:22:43 2014 -0700 MAUSB dissector uses USB addresses The MAUSB dissector now prints the USB address for MAUSB data packets in the Source & Destination columns. Before, the IP address was printed. All MAUSB data packets are now part of USB Conversations. Like the USB dissector, all data to & from one endpoint are part of the same conversation. Issues that need to be resolved: - In the case where multiple MAUSB packets exist in one TCP packet, only one USB address can be printed. - The USB conversations do not appear in the conversations window. They should appear under the USB conversations tab. Change-Id: I042daf7889cf70b3bbc450f9ccd974a0f93f4798 Reviewed-on: https://code.wireshark.org/review/1943 Reviewed-by: Evan Huus commit c6d175e Author: Michal Labedzki Date: Wed May 28 17:47:41 2014 +0200 Guarantee that open routines are initialized Open routines need to be initialized before try to open capture or add/remove routine. Change-Id: Ic3b88eef947ebd4a3dd2edf8120bb6bd8aec0765 Reviewed-on: https://code.wireshark.org/review/1874 Reviewed-by: Evan Huus commit 88581a6 Author: Sean O. Stalley Date: Tue Jun 3 14:46:47 2014 -0700 Added usb_set_addr helper function Added a helper function used to set the address fields for an urb. The code functions the same as before, but is now more modular. This change makes it easier for other dissectors to reuse the usb addressing code (ex: MAUSB). Change-Id: Idef3156a0fc9a9eda77ec7b2bbf3797b7a59e264 Reviewed-on: https://code.wireshark.org/review/1942 Reviewed-by: Evan Huus commit c5de173 Author: Pascal Quantin Date: Tue Jun 3 19:42:25 2014 +0200 MBIM: do not access to hash map when it is not initialized yet Change-Id: I560941115316ead5a85b9e0b55be693217fddff2 Reviewed-on: https://code.wireshark.org/review/1940 Reviewed-by: Pascal Quantin commit 9389d78 Author: Alexis La Goutte Date: Mon Jun 2 16:54:00 2014 +0200 Qt: Export Object * Fix indent (remove tabs) * Add title to the window Change-Id: I454046e47fa17969c710fa8dec4fac8cb7dbf22f Reviewed-on: https://code.wireshark.org/review/1917 Tested-by: Alexis La Goutte Reviewed-by: Alexis La Goutte commit 0a0a4c7 Author: Alexis La Goutte Date: Tue Jun 3 17:02:23 2014 +0200 USB: Try to make Mac os 10.5 buildbot Happy Fix warning: cast to pointer from integer of different size Change-Id: Ieed19204cb3be469c1b12f6ff87168b217a2a33d Reviewed-on: https://code.wireshark.org/review/1938 Reviewed-by: Alexis La Goutte commit 3eacdda Author: AndersBroman Date: Tue Jun 3 16:31:11 2014 +0200 Change ep_alloc() to wmem_new() change depcrecated API. Change-Id: I1eb3d3f3ccdfa265099446e8d609273867304a73 Reviewed-on: https://code.wireshark.org/review/1936 Reviewed-by: Anders Broman commit cd4ba3d Author: Martin Kaiser Date: Mon Jun 2 23:20:05 2014 +0200 make the PCR value filterable this fixes bug #10158 Change-Id: Ic67b074c464c52ac523e835b9815a5c3a3fa14d9 Reviewed-on: https://code.wireshark.org/review/1925 Reviewed-by: Anders Broman commit 3d03216 Author: Michael Mann Date: Sun Jun 1 14:38:24 2014 -0400 packet-bencode: proto_tree_add_text -> somthing filterable Also, cleanup dissector being called only with tree and a few tvb_new_subset calls. Change-Id: I1dab1b42ef1a27fc85b05d126f51f1582d7e5c58 Reviewed-on: https://code.wireshark.org/review/1932 Reviewed-by: Alexis La Goutte Reviewed-by: Michael Mann commit de9efa1 Author: Anish Bhatt Date: Sun Jun 1 19:13:55 2014 -0700 LLDP : Fix bug in mdi_power_source hf. While it compiles fine, hits an assert in add_string : failed assertion "hfinfo->type == FT_STRING || hfinfo->type == FT_STRINGZ || hfinfo->type == FT_STRINGZPAD" Fix takes care of this issue, but seems like we're losing the bitmask info here, is there a better way to do this ? Change-Id: I7156d734f4b058113730d5dfbf6498e801c36770 Signed-off-by: Anish Bhatt Reviewed-on: https://code.wireshark.org/review/1915 Reviewed-by: Alexis La Goutte commit fbf1873 Author: Pascal Quantin Date: Tue Jun 3 07:53:04 2014 +0200 Make decode_udp_ports() function available for plugins Change-Id: Ic5e087c333d46b4bf0946c80aaad5768534155b5 Reviewed-on: https://code.wireshark.org/review/1928 Reviewed-by: Pascal Quantin commit f9f3cf0 Author: Pascal Quantin Date: Mon Jun 2 23:45:32 2014 +0200 Make TCP functions available for plugins Change-Id: Ibce3f3351bfc89c069a02380c776680a1c78e12c Reviewed-on: https://code.wireshark.org/review/1926 Reviewed-by: Anders Broman commit e05dc82 Author: Bill Meier Date: Tue May 27 20:55:42 2014 -0400 Add a few more ad-hoc validations of the hf[] FIELDCONVERT field. Change-Id: Icd817a950331a2e7416a28c3d4a5a004d297e6f9 Reviewed-on: https://code.wireshark.org/review/1845 Reviewed-by: Michael Mann Reviewed-by: Bill Meier commit fae9726 Author: Bill Meier Date: Mon Jun 2 18:57:35 2014 -0400 packet-ipmi...: Various cleanups: - refs to value_strings in hf[] entries, by convention, should use VALS macro; - add editor-modelines as needed; Fix some indentation. Change-Id: Iaa0196bab6de066ed68a2755b69b07fadd33e498 Reviewed-on: https://code.wireshark.org/review/1927 Reviewed-by: Bill Meier commit 3bf635b Author: Marc Bevand Date: Mon Jun 2 13:18:09 2014 -0700 Update TLS extensions Add better reference to IANA list of all extensions. Add newer "channel_id" extension (0x7550) as used by current Chrome versions. Change-Id: Ia5b2515c557fbaf42d320ede918120f83b2e02dd Reviewed-on: https://code.wireshark.org/review/1924 Reviewed-by: Alexis La Goutte commit ea8d6da Author: Martin Kaiser Date: Mon Apr 14 14:34:49 2014 +0200 generate the usb tree outside of the if statement Change-Id: I959729a8834054cf333ec2c47f9d93756eb94066 Reviewed-on: https://code.wireshark.org/review/1922 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit cee6c5f Author: Martin Kaiser Date: Tue Apr 22 15:24:20 2014 +0200 use is_request from the conversation Change-Id: I16e6fd4f2d9fb37539cfcb17c0ade1033aea2d6f Reviewed-on: https://code.wireshark.org/review/1921 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 58348ba Author: Martin Kaiser Date: Sun Apr 13 19:40:36 2014 +0200 get the USB conversation struct as quickly as possible at first, read only the info required to fetch the conversation struct Change-Id: I3becbb59bf6a55f07805ca9f3c24f015484fcd13 Reviewed-on: https://code.wireshark.org/review/1920 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 75e53a1 Author: Peter Palúch Date: Sun Jun 1 19:29:24 2014 +0200 EIGRP Sequence TLV Dissector Patch In the EIGRP packet dissector, the dissector routine for the Sequence TLV dissected the TLV only up to the first address in the list. However, the Sequence TLV contains a variably sized list of addresses. This patch modifies the routine so that it processes the entire TLV, not just the first address in the contained list. Also, in the dissect_eigrp(), replaced calls to tvb_new_subset() with the reported length set to -1 with the call to tvb_new_subset_length(). TLVs always carry information about their length. And this time, correct truly ALL calls in the switch{} section. Sample packet capture is available in BugZilla. Bug: 10156 Change-Id: Idaaf182c05bcf799f770f23a2ce2b1e05a3d569a Reviewed-on: https://code.wireshark.org/review/1911 Reviewed-by: Pascal Quantin commit 13513a1 Author: Alexis La Goutte Date: Mon Jun 2 16:57:41 2014 +0200 HTTP2 : Max value for type is now 0x0B (BLOCKED type), update the heuristic Change-Id: I8de7b63ca90803f8fc6333bbe43aeb94459e6363 Reviewed-on: https://code.wireshark.org/review/1918 Reviewed-by: Michael Mann commit 1ca8d5f Author: Martin Kaiser Date: Sun Apr 13 20:31:57 2014 +0200 use bus_id from the conversation struct Change-Id: I796138bab6d4b75ade047f0706e68f301e4559df Reviewed-on: https://code.wireshark.org/review/1919 Reviewed-by: Martin Kaiser commit 090f568 Author: Guy Harris Date: Sun Jun 1 14:34:01 2014 -0700 Make this comple whether assertions are enabled or not. Make the check for a valid index range a macro, so the compiler doesn't whine if it's not used, but it's available if it *is* used. Change-Id: I3cee0460eacef23187c141458dc5ac7a7acbf7c8 Reviewed-on: https://code.wireshark.org/review/1914 Reviewed-by: Guy Harris commit 3883408 Author: Guy Harris Date: Sun Jun 1 14:28:11 2014 -0700 Fix type/length mismatch messages for FT_ETHER. The main limitation that comes to mind for the length of "an Ethernet" is that a 10BASE5 segment can't be longer than 500 m. :-) Say "a MAC address" rather than "an Ethernet", as 1) we're fetching an address, not an actual physical Ethernet and 2) FT_ETHER is really FT_MAC48 and it used for protocols other than Ethernet. Change-Id: I402341371006e7933faa5c60dab2e58cfb349eb3 Reviewed-on: https://code.wireshark.org/review/1913 Reviewed-by: Guy Harris commit 48440ac Author: Gerald Combs Date: Sun Jun 1 08:04:43 2014 -0700 [Automatic manuf, services and enterprise-numbers update for 2014-06-01] Change-Id: I5119b81cbb4457a1085219ba2a702c9abee2d0b3 Reviewed-on: https://code.wireshark.org/review/1907 Reviewed-by: Alexis La Goutte commit 6f15d7a Author: Joerg Mayer Date: Sun Jun 1 21:55:21 2014 +0200 Fix /home/jmayer/work/wireshark/git/wsutil/nghttp2/nghttp2_hd.c:996:12: error: ‘check_index_range’ defined but not used [-Werror=unused-function] static int check_index_range(nghttp2_hd_context *context, size_t idx) ^ cc1: all warnings being treated as errors Change-Id: Ie8e3fe12d339a689e0222eda501b253a7d6d923c Reviewed-on: https://code.wireshark.org/review/1912 Reviewed-by: Jörg Mayer commit d55bb72 Author: Guy Harris Date: Sun Jun 1 02:19:03 2014 -0700 Just have one value_string table for OUIs. While we're at it, get rid of duplicate #defines for some OUIs, sort the OUI #defines, and fix some routine names. Change-Id: I8f4e5408b44896c3629a0014299b060ebc15bab6 Reviewed-on: https://code.wireshark.org/review/1906 Reviewed-by: Guy Harris commit 7c68a8e Author: Guy Harris Date: Sat May 31 15:07:08 2014 -0700 Move the definitions of OUI value_strings to epan/oui.c. Change-Id: Iad921bebad03dd482b58a38ed25ae3f4a99c5cf2 Reviewed-on: https://code.wireshark.org/review/1904 Reviewed-by: Guy Harris commit a92d6bd Author: Pascal Quantin Date: Sat May 31 20:58:16 2014 +0200 HTTP2: try to please OSX 10.6 x64 buildbot Change-Id: I79e7a619b5dadb68b70f8b057494cc970a655cc7 Reviewed-on: https://code.wireshark.org/review/1903 Reviewed-by: Pascal Quantin commit af10e83 Author: Alexis La Goutte Date: Tue May 6 17:54:47 2014 +0200 HTTP2: Showing decompressed headers Decode the HTTP/2 header block using nghttp2 HPACK decoder In this patch, We use nghttp2 HPACK decoder to decompress HTTP/2 header block. To make HPACK decompressor work, we need to track down HTTP/2 connection from the beginning. If we see the HTTP/2 magic (connection preface), we initialize HPACK decompressor objects. We actually use 2 HPACK decompressor for both client and server. HPACK decompressor objects are stored in hash tables using TCP stream index as a key. Most code by: Tatsuhiro Tsujikawa Signed-off-by: Alexis La Goutte Signed-off-by: Pascal Quantin Change-Id: Idb4dd4b0a200924820cb0b34db664cc37518168d Reviewed-on: https://code.wireshark.org/review/1527 Reviewed-by: Pascal Quantin Reviewed-by: Alexis La Goutte commit 09816dd Author: Pascal Quantin Date: Sat May 31 17:42:00 2014 +0200 nghttp2: do not copy nghttp2* objects in wsutil folder Change-Id: I114d3a795a93c7612453fcd08f6e30e520dde900 Reviewed-on: https://code.wireshark.org/review/1902 Reviewed-by: Pascal Quantin commit 158dd9c Author: Pascal Quantin Date: Sat May 31 17:17:23 2014 +0200 nghttp2: more warning fixes Change-Id: Ib94a02f5977bd7d456895bbe453c35d77f559bd1 Reviewed-on: https://code.wireshark.org/review/1901 Reviewed-by: Pascal Quantin commit 173e302 Author: Pascal Quantin Date: Sat May 31 16:48:50 2014 +0200 nghttp2: upgrade library to g4f7223e and add casts to please buildbots Change-Id: Ic412d4bfc56695cbcab709d42a6f31aa9e50c64e Reviewed-on: https://code.wireshark.org/review/1900 Reviewed-by: Alexis La Goutte commit 33fc5c0 Author: Alexis La Goutte Date: Sat May 31 16:50:51 2014 +0200 NGHTTP2: Add missing nghttp2_int.h (need by make dist...) Change-Id: I7906f28b42960ea69b7f23e888bc0e184f67021a Reviewed-on: https://code.wireshark.org/review/1899 Reviewed-by: Alexis La Goutte commit 41c78af Author: Alexis La Goutte Date: Sat May 31 16:18:51 2014 +0200 NGHTTP2: fix -Wshadow about index with some old GCC release or Mac OS X buildbot (No problem with gcc-4.7 or gcc-4.8) Change-Id: Iae1f801abeb80429c08e93668133a9c5ac7977ef Reviewed-on: https://code.wireshark.org/review/1898 Reviewed-by: Alexis La Goutte commit c4aa524 Author: Alexis La Goutte Date: Sat May 31 16:14:19 2014 +0200 NGHTTP2: fix typo (nghttp2_ent.h => nghttp2_net.h) Change-Id: I52d3c40794841614d55e88c9fe9cf2de43a0fa46 Reviewed-on: https://code.wireshark.org/review/1897 Reviewed-by: Alexis La Goutte commit 3ec1ec1 Author: Martin Kaiser Date: Sat May 31 15:30:14 2014 +0200 do a plausibility check for interaction channel data in the linkage descriptor Change-Id: I7ebca539076b2b881e82fd6baec5bb223e778a52 Reviewed-on: https://code.wireshark.org/review/1896 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 62fd14c Author: Alexis La Goutte Date: Fri May 30 15:14:40 2014 -0400 Add nghttp2 lib (HPACK) Change-Id: I2a361951924045035a2a5d38f943e6b97c170f36 Reviewed-on: https://code.wireshark.org/review/1623 Reviewed-by: Pascal Quantin Reviewed-by: Michael Mann commit 5315416 Author: Jakub Zawadzki Date: Sat May 31 11:22:56 2014 +0200 Move cpuid to seperate header file. It'll be later used also for detecting sse4.2 Change-Id: I1930abb29026b455d453a79b5f301cdf37585160 Reviewed-on: https://code.wireshark.org/review/1803 Reviewed-by: Michael Mann commit 7999724 Author: Guy Harris Date: Sat May 31 02:27:31 2014 -0700 We need a "wlan_datapad" dissector as well. Change-Id: I8d7e0ebeef2a912737b3afc08fcaf166dfb525b1 Reviewed-on: https://code.wireshark.org/review/1895 Reviewed-by: Guy Harris commit 877f38b Author: Martin Kaiser Date: Sat May 31 11:00:30 2014 +0200 make population id filterable Change-Id: I3381e1c35795ac33331cdddb8cefa8b0a16907cc Reviewed-on: https://code.wireshark.org/review/1894 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 5672da8 Author: Guy Harris Date: Fri May 30 23:08:16 2014 -0700 Add a copyright/idempotency wrapper. Change-Id: I13928c78fc9e2c15adcc9d028dd07058800f402b Reviewed-on: https://code.wireshark.org/review/1893 Reviewed-by: Guy Harris commit 2af61db Author: Guy Harris Date: Fri May 30 22:56:19 2014 -0700 Fix (legitimate) compiler warning. Change-Id: Ie5abf8f95731a689e9851cc6ee5f169eafd617ac Reviewed-on: https://code.wireshark.org/review/1892 Reviewed-by: Guy Harris commit c91dd11 Author: Guy Harris Date: Fri May 30 21:48:41 2014 -0700 Split off the dissectors for 802.3 "slow protocols". Add a dissector table for the 802.3 "slow protocols" subtype, split the dissectors for those protocols into separate files, and have them register in that dissector table. Remove some unnecessary #includes while we're at it. Change-Id: Ic36c9c255efdd348055fa4f21fd6cc094f74e378 Reviewed-on: https://code.wireshark.org/review/1891 Reviewed-by: Guy Harris commit 60daeba Author: Jakub Zawadzki Date: Fri May 30 21:59:01 2014 +0200 Use tcp_info_append_uint() more Change-Id: I27656eacb698f8db7bfbe4f5502658c78b03fc13 Reviewed-on: https://code.wireshark.org/review/1890 Reviewed-by: Michael Mann commit d84b683 Author: Pavel Moravec Date: Fri May 30 15:51:51 2014 -0400 Add AMQP listening port option to preferences Change-Id: Ief46b7b53ddecd649e54d3c23a3504c4165c812f Reviewed-on: https://code.wireshark.org/review/1855 Reviewed-by: Michael Mann commit a8e6d12 Author: Hauke Mehrtens Date: Sat Apr 26 11:38:40 2014 +0200 ssl/dtls: add support for Raw Public keys Instead of X.509 certificates now also Raw public keys are supported and shown correctly. This is described in this draft: https://tools.ietf.org/html/draft-ietf-tls-oob-pubkey-11 Change-Id: Ibe7610aace31a19791b02e71ccd8d9ceb8cf979d Signed-off-by: Hauke Mehrtens Reviewed-on: https://code.wireshark.org/review/1372 Reviewed-by: Alexis La Goutte commit 584b813 Author: Hauke Mehrtens Date: Sat Apr 26 10:45:41 2014 +0200 ssl-utils: dissect the certificate type TLS extension This analyses the certificate type extensions and then stores the certificate type in the ssl session. This way we can later show the certificate in the correct from. This is described in this draft: https://tools.ietf.org/html/draft-ietf-tls-oob-pubkey-11 Change-Id: Ifdda165807bc29f1fc138da000a9a538ecd18b6e Signed-off-by: Hauke Mehrtens Reviewed-on: https://code.wireshark.org/review/1371 Reviewed-by: Alexis La Goutte commit 419ea28 Author: Martin Kaiser Date: Fri May 30 19:20:11 2014 +0200 make terrestrial centre frequency filterable Change-Id: I007ff5215f52f80f25622cab6980128eabd39c5f Reviewed-on: https://code.wireshark.org/review/1888 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit bc3ab61 Author: Martin Kaiser Date: Fri May 30 18:28:36 2014 +0200 make next time offset filterable Change-Id: I18c2b7992b237eaaacbec04d504fc293b03558a3 Reviewed-on: https://code.wireshark.org/review/1887 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 9f0419d Author: Martin Kaiser Date: Fri May 30 18:17:17 2014 +0200 make local time offset filterable Change-Id: Icccc07706287df4b6a7481108f9921b939aae2d5 Reviewed-on: https://code.wireshark.org/review/1886 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 13e4f77 Author: Hauke Mehrtens Date: Sun May 25 11:07:51 2014 +0300 ssl: use SslSession Use the struct SslSession instead of passing the tls version and cipher to each function. Change-Id: I19b163913f8f6521a34d94d130e2ae74546a615a Signed-off-by: Hauke Mehrtens Reviewed-on: https://code.wireshark.org/review/1821 Reviewed-by: Alexis La Goutte commit 00251ed Author: Hauke Mehrtens Date: Sat May 24 17:51:10 2014 +0300 dtls: use SslSession Use the struct SslSession instead of passing the tls version and cipher to each function. Change-Id: I95ad8cb5857794608f0f8db5c2dfd4b16e6578d5 Signed-off-by: Hauke Mehrtens Reviewed-on: https://code.wireshark.org/review/1820 Reviewed-by: Alexis La Goutte commit a7a4aa9 Author: Hauke Mehrtens Date: Thu May 22 10:45:40 2014 +0200 ssl: add SslSession structure This structure is used to store information about a SSL session which is not only needed for decrypting the session, but also to show nice dissection information. In an other patch I will add some more members to the struct because the old way of passing them to the function does not scale. Change-Id: I88e7f2896e0364a41d4538752dad291de83bfbca Signed-off-by: Hauke Mehrtens Reviewed-on: https://code.wireshark.org/review/1819 Reviewed-by: Evan Huus Reviewed-by: Alexis La Goutte Tested-by: Alexis La Goutte commit c04b529 Author: Michal Labedzki Date: Fri May 30 13:17:50 2014 +0200 cmake: Add feature info for SBC It is helpful to find and build this optional dependance. Change-Id: I73d7a7bb730778bc8b9a54d6560f7f42f1e23bc0 Reviewed-on: https://code.wireshark.org/review/1876 Reviewed-by: Alexis La Goutte commit 7c1171f Author: Balint Reczey Date: Thu May 29 19:07:44 2014 +0700 Fix wireshark.pc install destination Change-Id: I136d654ac5ea54237494d9b61c3ddb445b0720ae Reviewed-on: https://code.wireshark.org/review/1863 Reviewed-by: Alexis La Goutte commit 5c6403b Author: Balint Reczey Date: Thu May 29 10:58:05 2014 +0700 Honor configured CMAKE_INSTALL_LIBDIR when installing libraries Change-Id: I860c9408ed01e9567992b0dcf5c6c6421344c13e Reviewed-on: https://code.wireshark.org/review/1862 Reviewed-by: Alexis La Goutte commit 75531b6 Author: Lukas Emersberger Date: Thu Mar 20 06:56:49 2014 +0100 EPL: Duplicated frames The MN interprets the CMD layer data only if the CN increments the Send-Sequence-Counter => new data. The MN interprets the data only once, if the same frame is sent again the MN ignores the data. The behaviour is described in the powerlink specification 301 v1.2.0 chapter 6.3.2.3.2.3 Error: Duplication of Frame Frames which duplicate previous sent data are now marked as duplicated frames. Signed-off-by: Lukas Emersberger Change-Id: I9ef24b52712bfd3c735856b0cd5747c47aeef72a Reviewed-on: https://code.wireshark.org/review/992 Reviewed-by: Evan Huus commit 9182126 Author: Sean O. Stalley Date: Thu May 15 17:23:47 2014 -0700 Detect multiple MAUSB Packets in a single TCP packet Puts a tag in the info column when multiple MAUSB packets are in a single TCP packet. Change-Id: Ib20e5e30474d93270dd24e203ab96f64f5cc77ad Reviewed-on: https://code.wireshark.org/review/1658 Reviewed-by: Sean Onufer Stalley Reviewed-by: Evan Huus commit a1656bc Author: Martin Kaiser Date: Fri May 30 15:07:27 2014 +0200 fix packet-btavdtp.c: In function 'dissect_bta2dp': packet-btavdtp.c:2796:36: error: 'sep_data.vendor_codec' may be used uninitialized in this function [-Werror=maybe-uninitialized] packet-btavdtp.c:2799:12: error: 'sep_data.vendor_id' may be used uninitialized in this function [-Werror=maybe-uninitialized] Change-Id: I5b9e22e7ec787430ee25d2cd7dbe13f854f9eaa2 Reviewed-on: https://code.wireshark.org/review/1884 Reviewed-by: Martin Kaiser commit 7bf49b3 Author: Balint Reczey Date: Thu May 29 00:32:20 2014 +0700 Set PLUGIN_INSTALL_DIR properly for wireshark.pc Change-Id: I64c04095ce780ce2cc44a54a68695506d27e5747 Reviewed-on: https://code.wireshark.org/review/1861 Reviewed-by: Alexis La Goutte commit aff3807 Author: Michal Labedzki Date: Thu May 1 17:01:36 2014 +0200 cmake: Not all system have HtmlViewer Not all system have HtmlViewer, but we support that case by inform user about file/website, so we "have" HtmlViewer. Change-Id: I46e16a86b5c7f9dd47e1d1ded9d10fd4f565660f Reviewed-on: https://code.wireshark.org/review/1875 Reviewed-by: Alexis La Goutte commit 1258ce7 Author: Michal Labedzki Date: Mon Apr 14 18:59:07 2014 +0200 Bluetooth: AVDTP: First step to fully support AVDTP session Session should be finished too on HCI Disconnect and Adapter disappear. Change-Id: I0823872e60ec932fc0831975e54dc33d49fb5dbc Reviewed-on: https://code.wireshark.org/review/1882 Reviewed-by: Michal Labedzki commit 49cc957 Author: Michal Labedzki Date: Fri Apr 11 19:15:39 2014 +0200 Bluetooth: AVDTP: Add support for APT-X configuration Also add Service informations to Info column and service item. Change-Id: I0a565df94d7980432c524bd675b291f0e80704e5 Reviewed-on: https://code.wireshark.org/review/1881 Reviewed-by: Michal Labedzki commit 53c66a9 Author: Michal Labedzki Date: Fri Apr 11 13:19:34 2014 +0200 Bluetooth: Avoid using macro GPOINTER_TO_UINT() Fix warnings and try to inform user about unknown values in "Decode As". Also use define instead of magic number for Unknown L2CAP CIDs. Change-Id: Ie6f26a9e3330b84cef14bbf8861ffbdbdb789225 Reviewed-on: https://code.wireshark.org/review/1880 Reviewed-by: Michal Labedzki Tested-by: Michal Labedzki commit 5742d2e Author: Michal Labedzki Date: Fri Apr 11 09:22:46 2014 +0200 Bluetooth: L2CAP: Another fix for CIDs Example: if there is Connection Request than field with CID always is called SCID. If we Sent this packet, it is okay, but if we Receive it, then it is not SCID for us, but DCID. If we receive Connection Request (DCID) and than we want to make disconnection, so we send Disconnection Request with DCID that is SCID in Connection Request... etc. I try to clarify this, so rename stored SCID to Local CID and DCID to Remote CID. Change-Id: Idde0939a03955d8f4a10d8c9f7c43fd364254460 Reviewed-on: https://code.wireshark.org/review/1879 Reviewed-by: Michal Labedzki commit e3473c9 Author: Michal Labedzki Date: Thu Apr 10 17:46:25 2014 +0200 Bluetooth: AVDTP: Upgrade session logic To correctly resolve connections single "ID" value like L2CAP PSM, is not enough, because next connection may use the same PSM value. Solution is save frame number of frame that make disconnection. Conclusion: Any session key values should be updated to pair: {ID_1, disconnect_in_frame}, {ID_2, disconnect_in_frame}... then we should check if "disconnect_in_frame" is greater then current frame number, otherwise it is not valid session. Change-Id: I3d760112b6e53358a93c994f4aae455ac1bf5de6 Reviewed-on: https://code.wireshark.org/review/1878 Tested-by: Michal Labedzki Reviewed-by: Michal Labedzki commit 2abc541 Author: Michal Labedzki Date: Sun Mar 30 12:03:18 2014 +0200 Bluetooth AVDTP/RTP: Separate the streams The Stream is defined here as media stream that beginning on AVDTP Start (ResponseAccept). Also fix recognizing Channel streams by AVDTP according to the specification that says: 1. First channel is always Signaling. 2. Second may be Media. 3. Third may be Reporting. 4. Fourth may be Recovery. First and second will be supported right now. Change-Id: Id6d4dae6be1b9df68382288c2d520b7ed3661237 Reviewed-on: https://code.wireshark.org/review/1053 Reviewed-by: Michal Labedzki commit 32e66a4 Author: Michal Labedzki Date: Thu Mar 27 07:59:16 2014 +0100 Bluetooth: Add music duration info for SBC Music duration info can be used to detect underflow, what can decrease music quality. Change-Id: I8ea06655395d3e66473a09ee72b6833b894aa6e1 Reviewed-on: https://code.wireshark.org/review/1052 Reviewed-by: Michal Labedzki commit 7882284 Author: Michal Labedzki Date: Sat May 24 19:01:28 2014 +0200 Bluetooth: Fix Content Protection call for VDP Change-Id: I20a29fdb7d5737173c5b589fc8832b0b997bef2a Reviewed-on: https://code.wireshark.org/review/1877 Reviewed-by: Michal Labedzki commit 8515bd7 Author: Martin Kaiser Date: Fri May 30 09:59:05 2014 +0200 avoid proto_tree_add_uint_format() when we just want the default description Change-Id: Ice06e257a72f3b4ce1229ff90129628f0e3bbcfb Reviewed-on: https://code.wireshark.org/review/1873 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 21a1208 Author: Guy Harris Date: Thu May 29 10:56:46 2014 -0700 Introduce 802.11 dissectors with wired-in "FCS present" indications. For a number of protocols that encapsulate 802.11 frames inside packets, whether the frame includes an FCS or not is specified by the protocol, not by whether the link-layer frame carrying the packets *itself* includes an FCS. As we've done with Ethernet, add "_withfcs" and "_withoutfcs" dissectors, which *don't* check the pseudo-header FCS length indication, and call those, rather than dissectors that check the pseudo-header length indication, from the dissectors for those protocols. Change-Id: Ib8c8ecdd872e1782fdfc66e7573415d91911a62e Reviewed-on: https://code.wireshark.org/review/1866 Reviewed-by: Guy Harris commit 8b6c4e7 Author: Martin Kaiser Date: Thu May 29 19:34:23 2014 +0200 add gdb to the list of new protocols Change-Id: Ia985f5bbc3f60409ee119883451ea36f0c4b0605 Reviewed-on: https://code.wireshark.org/review/1865 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 357b610 Author: Martin Kaiser Date: Tue Feb 11 22:14:20 2014 +0100 start a dissector for GDB's remote serial protocol Change-Id: I8e20917ac08e2349caf330ee967d24d7c738bb71 Reviewed-on: https://code.wireshark.org/review/1815 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 7aecd47 Author: Martin Kaiser Date: Thu May 29 17:56:17 2014 +0200 convert cable freq, symbol rate into doubles Change-Id: Iaddd3c4847e803af855c847212ae822b2529ff06 Reviewed-on: https://code.wireshark.org/review/1860 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 91dac27 Author: Martin Kaiser Date: Thu May 29 17:51:37 2014 +0200 conver sat freq and symbol rate into doubles in order to make the filtering work, fix typos Change-Id: I7ed989807826d1322dab00d13d998488caaf73ff Reviewed-on: https://code.wireshark.org/review/1859 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 254e227 Author: Martin Kaiser Date: Fri Mar 14 10:14:14 2014 +0100 dissect more components of the track header box Change-Id: If8d35122ce096f52837bdff1c6599b47456697d5 Reviewed-on: https://code.wireshark.org/review/1858 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit f7b1607 Author: Michael Mann Date: Thu May 29 11:33:29 2014 -0400 Bugfix EIP explicit connection conversation and allow ForwardClose to not be present in capture for generated filter to work properly. Change-Id: I8e442dff85ef856672f42e787feb88453eba6f0e Reviewed-on: https://code.wireshark.org/review/1857 Reviewed-by: Michael Mann commit 2fa5996 Author: Vikhyat Umrao Date: Thu May 29 15:43:48 2014 +0530 glusterfs: if filename itself will become This patch will solve the issue in LOOKUP procedure if filename itself will become . Change-Id: Ib983ac4f9325db040a6b4eb3fc63179b36103bf4 Reported-by: Pranith Kumar Karampuri Reviewed-by: Niels de Vos Signed-off-by: Vikhyat Umrao Reviewed-on: https://code.wireshark.org/review/1854 Reviewed-by: Michael Mann commit ababf68 Author: Guy Harris Date: Thu May 29 02:34:14 2014 -0700 Have the protocol item cover only the PEEKREMOTE header. Change-Id: I8e5991f636e68a956bf5e09dd6bf4be1d4619ba0 Reviewed-on: https://code.wireshark.org/review/1852 Reviewed-by: Guy Harris commit 88a64b9 Author: Richard Sharpe Date: Mon May 26 16:05:36 2014 -0700 Improve the fix by removing code that miss dissects SPNEGO stuff ... as well as remove redundant stuff from the spnego.cnf file. Signed-off-by: Richard Sharpe Change-Id: I90a962a39dc4da0f13055c9b3893c26044f1fc97 Reviewed-on: https://code.wireshark.org/review/1809 Reviewed-by: Tomáš Kukosa Reviewed-by: Michael Mann commit 0ed2672 Author: Richard Sharpe Date: Wed May 28 21:05:41 2014 -0400 Try to fix the problems with the SPNEGO negTokenInit differences in Microsoft implementations Change-Id: Ifbfca88469a6bc479072c921deba280e667c7087 Reviewed-on: https://code.wireshark.org/review/1804 Reviewed-by: Michael Mann commit bb78e8f Author: Alexis La Goutte Date: Wed May 28 18:04:30 2014 +0200 Add Modelines and use tabs and fix typo Change-Id: Ie3f60f66f0f4a572098d1d7425c53aaf51bdb747 Reviewed-on: https://code.wireshark.org/review/1846 Reviewed-by: Michael Mann commit 56d8ff6 Author: Alexis La Goutte Date: Wed May 28 18:04:34 2014 +0200 Add Modelines Change-Id: I3b41a15f53afc718ccf5892174345220a09c6714 Reviewed-on: https://code.wireshark.org/review/1847 Reviewed-by: Michael Mann commit 40a21bc Author: Bill Meier Date: Wed May 28 17:38:58 2014 -0400 packet-kerberos.c: Use tfs_set_notset in hf[] entry instead of a local version. Change-Id: I00a3ae7afb46eb50d7477c22cfa340c705cbb34a Reviewed-on: https://code.wireshark.org/review/1851 Reviewed-by: Bill Meier commit d817b27 Author: Bill Meier Date: Wed May 28 16:39:48 2014 -0400 Update m3ap.cnf to match packet-m3ap.c change done in commit b40cb1ad Change-Id: Ib94647edcdba8c71439d37a48e213c8a475c351e Reviewed-on: https://code.wireshark.org/review/1850 Reviewed-by: Bill Meier commit a192e47 Author: ruengeler Date: Wed May 28 19:14:37 2014 +0200 Use Q_UNUSED instead of _U_ Change-Id: I19732f097b1238159b634e32ee13fe6ae3f1883d Reviewed-on: https://code.wireshark.org/review/1849 Reviewed-by: Michael Tüxen commit 74774fd Author: Michael Tüxen Date: Wed May 28 18:45:57 2014 +0200 Update reference for I-Bit support. Also remove the reference to the original ID. Change-Id: I51357fc04699a40af2d34ec2bd36518d09d3b180 Reviewed-on: https://code.wireshark.org/review/1848 Reviewed-by: Michael Tüxen commit 48ce562 Author: Bill Meier Date: Tue May 27 20:33:22 2014 -0400 Minor: use VALS macro (as per convention); Add editor modelines; Do whitespace changes. Change-Id: I6007c1b2098d06e4a892474dd07f06a7538f94ef Reviewed-on: https://code.wireshark.org/review/1843 Reviewed-by: Bill Meier commit e570507 Author: Bill Meier Date: Tue May 27 20:50:49 2014 -0400 packet-klerberos.c: Use typedef (true_false_string) to properly define a true_false_string. Change-Id: Ic89e5add39b8b0b2c3db254292f12ce6ae25b73c Reviewed-on: https://code.wireshark.org/review/1844 Reviewed-by: Bill Meier commit 4467e02 Author: Bill Meier Date: Tue May 27 19:40:34 2014 -0400 packet-ppcap.c: Minor cleanup - Remove SVN ID; - Add editor-modelines; - Do some whitespace changes. Change-Id: I7b8b38cfb1d5d206b35fb04c759f22f094810875 Reviewed-on: https://code.wireshark.org/review/1842 Reviewed-by: Bill Meier commit 76cabf3 Author: Alexis La Goutte Date: Tue May 27 18:14:48 2014 +0200 Try to fix Ubuntu buildbot (make dist failed) No rule to make target `cmake/modules/FeatureSummary.cmake', needed by `distdir'. Stop. Change-Id: I66124151ded4d9e3aeed3f9f27aa2fca81a962cb Reviewed-on: https://code.wireshark.org/review/1817 Reviewed-by: Alexis La Goutte commit 6dabe12 Author: Joerg Mayer Date: Wed May 28 17:12:49 2014 +0200 Commit 5ff629ec5ac636b901b2a004aa4d5248f68a5d0f requires the minimum cmake version to be 2.8.3. Make this explicit. commit 5ff629ec5ac636b901b2a004aa4d5248f68a5d0f Author: Alexis La Goutte Date: Thu May 22 22:05:08 2014 +0200 CMake: Remove FeatureSummary.cmake and fix display of feature Change-Id: If6f67c837f1bee92a22bbff8965baa3cc71bf663 Reviewed-on: https://code.wireshark.org/review/1841 Reviewed-by: Jörg Mayer commit 925b48e Author: ruengeler Date: Wed May 28 13:19:50 2014 +0200 Clang complains about the size of empty structs. Change-Id: I2951b1b384cf9b32677aea81c66c34ab07b0090f Reviewed-on: https://code.wireshark.org/review/1835 Reviewed-by: Michael Mann Reviewed-by: Michael Tüxen commit 9d77e7c Author: ruengeler Date: Wed May 28 13:22:15 2014 +0200 QIcon is not needed. Change-Id: I07207177e97e22bb8810226818b2280db5f5055e Reviewed-on: https://code.wireshark.org/review/1836 Reviewed-by: Michael Mann commit 9cd3c5c Author: Vikhyat Umrao Date: Tue May 27 20:34:29 2014 +0530 glusterfs: show filenames in the summary for common procedures With this patch we will have filename on the summary for procedures MKDIR, CREATE and LOOKUP. Example output: 173 18.309307 192.168.100.3 -> 192.168.100.4 GlusterFS 224 MKDIR V330 MKDIR Call, Filename: testdir 2606 36.767766 192.168.100.3 -> 192.168.100.4 GlusterFS 376 LOOKUP V330 LOOKUP Call, Filename: 1.txt 2612 36.768242 192.168.100.3 -> 192.168.100.4 GlusterFS 228 CREATE V330 CREATE Call, Filename: 1.txt Change-Id: I1995c309028f1472a61719d6d7d6ae2c68412a95 Signed-off-by: Vikhyat Umrao Reviewed-on: https://code.wireshark.org/review/1833 Reviewed-by: Alexis La Goutte commit 482e6a6 Author: Anish Bhatt Date: Tue May 27 22:45:48 2014 -0700 LLDP Cleanup : 802.1 Qbg TLV Change-Id: Ibdea530928d1bd98cb353ad8d7d938f739aa693f Signed-off-by: Anish Bhatt Reviewed-on: https://code.wireshark.org/review/1830 Reviewed-by: Alexis La Goutte commit 0701d61 Author: Michael Mann Date: Mon May 26 22:58:48 2014 -0400 Add EtherNet/IP connection conversation filters Change-Id: Ia69cbe9fea364c735bde956d84a82404b46ec236 Reviewed-on: https://code.wireshark.org/review/1810 Reviewed-by: Michael Mann commit c3b2b54 Author: Alexis La Goutte Date: Tue May 27 08:32:54 2014 +0200 Fix indent (use 4 spaces) Change-Id: I9e37c911865a0e3b13331ec03df05d79749904c5 Reviewed-on: https://code.wireshark.org/review/1811 Reviewed-by: Michael Mann commit eb1bbb6 Author: Alexis La Goutte Date: Tue May 27 08:35:58 2014 +0200 Fix indent (use tabs) Change-Id: Iecb242bddb06779ba8b5ce8913fa9c4f64d7f79a Reviewed-on: https://code.wireshark.org/review/1812 Reviewed-by: Michael Mann commit 1b439df Author: Jakub Zawadzki Date: Tue May 27 20:06:15 2014 +0200 Use proto_tree_add_format_text() Change-Id: Ie111c4db4afd0702f5a016da1547486631f571d8 Reviewed-on: https://code.wireshark.org/review/1818 Reviewed-by: Michael Mann commit cc3931c Author: Bill Meier Date: Tue May 27 17:58:17 2014 -0400 FIELDDISPLAY can be or'd with BASE_VAL64_STRING. Change-Id: I43014922fc51ddeed70235006296500ec00bd437 Reviewed-on: https://code.wireshark.org/review/1826 Reviewed-by: Bill Meier commit b4fb165 Author: Martin Kaiser Date: Tue May 27 23:37:31 2014 +0200 use proto_tree_add_float_format_value() correctly Change-Id: I927a2f32aa0016b5b0c476fa4c16fc1dbe0aebb0 Reviewed-on: https://code.wireshark.org/review/1825 Reviewed-by: Martin Kaiser commit b3008f3 Author: Martin Kaiser Date: Tue May 27 23:36:32 2014 +0200 make cable symbol rate filterable Change-Id: I034b351d4bc12f6c00a0224a5c5b9f85496657b6 Reviewed-on: https://code.wireshark.org/review/1824 Reviewed-by: Martin Kaiser commit 9c98f9f Author: Martin Kaiser Date: Fri May 23 18:40:15 2014 +0200 make cable frequency filterable Change-Id: I8464fb8e98e485523127dd95948a717554b6aee4 Reviewed-on: https://code.wireshark.org/review/1823 Reviewed-by: Martin Kaiser commit 3ce020a Author: Hauke Mehrtens Date: Mon May 26 19:29:45 2014 +0300 ssl-utils: fix TLS number of padding extension The padding extension got the number 21 (0x15) by the IANA and not 20 (0x14), see this list for details: https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml The number 20 is assigned to the server certificate type extension. Change-Id: I17271a3a336bcf5a323f15da3a5301115ca4cb45 Signed-off-by: Hauke Mehrtens Reviewed-on: https://code.wireshark.org/review/1822 Reviewed-by: Martin Kaiser commit 0911ce1 Author: Martin Kaiser Date: Fri May 23 18:23:59 2014 +0200 make the satellite symbol rate filterable Change-Id: I301d0804e097c62cd8bf7b27003918eedab9616a Reviewed-on: https://code.wireshark.org/review/1816 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 281616f Author: Alexis La Goutte Date: Tue May 27 13:13:37 2014 +0200 Fix build on my old Windows XP Buildbot (With VS2008EE) (Try 2...) ../../asn1/atn-ulcs/packet-atn-ulcs-template.c(126) : fatal error C1083: Cannot open include file: 'stdint.h': No such file or directory Change-Id: Id3c3082fe91a79e44abbfd4e2b2f1fc7d5c183d4 Reviewed-on: https://code.wireshark.org/review/1814 Reviewed-by: Alexis La Goutte Tested-by: Alexis La Goutte Reviewed-by: Michael Mann commit 5ff629e Author: Alexis La Goutte Date: Thu May 22 22:05:08 2014 +0200 CMake: Remove FeatureSummary.cmake and fix display of feature Bug:8819 Change-Id: I35778a4ce198245fbe86eaded2b733745ff8e934 Reviewed-on: https://code.wireshark.org/review/1728 Reviewed-by: Alexis La Goutte commit 7527224 Author: Martin Kaiser Date: Fri May 23 18:16:40 2014 +0200 make satellite orbital position filterable Change-Id: Ibd4edd30eca969699fea1971e1885299e4d3e552 Reviewed-on: https://code.wireshark.org/review/1813 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit abed02a Author: Evan Huus Date: Mon May 26 16:33:42 2014 -0400 Fix fencepost error in HTTP dissector Strndup adds +1 for the null-terminator itself, no need to do it in the caller. This was causing us to go past the end of the buffer when the HTTP header line didn't have any spaces in it. Caught by Alexis using ASAN. Bug:10135 Change-Id: Iee1b26da4740b774581ca6ec784ee40f7b920832 Reviewed-on: https://code.wireshark.org/review/1806 Reviewed-by: Evan Huus commit 5dfdd2b Author: Jakub Zawadzki Date: Mon May 26 22:46:21 2014 +0200 Optimize dissect_eth_common(): cache result of get_ether_name() In Anders profile output[1] is looks like that get_ether_name() is called four times, twice for src and dst. get_ether_name() takes ~2% of Ir, so caching result should reduce Ir count by 1%. Similar thing was already done for UDP and TCP - 5235dc6ca0d7ec4e6c1fe38cae34763366830629 [1] http://www.wireshark.org/lists/wireshark-dev/201405/msg00063.html Change-Id: I9ca582b0522387dbfaad866a48a0934693a2849f Reviewed-on: https://code.wireshark.org/review/1808 Reviewed-by: Pascal Quantin Reviewed-by: Evan Huus commit 70d67a2 Author: Joerg Mayer Date: Mon May 26 21:29:49 2014 +0200 Make packet-ieee80211.c a tiny bit less unreadable. This file is riddled with lots of magical flags causing the code to do one thing or another, and then in several cases with non-telling variable names (e.g. is_centrino). My absolute favourite is dissect_ieee80211_common (tvb, pinfo, tree, FALSE, pinfo->pseudo_header->ieee_802_11.fcs_len, FALSE, FALSE, FALSE, FALSE); Is there anyone who is able to understand what the line above does without looking up the function definition? Change-Id: Id49cc0a2992005c28f66a8558e4b2970b677a360 Reviewed-on: https://code.wireshark.org/review/1805 Reviewed-by: Jörg Mayer commit 26840fa Author: Evan Huus Date: Fri May 23 16:18:00 2014 -0400 Replace manual string handling with strbuf Much simpler and should probably fix bug 10121. Also add modelines. Bug:10121 Change-Id: Ib92977e734ebe1b8529c7b6b41fbd81eac13b186 Reviewed-on: https://code.wireshark.org/review/1758 Tested-by: Alexis La Goutte Reviewed-by: Alexis La Goutte Reviewed-by: Evan Huus commit 37d40eb Author: Pascal Quantin Date: Sun May 25 23:13:57 2014 +0200 MAC LTE: fix dissection of Extended Power Headroom control element Change-Id: Ia57b4769732f2e18dd2864b576c5c77fc68deb20 Reviewed-on: https://code.wireshark.org/review/1798 Reviewed-by: Pascal Quantin commit f8d6351 Author: Bill Meier Date: Sun May 25 14:21:38 2014 -0400 Fix [-Werror=clobbered] gcc warning Change-Id: Ibeef517a5100ae6d2c01f329022281b81a8b56a9 Reviewed-on: https://code.wireshark.org/review/1795 Reviewed-by: Bill Meier commit 08ce84e Author: Evan Huus Date: Sun May 25 11:13:04 2014 -0400 Grab-bag of dead initializers and two actual bugs. All caught by cppcheck. The two (semi)-interesting bugs are: - in asn1/atn-cpdlc/packet-atn-cpdlc-template.c where the break statement should have been inside the brace, causing potential control-flow weirdness with exceptions - in epan/dissectors/packet-ieee80211.c where the bounds check for tag_len did not match the expert info given Change-Id: Ie173fb8d917aabb9b4571435d671d6f16e1c7569 Reviewed-on: https://code.wireshark.org/review/1793 Reviewed-by: Alexis La Goutte Reviewed-by: Evan Huus commit c4ead25 Author: Pascal Quantin Date: Sun May 25 18:01:31 2014 +0200 GSM RLC MAC: Do not skip too many lines of the CSN_DESCR when the field is missing While we are at it, replace an undefined hf_timeslot_allocation_usf_tn by its hf_usf equivalent Bug: 10120 Change-Id: I3fe113279c779a9d8143d07489747a67d7351664 Reviewed-on: https://code.wireshark.org/review/1794 Reviewed-by: Pascal Quantin commit ff2061a Author: Gerald Combs Date: Sun May 25 08:04:32 2014 -0700 [Automatic manuf, services and enterprise-numbers update for 2014-05-25] Change-Id: Iec70af09a92ed92fdee6f2a34846d64e62ee075a Reviewed-on: https://code.wireshark.org/review/1789 Reviewed-by: Evan Huus commit 3229854 Author: Guy Harris Date: Sat May 24 17:37:52 2014 -0700 Get rid of trailing blank. Change-Id: I9eb6baee8866241a42d007d9bc69f64ab46f9a2e Reviewed-on: https://code.wireshark.org/review/1786 Reviewed-by: Guy Harris commit 088b064 Author: Guy Harris Date: Sat May 24 17:35:08 2014 -0700 Add support for dissecting pcap-ng file-type-specific blocks. Add a dissector for pcap-ng file-type-specific blocks; it creates a dissector table using the block type as the key, attempts to call the appropriate dissector using that table, and does a minimal dissection if that fails. Change-Id: I67e139f06ba88d40faa5b4ab169e8df08f5bfe7b Reviewed-on: https://code.wireshark.org/review/1784 Reviewed-by: Guy Harris commit 318cf8a Author: Guy Harris Date: Sat May 24 17:04:44 2014 -0700 Add support for dissecting non-packet records. Add a dissector table indexed by the file type, and, for the file-type-specific records, have the frame dissector skip the usual pseudo-header processing, as the pseudo-header has a file-type-specific record subtype in it, and call the dissector for that file type's records. Change-Id: Ibe97cf6340ffb0dabc08f355891bc346391b91f9 Reviewed-on: https://code.wireshark.org/review/1782 Reviewed-by: Guy Harris commit 6dffc3b Author: Guy Harris Date: Sat May 24 14:53:15 2014 -0700 Distinguish between "events" and "reports". Have two different classes of file-type-specific records - "events" and "reports". An "event" indicates something that happened in the capture process, such as a status transition on the network; a "report" just gives information not corresponding to something happening in the capture process, such as capture statistics. Note that both of those should be dissected and displayed like packets, and leave open the possibility of file-type-specific records whose contents should be processed and saved but not displayed in the packet list. Shorten "file_type_specific" to "ft_specific". Change-Id: I2342d82ef992c794b76f354c057823dd5eb371e6 Reviewed-on: https://code.wireshark.org/review/1779 Reviewed-by: Guy Harris commit d5b1730 Author: Guy Harris Date: Sat May 24 14:21:06 2014 -0700 Fix a compiler warning. Change-Id: I5b4b518982dc6033842b1e791e67d2faddfb5487 Reviewed-on: https://code.wireshark.org/review/1777 Reviewed-by: Guy Harris commit 1b6cc63 Author: Guy Harris Date: Sat May 24 13:57:11 2014 -0700 Add support for plugins to handle pcap-ng block types. We rename "file format" plugins to "libwiretap" plugins, as they can register as read handlers for a new file type, read/write handlers for a pcap-ng block type (or both). To register as a pcap-ng block type handler, in the register_wtap_module() routine of your plugin, call register_pcapng_block_type_handler() with the pcap-ng block type and pointers to your routines to read and write those blocks. Those routines should read and write REC_TYPE_FILE_TYPE_SPECIFIC records, with the block type in the pseudo-header for the record in the struct wtap_pkthdr structure, with time stamps stored in that structure, and with a blob of data for the rest of the record. This is for bug 8590. Change-Id: I71847d834854a29ceb85894fd094c2ae91a04273 Reviewed-on: https://code.wireshark.org/review/1775 Reviewed-by: Guy Harris commit 6db77b0 Author: Guy Harris Date: Sat May 24 11:28:30 2014 -0700 Allow wtap_read() and wtap_seek_read() to return records other than packets. Add a "record type" field to "struct wtap_pkthdr"; currently, it can be REC_TYPE_PACKET, for a record containing a packet, or REC_TYPE_FILE_TYPE_SPECIFIC, for records containing file-type-specific data. Modify code that reads packets to be able to handle non-packet records, even if that just means ignoring them. Rename some routines to indicate that they handle more than just packets. We don't yet have any libwiretap code that supplies records other than REC_TYPE_PACKET or that supporting writing records other than REC_TYPE_PACKET, or any code to support plugins for handling REC_TYPE_FILE_TYPE_SPECIFIC records; this is just the first step for bug 8590. Change-Id: Idb40b78f17c2c3aea72031bcd252abf9bc11c813 Reviewed-on: https://code.wireshark.org/review/1773 Reviewed-by: Guy Harris commit 33ae4cb Author: Sean O. Stalley Date: Fri May 23 15:40:08 2014 -0700 Fixed mausb valid bit & added invalid_valid TFS Fixed valid bit check for MAUSB EPHandleResp packet. the valid bit is active low (ie: valid = 0, invalid = 1). I noticed Some other dissectors also defined an tfs_invalid_valid, so got rid of their local definitions & added it to epan/tfs.c. Change-Id: Ifd78325f9c7c046224073fc9b29e0cc60dc5c286 Reviewed-on: https://code.wireshark.org/review/1766 Reviewed-by: Alexis La Goutte commit f67fc8a Author: Guy Harris Date: Fri May 23 16:44:23 2014 -0700 Fix some whitespace issues. Change-Id: I363361e898c4b37fcde29847a1473530e5052733 Reviewed-on: https://code.wireshark.org/review/1771 Reviewed-by: Guy Harris commit d470a46 Author: Guy Harris Date: Fri May 23 16:40:56 2014 -0700 More handling of missing time stamps. Make nstime_cmp() handle "unset" time stamps (they're equal to other "unset" time stamps, and less than all other time stamps), use it in reordercap, and "unset" the time stamp if it's absent. Also, nstime_cmp() does not modify its argument, so make it const. Change-Id: I016dab5fefaf4696e78cbd8c6dd3395808e54369 Reviewed-on: https://code.wireshark.org/review/1769 Reviewed-by: Guy Harris commit 9e2db54 Author: Guy Harris Date: Fri May 23 16:23:58 2014 -0700 Set the presence flags. If we're going to stuff a time stamp in there, let's at least indicate that it's there. Change-Id: Idc3d4ba5fdc109b21b5c6034906664a763b2ddda Reviewed-on: https://code.wireshark.org/review/1767 Reviewed-by: Guy Harris commit dc0ff56 Author: Guy Harris Date: Fri May 23 15:35:32 2014 -0700 More checks for the presence of a time stamp. Change-Id: If8dd4c37bcb1b35dd9f988184ad53118172ae9db Reviewed-on: https://code.wireshark.org/review/1764 Reviewed-by: Guy Harris commit f635efb Author: Guy Harris Date: Fri May 23 14:03:42 2014 -0700 More checks for the presence of a time stamp. And make sure we have a pointer to the struct wtap_pkthdr for the packet before we check it for a time stamp. Change-Id: I26b205e5467a3a1236e9fd1f7633e86ece5e9040 Reviewed-on: https://code.wireshark.org/review/1762 Reviewed-by: Guy Harris