From patchwork Mon Sep 4 15:43:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "plaisthos (Code Review)" X-Patchwork-Id: 3333 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:390:b0:d7:3b0f:3938 with SMTP id 16csp1291562dyq; Mon, 4 Sep 2023 08:44:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFrp4V9eQUCgBdSU6/g7sqezwRbgapejKYfBlv0j2f2I4IJuUPet500WWoSAGC8k1JwhKKG X-Received: by 2002:a05:6a20:8f13:b0:137:4fd0:e2e6 with SMTP id b19-20020a056a208f1300b001374fd0e2e6mr13759412pzk.6.1693842273611; Mon, 04 Sep 2023 08:44:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693842273; cv=none; d=google.com; s=arc-20160816; b=nTlpupLcRrxvkojVWQz+hMKWYqcnXMmwl38JIF4DwTHiKuEXY7fUMjWlUVYKdjytJt d/FXY/F99hgMq7BJEepu+2Uuo0vM5IgHd9vDVggtLKWqxFtQd2BmdKDkxxRAlHcj+8Zc V/ILZg4g3POJejTe4Hgt4C0wDVfVut8foR32hxHzAG2dzRZMIlL+71S3zV6YT123B/MT ciOeNiRZGS6PvKQlQjAIZ7SqxYsRy8yKE0An1Q6+jN3BrjAHPiddjbIY+I8bXeZH/KYN KyBc+ub4VXMJZz/pEWLn3k8zWXzOYOWAIJe46vCnrYUITktJNUMwqR4trwg6vt2jCrgh NE0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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:in-reply-to:auto-submitted:to :date:from:dkim-signature:dkim-signature:dkim-signature; bh=dS2jM6CbmaGAnyjyjPioGlIJo9uGu9LLlJMNWk2M/KA=; fh=lm0MLPW7DntlrDqRECIiC9JlE1uPxhepE0URYHIf+eE=; b=DGhXaHbTU0inducEV6izfY9kJcLBDrJ2NJcocfaeNzJDAUNx+8fo8bs7KHMMXYn8k/ dUt1taBT8XvnvhdYBwJhBcdD0TdTuzGDMyxfx0Md/wItAtVR4LFWpmUq1UWHl3C18tyu chgNKm8Jrp1kXGgF0MhYegvB/wWK/IFAGGPsFWXoCanL2e8N1pFsVbY2/u9wPjZNA/pJ D+k+u6esvKHGnDvoELIn5dy7AGSzRSnnuvEKXuUT2otcl7c33emKOAjFLmZ8gpJtayfM iI7ea1RUTPO63HEXBidBdp0hud7VryhzW8EDo2r+Ij5/lBU9bHFqVqujXtJ/h+Sz432L 4d+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=IjWrBejp; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=KAt17iyg; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=g3X+2Izc; 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 Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id h190-20020a6383c7000000b0055ba60a3301si7785869pge.295.2023.09.04.08.44.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Sep 2023 08:44:33 -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=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=IjWrBejp; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=KAt17iyg; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=g3X+2Izc; 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 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 1qdBjl-0001dl-KW; Mon, 04 Sep 2023 15:43:37 +0000 Received: from [172.30.20.202] (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 1qdBjj-0001de-6x for openvpn-devel@lists.sourceforge.net; Mon, 04 Sep 2023 15:43:35 +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:In-Reply-To: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:List-Help:List-Subscribe :List-Post:List-Owner:List-Archive; bh=s3lZasZz/6GXCPsOkyrvrd/s+XuxinBp31ozbg9FrKQ=; b=IjWrBejpNveUxVKh1+F61QPUwy 5v72NJ088zXJOcB6wNzPE4oXPpk0WiD3P7D83tA9LUojEXRC7gS8tbUw0eMMNDgD4g/hjvhUUi1fG 20YUTWmp1O7GrljNgkHkzfI6G7S77rayHU891ZUEyOITdmqlHmOZE0QKYtlB6OuqVDAw=; 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:In-Reply-To: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:List-Help:List-Subscribe:List-Post: List-Owner:List-Archive; bh=s3lZasZz/6GXCPsOkyrvrd/s+XuxinBp31ozbg9FrKQ=; b=K At17iyglQdb5ynw0qcFcrg6IgNjVHOWGhe+ddhklC0u/Ca43ENcpCnLEhqwFFjGriU0cU4NmZWc/B ps+gRm+AN3X2Qh3QAgwRAL21eMuqu14jYw2F+RngQKXV+ONj8x3go1YrFbwD8q69Z4YPEM69mJeT0 eKyWE+zFT0Qqu1uo=; Received: from mail-wr1-f53.google.com ([209.85.221.53]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1qdBjf-009OXk-U9 for openvpn-devel@lists.sourceforge.net; Mon, 04 Sep 2023 15:43:35 +0000 Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-31c5cac3ae2so1386203f8f.3 for ; Mon, 04 Sep 2023 08:43:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1693842205; x=1694447005; darn=lists.sourceforge.net; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:in-reply-to:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from:from:to:cc :subject:date:message-id:reply-to; bh=s3lZasZz/6GXCPsOkyrvrd/s+XuxinBp31ozbg9FrKQ=; b=g3X+2IzcJy14CXDufpFWJTsOftwSclO80uDuAhPgNAMnjurGtGQfeznM1Vgwlu5d+O c8sWLrKZAi4HI/iP47Um8XyrMkee7Mp1ga34yiZUnWeC8utLzZZBgaFKUIQGbcsPcvQS lkpjlgPml81+2oRfTXDtCvMRW3LsHu5AqAzb1Pe06Xnj8K7GvwUXk/c6rsjzoKOEi9Cg foF6kzrY45KTOCXAnMZNcJQtbnqEIgYLmf8kNUq75jnJcnVuQi7VmWwV9/d5CuQPesDf 8CoN9urN0C/f+Bdng4CxmQRXkz7QHLHVsMo7IJ94HXlvqW8JsWOQs/VljCRG8C8lwoOf qBog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693842205; x=1694447005; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:in-reply-to: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=s3lZasZz/6GXCPsOkyrvrd/s+XuxinBp31ozbg9FrKQ=; b=TtxCebmzBzaXjpJlpwkm00T3MNDx/MNFikz7nE+3x4fUJJ1CAFqsb3WWI7z2blFdrT pt0iOI6Gfl/jpj6B3SjNFKekyLDQN9D02LuFUyv6xz7bxStukbqmfjT7IySeEbr+nRyE TiFsq6lKGJvnPJ0huc/BY0EvwneRdwG3HGupDwMR0kO+BKdTSjrPL245r186s+FYlahx 9nmqdIoW2SS1oKshm+4i5pA4zs5GTk3CwtavKUHBqP1qS+Eynh0sJHeLKVwc+mp+ZxqM WC4ymJXhYUPh/9VL9L7sfluCEmyGinaozwf2LRL07OZJOdL72L6RZzJlfylTiy59QS83 vq1w== X-Gm-Message-State: AOJu0Yw5xSW7Vq0OVSVYHBUv7RUOJ5xT+mv6H2vlf2O8tns46M1l4szz /ft0fqZHwmOMK7bvbVuWbjmwulaZYDk/n19TJZs= X-Received: by 2002:adf:e691:0:b0:319:8333:a2cb with SMTP id r17-20020adfe691000000b003198333a2cbmr8776480wrm.13.1693842205197; Mon, 04 Sep 2023 08:43:25 -0700 (PDT) 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 bt12-20020a056000080c00b0031433443265sm9072808wrb.53.2023.09.04.08.43.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Sep 2023 08:43:24 -0700 (PDT) From: "stipa (Code Review)" X-Google-Original-From: "stipa (Code Review)" X-Gerrit-PatchSet: 2 Date: Mon, 4 Sep 2023 15:43:23 +0000 To: flichtenheld Auto-Submitted: auto-generated X-Gerrit-MessageType: newpatchset X-Gerrit-Change-Id: I2139b62117ba69d643b585d2610e8aef15f71d3e X-Gerrit-Change-Number: 327 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: c5e4c8b6f756553e860ff468176fd37dc577c088 In-Reply-To: References: Message-ID: <89726e852cdbbc4b924435a8a04b95db5d2c720c-EmailReplacePatchSet-HTML@gerrit.openvpn.net> MIME-Version: 1.0 User-Agent: Gerrit/3.8.0 X-Spam-Score: -0.2 (/) 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: Attention is currently required from: flichtenheld, stipa. Hello flichtenheld, I'd like you to reexamine a change. 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.221.53 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.53 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 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_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1qdBjf-009OXk-U9 Subject: [Openvpn-devel] [XS] Change in openvpn[release/2.6]: Support for long INFO/INFO_PRE messages 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: lstipakov@gmail.com, 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?1776117245484061996?= X-GMAIL-MSGID: =?utf-8?q?1776122355811615082?= Attention is currently required from: flichtenheld, stipa. Hello flichtenheld, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/327?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by flichtenheld Change subject: Support for long INFO/INFO_PRE messages ...................................................................... Support for long INFO/INFO_PRE messages Current hardcoded limit is not defined anywhere and the server (CloudConnexa) sends the longer string in some cases. Change-Id: I2139b62117ba69d643b585d2610e8aef15f71d3e Signed-off-by: Lev Stipakov --- M src/openvpn/push.c 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/27/327/2 diff --git a/src/openvpn/push.c b/src/openvpn/push.c index d468211..722bfce 100644 --- a/src/openvpn/push.c +++ b/src/openvpn/push.c @@ -42,6 +42,8 @@ static char push_reply_cmd[] = "PUSH_REPLY"; +#define INFOMSG_MAN ">INFOMSG:" + /* * Auth username/password * @@ -243,8 +245,8 @@ * We use >INFOMSG here instead of plain >INFO since INFO is used to * for management greeting and we don't want to confuse the client */ - struct buffer out = alloc_buf_gc(256, &gc); - buf_printf(&out, ">%s:%s", "INFOMSG", m); + struct buffer out = alloc_buf_gc(strlen(INFOMSG_MAN) + BLEN(&buf), &gc); + buf_printf(&out, "%s%s", INFOMSG_MAN, m); management_notify_generic(management, BSTR(&out)); gc_free(&gc);