From patchwork Thu Dec 12 07:47:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "ralf_lici (Code Review)" X-Patchwork-Id: 3988 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:750c:b0:5e7:b9eb:58e8 with SMTP id r12csp1399775mai; Wed, 11 Dec 2024 23:48:02 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUcvtGj0PkjICYVrgiu736sgTzQCglJRwkhF5vzSw/wR9P5bKtZuGI1bJwoa+3fm8pNqayFHb3nM+M=@openvpn.net X-Google-Smtp-Source: AGHT+IH94MUng7YoUBdJlTuW2XnwViL4wG9d7m9PXrOCfYrH4fL6PHqSwU/7/pDdBoYHk8q5tzKw X-Received: by 2002:a05:6808:2190:b0:3e7:a201:dc31 with SMTP id 5614622812f47-3eb85bf78demr3314661b6e.23.1733989682228; Wed, 11 Dec 2024 23:48:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1733989682; cv=none; d=google.com; s=arc-20240605; b=h4FDPxHpyK84/ygtCgHm/3WHAXkIbLlX4p0srWeHiu+fzO/G9yGHMDuDaJTHEX8ibA e7ctX7I8eAbAyhq8cxE/+BNfnP5EgVAgHwXEwsy/y0mx9Gp3jvPVi2pLjRlndE3No5kh ue6E1c/rmTEC8m6KlYkfikPfvcQne+CA4at5ZFW30i7JAYIxndkz8F7qYWUowLelTM7z +cRBX4QZ4wlp7IIr/Vt8kvbB8SK/4SBLiCwf+Z8XJ4m5PZgDJAUEKn1DliMlRF7UyBdi k4fg7VN+3UWWsrRTg8Kvpo9++dSOLsdcD9ORRuUCH0U8xf2HGinpJZ/6tAdvvsziriSa dVag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:cc:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:user-agent :mime-version:message-id:references:auto-submitted:to:date:from :dkim-signature:dkim-signature:dkim-signature; bh=F6MDobYrr4h2DvVMSaATP8gJCaupBJSrSpUlusSQ3e8=; fh=U7wEyxtwz2o5+UdevFSA47vNeG9knhWH0KV//QhD5a0=; b=K2xDNubcScXEjEH5jpZWBfPJrb7/CQ2f3Q2WeucXolDadnGnIvB21xJXo3O8QZe0XY auGiOIHbNI9vZt75Sh7AdSrNwaGhGjLUnIIrt/B2nhy/+OgnZcuVSjVpBPGvtMtzIjV7 MFm4pEjnSqg43ysl3V0BZMxScTrMHGDnW5TTHi74w6Ui0xw26qzdnqyx04Eji0BgmqGK 9bPQxLvHZwgRcq7Lz4vVlt3Ke20FpSaomG4/jVgVPkiEh6NLUsTv2Pk24Ft9DTW6Ctv1 SLeTmCve4j/uE9rZ8KRdHN/LB6i3rsWdKTO8bUmsrntQArhNVQFBa10n3E7sqI+EeRsH CPqg==; 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=QqCR8FRu; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=nVk+VKTR; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=fmTplDGj; 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=openvpn.net; dara=fail header.i=@openvpn.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 5614622812f47-3eb50ce4ee3si5377757b6e.300.2024.12.11.23.48.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Dec 2024 23:48:02 -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=QqCR8FRu; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=nVk+VKTR; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=fmTplDGj; 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=openvpn.net; dara=fail header.i=@openvpn.net Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1tLdvS-0003ua-5H; Thu, 12 Dec 2024 07:47:58 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1tLdvQ-0003uP-Qc for openvpn-devel@lists.sourceforge.net; Thu, 12 Dec 2024 07:47:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:Content-Transfer-Encoding:MIME-Version :Message-ID:Reply-To:References:Subject:List-Unsubscribe:List-Id:Cc:To:Date: From:Sender:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help: List-Subscribe:List-Post:List-Owner:List-Archive; bh=dqkzViWFOMcEX3obIlXjCKyz6qTq9WgPcrPrqa7Ffco=; b=QqCR8FRuRbY3BaytqTSww1PNSB a09maBYpWRLbifmmJNqhh7keMNNkabvXkgoXcoxEgHBgIdD+15Jn7jR+fpQ+NC0u6+lRieraFqQFU MLXb1MX7PB7r5mYV/2RN7eHDbET+YYuDZUnkqYu6+pRjquVpo+gI0tvp49WFVzDzFnGM=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:Content-Transfer-Encoding:MIME-Version:Message-ID:Reply-To: References:Subject:List-Unsubscribe:List-Id:Cc:To:Date:From:Sender:Content-ID :Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To: Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help:List-Subscribe:List-Post: List-Owner:List-Archive; bh=dqkzViWFOMcEX3obIlXjCKyz6qTq9WgPcrPrqa7Ffco=; b=n Vk+VKTRq5nTamks6etfJdV5ZLiLQ9izKb2DPc7ZiT5kSW7RBeCvsGDe8qkAcPnohKc+QPCopG9FEJ HpwmyuK/YvurgU46M2Ib4Rh07/86fSARl0wbmg43cwwEMBvDs7QqCrk4REZ/JHqpqtX3lXfOcY2tl BkO3+E7UvNRBdZBU=; Received: from mail-wm1-f46.google.com ([209.85.128.46]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1tLdvP-00064S-AQ for openvpn-devel@lists.sourceforge.net; Thu, 12 Dec 2024 07:47:56 +0000 Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-432d86a3085so1603105e9.2 for ; Wed, 11 Dec 2024 23:47:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1733989664; x=1734594464; darn=lists.sourceforge.net; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from:from:to:cc :subject:date:message-id:reply-to; bh=dqkzViWFOMcEX3obIlXjCKyz6qTq9WgPcrPrqa7Ffco=; b=fmTplDGjOcVqbHwsZnZg/HCmWheyhe0YYg+bzH/XKW2OUjXyb1bg/YpR4t61qX/iWc qrWXCKRArhGjt//8Ryo9OKey5SsRaimBpsI6ekPkTLoXTAc1RC1xevKfDzFS794vAqSl YD1O4leYmPGSKbK+NkeecpieP3Fy18ya2kGcGAdxssmk9UiF1OebEEeqlFbMi82QS5aG dX0suNKwWU5fkH+gY285pfcE5tCkT4HXTLrafwvR3QrN5oCkvLkX7c/xCw7tVFvTTfO0 1YcJ6JjSfT/QKKCU4EyaSYV1bGKlfsnOH3WvoEhlCxydKKOMkIYrHVROblJYTBMWweMn RSlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733989664; x=1734594464; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=dqkzViWFOMcEX3obIlXjCKyz6qTq9WgPcrPrqa7Ffco=; b=m83dgWkm+xBG1/DyHHuk4ncHrEwvb5v8LSLGWIOIvH/iZfOm4muOchevtzTM8vo4Gs QHolFMj87vw/Oe/kF9GJmNpW6zuqAW73H9T/+w33gd/35qg8v8tVIo7wchnIaSsZGzRR rDw8/f5VwHkwnBi4keuANEPluPzSk5GZqBQiuslB6+PZQj5j1NbLmYJz7rsgcu0CXo4O PfFLYkaG3wQalKpYutgY05OF4Pn4FKZpt1WxY1Ep+mkSaJg4y12bDebJL7eQES/u1i54 qT2irX+I9bfl24ip/Uvol7HWAWg1bu+QnNohioVzLhcJ35l1xX/x7aNDEPfDR5CvnWha dXvg== X-Gm-Message-State: AOJu0YyTZZ7s4dlpBJIX53GvjE8nWHgNRjR9ljBZFm7T+aXivtNJSl2r MzwFAS1oAvkAfLPz1V0k1/DMFlUIOlbi5ApF0qoqzEOfXaC/y9nwSQnt7S+evh1OJadUWeQ9P98 9 X-Gm-Gg: ASbGncvh40fQ4OqiQgMdIrjB65osUKDMKjG+6i/T0a1kwXKCJ8LlxSMAcdO3bjGbxsX rsj1e3AnX+Gq7ageIpH2RzrPmXaqvlHTNlbIgcNtXGoju9oquRAki91Mwti2qV7H9S4naZM5BM2 bWsL9zQMlv6AuuG+87TuDM1SGuJvRp2LsV72JZInSn4qBXd99T+l1CM7cMGNir/cSzhRgO+wrWy Ip4nt8I4VvQHJrtj6fLkNFBIaZXjLYI5svkJmwYFkksvs435FP9RQIUABqPElin7Pof7eGVvRx0 QApaoZhpRbEvujhdWIhgcgyDO3EFx88Bw1u/t0TzqTgzc8fo X-Received: by 2002:a05:600c:3548:b0:42a:a6d2:3270 with SMTP id 5b1f17b1804b1-4361c3e2345mr40753795e9.21.1733989663757; Wed, 11 Dec 2024 23:47:43 -0800 (PST) Received: from gerrit.openvpn.in (ec2-18-159-0-78.eu-central-1.compute.amazonaws.com. [18.159.0.78]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43625717c9fsm8155605e9.44.2024.12.11.23.47.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2024 23:47:43 -0800 (PST) From: "d12fk (Code Review)" X-Google-Original-From: "d12fk (Code Review)" X-Gerrit-PatchSet: 1 Date: Thu, 12 Dec 2024 07:47:42 +0000 To: plaisthos , flichtenheld Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: I81d4bb0abdd421f5ba260c10c610918652334a4d X-Gerrit-Change-Number: 834 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: eff945ed4eafec036f4920f8e89eeefcdd501e76 References: Message-ID: <6389cf62a6846c2fbb37283949b0d6308d3510da-HTML@gerrit.openvpn.net> MIME-Version: 1.0 User-Agent: Gerrit/3.8.2 X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-2.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: Attention is currently required from: flichtenheld, plaisthos. Hello plaisthos, flichtenheld, I'd like you to do a code review. Please visit Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.46 listed in list.dnswl.org] 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. [209.85.128.46 listed in sa-trusted.bondedsender.org] 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. [209.85.128.46 listed in bl.score.senderscore.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.46 listed in wl.mailspike.net] 0.0 WEIRD_PORT URI: Uses non-standard port number for HTTP 0.0 HTML_MESSAGE BODY: HTML included in message -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1tLdvP-00064S-AQ Subject: [Openvpn-devel] [XS] Change in openvpn[master]: dns: store IPv4 addresses in network byte order 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: , Reply-To: heiko@openvpn.net, arne-openvpn@rfc2549.org, openvpn-devel@lists.sourceforge.net, frank@lichtenheld.com Cc: openvpn-devel Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1818219965501986530?= X-GMAIL-MSGID: =?utf-8?q?1818219965501986530?= X-getmail-filter-classifier: gerrit message type newchange Attention is currently required from: flichtenheld, plaisthos. Hello plaisthos, flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/834?usp=email to review the following change. Change subject: dns: store IPv4 addresses in network byte order ...................................................................... dns: store IPv4 addresses in network byte order This is done so that inet_ntop(3) can be used with IPv4 name server addresses. It expects the binary address in network byte order. If they are not that way the address octets are reversed. Change-Id: I81d4bb0abdd421f5ba260c10c610918652334a4d Signed-off-by: Heiko Hund --- M src/openvpn/dns.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/34/834/1 diff --git a/src/openvpn/dns.c b/src/openvpn/dns.c index 0539ca5..15e7322 100644 --- a/src/openvpn/dns.c +++ b/src/openvpn/dns.c @@ -121,7 +121,7 @@ if (ai->ai_family == AF_INET) { struct sockaddr_in *sin = (struct sockaddr_in *)ai->ai_addr; - server->addr[server->addr_count].in.a4.s_addr = ntohl(sin->sin_addr.s_addr); + server->addr[server->addr_count].in.a4.s_addr = sin->sin_addr.s_addr; } else { @@ -384,7 +384,7 @@ if (s->addr[j].family == AF_INET) { setenv_dns_option(es, "dns_server_%d_address_%d", i, j + 1, - print_in_addr_t(s->addr[j].in.a4.s_addr, 0, &gc)); + print_in_addr_t(s->addr[j].in.a4.s_addr, IA_NET_ORDER, &gc)); } else { @@ -443,7 +443,7 @@ const char *fmt_port; if (server->addr[j].family == AF_INET) { - addr = print_in_addr_t(server->addr[j].in.a4.s_addr, 0, &gc); + addr = print_in_addr_t(server->addr[j].in.a4.s_addr, IA_NET_ORDER, &gc); fmt_port = " address = %s:%s"; } else