aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [Automatic update for 2020-10-18]master-2.6Gerald Combs2020-10-184-18/+91
| | | | Update manuf, services enterprise numbers, translations, and other items.
* [Automatic update for 2020-10-11]Gerald Combs2020-10-113-51/+140
| | | | Update manuf, services enterprise numbers, translations, and other items.
* E212: fix a test when checking MCC digitsPascal Quantin2020-10-071-1/+1
| | | | | | Closes #16895 (cherry picked from commit 926d6e37999e3f38831977777398ae2fe7db12a6)
* [Automatic update for 2020-10-04]Gerald Combs2020-10-045-24/+68
| | | | Update manuf, services enterprise numbers, translations, and other items.
* ICMP: Fix dissection of Interface Information Objectishaangandhi2020-10-031-0/+2
| | | | | | If an address subobject was included, all subsequent subobjects (eg, interface name or MTU subobjects) would read from the same offset. (cherry picked from commit c1eb36b84b6fcfea93bfc087b280da60273b597d)
* FBZERO: Make sure our offset advances.Gerald Combs2020-10-031-2/+12
| | | | | | | Make sure our offset advances so that we don't infinitely loop. Fixes #16887. (cherry picked from commit 3ff940652962c099b73ae3233322b8697b0d10ab)
* [Automatic update for 2020-09-27]Gerald Combs2020-09-2713-89/+185
| | | | Update manuf, services enterprise numbers, translations, and other items.
* Version: 2.6.20 → 2.6.21.v2.6.21rc0Gerald Combs2020-09-2312-477/+30
|
* Build: 2.6.20.wireshark-2.6.20v2.6.20Gerald Combs2020-09-234-38/+496
|
* Prep for 2.6.20.Gerald Combs2020-09-221-1/+24
|
* [Automatic update for 2020-09-20]Gerald Combs2020-09-205-19/+106
| | | | Update manuf, services enterprise numbers, translations, and other items.
* Update our issue tracker URL in some places.Gerald Combs2020-09-154-8/+8
| | | | | | | | | | | | | | | Replace bugs.wireshark.org links with their equivalent gitlab.com/wireshark/wireshark/issues links in the AsciiDoctor buglink macro and the please_report_bug function. Update the bug URLs in comments in the tools and test directories. (cherry picked from commit c61c1a001b6670839e9c041643719dddf973e729) Conflicts: docbook/asciidoctor-macros/wsbuglink-inline-macro/extension.rb docbook/wsug_src/WSUG_chapter_mate.asciidoc test/suite_decryption.py test/suite_text2pcap.py
* gsm_a_rr: move TARGET PCID into the correct subtreeAlexander Couzens2020-09-151-2/+2
| | | (cherry picked from commit c1889e3cd5c455d4915033bfc83c8431e0548c34)
* GQUIC: fix dissection of ACK frameNardi Ivan2020-09-141-13/+6
| | | (cherry picked from commit 25d10e68a89633de80ea00406ab7683fab8795f6)
* Updates to NCP protocol dissectorGreg Morris2020-09-142-1/+13
| | | | | | | | | | | | | | Add NCP 98 Fix NDSrequestprotocolflags not being captured on request so that reply would offset correctly with CRC flag. Change-Id: Ie45a1017326dd38393baf3f005f3ec9195438565 Reviewed-on: https://code.wireshark.org/review/33146 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 715f46b768c3dab4752b0b5752f89f62f509fa0d)
* Put back the NCP Group Type item for LIP Echo packets.Guy Harris2020-09-143-17/+21
| | | | | | | | Change-Id: Ifc26e939ed204ec55eb508f26d0f47c4a6f38484 Reviewed-on: https://code.wireshark.org/review/32179 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 95bf9f5e0acac09f35cd8e8467cb6d93fb5a0d78)
* ncp2222: remove unused variable.Dario Lombardo2020-09-141-2/+0
| | | | | | | | | | Change-Id: Id42897b07bfec788499207a9438041d7439d8b14 Reviewed-on: https://code.wireshark.org/review/32177 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit d99cd2ed739277f714cb7e67c60264269d73c755)
* Fix dissection of Large Internet Packet echos.Guy Harris2020-09-142-46/+44
| | | | | | | | | | | | There are two different types, with different formats, and the stuff after the "LIP Echo Data"/"Lip Echo Data" string isn't text, it's arbitrary binary data. Change-Id: I5bc56a557b436b7d179b0bea586f3ed5d4e017d0 Reviewed-on: https://code.wireshark.org/review/32175 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 5b9bbaf7e2286c7c450dde606e460c445e037972)
* ncp: fix a copy-and-pasteo.Guy Harris2020-09-131-2/+4
| | | | | | | | | | | | | | In process_multivalues(), we create a protocol item for the attribute syntax, but we don't fetch its value, and don't pass it to print_nds_values() as the syntax argument; instead, we pass a variable that wee initialize to 0, but never set. (One of the disadvantages of preemptively initializing local variables is that data flow analyzers in compilers and static analyzers can't point out that you didn't set the variables in question to *useful* values.) This fixes the dissection of NDS Read replies. (cherry picked from commit 1a410ef0b0d841c4f60936418f18ef6a5544dbd9)
* [Automatic update for 2020-09-13]Gerald Combs2020-09-134-14/+155
| | | | Update manuf, services enterprise numbers, translations, and other items.
* proto.c: add support for BASE_SPECIAL_VALS to fill_label_number64()Pascal Quantin2020-09-131-6/+21
| | | | | | This is similar to what is done in fill_label_number() (cherry picked from commit cb810e70036e232308c50dd9296fa6a257468ad9)
* CMake: Fix libssh >= 0.9.5 version detectionJoão Valverde2020-09-121-3/+9
| | | | | | | | libssh 0.9.5 moved version macros to a different header file. Closes #16845 (cherry picked from commit fd7739de6bc679036c02c7aabbc3f71783751e3d)
* Q.933: Fix decoding of PVC Status fieldHarald Welte2020-09-121-3/+4
| | | | | | | | | | | | | This field is actually a bitmask of four bits. It's somewhat odd to decode it using a value_string. In any case, the values were plain wrong (shifted to the left by '1'). See Figure A.3 of ITU-T Q.933 A related pcap file can be found at https://people.osmocom.org/laforge/pcap/gsmtap-fr-q933-pvc_status.pcap (cherry picked from commit 13ac47ad4ecdf9ce4363d89f15a245fc10c3c67e)
* Q,933: Fix display of 'active' bit in PVC StatusHarald Welte2020-09-121-1/+1
| | | | | | | | | | | | | The mask applied to the final octet of the PVC Status IE must be 0x0E, not 0x0A. The current code masks out the active bit, printing a '.' instead of it. See Figure A.3 of ITU-T Q.933 A related pcap file can be found at https://people.osmocom.org/laforge/pcap/gsmtap-fr-q933-pvc_status.pcapc (cherry picked from commit ee292b11a73e00ea3f5d1e2ee25cf9579f6c7532)
* gsm_a_rr: correct spare bits of Channel DescriptionAlexander Couzens2020-09-111-3/+3
| | | | | | | ETSI 44.018: 10.5.2.5: spare bits are 3+4 and not 5+6. The counting in the spec might be confusing, because bits start at 8 not at 1. (cherry picked from commit f33e1c13fa1b91d7c57b282043bbc58ab03cc0be)
* Release notes: Add an EOL notice.Gerald Combs2020-09-081-0/+4
|
* BSSMAP: Fix malformed packet exception on correct packetPau Espin Pedrol2020-09-071-1/+1
| | | | | | | | | Both osmocom and TTCN3 Titan are parsing Handover Request with an IPv6 Transport layer Address just fine, but wireshark was showing it as malformed. Parsing the address similar to what is done in IPv4 fixes the issue. (cherry picked from commit 5a874c5796d487054a3f562379731720931340d3)
* AARP: Add length checks.Gerald Combs2020-09-061-5/+34
| | | | | | | | | | | | | | Add hardware and protocol address length checks. Bug: 15661 Change-Id: Iff871ea40d01efcac99228001c1429ba872e7da5 Reviewed-on: https://code.wireshark.org/review/32681 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 aa0abdf156a67a910b4a9daa50faf6ba217270ad)
* [Automatic update for 2020-09-06]Gerald Combs2020-09-065-19/+91
| | | | Update manuf, services enterprise numbers, translations, and other items.
* S1AP: fix a field maskPascal Quantin2020-09-042-2/+2
| | | (cherry picked from commit fa9f718692dae293e16bf9e081780f5947010926)
* X2AP: fix a field maskPascal Quantin2020-09-042-2/+2
| | | (cherry picked from commit 6f68f86f2884e8073cc8eda7fe138fcfe8ac9a1f)
* Query #define was being used in reply processor.Chuck Craft2020-09-041-1/+1
| | | (cherry picked from commit eb626aa650b0216b094d2a5a8f41c9c87c62b322)
* TCP: do not use an unknown status when the checksum is 0xffffPascal Quantin2020-09-021-1/+1
| | | | | | | | | | | | | Otherwise it triggers an assert when adding the column as the field is defined as BASE_NONE and not BASE_DEC or BASE_HEX. Thus an unknown value (not in proto_checksum_vals[)array) cannot be represented. Mark the checksum as bad even if we process the packet. Closes #16816 Conflicts: epan/dissectors/packet-tcp.c (cherry picked from commit 7f3fe6164a68b76d9988c4253b24d43f498f1753)
* multipart: fix deallocation of invalid partsGeorge Hopkins2020-09-021-5/+4
| | | | | | Fixes #16741 (cherry picked from commit 2411eae9edb562e80c45962c74945238a94e5d3b)
* Fix dist.Gerald Combs2020-08-311-1/+0
| | | | | We no longer have tools/commit-msg, so remove it from tools/Makefile.am.
* [Automatic update for 2020-08-30]Gerald Combs2020-08-304-32/+137
| | | | | Update manuf, services enterprise numbers, translations, and other items. /target_branch master-2.6
* Remove .gitreview.Gerald Combs2020-08-261-6/+0
| | | | | | We no longer use Gerrit, so it's no longer needed. Change-Id: I59fa175af481371747046be4a8f1cbe1676a29d2
* Remove tools/commit-msg.Gerald Combs2020-08-251-181/+0
| | | | | | | | | | tools/commit-msg was specific to Gerrit, so remove it. Modified cherry-pick of 50550708cc. (cherry picked from commit d4724b002d7074510b95f3562507216ecf76ed00) Change-Id: I3c2405f84548fb41b45f7751ead5c2b0b15f7db7
* gitlab-ci: Use the wireshark-ubuntu-dev base image.Gerald Combs2020-08-241-38/+2
| | | | | | | | Start migrating to the wireshark/wireshark-ubuntu-dev base image, similar to g8a2cd1f7a3. Drop the gcc-4 and clang 3.5 - 3.8 builds since they no longer have packages available. Change-Id: Iaa4647b85903bafd4f1c7652b4bd757f8f056d03
* [Automatic update for 2020-08-23]Gerald Combs2020-08-233-16/+128
| | | | | | | | Update manuf, services enterprise numbers, translations, and other items. Change-Id: Iaffa821af44b8cecdd29d0ed08c53d472373f751 Reviewed-on: https://code.wireshark.org/review/38235 Reviewed-by: Gerald Combs <gerald@wireshark.org>
* [Automatic update for 2020-08-16]Gerald Combs2020-08-1612-77/+151
| | | | | | | | Update manuf, services enterprise numbers, translations, and other items. Change-Id: Iae7457c45aa10491f5da3e5c0e850fff136676ac Reviewed-on: https://code.wireshark.org/review/38176 Reviewed-by: Gerald Combs <gerald@wireshark.org>
* GTPv2: fix S103PDF and S1UDF IE dissectionPascal Quantin2020-08-131-4/+4
| | | | | | | | | | | | | The IPv4 or IPv6 address was not added properly to the tree Bug: 16777 Change-Id: Ic28138cc1d4c2dc350fb5ff95aa3a5496a293c91 Reviewed-on: https://code.wireshark.org/review/38153 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org> (cherry picked from commit f59262b94c10cb3e2c5655274698899dc41d43cf) Reviewed-on: https://code.wireshark.org/review/38156
* 2.6.19 → 2.6.20.v2.6.20rc0Gerald Combs2020-08-1212-620/+16
| | | | | | Change-Id: I63626b7f2acb80097c69724c08e067be55189144 Reviewed-on: https://code.wireshark.org/review/38149 Reviewed-by: Gerald Combs <gerald@wireshark.org>
* Build 2.6.19.wireshark-2.6.19v2.6.19Gerald Combs2020-08-123-27/+629
| | | | | | Change-Id: Ic99fba21cd074b602624af1c20ac85e9feb2a975 Reviewed-on: https://code.wireshark.org/review/38146 Reviewed-by: Gerald Combs <gerald@wireshark.org>
* Prep for 2.6.19.Gerald Combs2020-08-111-1/+33
| | | | | | Change-Id: Idfd6acf404e328fb5dba6df3f8a27c99f190b19a Reviewed-on: https://code.wireshark.org/review/38132 Reviewed-by: Gerald Combs <gerald@wireshark.org>
* Revert "dicom: when exporting objects, don't assume we have the AE titles."Guy Harris2020-08-111-2/+1
| | | | | | | | | | This reverts commit 5e201ecca62d801ef96086e9b24bb83d28bc4f15. Reason for revert: This doesn't apply in the 2.6 branch, as change 33955 isn't in that branch, so the AE titles are arrays, not pointers. Change-Id: I83adb305b9f17a0ffee57c7a5be04e6c356d8362 Reviewed-on: https://code.wireshark.org/review/38127 Reviewed-by: Guy Harris <gharris@sonic.net>
* [Automatic update for 2020-08-09]Gerald Combs2020-08-094-21/+83
| | | | | | | | Update manuf, services enterprise numbers, translations, and other items. Change-Id: I8832258202e653df15c84520b2ef51d4034efab4 Reviewed-on: https://code.wireshark.org/review/38094 Reviewed-by: Gerald Combs <gerald@wireshark.org>
* dicom: when exporting objects, don't assume we have the AE titles.Guy Harris2020-08-061-1/+2
| | | | | | | | | | | | | | | | In dcm_export_create_object(), don't assume that assoc->ae_calling and assoc->ae_called are non-null; if we don't have an A-ASSOCIATE request earlier in the capture, which we are not guaranteed to have, the called and called AE titles won't be set. Bug: 16748 Change-Id: I7d6d22d1c23e28b1f0967a803d0d89609a421712 Reviewed-on: https://code.wireshark.org/review/38077 Petri-Dish: Guy Harris <gharris@sonic.net> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <gharris@sonic.net> (cherry picked from commit 9015824c0ea3ee9ff265ae0db488bd3472d1875c) Reviewed-on: https://code.wireshark.org/review/38080
* ieee80211-netmon: fix a typo.Guy Harris2020-08-061-1/+1
| | | | | | | | | | | | | The "monitor mode" flag was called "netmon_802_11.op_mode.on", not "netmon_802_11.op_mode.mon". Fix that. Change-Id: I4a712c1d5fa7c7e43335d83c0f40ace4358a881c Reviewed-on: https://code.wireshark.org/review/38069 Petri-Dish: Guy Harris <gharris@sonic.net> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <gharris@sonic.net> (cherry picked from commit 245b6387f0724ba95d12856c54799b78836f1169) Reviewed-on: https://code.wireshark.org/review/38072
* dcom: free data_marshalers and set it to null when we change capture files.liningjie2020-08-021-0/+8
| | | | | | | | | | | Bug: 16746 Change-Id: I5893979ff90f061c773a5dfcfa1ceb7ee71901ba Reviewed-on: https://code.wireshark.org/review/38030 Petri-Dish: Guy Harris <gharris@sonic.net> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <gharris@sonic.net> (cherry picked from commit 48fdd082377d5f9465130938a997446f775bcaab) Reviewed-on: https://code.wireshark.org/review/38033
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-25 18:21:32 +0000