From patchwork Wed Mar 31 19:44:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony He X-Patchwork-Id: 1680 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director10.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id IMMBBx5sZWAAPgAAIUCqbw (envelope-from ) for ; Thu, 01 Apr 2021 02:45:50 -0400 Received: from proxy16.mail.ord1d.rsapps.net ([172.30.191.6]) by director10.mail.ord1d.rsapps.net with LMTP id IAzhBh5sZWBiOwAApN4f7A (envelope-from ) for ; Thu, 01 Apr 2021 02:45:50 -0400 Received: from smtp30.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy16.mail.ord1d.rsapps.net with LMTPS id qIl8Bh5sZWCuGQAAetu3IA (envelope-from ) for ; Thu, 01 Apr 2021 02:45:50 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp30.gate.ord1d.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: e4cbc298-92b5-11eb-9441-5254001e8e38-1-1 Received: from [216.105.38.7] ([216.105.38.7:37142] helo=lists.sourceforge.net) by smtp30.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id EA/FC-07319-D1C65606; Thu, 01 Apr 2021 02:45:49 -0400 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.92.3) (envelope-from ) id 1lRr4h-0005wC-AS; Thu, 01 Apr 2021 06:45:03 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) (envelope-from ) id 1lRr4g-0005w1-9d for openvpn-devel@lists.sourceforge.net; Thu, 01 Apr 2021 06:45:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: MIME-Version:Content-Type:Content-Transfer-Encoding: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=2ZPYwjmkPJzKzs8TaX0iA1WLCqOHNyw8h4n06GnCDFs=; b=AoKs1qqu70K7tYmSwydd3XwyJx xepn3sMhwWOr7HFz5vhHzbv3ULMi/QSpPBl/JKP4gH3sMnvb+gNEUL9w3sZ921G7dBU3ampTvONto 2BHNPImDlgDNFyQNuk4J9AgE0nozjFvWjBI+VhMSHdSTLyuuJiqhuW7ZEI1G9JioJmN8=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version: Content-Type:Content-Transfer-Encoding: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=2ZPYwjmkPJzKzs8TaX0iA1WLCqOHNyw8h4n06GnCDFs=; b=A88CshhA8LPLaY6J/JiueEX+ox JftW1QvLiD1w/QRFjZ0XGQGrE+XYKXMJDc8FEI8O9eDdPRtl8vb6OToESyShFcfuNHJEhyoVnci0d 4+pMG7kYW7TkKOIpWKnlnUHgNRytHOHCJVB/PuIv5b/ZiWZkK9caFQq3ctXn+rRpx3Ek=; Received: from mail-pj1-f52.google.com ([209.85.216.52]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1lRr4W-0025A7-15 for openvpn-devel@lists.sourceforge.net; Thu, 01 Apr 2021 06:45:02 +0000 Received: by mail-pj1-f52.google.com with SMTP id x21-20020a17090a5315b029012c4a622e4aso497931pjh.2 for ; Wed, 31 Mar 2021 23:44:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=2ZPYwjmkPJzKzs8TaX0iA1WLCqOHNyw8h4n06GnCDFs=; b=CwWQSuAHKNibv6DqU4zAAcUAM4q58oUksnduKHvfbUqm61F2QhyDKtInjnugh0GLLt mKJbQWj33LCbpSSdU8WDvNpiV3n+bmG1u9iTRlgbwyNggkfeJ6FjZ+l0oOIvOZhqDIop eSixQ29TORgZdoFQ88tMpCFm+liI4fQZtD1eQ0/VLrTIlb3vxpHA8Hwi+47vaJfl0Knq 4mImdRHgXuOV7siqhEqD7an1EhaPkdyhJBxLrv03smfIdBbreIXbHKhhb61urYKKGJLA fqfxTWgq/vNjUeDVH/nPxegKUWB2BDr7tXRDBnvG8t6EyLavgWnKoqbylAKQtGN8EQr0 h7hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=2ZPYwjmkPJzKzs8TaX0iA1WLCqOHNyw8h4n06GnCDFs=; b=l+osKj9IlI7Hjeetfbmfv9dM7ucEGdgpYOXgbGAU61/Vjn2pvlg9ysm4vlHFd6FjWI nYpPvwBnWLGUVpePPBA+TAcFaT5PsPhWZMiqRvqEusH/e+XcaJraIewBo11bB4oxEnjD DzunDglUzge/G0HsaGrs5HKCSEcn6L+8RCYUrvug5vkrI3TDTq+fY835FpWf4Gk4FZ+B RaoyG7vp8L9a18QHeSz0muLQQYI1G0GazarDJQwTfzpTEQ19trniNYNRKmd5oL1PC+1E 16V2ELrtaIE53RJMODIfJn1168Nw05hUVxSkxwbeFeQykr8Swq0/IDqYVa6mDfXMcjRG Pc+g== X-Gm-Message-State: AOAM533PxZiyXiR3EHzbf3efeuy/JRt8bNuYvsjhR0n1QVtgF2LtLaDq wz8FcNwogxdXuU5YHvzN8j6zzfXsIT/0aWw4 X-Google-Smtp-Source: ABdhPJw/ab1zl3StqpfYj4zn96eUcQxDNIzpsHLeS6SUadBsNI7EErQNPhwrQB+D0EbA1AvJrYSrUQ== X-Received: by 2002:a17:90b:1950:: with SMTP id nk16mr7353596pjb.140.1617259486571; Wed, 31 Mar 2021 23:44:46 -0700 (PDT) Received: from localhost (118-160-14-245.dynamic-ip.hinet.net. [118.160.14.245]) by smtp.gmail.com with ESMTPSA id t18sm4625370pgg.33.2021.03.31.23.44.45 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 31 Mar 2021 23:44:46 -0700 (PDT) From: Tony He To: a@unstable.cc Date: Thu, 1 Apr 2021 14:44:31 +0800 Message-Id: <20210401064431.20229-1-huangya90@gmail.com> X-Mailer: git-send-email 2.17.1 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: stackoverflow.com] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (huangya90[at]gmail.com) 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.216.52 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.216.52 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (huangya90[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Headers-End: 1lRr4W-0025A7-15 Subject: [Openvpn-devel] [PATCH] ovpn-dco: ovpn-cli: properly set socket options 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: , Cc: openvpn-devel@lists.sourceforge.net MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox Actully We can not set two options at the same time. Old code: setsockopt(s, SOL_SOCKET, SO_REUSEADDR | SO_REUSEPORT, &opt, sizeof(opt)) If you use strace to trace sys call, you will find only SO_REUSEPORT is set: >setsockopt(3, SOL_SOCKET, SO_REUSEPORT, [1], 4) = 0 This is because SD_REUSEADDR is 2(0x0010) and SR_REUSEPORT is 15(0x1111) defined in /usr/include/asm-generic/socket.h in X86-64 platform. We need to set them one by one. In other platforms, if you set mutli options at the same time, you may encounter error "setsockopt: Protocol not available". Refer to https://stackoverflow.com/questions/58599070/socket-programming-setsockopt-protocol-not-available Signed-off-by: Tony He --- tests/ovpn-cli.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/ovpn-cli.c b/tests/ovpn-cli.c index c1cf3b4..68d28b4 100644 --- a/tests/ovpn-cli.c +++ b/tests/ovpn-cli.c @@ -426,9 +426,14 @@ static int ovpn_socket(struct ovpn_ctx *ctx, sa_family_t family, int proto) } int opt = 1; - ret = setsockopt(s, SOL_SOCKET, SO_REUSEADDR | SO_REUSEPORT, &opt, sizeof(opt)); + ret = setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)); if (ret < 0) { - perror("setsockopt"); + perror("setsockopt for SO_REUSEADDR"); + return ret; + } + ret = setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt)); + if (ret < 0) { + perror("setsockopt for SO_REUSEPORT"); return ret; }