Skip to content

Commit

Permalink
Merge branch 'master' of [email protected]:wireshark/wireshark.git into …
Browse files Browse the repository at this point in the history 
…s7commwireshark

* 'master' of [email protected]:wireshark/wireshark.git: (715 commits)
  GitLab CI: Switch to clang 17
  GTPv2: Dissect IE Group ID
  Improve pkg-config description
  GTPv2: Dissect IE PGW Set FQDN Extendable
  Qt: Don't connect in the .ui file only to disconnect in constructor
  Move wireshark.pc.in and make our .pc file paths relative
  Resolve GCC clobbered variable warnings
  Logray: Fix the Syscall profile
  Windows: Upgrade GnuTLS to 3.8.2
  srt: Parse Key Material message.
  Falco bridge: Add protocols for each filter check type
  epan: Add plugin get_descriptions callback
  epan: Remove register_all_tap_listeners plugin callback
  Qt: Remove HAVE_PLUGINS #ifdef
  epan: Remove HAVE_PLUGINS #ifdef
  MAC and RLC statistics: fix filter expressions to work with NR
  Zigbee improved Smart Energy time format and display
  Fix some broken dissector URLs
  Monero: Use col_add_str
  Falco bridge: Set our event number
  ...
  • Loading branch information
@JuergenKosel
JuergenKosel committed Dec 13, 2023
2 parents 72d8ee1 + 5353057 commit 28a43de
Show file tree
Hide file tree
Showing 2,428 changed files with 382,868 additions and 319,967 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: [push]
jobs:
macos:
name: Build & Test
runs-on: macos-11.0
runs-on: macos-latest
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ CMakeLists.txt.user*
.vagrant
.vscode
.idea
*.swp
*.sw?
*~
cscope.*
tags
Expand Down
160 changes: 118 additions & 42 deletions .gitlab-ci.yml
View file

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions .mailmap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ Başak Kalfa <[email protected]> <[email protected]>
Başak Kalfa <[email protected]> basakkal <[email protected]>
Boris Bochkarev <[email protected]> boris.bochkarev <[email protected]>
Brian Whitney <[email protected]> bwhitn <[email protected]>
Cal Turney <[email protected]> Cal Turney <[email protected]>
Cal Turney <[email protected]> Cal Turney <[email protected]>
Cal Turney <[email protected]> cturney <[email protected]>
Cal Turney <[email protected]> Cal Turney <[email protected]>
Cal Turney <[email protected]> Cal Turney <[email protected]>
Cal Turney <[email protected]> cturney <[email protected]>
Camille Guerin <[email protected]> cacamille3 <[email protected]>
Cedric Izoard <[email protected]> Cedric Izoard <[email protected]>
Chaoyong Zhou <[email protected]> chaoyongzhou <[email protected]>
Expand All @@ -54,6 +54,7 @@ Dave Tapuska <[email protected]> [email protected]
David Aggeler <[email protected]> david-aggeler <[email protected]>
David Ameiss <[email protected]> <[email protected]>
David Bastiani <[email protected]>Dave B <[email protected]>
David Perry <[email protected]> David Perry <[email protected]>
David Zoller <[email protected]> dz-msfc <[email protected]>
Deep Datta <[email protected]> Deep Datta <[email protected]>
Denis Janssen <[email protected]> janssend <[email protected]>
Expand Down
1 change: 1 addition & 0 deletions .tx/config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ trans.ru = ui/qt/wireshark_ru.ts
trans.tr_TR = ui/qt/wireshark_tr_TR.ts
trans.uk = ui/qt/wireshark_uk.ts
trans.de = ui/qt/wireshark_de.ts
trans.ko = ui/qt/wireshark_ko.ts
replace_edited_strings = false
keep_translations = false

26 changes: 21 additions & 5 deletions AUTHORS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3219,9 +3219,8 @@ Juha Siltanen <juha.siltanen[AT]nsn.com> {
FLIP dissector
}

