Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@dabreadman
dabreadman committed Feb 9, 2025
2 parents 91286c4 + 90a4925 commit 1be044e
Show file tree
Hide file tree
Showing 24 changed files with 217 additions and 57 deletions.
9 changes: 9 additions & 0 deletions AUTHORS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4052,6 +4052,7 @@ Ajay Panicker <apanicke[AT]google.com>
akuchekar <akuchekar[AT]empirix.com>
Alan Birtles <alan.birtles[AT]eu.sony.com>
Alan Partis <alpartis[AT]thundernet.com>
Alastair Knowles <kno0001[AT]gmail.com>
Albert Chuang <achuang[AT]wi-fi.org>
Alberto Pasquale <alberto[AT]apworks.eu>
Alberto Sartori <alberto.sartori.as[AT]gmail.com>
Expand Down Expand Up @@ -4115,6 +4116,7 @@ Andrey Kulikov <amdei[AT]cryptopro.ru>
Andrey Tverd <andr.tverd[AT]gmail.com>
Andrii Vladyka <a.vladyka[AT]ukr.net>
Andy Grover <agrover[AT]cloudflare.com>
Andy Herron <andyhe[AT]microsoft.com>
Andy Ling <Andy.Ling[AT]quantel.com>
Andy Ling <andy.ling[AT]s-a-m.com>
Andy Zhao <jinhzhx[AT]gmail.com>
Expand Down Expand Up @@ -4347,6 +4349,7 @@ Devin Heitmueller <dheitmueller[AT]kernellabs.com>
Dexter Gerig <dexgerig[AT]gmail.com>
Dhananjay Patki <dhpatki[AT]cisco.com>
Dhiru Kholia <kholia[AT]kth.se>
Dhruv Chandwani <dhruvchandwani23[AT]gmail.com>
DiablosOffens <DiablosOffens[AT]gmx.de>
Diana Deac <dianadeac191[AT]gmail.com>
Didier Arenzana <darenzana[AT]yahoo.fr>
Expand Down Expand Up @@ -4381,6 +4384,7 @@ Dr. Matthias St. Pierre <matthias.st.pierre[AT]ncp-e.com>
Dror Eiger <droreiger[AT]gmail.com>
Dwayne Rich <dwayne_rich[AT]selinc.com>
Dylan Ulis <daulis0[AT]gmail.com>
Dylan Ulis <daulis[AT]ra.rockwell.com>
Eason Wei <sharkhw[AT]huawei.com>
Ebben Aries <exa[AT]fb.com>
Eckart Haug <wireshark[AT]syntacs.com>
Expand Down Expand Up @@ -4826,6 +4830,7 @@ Martin Stigge <martin[AT]stigge.org>
Martin Tibenský <martin.tibensky[AT]alcatel-lucent.com>
Martin Tschoepe <martin.tschoepe[AT]web.de>
Martin Vit <martin[AT]voipmonitor.org>
Marton Papp <marcigladiator[AT]gmail.com>
Marvin Butkereit <marvin.butkereit[AT]haw-hamburg.de>
Masaru Tsuchiyama <m.tmatma[AT]gmail.com>
Masashi Honma <masashi.honma[AT]gmail.com>
Expand Down Expand Up @@ -5123,6 +5128,7 @@ Roi Berkovich <roiberkovich[AT]gmail.com>
Roland Haenel <roland[AT]haenel.me>
Roland Knall <rknall[AT]gmail.com>
Romain Tartière <romain[AT]blogreen.org>
Roman Donchenko <rdonchen[AT]outlook.com>
Roman Dudin <9205230+1ndahous3[AT]users.noreply.github.com>
Roman Koshelev <roman.koshelev[AT]bk.ru>
Roman Leonhartsberger <ro.leonhartsberger[AT]gmail.com>
Expand Down Expand Up @@ -5242,6 +5248,7 @@ Sven Schnelle <svens[AT]stackframe.org>
Swapnil Roy <swapnil.advent[AT]gmail.com>
Sylvain Heiniger <sploutchy[AT]gmail.com>
Sylvain Munaut <tnt[AT]246tNt.com>
Szilard Turi-Kovats <szilard.turi-kovats[AT]commsignia.com>
T. Scholz <scholzt234[AT]googlemail.com>
Tadeusz Struk <tadeusz.struk[AT]intel.com>
Taisuke Sasaki <taisasak[AT]cisco.com>
Expand Down Expand Up @@ -5279,6 +5286,7 @@ Timmy Brolin <tib[AT]hms.se>
Timo Warns <timow[AT]DiningPhilosopher.de>
Timotej Ecimovic <timotej.ecimovic[AT]silabs.com>
Timothy Geiser <slimshady007[AT]inbox.lv>
tkszilu <tkszilu[AT]gmail.com>
Tobias Brunner <tobias[AT]strongswan.org>
Tobias Micheler <tobiasmicheler[AT]outlook.de>
Tobias Mueller <muelli[AT]cryptobitch.de>
Expand Down Expand Up @@ -5368,6 +5376,7 @@ Xiaofeng Wang <wasphin[AT]gmail.com>
Xiaoxia Lang <xxlang[AT]grandstream.cn>
Xiong Nandi <xndchn[AT]gmail.com>
XuNiu <993273596[AT]qq.com>
Yakun Xu <xyk[AT]google.com>
Yan Burman <yanb[AT]mellanox.com>
Yang Luo <hsluoyz[AT]qq.com>
Yaniv Kaul <yaniv.kaul[AT]scylladb.com>
Expand Down
2 changes: 1 addition & 1 deletion epan/dissectors/packet-quic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1529,7 +1529,7 @@ quic_stream_free_persistent_key(void *ptr)
g_slice_free(quic_stream_key, key);
}

