From patchwork Tue Jan 16 23:38:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 191 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director3.mail.ord1d.rsapps.net ([172.28.255.1]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id 8zbvG/MnX1rUbQAAgoeIoA for ; Wed, 17 Jan 2018 05:39:47 -0500 Received: from director7.mail.ord1c.rsapps.net ([172.28.255.1]) by director3.mail.ord1d.rsapps.net (Dovecot) with LMTP id G5K8G/MnX1ryOQAAkXNnRw ; Wed, 17 Jan 2018 05:39:47 -0500 Received: from smtp45.gate.ord1a ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by director7.mail.ord1c.rsapps.net (Dovecot) with LMTP id yoe+GfMnX1p5NwAAqdfm7w ; Wed, 17 Jan 2018 05:39:47 -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: smtp45.gate.ord1a.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: bcba130a-fb72-11e7-849b-001ec957df86-1-1 Received: from [216.34.181.88] ([216.34.181.88:4913] helo=lists.sourceforge.net) by smtp45.gate.ord1a.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 25/F2-02045-2F72F5A5; Wed, 17 Jan 2018 05:39:47 -0500 Received: from localhost ([127.0.0.1] helo=sfs-ml-3.v29.ch3.sourceforge.com) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1ebl7H-0006vK-Qv; Wed, 17 Jan 2018 10:38:47 +0000 Received: from sfi-mx-4.v28.ch3.sourceforge.com ([172.29.28.194] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) (envelope-from ) id 1ebl7G-0006vD-E3 for openvpn-devel@lists.sourceforge.net; Wed, 17 Jan 2018 10:38:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To: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:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=UCUq4uQXqRiX7ZYxkjtioSUV616OFmEjNncn5/7TROc=; b=GFnrNwrm780p85KE3tzaYagBAM 6gR/sEzWwzhiXj2l1mdGK0zE5EWTHHITmoWLMyF4WSFDlukabcNTt8MLl2cIzjWi6DHVp1gEQiWFu Ei5dg/B+6mqPeGG07U5tq6wF9YcqVC7K0iPnK304jxyWyvORzmw68GGpJFDSFsHsLYh0=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To: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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=UCUq4uQXqRiX7ZYxkjtioSUV616OFmEjNncn5/7TROc=; b=fcmTyblbhUBVzowFXtHLzk+KWF DkjTkmSQipSmt4mlfB47izKDpjzM973LLkKXOiy11ZP6hrvGK8C1fLpAylCiaBoyDz4eCcfa/pbPs HyPg9z4Q9zUMPZTjM1tTdScg2Rz4QNjumer/lUWir/Z8z2ojzjmMTDn54U4bYABkN520=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-4.v28.ch3.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) id 1ebl7D-0006WT-Iz for openvpn-devel@lists.sourceforge.net; Wed, 17 Jan 2018 10:38:46 +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 1ebl76-000HaF-3B for openvpn-devel@lists.sourceforge.net; Wed, 17 Jan 2018 11:38:36 +0100 Received: (nullmailer pid 28166 invoked by uid 10006); Wed, 17 Jan 2018 10:38:36 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Wed, 17 Jan 2018 11:38:36 +0100 Message-Id: <1516185516-28125-1-git-send-email-arne@rfc2549.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <608a626b-1aae-0215-ea96-fc3280aaafdd@fox-it.com> References: <608a626b-1aae-0215-ea96-fc3280aaafdd@fox-it.com> 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: 1ebl7D-0006WT-Iz Subject: [Openvpn-devel] [PATCH v2] 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 Patch V2: Use openvpn_snprintf instead snprintf Acked-By: Gert Doering --- 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..1e1f204d 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); + openvpn_snprintf(out, sizeof(out), "%s %s %s dev %s", network, netmask, gateway, rgi->iface); } else { - buf_printf(&out, "%s %s %s", network, netmask, gateway); + openvpn_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); + openvpn_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..2644d996 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]; + openvpn_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)); + openvpn_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...