From patchwork Sat Jan 25 09:59:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4079 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:c127:b0:5e7:b9eb:58e8 with SMTP id jm39csp1305869mab; Sat, 25 Jan 2025 01:59:28 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUMklQSBrjGLg7OXvhDdEFNtNQvZeRI1b6Ggy0eDWuYTddFBavPuHaBC6erFZu+gVmyD2HSOIXp6KI=@openvpn.net X-Google-Smtp-Source: AGHT+IE4GamN6bXFBo3ifKbTmc85MbH1Ovkz5luR6aguYysu7nbpuQhgMgh/E3G5rvEYdVJUlPYx X-Received: by 2002:a05:6808:2f13:b0:3eb:7675:3495 with SMTP id 5614622812f47-3f19fbfce7cmr23486023b6e.1.1737799168759; Sat, 25 Jan 2025 01:59:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1737799168; cv=none; d=google.com; s=arc-20240605; b=guPO3pmgCFX/KGM7Do1xTqSz/oYWsrQ+SrMIDc2g4I46Jqtz/FyhK2dMf4w55lCAAn tkD2z2nvzRGaULCgDBBWaqGVQ5ywMIzEvWih2JQy3srH7dhXRqy3jsNXwhIb6VFXpww1 r8IDw3a+wsH4Ya2tW9rU7IxxrQFwjxvP9u1blkc8SYwU79vmRbm8Uy+TYqJR/qGk+fJd f+yUSGWbZAAhuPXspF6Krp34nlHRzw25qIS+feqz5TmPgDmZkT+gRsyFBAl664+kIL6Q 8pOiCHbeOCw16eHD4CpUS62y1tg4wRgFZ0ewf2iJiYgdGEWuG51o/g8YBxxjNa+Hwjof b8Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature; bh=qJtNAbqpls7P5jNimcFHAXxpsFmrVoh0YJgglYJKby0=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=h4wBFDAypxx8gsMyf+1yHa/dMWLMFFSEHrV9ZS0NM9TX36wrJVf1Lucrvg+yHL/Yyk YpchMAhlKCGLOhrlYgPoieU7q74mUJzcULJt2f2iKSQmgrisvGgGZiYz5aT0niOoAV/W VM8yCz8f3nPv+HAwnLTibCwERrY1JPT4IiSBFLrnZhpnhZAGnhSnwyzl25XHLLt992po F7tnSpA+ULB99HbNEBSyT2YkOhftrNJu1dWIvdSxvnn4jOmEhkiILPQ8pDX4k0eTvQGE nMHuVlLssOBkqroyrgQHj9mGwiRxq0dpxHP8G0yAkwAzFU6hEOZ19OtjB9rFB0it65u1 vN0Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b="KiC/VB5r"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=ZJhs6CF1; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 5614622812f47-3f1f086db46si3318338b6e.63.2025.01.25.01.59.28 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 25 Jan 2025 01:59:28 -0800 (PST) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b="KiC/VB5r"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=ZJhs6CF1; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1tbcwl-00045a-S4; Sat, 25 Jan 2025 09:59:23 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1tbcwk-00045O-Rc for openvpn-devel@lists.sourceforge.net; Sat, 25 Jan 2025 09:59:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=rPrsWRuIBRfuK7SxOQcNYfv/e7+0kJAPHJphzBIr6rQ=; b=KiC/VB5r/fvrUoYLWbQsNjZy0L Mbtokw/+seRPI2T4ugJau3cd6rYMM9t9zl8fveRmQLy6MqjxwmSuPSTCaYufgbPDGdUINm/8AF12a bsSwlh5MOH46733gCvAOkKJwi7ewnXCRi5w27P/lIFpklyWmlYmwWZVRLv3eQxvgHBmw=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=rPrsWRuIBRfuK7SxOQcNYfv/e7+0kJAPHJphzBIr6rQ=; b=ZJhs6CF10YT+eKGkzmQ2jTBSdQ 2FaE75QFONsIg1bhr1kzUvdW980+wX9DGgbonAokC07kjNlLbA8HK82CtbcC74nEglm8gq6TvXLHt IRr/3oMsae9pI/c6CU7t+h/ZSnjKUGt0nIJmcFQFep5lx5DqlXWlIEULCRYzwGjlSmz8=; Received: from dhcp-174.greenie.muc.de ([193.149.48.174] helo=blue.greenie.muc.de) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1tbcwj-0004Dp-HV for openvpn-devel@lists.sourceforge.net; Sat, 25 Jan 2025 09:59:22 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.17.1.9/8.17.1.9) with ESMTP id 50P9xAET014698 for ; Sat, 25 Jan 2025 10:59:10 +0100 Received: (from gert@localhost) by blue.greenie.muc.de (8.17.1.9/8.17.1.9/Submit) id 50P9x9bL014697 for openvpn-devel@lists.sourceforge.net; Sat, 25 Jan 2025 10:59:09 +0100 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Sat, 25 Jan 2025 10:59:09 +0100 Message-ID: <20250125095909.14688-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Gianmarco De Gregori This commit renames all instances of 'struct link_socket' from the abbreviation 'ls' to the more descriptive 'sock' making it clearer that the variables represent socket-related structures. Content analysis details: (-0.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [193.149.48.174 listed in sa-accredit.habeas.com] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [193.149.48.174 listed in bl.score.senderscore.com] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Headers-End: 1tbcwj-0004Dp-HV Subject: [Openvpn-devel] [PATCH v3] Rename occurences of 'struct link_socket' from 'ls' to 'sock' X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1822214501358006608?= X-GMAIL-MSGID: =?utf-8?q?1822214501358006608?= From: Gianmarco De Gregori This commit renames all instances of 'struct link_socket' from the abbreviation 'ls' to the more descriptive 'sock' making it clearer that the variables represent socket-related structures. No functional changes have been introduced. Change-Id: Iff12c4dbac84a814612aa8b5b89224be08bb9058 Signed-off-by: Gianmarco De Gregori Acked-by: Gert Doering --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/874 This mail reflects revision 3 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering diff --git a/src/openvpn/init.c b/src/openvpn/init.c index d84f826..2ae3726 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -4935,12 +4935,12 @@ void inherit_context_child(struct context *dest, const struct context *src, - struct link_socket *ls) + struct link_socket *sock) { CLEAR(*dest); /* proto_is_dgram will ASSERT(0) if proto is invalid */ - dest->mode = proto_is_dgram(ls->info.proto) ? CM_CHILD_UDP : CM_CHILD_TCP; + dest->mode = proto_is_dgram(sock->info.proto) ? CM_CHILD_UDP : CM_CHILD_TCP; dest->gc = gc_new(); @@ -4966,7 +4966,7 @@ /* options */ dest->options = src->options; - dest->options.ce.proto = ls->info.proto; + dest->options.ce.proto = sock->info.proto; options_detach(&dest->options); dest->c2.event_set = src->c2.event_set; @@ -4977,7 +4977,7 @@ * The CM_TOP context does the socket listen(), * and the CM_CHILD_TCP context does the accept(). */ - dest->c2.accept_from = ls; + dest->c2.accept_from = sock; } #ifdef ENABLE_PLUGIN @@ -5004,11 +5004,11 @@ ALLOC_ARRAY_GC(dest->c2.link_sockets, struct link_socket *, 1, &dest->gc); /* inherit parent link_socket and tuntap */ - dest->c2.link_sockets[0] = ls; + dest->c2.link_sockets[0] = sock; ALLOC_ARRAY_GC(dest->c2.link_socket_infos, struct link_socket_info *, 1, &dest->gc); ALLOC_OBJ_GC(dest->c2.link_socket_infos[0], struct link_socket_info, &dest->gc); - *dest->c2.link_socket_infos[0] = ls->info; + *dest->c2.link_socket_infos[0] = sock->info; /* locally override some link_socket_info fields */ dest->c2.link_socket_infos[0]->lsa = &dest->c1.link_socket_addrs[0]; diff --git a/src/openvpn/init.h b/src/openvpn/init.h index 11c32ac..50b38e3 100644 --- a/src/openvpn/init.h +++ b/src/openvpn/init.h @@ -96,7 +96,7 @@ void inherit_context_child(struct context *dest, const struct context *src, - struct link_socket *ls); + struct link_socket *sock); void inherit_context_top(struct context *dest, const struct context *src); diff --git a/src/openvpn/mtcp.c b/src/openvpn/mtcp.c index 582e9b3..38dd9f0 100644 --- a/src/openvpn/mtcp.c +++ b/src/openvpn/mtcp.c @@ -47,16 +47,16 @@ }; struct multi_instance * -multi_create_instance_tcp(struct multi_context *m, struct link_socket *ls) +multi_create_instance_tcp(struct multi_context *m, struct link_socket *sock) { struct gc_arena gc = gc_new(); struct multi_instance *mi = NULL; struct hash *hash = m->hash; - mi = multi_create_instance(m, NULL, ls); - if (mi && !proto_is_dgram(ls->info.proto)) + mi = multi_create_instance(m, NULL, sock); + if (mi && !proto_is_dgram(sock->info.proto)) { - mi->real.proto = ls->info.proto; + mi->real.proto = sock->info.proto; struct hash_element *he; const uint32_t hv = hash_value(hash, &mi->real); struct hash_bucket *bucket = hash_bucket(hash, hv); @@ -139,10 +139,10 @@ void multi_tcp_dereference_instance(struct multi_io *multi_io, struct multi_instance *mi) { - struct link_socket *ls = mi->context.c2.link_sockets[0]; - if (ls && mi->socket_set_called) + struct link_socket *sock = mi->context.c2.link_sockets[0]; + if (sock && mi->socket_set_called) { - event_del(multi_io->es, socket_event_handle(ls)); + event_del(multi_io->es, socket_event_handle(sock)); mi->socket_set_called = false; } multi_io->n_esr = 0; diff --git a/src/openvpn/mtcp.h b/src/openvpn/mtcp.h index 0a5b045..a0ef6a4 100644 --- a/src/openvpn/mtcp.h +++ b/src/openvpn/mtcp.h @@ -46,7 +46,7 @@ bool multi_tcp_process_outgoing_link_ready(struct multi_context *m, struct multi_instance *mi, const unsigned int mpp_flags); -struct multi_instance *multi_create_instance_tcp(struct multi_context *m, struct link_socket *ls); +struct multi_instance *multi_create_instance_tcp(struct multi_context *m, struct link_socket *sock); void multi_tcp_link_out_deferred(struct multi_context *m, struct multi_instance *mi); diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c index 86e1713..8496400 100644 --- a/src/openvpn/mudp.c +++ b/src/openvpn/mudp.c @@ -186,14 +186,14 @@ struct multi_instance * multi_get_create_instance_udp(struct multi_context *m, bool *floated, - struct link_socket *ls) + struct link_socket *sock) { struct gc_arena gc = gc_new(); struct mroute_addr real = {0}; struct multi_instance *mi = NULL; struct hash *hash = m->hash; - real.proto = ls->info.proto; - m->hmac_reply_ls = ls; + real.proto = sock->info.proto; + m->hmac_reply_ls = sock; if (mroute_extract_openvpn_sockaddr(&real, &m->top.c2.from.dest, true) && m->top.c2.buf.len > 0) @@ -259,7 +259,7 @@ * connect-freq but not against connect-freq-initial */ reflect_filter_rate_limit_decrease(m->initial_rate_limiter); - mi = multi_create_instance(m, &real, ls); + mi = multi_create_instance(m, &real, sock); if (mi) { hash_add_fast(hash, bucket, &mi->real, hv, mi); diff --git a/src/openvpn/mudp.h b/src/openvpn/mudp.h index 357b684..37752e1 100644 --- a/src/openvpn/mudp.h +++ b/src/openvpn/mudp.h @@ -33,7 +33,7 @@ unsigned int p2mp_iow_flags(const struct multi_context *m); -void multi_process_io_udp(struct multi_context *m, struct link_socket *ls); +void multi_process_io_udp(struct multi_context *m, struct link_socket *sock); /**************************************************************************/ /** * Get, and if necessary create, the multi_instance associated with a @@ -47,13 +47,13 @@ * successful, returns the newly created instance. * * @param m - The single multi_context structure. - * @param ls - Listening socket where this instance is connecting to + * @param sock - Listening socket where this instance is connecting to * * @return A pointer to a multi_instance if one already existed for the * packet's source address or if one was a newly created successfully. * NULL if one did not yet exist and a new one was not created. */ struct multi_instance *multi_get_create_instance_udp(struct multi_context *m, bool *floated, - struct link_socket *ls); + struct link_socket *sock); #endif /* ifndef MUDP_H */ diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index b83425c..4d690d6 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -751,7 +751,7 @@ */ struct multi_instance * multi_create_instance(struct multi_context *m, const struct mroute_addr *real, - struct link_socket *ls) + struct link_socket *sock) { struct gc_arena gc = gc_new(); struct multi_instance *mi; @@ -774,7 +774,7 @@ generate_prefix(mi); } - inherit_context_child(&mi->context, &m->top, ls); + inherit_context_child(&mi->context, &m->top, sock); if (IS_SIG(&mi->context)) { goto err; @@ -794,7 +794,7 @@ { goto err; } - mi->real.proto = ls->info.proto; + mi->real.proto = sock->info.proto; generate_prefix(mi); } @@ -3129,7 +3129,7 @@ void multi_process_float(struct multi_context *m, struct multi_instance *mi, - struct link_socket *ls) + struct link_socket *sock) { struct mroute_addr real = {0}; struct hash *hash = m->hash; @@ -3185,7 +3185,7 @@ mi->context.c2.to_link_addr = &mi->context.c2.from; /* inherit parent link_socket and link_socket_info */ - mi->context.c2.link_sockets[0] = ls; + mi->context.c2.link_sockets[0] = sock; mi->context.c2.link_socket_infos[0]->lsa->actual = m->top.c2.from; tls_update_remote_addr(mi->context.c2.tls_multi, &mi->context.c2.from); @@ -3335,7 +3335,7 @@ */ bool multi_process_incoming_link(struct multi_context *m, struct multi_instance *instance, - const unsigned int mpp_flags, struct link_socket *ls) + const unsigned int mpp_flags, struct link_socket *sock) { struct gc_arena gc = gc_new(); @@ -3356,7 +3356,7 @@ #ifdef MULTI_DEBUG_EVENT_LOOP printf("TCP/UDP -> TUN [%d]\n", BLEN(&m->top.c2.buf)); #endif - multi_set_pending(m, multi_get_create_instance_udp(m, &floated, ls)); + multi_set_pending(m, multi_get_create_instance_udp(m, &floated, sock)); } else { @@ -3390,14 +3390,14 @@ /* decrypt in instance context */ perf_push(PERF_PROC_IN_LINK); - lsi = &ls->info; + lsi = &sock->info; orig_buf = c->c2.buf.data; if (process_incoming_link_part1(c, lsi, floated)) { /* nonzero length means that we have a valid, decrypted packed */ if (floated && c->c2.buf.len > 0) { - multi_process_float(m, m->pending, ls); + multi_process_float(m, m->pending, sock); } process_incoming_link_part2(c, lsi, orig_buf); diff --git a/src/openvpn/multi.h b/src/openvpn/multi.h index 092aed6..229f500 100644 --- a/src/openvpn/multi.h +++ b/src/openvpn/multi.h @@ -275,7 +275,7 @@ void multi_top_free(struct multi_context *m); struct multi_instance *multi_create_instance(struct multi_context *m, const struct mroute_addr *real, - struct link_socket *ls); + struct link_socket *sock); void multi_close_instance(struct multi_context *m, struct multi_instance *mi, bool shutdown); @@ -290,7 +290,7 @@ * updates hashtables in multi_context. */ void multi_process_float(struct multi_context *m, struct multi_instance *mi, - struct link_socket *ls); + struct link_socket *sock); #define MPP_PRE_SELECT (1<<0) #define MPP_CONDITIONAL_PRE_SELECT (1<<1) @@ -355,10 +355,10 @@ * when using TCP transport. Otherwise NULL, as is * the case when using UDP transport. * @param mpp_flags - Fast I/O optimization flags. - * @param ls - Socket where the packet was received. + * @param sock - Socket where the packet was received. */ bool multi_process_incoming_link(struct multi_context *m, struct multi_instance *instance, const unsigned int mpp_flags, - struct link_socket *ls); + struct link_socket *sock); /**