aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* randpkt: restore produce_filename in random generation.master-2.2Dario Lombardo2019-03-221-0/+1
| | | | | | | | | | | | Bug: 15627 Change-Id: Iac267a679ca3f935f0e165880bb3127a8715b81c Reviewed-on: https://code.wireshark.org/review/32503 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 64e02c943a07749af30ceeae7ffc6c88183316fe) Reviewed-on: https://code.wireshark.org/review/32511 Reviewed-by: Dario Lombardo <lomato@gmail.com>
* LISP: Fix action bits decodingLorand Jakab2018-11-141-1/+7
| | | | | | | | | | | Change-Id: I76f5e10fbc5ca0071d1444e31ce4c8fba639c3bc Signed-off-by: Lorand Jakab <ljakab@ac.upc.edu> Reviewed-on: https://code.wireshark.org/review/30630 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 6f3e7a6d80f55809560d7431a12bc2f3b0a480d7) Reviewed-on: https://code.wireshark.org/review/30638
* make-manuf.py: Add a missing quote.Gerald Combs2018-09-101-1/+1
| | | | | | Change-Id: I3e2b9205c7747d3147b73b03c707c8132fff0ebd Reviewed-on: https://code.wireshark.org/review/29571 Reviewed-by: Gerald Combs <gerald@wireshark.org>
* Fix handling of invalid type values.Guy Harris2018-09-091-185/+99
| | | | | | | | | | | | If vType_get_type() returns NULL, that means that the packet is bad, not that the dissector is bad. Report it as such. Bug: 15119 Change-Id: I8e66fcece2b526ef9edbf948862f8fc5bea25d74 Reviewed-on: https://code.wireshark.org/review/29511 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit f4d2dffd8be1df30a832647a2f188507076f0fed) Reviewed-on: https://code.wireshark.org/review/29515
* BT LE LL: fix invalid memory access reported by valgrindPascal Quantin2018-09-081-3/+3
| | | | | | | | | | | | | | | - broadcast_addr shoudl be static and not on call stack - set the AT_STRINGZ address length with the string length and not the buffer length Bug: 13381 Change-Id: I86e15ccaa9b5d7779c266ab24b637476e983664c Reviewed-on: https://code.wireshark.org/review/20103 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit fe78e1302f6076291e7270de2e8443ddb2c082af) Reviewed-on: https://code.wireshark.org/review/29496 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Don't use on-the-stack buffers for pinfo addresses.Guy Harris2018-09-081-1/+2
| | | | | | | | | | | pinfo addresses are supposed to be valid after the routine that sets them exits; therefore, the data mustn't be on the stack. Change-Id: I7db48065b2cacad200fa6b18e19b68e130e535a5 Reviewed-on: https://code.wireshark.org/review/29492 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 8dd322ba98b15a8dd967d7714bbedf28c4a8edce) Reviewed-on: https://code.wireshark.org/review/29495
* Add make-manuf.py to dist.Gerald Combs2018-09-071-1/+1
| | | | | | | | | | | | | Conflicts: tools/Makefile.am Change-Id: I6b1dbdae4d91fca546f5fdd4523640963366a3ac Reviewed-on: https://code.wireshark.org/review/29481 Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 6deb4c9a6bfb49060fdc402fdc6cc72be7f4a208) Reviewed-on: https://code.wireshark.org/review/29482 (cherry picked from commit aae2a6aef46da565e9a38f54317ba9eb079f7b4f) Reviewed-on: https://code.wireshark.org/review/29483
* make-manuf.py: Skip the title row of each .csv file.Gerald Combs2018-09-072-1/+2
| | | | | | | | | | | Conflicts: manuf Change-Id: I88a4b3da6b75d4891dc3b3e5b8ceb1233e038932 Reviewed-on: https://code.wireshark.org/review/29470 Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit aba5c65f4de488d14f275530e3fac2536d63f47b) Reviewed-on: https://code.wireshark.org/review/29473
* Migrate make-manuf to Python+CSV.Gerald Combs2018-09-074-796/+906
| | | | | | | | | | | | | | | | | | | | | | | | The download links offered by the IEEE at https://standards.ieee.org/products-services/regauth/ are CSV files. Updating the Perl version to support CSV would have required rewriting a significant portion of the script along with either adding a dependency on Text::CSV or writing our own CSV parser. Migrate it to Python, which has a built-in CSV module. Conflicts: manuf tools/make-manuf Change-Id: I39ba0ec873145f44374ab9f751e8bde51535ca4d Reviewed-on: https://code.wireshark.org/review/29442 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit a1fac65d8e9135014ff8cb9dfe9841e8b8267efb) (cherry picked from commit 7c43ce01b3fcc6e5dd6bd89607a31496e0ce5fda) Reviewed-on: https://code.wireshark.org/review/29469
* PER: fix dissection of enumerated type with a single extension valuePascal Quantin2018-09-071-14/+5
| | | | | | | | | | | | | Per X.691 chapter 14.3, a enumerated type with extension marcker should always be encoded as a normally small non-negative whole number. Change-Id: Ice070a932792ba1654674c68157ff4b6b0942f90 Reviewed-on: https://code.wireshark.org/review/29454 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit e4ff3e657a8abfad75041cb9e6d750ca42764af0) Reviewed-on: https://code.wireshark.org/review/29459
* tvbuff_subset.c: handle a reported_length set to -1 in tvb_new_subset_length()Pascal Quantin2018-09-051-4/+10
| | | | | | | | | | | | | | | | | | | According to tvbuff.h, tvb_new_subset_length() should behave like tvb_new_subet_caplen(). Let's do so. Bug: 15112 Change-Id: I3f05ff45246ac0d05e9bc7bd069ec864da1afae6 Reviewed-on: https://code.wireshark.org/review/29426 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit b40beb9edfc5c09bb2374e2382871a7fc8825858) Conflicts: epan/tvbuff_subset.c Reviewed-on: https://code.wireshark.org/review/29439 (cherry picked from commit 2c91551f3143489d80f084fcfe96620b7dba87d8) Reviewed-on: https://code.wireshark.org/review/29441
* [Automatic update for 2018-09-02]Gerald Combs2018-09-023-14/+250
| | | | | | | | Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ib8110b8e9b3eae5ca0d702dbacb4c4a3405b8fc1 Reviewed-on: https://code.wireshark.org/review/29395 Reviewed-by: Gerald Combs <gerald@wireshark.org>
* DPLAY: fix heuristic checkPascal Quantin2018-08-301-1/+1
| | | | | | | | | | | | | | Regression introduced in 9c3be9d5 Bug: 15092 Change-Id: If52b1dfe05c8093d93ef6ed52cd38f3b2263e9e3 Reviewed-on: https://code.wireshark.org/review/29351 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 942bb3ea7c4342978ad3cbfe73fb9ca0c460d587) Reviewed-on: https://code.wireshark.org/review/29354
* 2.2.17 → 2.2.18.v2.2.18rc0Gerald Combs2018-08-2911-72/+28
| | | | | | Change-Id: I52e07d274d3439f5f4a66038ee666be789fde1cc Reviewed-on: https://code.wireshark.org/review/29341 Reviewed-by: Gerald Combs <gerald@wireshark.org>
* Build 2.2.17.wireshark-2.2.17v2.2.17Gerald Combs2018-08-294-144/+708
| | | | | | Change-Id: I95d160304306dc6cbb660cf3b507ba4f1062c945 Reviewed-on: https://code.wireshark.org/review/29337 Reviewed-by: Gerald Combs <gerald@wireshark.org>
* Update the release notes for 2.2.17.Gerald Combs2018-08-281-11/+55
| | | | | | Change-Id: Ib59dbf002faa20804a42d48819620364be199d6f Reviewed-on: https://code.wireshark.org/review/29325 Reviewed-by: Gerald Combs <gerald@wireshark.org>
* SSL: use col_append_sep_str() to add heartbeat to info columnPascal Quantin2018-08-271-2/+2
| | | | | | | | | | | | Bug: 15079 Change-Id: I97e5179f1385d24b38a0537a91bc73a9eb3a241b Reviewed-on: https://code.wireshark.org/review/29299 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 281936a5bed109f3ed4287d8d14ab410629f00f4) Reviewed-on: https://code.wireshark.org/review/29303
* [Automatic update for 2018-08-26]Gerald Combs2018-08-264-95/+282
| | | | | | | | Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ib9d15dd2a1a346ee1139af6c50c8f79739016e47 Reviewed-on: https://code.wireshark.org/review/29289 Reviewed-by: Gerald Combs <gerald@wireshark.org>
* E.212: fix 255 04 and 255 06 PLMN namesPascal Quantin2018-08-201-2/+2
| | | | | | | | | | | | | This fixes commit g2c89e6c448 Bug: 15068 Change-Id: Ieec7ffb039af48903f9ee3f91800f603203f811e Reviewed-on: https://code.wireshark.org/review/29201 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 99df34848e6aa2c63f17fe5fb3ee954e1f07bdeb) Reviewed-on: https://code.wireshark.org/review/29204
* [Automatic update for 2018-08-19]Gerald Combs2018-08-195-26/+294
| | | | | | | | Update manuf, services enterprise numbers, translations, and other items. Change-Id: I6f2a2f9432fa91214548ded7e1ffb359c6b144a3 Reviewed-on: https://code.wireshark.org/review/29194 Reviewed-by: Gerald Combs <gerald@wireshark.org>
* Windows: upgrade USBPcap to 1.2.0.4Pascal Quantin2018-08-164-9/+7
| | | | | | | | Change-Id: I5e94a169d28c0e4981e313f1ecb011fe82a48c70 Reviewed-on: https://code.wireshark.org/review/29165 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
* export_pdu.c: Fix a memory leakVasil Velichkov2018-08-142-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Allocate the exp_pdu_data using the wmem_packet_scope allocator so the epan_dissect_run_with_taps will free it after calling all registered tap listeners. valgrind --tool=memcheck --leak-check=full ./run/tshark -r sctp.pcap -U "OSI layer 3" -w exported.pcap 32 bytes in 1 blocks are definitely lost in loss record 48 of 76 at 0x4C2EBAB: malloc (vg_replace_malloc.c:299) by 0xB3FC3C5: g_malloc (gmem.c:99) by 0x68C2BE1: export_pdu_create_tags (exported_pdu.c:251) by 0x68C2D5E: export_pdu_create_common_tags (exported_pdu.c:231) by 0x70AA54E: create_exp_pdu_proto_name (packet-sctp.c:3240) by 0x70AA54E: export_sctp_data_chunk.part.23 (packet-sctp.c:3268) by 0x70AB76B: export_sctp_data_chunk (packet-sctp.c:3256) by 0x70AB76B: dissect_data_chunk (packet-sctp.c:3509) Change-Id: I6e247ab2861bbb053f0958faf253913b28dbcbeb Reviewed-on: https://code.wireshark.org/review/29126 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 88dd7e734acdc48ebdf61ffcf3f93db9fb7c81dd) Reviewed-on: https://code.wireshark.org/review/29133
* BT A2DP: fully initialize sep_entry_t structurePascal Quantin2018-08-141-3/+1
| | | | | | | | | | | | Bug: 14884 Change-Id: Id409563d5e8869596db7b479132045bf8cf88f16 Reviewed-on: https://code.wireshark.org/review/29128 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit c48d6a6d60c5c9111838a945966b6cb8750777be) Reviewed-on: https://code.wireshark.org/review/29136 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
* HTTP: really choose the correct server port for tunnelsPeter Wu2018-08-131-2/+2
| | | | | | | | | | | | | | | | | | | | | The very first message after a 200 OK response to a CONNECT request likely originates from the client. So assume that this destination is actually the server. This reduces the probability of address and port collisions. Previously the proxy port (e.g. 3128) and server port (443) identified each conversation, now it will use the client and server port instead. Bug: 15043 Change-Id: Ib73f370334873efd773ac6b49e2db57146bc20b0 Fixes: v2.9.0rc0-1420-g2f126db3fe ("HTTP: set correct server port for tunnels") Reviewed-on: https://code.wireshark.org/review/29110 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 1d4bb22a225285a1fb088d0970499131d242d098) Reviewed-on: https://code.wireshark.org/review/29121 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
* [Automatic update for 2018-08-12]Gerald Combs2018-08-1211-118/+307
| | | | | | | | Update manuf, services enterprise numbers, translations, and other items. Change-Id: I831acb7df584a2c5c3e3403ab83ccde84039d896 Reviewed-on: https://code.wireshark.org/review/29108 Reviewed-by: Gerald Combs <gerald@wireshark.org>
* More comment cleanup.Guy Harris2018-08-121-5/+5
| | | | | | | | Change-Id: I0fac7351d204eac1ca5f00fb2f19d275d4d5767c Reviewed-on: https://code.wireshark.org/review/29101 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit fc9d5b7060309083834b644dd6d81eb68df9b16a) Reviewed-on: https://code.wireshark.org/review/29104
* Improve comments.Guy Harris2018-08-121-1/+10
| | | | | | | | Change-Id: Icce916d6d465f80e06ed45e4d5bd98362d63a26a Reviewed-on: https://code.wireshark.org/review/29097 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit d22816d2ba9488fd21c8f070bca4fc17d048b4a9) Reviewed-on: https://code.wireshark.org/review/29100
* Clean up temporary filename generation.Guy Harris2018-08-121-12/+6
| | | | | | | | | | | | | | Don't put identical code in both arms of a conditional - move it out of the conditional. Doing that with one line of code means that the conditional is now *itself* duplicated in both arms of a conditional, so move it out, too. Change-Id: I07c1d00e7d0053684aa2ef74b460eb008b145015 Reviewed-on: https://code.wireshark.org/review/29093 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit f033cd542efbfa857622853d5b3e53c712cf8344) Reviewed-on: https://code.wireshark.org/review/29096
* Put a "Friendly Name" column in on UN*X as well.Guy Harris2018-08-111-5/+0
| | | | | | | | | | Windows is not the only OS with "friendly" names for interfaces; macOS has them as well, and some *BSDs let you tag interfaces with names as well. Change-Id: Ie1221a5896ace3edcc1ed90ed65a3514ee692f5d Reviewed-on: https://code.wireshark.org/review/29086 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* More comments.Guy Harris2018-08-111-1/+15
| | | | | | | | Change-Id: I1fc6df514983bb73b7e620d05223728496de7919 Reviewed-on: https://code.wireshark.org/review/29078 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 530061b66e25e04ef6acb34da1077f015b2ac275) Reviewed-on: https://code.wireshark.org/review/29081
* Fix two warnings when compiling with rpcap support on macOS.Joerg Mayer2018-08-112-3/+1
| | | | | | | | | | | | | | | | | | | | | | | One is an unused variable warning turning error, the other is [ 71%] Building C object ui/CMakeFiles/ui.dir/recent.c.o /Users/jmayer/worktmp/wireshark/git/ui/recent.c:494:23: error: implicit conversion loses integer precision: 'glong' (aka 'long') to 'gint' (aka 'int') [-Werror,-Wshorten-64-to-32] rh->auth_type = auth_type; ~ ^~~~~~~~~ 1 error generated. Please review. Change-Id: If838f8fa1e8a76dc8c6cc78db495befdd527da92 Reviewed-on: https://code.wireshark.org/review/18544 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com> (cherry picked from commit 42f0695f4d84093a1617ee1f35ee724aa4d98166) Reviewed-on: https://code.wireshark.org/review/29077 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Make a routine static that's not used outside its source file.Guy Harris2018-08-112-10/+1
| | | | | | | | Change-Id: I5121828c1fb95cbf89e7304dd748f8fcac63ad5a Reviewed-on: https://code.wireshark.org/review/29073 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 1b3aaeae7263b5f97582dbc681ec40b2523e246d) Reviewed-on: https://code.wireshark.org/review/29076
* Add support for reading and writing the new if_hardware IDB option.Guy Harris2018-08-116-3/+59
| | | | | | | | | | | | Support for writing it in live captures will come later; this change, but not that one, will be backported so older versions of Wireshark won't remove it when writing a file out. Change-Id: I9fd4067991acfd2d18c03d0a373ce8337a9f3a76 Reviewed-on: https://code.wireshark.org/review/29064 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 08cbe559b3c82c4e152c3b8df2f6f6f1fe3d51a0) Reviewed-on: https://code.wireshark.org/review/29067
* HTTP: set correct server port for tunnelsPeter Wu2018-08-101-1/+4
| | | | | | | | | | | | | | | | | | | The server port must be set or else http_payload_subdissector will assume two independent flows originating from the client. For example, client 50813 connects through proxy server 3128 to server 443. Previously it would result in three conversations: 50813<->3128 (proxy), 50813->443, 3128->443. Now it will see 50813<->3128 and 3128<->443 and TLS decryption will work again. Bug: 15042 Change-Id: I50bcef568be320b6512ee6fc5a09d2838d2f7a9a Reviewed-on: https://code.wireshark.org/review/29046 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 2f126db3fea715428b43c346d98cad1a8b3a88d6) Reviewed-on: https://code.wireshark.org/review/29056 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
* 802.11 Radiotap: add more bound checks in ieee80211_radiotap_iterator_next()Pascal Quantin2018-08-081-0/+6
| | | | | | | | | | | | | | Bug: 15022 Change-Id: Ife413312c88b8d78926c78bdb6707903257e7964 Reviewed-on: https://code.wireshark.org/review/29017 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com> (cherry picked from commit 739eebd3d2e39db63c959eb99291edf59647ed6d) Reviewed-on: https://code.wireshark.org/review/29027 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 4ac83382dc49f9f7b62bffb3cfc508cdaa1e7be5) Reviewed-on: https://code.wireshark.org/review/29028
* The radiotap header length must be >= 8.Guy Harris2018-08-081-2/+16
| | | | | | | | | | Report an error and quit dissecting if it's less than 8. Change-Id: I297fcb0ca754641a9e197037df1140361000fd25 Reviewed-on: https://code.wireshark.org/review/29022 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit f4bc40bc3ba3828b1dd700608aa28b75d78e30ad) Reviewed-on: https://code.wireshark.org/review/29025
* ssl-utils: fix key log read after EOFPeter Wu2018-08-081-1/+10
| | | | | | | | | | | | | | | | C99 requires fgets to fail once the EOF bit is set, glibc 2.28 started implementing this behavior. Clear the EOF bit to avoid all future reads from failing. Add another error check while at it. Change-Id: I1c5f7e190426d29e3bf437c443b09092ed8d2d35 Fixes: v1.99.0-rc1-1080-ga69a63f5d1 ("ssl: fix SSL keylog file live-capture use case") Reviewed-on: https://code.wireshark.org/review/28984 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 4d87743c234c202e810e727d946b578ab38f4e2f) Reviewed-on: https://code.wireshark.org/review/29013 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
* Another dictionary fix.Guy Harris2018-08-061-1/+1
| | | | | | | | | | | RFC 5447 says MIP6-Feature-Vector is a 64-bit integer, not an octet string. Change-Id: I676cb4de09424259a9020680d11b92b783100482 Reviewed-on: https://code.wireshark.org/review/28999 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 1dc6d54d8d6b794549473ced4435c2d749b72076) Reviewed-on: https://code.wireshark.org/review/29002
* [Automatic update for 2018-08-05]Gerald Combs2018-08-054-15/+245
| | | | | | | | Update manuf, services enterprise numbers, translations, and other items. Change-Id: I0beaf0b2d4993f74ffe41a8a1266970516be2e9b Reviewed-on: https://code.wireshark.org/review/28971 Reviewed-by: Gerald Combs <gerald@wireshark.org>
* ASTERIX: Fix cat068/135 altitude valueJaap Keuter2018-08-041-1/+1
| | | | | | | | | | | | | | | The altitude value presented is the value converted into feet. Instead, as the label suggests, the value should be presented as a flight level. Change the conversion as such. Bug: 15030 Change-Id: I131f6b586c6b1f59090f93862ea13b117403c502 Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-on: https://code.wireshark.org/review/28961 Reviewed-by: Marko Hrastovec <marko.hrastovec@gmail.com> Tested-by: Petri Dish Buildbot (cherry picked from commit aa8ebb94e5d5db58eae56af64cdc5d8968b60b0b) Reviewed-on: https://code.wireshark.org/review/28965
* Fix bug in RFC 5447 dictionary.Guy Harris2018-08-031-1/+5
| | | | | | | | | | | | | | | | | | | | Pick up the current version ("current" as in "picked up from a recent checkout of the FreeRADIUS/freeradius-server repository on GitHub") of dictionary.rfc5447. See https://github.com/FreeRADIUS/freeradius-server/issues/2269 and some of the discussion in https://github.com/the-tcpdump-group/tcpdump/pull/636 Change-Id: Ib21838684ac250ff1f02fcea6c1e5ca865b4b6ff Reviewed-on: https://code.wireshark.org/review/28935 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 7b6181ae6bf0acf7dc376058b71cc310dd5f60fd) Reviewed-on: https://code.wireshark.org/review/28938
* Improve debugging messages.Guy Harris2018-07-311-10/+36
| | | | | | | | | | For various attempted matches, print what we're matching against. Change-Id: Ib915aa9bc6e6e1ea6cc7a273f261db2a4952c0c4 Reviewed-on: https://code.wireshark.org/review/28900 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 83715db4a99b58f4314242be5de0865d4ec5993b) Reviewed-on: https://code.wireshark.org/review/28903
* Frame numbers are unsigned.Guy Harris2018-07-311-3/+3
| | | | | | | | Change-Id: I07641b0a759058fe5111e10c3ccd4c8f69eeccef Reviewed-on: https://code.wireshark.org/review/28894 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 20a3248ebb8648928c456e8c0da138dfe966a411) Reviewed-on: https://code.wireshark.org/review/28899
* Clean up white space.Guy Harris2018-07-311-36/+37
| | | | | | | | Change-Id: Id1eb5ec743581a0d05b82e94c78f262e7dc33f7b Reviewed-on: https://code.wireshark.org/review/28892 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit a9dcc80f1ba9b3407ac3591940b1bbcefb865f39) Reviewed-on: https://code.wireshark.org/review/28897
* [Automatic update for 2018-07-29]Gerald Combs2018-07-293-28/+235
| | | | | | | | Update manuf, services enterprise numbers, translations, and other items. Change-Id: I6bf9c07d90b43da39e2df81a1afac30db95936e9 Reviewed-on: https://code.wireshark.org/review/28880 Reviewed-by: Gerald Combs <gerald@wireshark.org>
* Remove executable file permission from lua test filesJaap Keuter2018-07-245-0/+0
| | | | | | | | | | | Change-Id: I18b3f145bb48a78edabed3cca03691d15cd06842 Reviewed-on: https://code.wireshark.org/review/28809 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> (cherry picked from commit d7c4e482b754b7802e3efb5a56acac1f4aa57268) Reviewed-on: https://code.wireshark.org/review/28826
* Alas, REPORT_DISSECTOR_BUG() takes only one argument in 2.2.Guy Harris2018-07-231-1/+1
| | | | | | Change-Id: I5734654cdb8af845e75088c8a3d75a8a018788c2 Reviewed-on: https://code.wireshark.org/review/28820 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* If the dissector isn't registered, you shouldn't be calling it.Guy Harris2018-07-221-1/+1
| | | | | | | | | | Report a dissector bug, rather than calling the data dissector. Change-Id: I7bde1001a48d2443acf2dc7caa83434e0972aab7 Reviewed-on: https://code.wireshark.org/review/28814 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 954fe24e418723df7bac6be146528947ca11d060) Reviewed-on: https://code.wireshark.org/review/28817
* Don't assume a given btgatt.uuid0xXXXX dissector exists.Guy Harris2018-07-221-8/+21
| | | | | | | | | | | They're not guaranteed to have been registered. Bug: 14994 Change-Id: I11c2b2d4d8a7dd020a0ef3d700b29b0859bc68ca Reviewed-on: https://code.wireshark.org/review/28805 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit f98fbce64cb230e94a2cafc410a3cedad657b485) Reviewed-on: https://code.wireshark.org/review/28808
* ssl: dtls: Fix small memory leaksVasil Velichkov2018-07-222-8/+8
| | | | | | | | | | | | | | | | Use g_strsplit/g_strfreev instead of wmem_strsplit/wmem_free because in wmem_strutil.h the wmem_strsplit is documented not to be used with a NULL allocator. The wmem_free does not free the string elements in contrast to g_strfreev. Change-Id: Ia207d5df5b8b7edd4ba77071292761ae4819fb12 Reviewed-on: https://code.wireshark.org/review/28796 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-on: https://code.wireshark.org/review/28800 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>