From patchwork Sat Oct 11 08:22:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4499 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:7d42:b0:72f:f16c:e055 with SMTP id fr2csp826962mab; Sat, 11 Oct 2025 01:22:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUx+Z/Y0iX0Hj9F7ChYni/cqCKouIk8DLwX9688/nBROiiwgX1Zpt5NE66+ESiQOGzctdmYOeNyNYA=@openvpn.net X-Google-Smtp-Source: AGHT+IHI9FLmcd3MDLJMLXFQ7dEvXI/osyXN2xueB5ZFNLC78lDNLTsPqDGwNR1cK7AOm3e6JtC7 X-Received: by 2002:a05:6820:a01c:b0:64e:6528:2475 with SMTP id 006d021491bc7-64f1f778fd9mr6800410eaf.1.1760170963706; Sat, 11 Oct 2025 01:22:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1760170963; cv=none; d=google.com; s=arc-20240605; b=fQgHdIK2eiBFDoBQA7ZnC2ni4/qqAvPc67mYGPB2XJlIL7LCmQtMvsNqqIxmZuA+Cu oVTR4GfiFIh0jkWH2zEBQfcGvm8SyqkDdZpqKEJb5xjtgs9TklCV0whru4Z9YhcfxpFz 0ZW8AA4snZ6TvlzSMeEY8MhZ1NAdz5M5IXPdTi/mTku2nkZu6oXWR1R0TsxpDsBevmpI a19JiZmhe0Uo1qH+7Kb/o4u1KcduMZU/gqK2i6ONIlv2uDbNDSfUR6rE4prTl+RZrGiy PJMSRaNYRc6tgOe9KOqFSyeMxuR9NEpPdczTY5xFjWnjF/WtsinHQNB2WGwaZFuVZaj9 xEMg== 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:dkim-signature; bh=y9sjF28eAGzd+CyblqyjP2TwBfeuqWd9LEMUQgt8mdI=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=LCr2KV60B7UyMt5n7GL8GYMhosjW21FvGxj23pX3uU+ZW5em+pVU7/Ox+MeUTor//g pKeK1YHHcpwMUVi98Ncy8d/Gb0NBIMD0QZGObReMK5f6k3PLSoPqfnrnnU5Jc+xmiF7+ m55WjK8E5FrvdfESz9IigzyRCLiLMoXIeNZUn+NIX4eDSGCTE4ljQqEeuRTqrD4dq9O8 40Hyh79YWmvW1RnyHYlABsmYHPdlqnxn3WUve1SMAtPdIaZ2wrGhae15Ao4FhqgRFQuG fbc6TPcz0CHAoJMPat/q7j8rK/ur0QxZgfZqNUfKtQfZ7b6+bev3V2TIYdCQ2voGsOsV 97oQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=PwWFgioc; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=HAFW3fRn; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Vt9gsfyl; 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 006d021491bc7-650181e25besi991771eaf.109.2025.10.11.01.22.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Oct 2025 01:22:43 -0700 (PDT) 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=pass header.i=@lists.sourceforge.net header.s=beta header.b=PwWFgioc; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=HAFW3fRn; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Vt9gsfyl; 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 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Subject:MIME-Version:References:In-Reply-To:Message-ID:Date:To:From:Sender: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=y9sjF28eAGzd+CyblqyjP2TwBfeuqWd9LEMUQgt8mdI=; b=PwWFgioc1AqRDU9A35kHSE52gp 1+F4khO3G1Lpx2061ifLYn3jPuF9P8ei53eQ+L3ARc0vIpdNjq+wSD5Mbczz65vLUsABSx9UJtT10 AFFLy7uG05O3B1QZqHSRd8jNwmOljuSoHs/0KxIv3a4l67+zSkX+iKnxc3cjorOyu2uI=; Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1v7UsD-000780-DJ; Sat, 11 Oct 2025 08:22:41 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1v7UsC-00077u-Ik for openvpn-devel@lists.sourceforge.net; Sat, 11 Oct 2025 08:22:40 +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=sZqCFn59EH9IPbHh8hXOA2aWShsFloPzHm4tTYTkIfE=; b=HAFW3fRn7NUKDdekhlOU6vcjFz kGgQBQJGhRpKP15JXGYeXzDig5JFXCPMwyGOP7bYMR///5EcfUs9xE9SFa77yLGTHKUE2MUm9OlVc uDXg3sSWJ7UvpgxVF2jqnHr9q9gMDFLGWJo0IhbBIn7AEyFMAb3etq6Un+oSAJNPqQz8=; 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=sZqCFn59EH9IPbHh8hXOA2aWShsFloPzHm4tTYTkIfE=; b=Vt9gsfylwGWZgKaWn1rudHBiQz lPr82f/1NW95S/YUcln03plRcrl+oqNo6/C05isCi4bzoUoVOhQiGlV/QnYI1ehh3iXJWKOcO4r8R dDsxM+zZlFKSKo3wohdgOr9mdS6DG6wwMUFpt5yhQ7jM5NpLcwbM3PVBSAUBL44FZykI=; Received: from [193.149.48.134] (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 1v7UsB-0002gd-NI for openvpn-devel@lists.sourceforge.net; Sat, 11 Oct 2025 08:22:40 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.18.1/8.18.1) with ESMTP id 59B8MXxE027623 for ; Sat, 11 Oct 2025 10:22:33 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.18.1/8.18.1/Submit) id 59B8MXqQ027622 for openvpn-devel@lists.sourceforge.net; Sat, 11 Oct 2025 10:22:33 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Sat, 11 Oct 2025 10:22:26 +0200 Message-ID: <20251011082232.27602-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.49.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "sfi-spamd-2.hosts.colo.sdot.me", 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: Frank Lichtenheld Just nicer. Verified against https://www.iana.org/assignments/bootp-dhcp-parameters/bootp-dhcp-parameters.xhtml Change-Id: Ie41101bd00d038fa6fb906f3d30d44bf65788b96 Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Gerrit URL: https://gerrit.openvpn.net/c/open [...] Content analysis details: (1.3 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-Headers-End: 1v7UsB-0002gd-NI Subject: [Openvpn-devel] [PATCH v1] dhcp: Replace DHCP Option types with defines 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?1845673028570897557?= X-GMAIL-MSGID: =?utf-8?q?1845673028570897557?= From: Frank Lichtenheld Just nicer. Verified against https://www.iana.org/assignments/bootp-dhcp-parameters/bootp-dhcp-parameters.xhtml Change-Id: Ie41101bd00d038fa6fb906f3d30d44bf65788b96 Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1266 --- 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/+/1266 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering diff --git a/src/openvpn/dhcp.c b/src/openvpn/dhcp.c index 653127d..56f03f2 100644 --- a/src/openvpn/dhcp.c +++ b/src/openvpn/dhcp.c @@ -342,27 +342,27 @@ bool error = false; if (o->domain) { - write_dhcp_str(buf, 15, o->domain, &error); + write_dhcp_str(buf, DHCP_DOMAIN_NAME, o->domain, &error); } if (o->netbios_scope) { - write_dhcp_str(buf, 47, o->netbios_scope, &error); + write_dhcp_str(buf, DHCP_NETBIOS_SCOPE, o->netbios_scope, &error); } if (o->netbios_node_type) { - write_dhcp_u8(buf, 46, o->netbios_node_type, &error); + write_dhcp_u8(buf, DHCP_NETBIOS_NODE_TYPE, o->netbios_node_type, &error); } - write_dhcp_u32_array(buf, 6, (uint32_t *)o->dns, o->dns_len, &error); - write_dhcp_u32_array(buf, 44, (uint32_t *)o->wins, o->wins_len, &error); - write_dhcp_u32_array(buf, 42, (uint32_t *)o->ntp, o->ntp_len, &error); - write_dhcp_u32_array(buf, 45, (uint32_t *)o->nbdd, o->nbdd_len, &error); + write_dhcp_u32_array(buf, DHCP_DOMAIN_SERVER, (uint32_t *)o->dns, o->dns_len, &error); + write_dhcp_u32_array(buf, DHCP_NETBIOS_DOMAIN_SERVER, (uint32_t *)o->wins, o->wins_len, &error); + write_dhcp_u32_array(buf, DHCP_NTP_SERVER, (uint32_t *)o->ntp, o->ntp_len, &error); + write_dhcp_u32_array(buf, DHCP_NETBIOS_DIST_SERVER, (uint32_t *)o->nbdd, o->nbdd_len, &error); if (o->domain_search_list_len > 0) { - write_dhcp_search_str(buf, 119, o->domain_search_list, o->domain_search_list_len, &error); + write_dhcp_search_str(buf, DHCP_DOMAIN_SEARCH, o->domain_search_list, o->domain_search_list_len, &error); } /* the MS DHCP server option 'Disable Netbios-over-TCP/IP @@ -375,7 +375,7 @@ msg(M_WARN, "build_dhcp_options_string: buffer overflow building DHCP options"); return false; } - buf_write_u8(buf, 43); + buf_write_u8(buf, DHCP_VENDOR); buf_write_u8(buf, 6); /* total length field */ buf_write_u8(buf, 0x001); buf_write_u8(buf, 4); /* length of the vendor specified field */ diff --git a/src/openvpn/dhcp.h b/src/openvpn/dhcp.h index 8e15a39..3fcd2b6 100644 --- a/src/openvpn/dhcp.h +++ b/src/openvpn/dhcp.h @@ -30,10 +30,19 @@ #pragma pack(1) /* DHCP Option types */ -#define DHCP_PAD 0 -#define DHCP_ROUTER 3 -#define DHCP_MSG_TYPE 53 /* message type (u8) */ -#define DHCP_END 255 +#define DHCP_PAD 0 +#define DHCP_ROUTER 3 +#define DHCP_DOMAIN_SERVER 6 +#define DHCP_DOMAIN_NAME 15 +#define DHCP_NTP_SERVER 42 +#define DHCP_VENDOR 43 +#define DHCP_NETBIOS_DOMAIN_SERVER 44 +#define DHCP_NETBIOS_DIST_SERVER 45 +#define DHCP_NETBIOS_NODE_TYPE 46 +#define DHCP_NETBIOS_SCOPE 47 +#define DHCP_MSG_TYPE 53 +#define DHCP_DOMAIN_SEARCH 119 +#define DHCP_END 255 /* DHCP Messages types */ #define DHCPDISCOVER 1