const reassembly_table_functions
static const reassembly_table_functions
quic_reassembly_table_functions = {
quic_stream_hash,
quic_stream_equal,
Expand Down
11 changes: 6 additions & 5 deletions epan/dissectors/packet-smb2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4023,7 +4023,7 @@ dissect_smb2_session_setup_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree
if (!pinfo->fd->visited) {
idx = 0;
while ((ntlmssph = (const ntlmssp_header_t *)fetch_tapped_data(ntlmssp_tap_id, idx++)) != NULL) {
if (ntlmssph && ntlmssph->type == NTLMSSP_AUTH) {
if (ntlmssph->type == NTLMSSP_AUTH) {
si->session = smb2_get_session(si->conv, si->sesid, pinfo, si);
si->session->acct_name = wmem_strdup(wmem_file_scope(), ntlmssph->acct_name);
si->session->domain_name = wmem_strdup(wmem_file_scope(), ntlmssph->domain_name);
Expand Down Expand Up @@ -10496,7 +10496,7 @@ dissect_smb2_create_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
offset = dissect_nt_create_options(tvb, tree, offset);

if (tvb_get_letohl(tvb, offset-4) & 0x1000) {
col_append_fstr(pinfo->cinfo, COL_INFO, ", (delete on close)");
col_append_str(pinfo->cinfo, COL_INFO, ", (delete on close)");
if (si->file)
si->file->delete_on_close = TRUE;
}
Expand Down Expand Up @@ -10651,7 +10651,7 @@ dissect_smb2_create_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
si->saved->uuid_fid = tag_guid;

if (si->file && si->file->delete_on_close)
col_append_fstr(pinfo->cinfo, COL_INFO, ", (delete on close)");
col_append_str(pinfo->cinfo, COL_INFO, ", (delete on close)");

/* Display the GUID subtree */
offset = dissect_smb2_fid(tvb, pinfo, tree, offset, si, FID_MODE_OPEN);
Expand Down Expand Up @@ -11076,6 +11076,7 @@ dissect_smb2_server_to_client_notification(tvbuff_t *tvb, packet_info *pinfo, pr
}

/* names here are just until we find better names for these functions */
/* decode_smb2_name can be used to access this safely */
static const value_string smb2_cmd_vals[] = {
{ 0x00, "Negotiate Protocol" },
{ 0x01, "Session Setup" },
Expand Down Expand Up @@ -11646,7 +11647,7 @@ static const smb2_function smb2_dissector[256] = {
#define SMB3_AES128CCM_NONCE 11
#define SMB3_AES128GCM_NONCE 12

static bool is_decrypted_header_ok(uint8_t *p, size_t size)
static bool is_decrypted_header_ok(const uint8_t *p, size_t size)
{
if (size < 4)
return false;
Expand Down Expand Up @@ -12572,7 +12573,7 @@ dissect_smb2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, bool fi
si->opcode = tvb_get_letohs(tvb, offset);
proto_tree_add_item(header_tree, hf_smb2_cmd, tvb, offset, 2, ENC_LITTLE_ENDIAN);
proto_item_append_text(item, ", %s %s",
smb2_cmd_vals[si->opcode].strptr,
decode_smb2_name(si->opcode),
si->flags & SMB2_FLAGS_RESPONSE ? "Response" : "Request");
offset += 2;

Expand Down
44 changes: 41 additions & 3 deletions epan/enterprises.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/

/* (last updated 2025-02-01) */
/* (last updated 2025-02-07) */

#include "config.h"

Expand Down Expand Up @@ -44668,7 +44668,7 @@ static const char * const table[] =
"Emko Elektronik Sanayi ve Ticaret A.Ş.", // 44646
"Argus der Presse AG", // 44647
"Manet Ltd", // 44648
"Alma Technologies", // 44649
"John K. Hinsdale", // 44649
"Hemotology Oncology Care of Northern VA", // 44650
"University of Detroit Jesuit High School and Academy", // 44651
"LaMarche Mfg. Company", // 44652
Expand Down Expand Up @@ -63065,7 +63065,45 @@ static const char * const table[] =
"TMC, LLC", // 63043
"Harrison County Health Department", // 63044
"Nlets", // 63045
"Yass Valley Council" // 63046
"Yass Valley Council", // 63046
"UCDPN Freelance", // 63047
"The Cyber Security Clinic", // 63048
"Trevor", // 63049
"Roskilde Festival", // 63050
"Plugnotes", // 63051
"Agile Design Services Pvt Ltd", // 63052
"MIND Software", // 63053
"Nplus S.r.l.", // 63054
"Cardiff Students' Union", // 63055
"طراحان ارتباط پایدار آروین, (Tarahan Ertabat Payedar Arvin)", // 63056
"Barrientos FRG", // 63057
"InbisPlus", // 63058
"Qingdao Haier New Energy Technology Co.,Ltd.", // 63059
"FAFO e.V.", // 63060
"Michael Vostrikov", // 63061
"SpiderOak", // 63062
"Marceco LTD", // 63063
"Squared Paper", // 63064
"ESDEE BUSINESS MACHINE PVT.LTD.", // 63065
"MCS IT Distribution Limited", // 63066
"Wiremax s.r.o.", // 63067
"Klinikum der Stadt Ludwigshafen am Rhein gGmbH", // 63068
"MightyFalcon DMCC", // 63069
"Tilt Brand Solutions", // 63070
"Dirección de Gestión de Resultados", // 63071
"Procescom", // 63072
"Scene Above, Inc.", // 63073
"Nexthop Systems Inc.", // 63074
"Peter Döhle Schiffahrts-KG", // 63075
"Credit Agricole Consumer Finance", // 63076
"NOREST-TELECOM", // 63077
"Slate", // 63078
"influence.money LLC", // 63079
"Nanjing Aozheng Information Technology Co., Ltd.", // 63080
"Unscrew IT", // 63081
"Bioinformation and DDBJ Center", // 63082
"ARQUUS DEFENSE", // 63083
"CryptoNext Security" // 63084
};

const char* global_enterprises_lookup(uint32_t value)
Expand Down
Loading

0 comments on commit 1be044e

Please sign in to comment.