From patchwork Mon Jan 1 09:40:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 3543 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7301:2791:b0:100:d2e5:60d with SMTP id hm17csp1404881dyb; Mon, 1 Jan 2024 01:41:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IHSrI//5zSFzjmrPslwi+771PzRVb/bAaaIQxefLO3Sjo0XkUcXP+BegQdP4ing5w0GAGio X-Received: by 2002:a17:902:7292:b0:1d4:b46d:81fe with SMTP id d18-20020a170902729200b001d4b46d81femr4649246pll.3.1704102090550; Mon, 01 Jan 2024 01:41:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704102090; cv=none; d=google.com; s=arc-20160816; b=0pncevtURTYuZII1VkuUz8Y1Eb7/eVoyf+O/MKLZ4JXAgfpTA1zL9VMqpoK0XdKDuL LvD24K2YHz7QmBrJ17IwwhEnzZXTYIuTJvJkGFAQBIXEXl2dJnqrptFrK6SAIo5kkuiR tgOB+SNFVFhUaYbIbgdAItF5IZ5eNOahs9oj1qj+9F+BnlaH9RGKbToZRRhpC7dp0D4d FfKyIcmcDTgc+eLp61KvXHqwfF61Ay8fTVzh8dJgkvD98fEH7J/w+D4Eq4eeJ+5HZg8A GNIvaIJ/q7PPoUzDDFcV/xHrk9jdgF9yWzc12zH6fzjuAy+My/Q4x4Qt571DlosTeNPV 5Pig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:dkim-signature; bh=96ttnrCxLG8g5dxsuGNLiaDQ+YwTKUXNvt3xZPap2sw=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=AtbzTNL1V1JDnyRa95UHGESeK0bQnra1mowwIJWKPSsM1eEjkVePuCkbwUqW6GwtLa vOS0GqU8L+QXBavAX4zuVncaVlaL+OMpFwSgWx+5qiyjYkhz+BmtXg4TOwi8fkB/plRU UdHGYtEEaNYRs8LwJAEQxhsrYbl57nLnV3xqw0rYL7XrnaPoiUBDA+XVIew+mWY5TuQM S5wNkgqevAcYavX8h4o6D24q60jM7RuH/R85Hjfd1ZX4o6ppUhJNlp3CJNLw4eL/qmZd JZsKAF3tT3NO3Ia5NcpgzQ2gDT6i9iBDCDMVfwORl+KZuYuY+U4JXkTfzFNzW5udi22H o4Nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=SDXkcWtW; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Pcs8NhUu; 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 g5-20020a170902868500b001d36292f2b2si18322522plo.215.2024.01.01.01.41.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Jan 2024 01:41:30 -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=SDXkcWtW; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Pcs8NhUu; 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-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1rKEnG-0004zy-CT; Mon, 01 Jan 2024 09:41:10 +0000 Received: from [172.30.20.202] (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 1rKEnF-0004zs-Pf for openvpn-devel@lists.sourceforge.net; Mon, 01 Jan 2024 09:41:09 +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: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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=0PZtWMJ28qnkC1ljfHBQ7xmwAylBNXEIAYe62o1NMIc=; b=SDXkcWtWgLJaFaFdi2G5cP5LZX 8R0VOy9nwxyZfQJPZI7/wUAcotmdwEI3/pygdPeb+BVpXXp4E3qEVkg0Y0qnvRhRqzOrfBlEb2Xni lxVPpIsOB4Yfo2owJjeUa0thlYoe6Mr5B2sQ3145yxHuZhkBPa/ivk2JerOE9M7xfP6g=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version: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:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=0PZtWMJ28qnkC1ljfHBQ7xmwAylBNXEIAYe62o1NMIc=; b=P cs8NhUuHJcW0gbZv/aYZNzTYd5SjQIzsfRrp08oJaQ3ljKeq2RJWFi9PZRMf/up8phbJPiY8c0moP IZog5jevKDcIZZ2YNstH3nF0HAOhUetJNs7MIH4e4p3F8hxtbhzKw8rEKdpDRPAj6Eyq1E5lfVjP2 XUo0nJch6thh+jV4=; Received: from chekov.greenie.muc.de ([193.149.48.178]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1rKEnC-0007Uw-67 for openvpn-devel@lists.sourceforge.net; Mon, 01 Jan 2024 09:41:08 +0000 Received: from chekov.greenie.muc.de (localhost [127.0.0.1]) by chekov.greenie.muc.de (8.17.1/8.17.1) with ESMTPS id 4019esY0038875 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO) for ; Mon, 1 Jan 2024 10:40:54 +0100 (CET) (envelope-from gert@chekov.greenie.muc.de) Received: (from gert@localhost) by chekov.greenie.muc.de (8.17.1/8.17.1/Submit) id 4019esjl038874 for openvpn-devel@lists.sourceforge.net; Mon, 1 Jan 2024 10:40:54 +0100 (CET) (envelope-from gert) From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Mon, 1 Jan 2024 10:40:54 +0100 Message-ID: <20240101094054.38869-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) 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: OpenBSD route sockets do not want to be passed RTA_IFP on RTM_GET - if we do this, we get back EINVAL. On other platforms, if we do not request RTA_IFP, we will not get back interface information for queried routes - on OpenBSD, RTA_IFP comes back always... Content analysis details: (-0.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -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: 1rKEnC-0007Uw-67 Subject: [Openvpn-devel] [PATCH] OpenBSD: repair --show-gateway 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?1786880553702531814?= X-GMAIL-MSGID: =?utf-8?q?1786880553702531814?= OpenBSD route sockets do not want to be passed RTA_IFP on RTM_GET - if we do this, we get back EINVAL. On other platforms, if we do not request RTA_IFP, we will not get back interface information for queried routes - on OpenBSD, RTA_IFP comes back always... So we need to #ifdef this, RTA_IFP on all platforms except OpenBSD. (Found this fix in OpenBSD's ports tree, in their patches for OpenVPN 2.6.8 - but they just remove RTA_IFP, no #ifdef, so we can't just apply their patch) While at it, add M_ERRNO to the "write to routing socket" error message. Signed-off-by: Gert Doering Acked-By: Arne Schwabe --- src/openvpn/route.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/openvpn/route.c b/src/openvpn/route.c index f75199c6..b05729f1 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -3518,7 +3518,11 @@ get_default_gateway(struct route_gateway_info *rgi, openvpn_net_ctx_t *ctx) /* setup data to send to routing socket */ pid = getpid(); seq = 0; +#ifdef TARGET_OPENBSD + rtm_addrs = RTA_DST | RTA_NETMASK; /* Kernel refuses RTA_IFP */ +#else rtm_addrs = RTA_DST | RTA_NETMASK | RTA_IFP; +#endif bzero(&m_rtmsg, sizeof(m_rtmsg)); bzero(&so_dst, sizeof(so_dst)); @@ -3556,7 +3560,7 @@ get_default_gateway(struct route_gateway_info *rgi, openvpn_net_ctx_t *ctx) } if (write(sockfd, (char *)&m_rtmsg, l) < 0) { - msg(M_WARN, "GDG: problem writing to routing socket"); + msg(M_WARN|M_ERRNO, "GDG: problem writing to routing socket"); goto done; } do @@ -3733,7 +3737,11 @@ get_default_gateway_ipv6(struct route_ipv6_gateway_info *rgi6, /* setup data to send to routing socket */ pid = getpid(); seq = 0; +#ifdef TARGET_OPENBSD + rtm_addrs = RTA_DST | RTA_NETMASK; /* Kernel refuses RTA_IFP */ +#else rtm_addrs = RTA_DST | RTA_NETMASK | RTA_IFP; +#endif bzero(&m_rtmsg, sizeof(m_rtmsg)); bzero(&so_dst, sizeof(so_dst));