From patchwork Tue Jan 16 10:24:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 190 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director3.mail.ord1d.rsapps.net ([172.27.255.57]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id my4GKSZzXlrodgAAgoeIoA for ; Tue, 16 Jan 2018 16:48:22 -0500 Received: from proxy17.mail.iad3a.rsapps.net ([172.27.255.57]) by director3.mail.ord1d.rsapps.net (Dovecot) with LMTP id EzfMIyZzXlpCdQAAkXNnRw ; Tue, 16 Jan 2018 16:48:22 -0500 Received: from smtp49.gate.iad3a ([172.27.255.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy17.mail.iad3a.rsapps.net (Dovecot) with LMTP id mWnKHyZzXlpAAwAAR4KW9A ; Tue, 16 Jan 2018 16:48:22 -0500 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.34.181.88] Authentication-Results: smtp49.gate.iad3a.rsapps.net; iprev=pass policy.iprev="216.34.181.88"; 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; dmarc=none (p=nil; dis=none) header.from=rfc2549.org X-Classification-ID: f87061e0-fb06-11e7-854f-525400fffce0-1-1 Received: from [216.34.181.88] ([216.34.181.88:32786] helo=lists.sourceforge.net) by smtp49.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 76/FF-17143-5237E5A5; Tue, 16 Jan 2018 16:48:21 -0500 Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1ebZ4c-0004hy-BZ; Tue, 16 Jan 2018 21:47:14 +0000 Received: from sfi-mx-2.v28.ch3.sourceforge.com ([172.29.28.192] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) (envelope-from ) id 1ebZ4a-0004hr-Ec for openvpn-devel@lists.sourceforge.net; Tue, 16 Jan 2018 21:47:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: 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=6BmwoeuP70DXYCG6MDYj6dJ1Pw3jdbRpIOvvXJcIGXc=; b=WhYMg46yyPm2g2e4f8IfH2YkJl Kksw6/qzsXblH9ss4Ufw7+eFmwDmXScOiAqHBFgHSQkoONZX2Jv/ahD6ZpfTWlt4Ytta4ftUGxhE3 nbz1En7EmEICMMKhR5+S+mNcRxqM2vgSR7b1wz8Ixlfsz5zC5tdzZku6sXHJ0k2b0mqs=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: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=6BmwoeuP70DXYCG6MDYj6dJ1Pw3jdbRpIOvvXJcIGXc=; b=lKr//DdU+9LCV9Vr2ht1t5fELn wawc3BcFfueyqGogLG71yT/ven6BSlXUaN6Bj4JsgyWQ6LGlRTaxUuIq0rGsBJb6rE6VM8ftDeqbF hVzU9uKxz2PIwkZ+MySwtycMOmuPuyLXRzmWDE9WAAOtitZ2DPc4nRqNgoU3rhIcvy50=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-2.v28.ch3.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) id 1ebZ4Y-0002re-Sn for openvpn-devel@lists.sourceforge.net; Tue, 16 Jan 2018 21:47:12 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.89 (FreeBSD)) (envelope-from ) id 1ebYiG-000FaG-I6 for openvpn-devel@lists.sourceforge.net; Tue, 16 Jan 2018 22:24:08 +0100 Received: (nullmailer pid 22606 invoked by uid 10006); Tue, 16 Jan 2018 21:24:08 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Tue, 16 Jan 2018 22:24:08 +0100 Message-Id: <1516137848-22565-1-git-send-email-arne@rfc2549.org> X-Mailer: git-send-email 2.7.4 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain X-Headers-End: 1ebZ4Y-0002re-Sn Subject: [Openvpn-devel] [PATCH] Replace buffer backed strings for management_android_control with simple stack variables 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: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox This simplifies the code a bit and also silences compiler warnings about uint8_t pointers passed to char pointers without cast --- src/openvpn/route.c | 14 +++++++------- src/openvpn/tun.c | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/openvpn/route.c b/src/openvpn/route.c index 2bd5845b..6826b4cc 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -1610,17 +1610,17 @@ add_route(struct route_ipv4 *r, status = openvpn_execve_check(&argv, es, 0, "ERROR: Linux route add command failed"); #elif defined (TARGET_ANDROID) - struct buffer out = alloc_buf_gc(128, &gc); + char out[128]; if (rgi) { - buf_printf(&out, "%s %s %s dev %s", network, netmask, gateway, rgi->iface); + snprintf(out, sizeof(out), "%s %s %s dev %s", network, netmask, gateway, rgi->iface); } else { - buf_printf(&out, "%s %s %s", network, netmask, gateway); + snprintf(out, sizeof(out), "%s %s %s", network, netmask, gateway); } - management_android_control(management, "ROUTE", buf_bptr(&out)); + management_android_control(management, "ROUTE", out); #elif defined (_WIN32) { @@ -1963,11 +1963,11 @@ add_route_ipv6(struct route_ipv6 *r6, const struct tuntap *tt, unsigned int flag status = openvpn_execve_check(&argv, es, 0, "ERROR: Linux route -6/-A inet6 add command failed"); #elif defined (TARGET_ANDROID) - struct buffer out = alloc_buf_gc(64, &gc); + char out[64]; - buf_printf(&out, "%s/%d %s", network, r6->netbits, device); + snprintf(out, sizeof(out), "%s/%d %s", network, r6->netbits, device); - management_android_control(management, "ROUTE6", buf_bptr(&out)); + management_android_control(management, "ROUTE6", out); #elif defined (_WIN32) diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 6e163489..46ed5d0d 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -1031,12 +1031,12 @@ do_ifconfig(struct tuntap *tt, if (do_ipv6) { - struct buffer out6 = alloc_buf_gc(64, &gc); - buf_printf(&out6, "%s/%d", ifconfig_ipv6_local,tt->netbits_ipv6); - management_android_control(management, "IFCONFIG6",buf_bptr(&out6)); + char out6[64]; + snprintf(out6, sizeof(out6), "%s/%d", ifconfig_ipv6_local,tt->netbits_ipv6); + management_android_control(management, "IFCONFIG6", out6); } - struct buffer out = alloc_buf_gc(64, &gc); + char out[64]; char *top; switch (tt->topology) @@ -1057,8 +1057,8 @@ do_ifconfig(struct tuntap *tt, top = "undef"; } - buf_printf(&out, "%s %s %d %s", ifconfig_local, ifconfig_remote_netmask, tun_mtu, top); - management_android_control(management, "IFCONFIG", buf_bptr(&out)); + snprintf(out, sizeof(out), "%s %s %d %s", ifconfig_local, ifconfig_remote_netmask, tun_mtu, top); + management_android_control(management, "IFCONFIG", out); #elif defined(TARGET_SOLARIS) /* Solaris 2.6 (and 7?) cannot set all parameters in one go...