Cal Turney <cturney[AT]charter.net> {
NFS access tracking
tshark version of the SCSI tap
Cal Turney <cturney111[AT]gmail.com> {
Updates to iSCSI, HTTP, TCP, NFS, SMB, BER
}

Lukasz Kotasa <lukasz.kotasa[AT]tieto.com> {
Expand Down Expand Up @@ -4056,6 +4055,7 @@ Alex Sirr <alexsirruw[AT]gmail.com>
Alex Tessmer <dev[AT]tessmer.me>
AlexL <loginov.alex.valer[AT]gmail.com>
Alexander Aring <aahringo[AT]redhat.com>
Alexander Basargin <alexander.bsrgin[AT]yandex.ru>
Alexander Clouter <aclouter[AT]networkradius.com>
Alexander Clouter <alex[AT]digriz.org.uk>
Alexander Couzens <lynxis[AT]fe80.eu>
Expand Down Expand Up @@ -4144,6 +4144,7 @@ Aymeric Moizard <amoizard[AT]gmail.com>
Babak Farrokhi <babak[AT]farrokhi.net>
Bahadir Ozgun <bhdrozgn[AT]gmail.com>
Balint Reczey <rbalint[AT]ubuntu.com>
Bart-Baekelandt <bart.stefan.baekelandt[AT]gmail.com>
Bartel Eerdekens <bartel.eerdekens[AT]constell8.be>
Bartolo Otrit <bartolootrit[AT]gmail.com>
Bartłomiej Nóżka <git[AT]nozka.net.pl>
Expand Down Expand Up @@ -4232,6 +4233,7 @@ Christoph Schlosser <christoph[AT]schlosser.xyz>
Christoph Wurm <wurm[AT]elastic.co>
Christoph Zeller <zeller_chr[AT]bluewin.ch>
Christophe GUERBER <christophe.guerber[AT]gmail.com>
Christophe Guerber <christophe.guerber[AT]enac.fr>
Christopher Farman <christopher.farman[AT]couchbase.com>
Christopher Kilgour <techie[AT]whiterocker.com>
Chuan He <bupthc[AT]gmail.com>
Expand All @@ -4253,6 +4255,7 @@ Cristian Sava <contact[AT]cristiansava.ro>
Cédric Delmas <cedricde[AT]outlook.fr>
D. W. Poon <dwpoon[AT]mail.ubc.ca>
Daan De Meyer <daan.j.demeyer[AT]gmail.com>
Daisuke Matsuda <matsuda-daisuke[AT]fujitsu.com>
Damir Franusic <damir.franusic[AT]gmail.com>
Dan Robertson <danlrobertson89[AT]gmail.com>
Dana Sy <dana.hayden.sy[AT]gmail.com>
Expand All @@ -4262,6 +4265,7 @@ Daniel Hirschberger <daniel.hirschberger+wireshark[AT]rub.de>
Daniel Kamil Kozar <dkk089[AT]gmail.com>
Daniel Lenski <dlenski[AT]gmail.com>
Daniel Mack <daniel[AT]zonque.org>
Daniel McCarney <daniel[AT]binaryparadox.net>
Daniel McLean <maczor[AT]gmail.com>
Daniel Mouscher <dmouscher[AT]gmail.com>
Daniel Stenberg <daniel[AT]haxx.se>
Expand Down Expand Up @@ -4292,7 +4296,6 @@ David Kreitschmann <dkreitschmann[AT]seemoo.tu-darmstadt.de>
David McKay <mckay.david[AT]gmail.com>
David Morsberger <dave[AT]morsberger.com>
David Perry <boolean263[AT]protonmail.com>
David Perry <d.perry[AT]utoronto.ca>
David Snowdon <daves[AT]metamako.com>
David Tapuska <dave[AT]tapuska.com>
David Zoller <zollerd[AT]gmail.com>
Expand Down Expand Up @@ -4374,6 +4377,7 @@ Eric Wetzel <thewetzel[AT]gmail.com>
Eric Wild <ewild[AT]sysmocom.de>
Erik de Jong <erikdejong[AT]gmail.com>
Erika Szelleova <szelleerika[AT]gmail.com>
Ernst Oudhof <ernst[AT]mailfrom.nl>
Ethan Everett <ethan.everett[AT]meraki.net>
Ethan Young <imfargo[AT]gmail.com>
Etienne Dechamps <etienne[AT]edechamps.fr>
Expand Down Expand Up @@ -4411,6 +4415,7 @@ Franklin Mathieu <franklinmathieu[AT]gmail.com>
Frans Meulenbroeks <fransmeulenbroeks[AT]yahoo.com>
Frédéric Perrin <fred[AT]fperrin.net>
GBLCA\amrobles <amrobles[AT]gblsys.com>
Gabor Spaits <gabor.spaits[AT]ericsson.com>
Gabor Vaszkun <vaszkun[AT]gmail.com>
Gabriel Ganne <gabriel.ganne[AT]enea.com>
Gabriel Ganne <gabriel.ganne[AT]gmail.com>
Expand Down Expand Up @@ -4449,14 +4454,17 @@ Gregorio Maglione <gregorio.maglione[AT]city.ac.uk>
Grzegorz Niemirowski <grzegorz[AT]grzegorz.net>
Gtker <git[AT]gtker.com>
Gtker <wireshark[AT]gtker.com>
Guerber <cguerber[AT]yahoo.com>
Guillaume Autran <gautran[AT]clearpathrobotics.com>
Gulshan Singh <gsingh2011[AT]gmail.com>
Gustavo Garcia <gustavogb[AT]gmail.com>
Guvenc Gulce <guvenc[AT]linux.ibm.com>
Guy Davies <aguydavies[AT]gmail.com>
Guy Harris <gharris[AT]sonic.net>
Gábor Spaits <gaborspaits1[AT]gmail.com>
Günther Deschner <gd[AT]samba.org>
HOMEPC\eaosk <ea.oskolkov[AT]yandex.ru>
Haiyun Liu <liu0hy[AT]gmail.com>
Hal Rosenstock <hal.rosenstock[AT]gmail.com>
Hannes Reinecke <hare[AT]suse.de>
Hans Hinrichsen <hinrichsen.hans[AT]gmail.com>
Expand Down Expand Up @@ -4528,6 +4536,7 @@ Jason Cohen <7011141-kryojenik[AT]users.noreply.gitlab.com>
Jason Cohen <j.cohen[AT]f5.com>
Jason Cohen <kryojenik2[AT]gmail.com>
Jason Heimann <jheimann[AT]pertino.com>
Jason Tang <10972498-jtang613[AT]users.noreply.gitlab.com>
Jason Uher <jason.uher[AT]jhuapl.edu>
Jason Zhekov <jasssonpet[AT]gmail.com>
Javier Cardona <jcardona[AT]fb.com>
Expand Down Expand Up @@ -4608,6 +4617,7 @@ Josef Baumgartner <josef.baumgartner[AT]br-automation.com>
Joseph Huffman <jhuffman[AT]codeaurora.org>
Josh Schmelzle <13954434+joshschmelzle[AT]users.noreply.github.com>
Josh Schmelzle <josh[AT]joshschmelzle.com>
Josh Strohminger <18415319-joshstrohminger[AT]users.noreply.gitlab.com>
Josip Medved <jmedved[AT]jmedved.com>
Josselin VALLET <josselin.vallet[AT]toulouse.viveris.com>
Juan Jose Martin Carrascosa <juanjo[AT]rti.com>
Expand Down Expand Up @@ -4869,7 +4879,7 @@ Nils Björklund <nils.bjorklund[AT]effnet.com>
Nils Hanke <nils.hanke[AT]outlook.de>
Nils Ohlmeier <github[AT]ohlmeier.org>
Nitzan Carmi <nitzanc[AT]mellanox.com>
Noan Perrot <noan.perrot[AT]gmail.com>
Noan <noan.perrot[AT]gmail.com>
Noel Power <noel.power[AT]suse.com>
Nora Sandler <nsandler[AT]securityinnovation.com>
Odysseus Yang <wiresharkyyh[AT]outlook.com>
Expand Down Expand Up @@ -4925,6 +4935,7 @@ Pavel Moravec <mgr.pavel[AT]gmail.com>
Pavel Odintsov <pavel.odintsov[AT]gmail.com>
Pavel Strnad <strnadp[AT]tiscali.cz>
Pavlos Antoniou <pant[AT]intracom-telecom.com>
Pedro Alvarez <pinheirp[AT]tcd.ie>
Pedro Jose Marron <pjmarron[AT]locoslab.com>
Pedro Malagon <malagon[AT]die.upm.es>
Peng Li <seudut[AT]gmail.com>
Expand Down Expand Up @@ -4992,9 +5003,11 @@ Richard Smith <pcy190[AT]126.com>
Rickard Holmberg <rickard.holmberg[AT]raysearchlabs.com>
Rickard Holmberg <rickard[AT]avkrok.net>
Rishi Dev Singh <rishi.dev[AT]samsung.com>
Riya Dixit <riyadixitagra[AT]gmail.com>
Robert Beardsworth <rob_beardsworth[AT]hotmail.com>
Robert Cragie <robert.cragie[AT]gmail.com>
Robert Crowston <crowston[AT]protonmail.com>
Robert Falkenberg <robert.falkenberg[AT]srs.io>
Robert Frohl <rfrohl[AT]suse.com>
Robert P <tehownt[AT]gmail.com>
Robert Sauter <sauter[AT]locoslab.com>
Expand Down Expand Up @@ -5057,6 +5070,7 @@ Sergey Rak <sergrak[AT]iotecha.com>
Sergey V. Lobanov <sergey.v.lobanov[AT]yandex.ru>
Sergey V. Lobanov <sergey[AT]lobanov.in>
Sergio Moreno Mozota <sergio.morenomozota[AT]telefonica.com>
Sergio de Paula <sergio.paula[AT]dsr-corporation.com>
Seth Alexander <seth.alexander[AT]cosmicaes.com>
Sharon Brizinov <SharonBrizinov[AT]users.noreply.github.com>
Sharvil Nanavati <sharvil[AT]playground.global>
Expand Down Expand Up @@ -5306,6 +5320,8 @@ reno <renovetrov[AT]gmail.com>
sherber1 <sebastian.herber[AT]hbkworld.com>
shqking <shqking[AT]gmail.com>
snicket2100 <15079832-snicket2100[AT]users.noreply.gitlab.com>
snicket2100 <snicket2100[AT]protonmail.com>
sofiane degoui <degoui.sofiane[AT]gmail.com>
steve71 <steve[AT]clarke.org.uk>
subhav8 <subhadevi88[AT]gmail.com>
wi24rd <wi24rd+gitlab[AT]fedoraproject.org>
Expand Down
Loading

0 comments on commit 28a43de

Please sign in to comment.