From patchwork Thu Dec 28 22:54:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffan Karger X-Patchwork-Id: 161 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director2.mail.ord1d.rsapps.net ([172.30.191.6]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id HtxPFNAwTloTJQAAgoeIoA for ; Thu, 04 Jan 2018 08:49:04 -0500 Received: from proxy9.mail.ord1d.rsapps.net ([172.30.191.6]) by director2.mail.ord1d.rsapps.net (Dovecot) with LMTP id C9ShJ9AwTlqxAQAAgYhSiA ; Thu, 04 Jan 2018 08:49:04 -0500 Received: from smtp15.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy9.mail.ord1d.rsapps.net (Dovecot) with LMTP id TA4fCNAwTlpwYQAA7h+8OQ ; Thu, 04 Jan 2018 08:49:04 -0500 X-Spam-Exception: WHITELISTED X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: patchwork@openvpn.net X-Originating-Ip: [184.106.54.85] Authentication-Results: smtp15.gate.ord1d.rsapps.net; iprev=pass policy.iprev="184.106.54.85"; spf=pass smtp.mailfrom="samuli@openvpn.net" smtp.helo="smtp85.ord1d.emailsrvr.com"; 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=fox-it.com X-Classification-ID: 06b86050-f156-11e7-a424-5254007ab6c8-1-1 Received: from [184.106.54.85] ([184.106.54.85:58529] helo=smtp85.ord1d.emailsrvr.com) by smtp15.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id E8/FF-09219-0D03E4A5; Thu, 04 Jan 2018 08:49:04 -0500 Received: from smtp11.relay.ord1d.emailsrvr.com (localhost [127.0.0.1]) by smtp11.relay.ord1d.emailsrvr.com (SMTP Server) with ESMTP id 06DBC60062 for ; Thu, 4 Jan 2018 08:49:04 -0500 (EST) X-Auth-ID: samuli@openvpn.net Received: by smtp11.relay.ord1d.emailsrvr.com (Authenticated sender: samuli-AT-openvpn.net) with ESMTPSA id 7822760096 for ; Thu, 4 Jan 2018 08:49:03 -0500 (EST) X-Sender-Id: samuli@openvpn.net Received: from [192.168.15.45] (91-159-32-223.elisa-laajakaista.fi [91.159.32.223]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA) by 0.0.0.0:465 (trex/5.7.12); Thu, 04 Jan 2018 08:49:04 -0500 Resent-From: =?utf-8?q?Samuli_Sepp=C3=A4nen?= Resent-To: patchwork@openvpn.net Resent-Date: Thu, 4 Jan 2018 15:49:01 +0200 Resent-Message-ID: Resent-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 Received: from MBX10C-ORD1.mex06.mlsrvr.com (172.29.1.28) by MBX10C-ORD1.mex06.mlsrvr.com (172.29.1.28) with Microsoft SMTP Server (TLS) id 15.0.1293.2 via Mailbox Transport; Fri, 29 Dec 2017 03:55:28 -0600 Received: from MBX08D-ORD1.mex06.mlsrvr.com (172.29.1.23) by MBX10C-ORD1.mex06.mlsrvr.com (172.29.1.28) with Microsoft SMTP Server (TLS) id 15.0.1293.2; Fri, 29 Dec 2017 03:55:28 -0600 Received: from gate.forward.smtp.ord1c.emailsrvr.com (108.166.43.128) by MBX08D-ORD1.mex06.mlsrvr.com (172.29.1.23) with Microsoft SMTP Server (TLS) id 15.0.1293.2 via Frontend Transport; Fri, 29 Dec 2017 03:55:28 -0600 Received: from [216.34.181.88] ([216.34.181.88:33810] helo=lists.sourceforge.net) by smtp31.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 1C/0A-28857-F01164A5; Fri, 29 Dec 2017 04:55:27 -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 1eUrNJ-0006Zr-4j; Fri, 29 Dec 2017 09:54:49 +0000 Received: from sfi-mx-3.v28.ch3.sourceforge.com ([172.29.28.193] 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 1eUrNH-0006Zg-LK for openvpn-devel@lists.sourceforge.net; Fri, 29 Dec 2017 09:54:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Sender:Reply-To: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=fEVbfM+phOHv/RXv1/h3j/UDo9dbDJycurCQpAVpfLc=; b=LyGSq90rzzZsyriOekOtaY9+Dy beRzpa9iUQkK3w1z859ve9FbLFu7AyGroQenaQMmEupDXMq9DI6ApKwmy1YeqBj/hL7Wjd8L81aM2 eOF+gD1530xGN0qZ4xYBdEyOr19QAkFt924AWGPztMbqyrd9gL4ik6VyW3yQ7QE/U6es=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject: CC:To:From:Sender:Reply-To: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=fEVbfM+phOHv/RXv1/h3j/UDo9dbDJycurCQpAVpfLc=; b=DGeX2F3hSsEECkfcm9Kl4HuAVL V8l3NxDVCV3UJcEmMWwZnUJKtWHRLgrtBH/FEK+tdGDk7/EGLkiEe0RYxMk4E8xdqQWG4Bojss6sc ZFPPve6V0d+TT3wBc6NErx44jA17s+HsDOw2NRWpG7DSj0HvEAPlnjsIGbFwiecqmyg8=; Received: from ns2.fox-it.com ([178.250.144.131]) by sfi-mx-3.v28.ch3.sourceforge.com with esmtps (TLSv1:ECDHE-RSA-AES256-SHA:256) (Exim 4.89) id 1eUrNF-0005Ox-RT for openvpn-devel@lists.sourceforge.net; Fri, 29 Dec 2017 09:54:47 +0000 Received: from FOXDFT52.FOX.local (unknown [10.0.0.129]) by ns2.fox-it.com (Postfix) with ESMTPS id DD5D81AF767 for ; Fri, 29 Dec 2017 10:54:39 +0100 (CET) Received: from steffan-fox.fox.local (10.0.3.167) by FOXDFT52.FOX.local (10.0.0.129) with Microsoft SMTP Server (TLS) id 15.0.1293.2; Fri, 29 Dec 2017 10:54:39 +0100 From: Steffan Karger To: Date: Fri, 29 Dec 2017 10:54:31 +0100 Message-ID: <1514541271-19597-1-git-send-email-steffan.karger@fox-it.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498913642-32459-5-git-send-email-steffan.karger@fox-it.com> References: <1498913642-32459-5-git-send-email-steffan.karger@fox-it.com> X-ClientProxiedBy: FOXDFT52.FOX.local (10.0.0.129) To FOXDFT52.FOX.local (10.0.0.129) 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 -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1eUrNF-0005Ox-RT Subject: [Openvpn-devel] [PATCH 5/5 v2] buffer_list_aggregate_separator(): simplify code 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-MS-Exchange-Organization-Network-Message-Id: ad7cf38a-6c03-4319-e3ce-08d54ea24a4a X-MS-Exchange-Organization-AVStamp-Mailbox: SMEXzs^g;1387100;0;This mail has been scanned by Trend Micro ScanMail for Microsoft Exchange; X-MS-Exchange-Organization-AuthSource: MBX08D-ORD1.mex06.mlsrvr.com X-MS-Exchange-Organization-AuthAs: Anonymous MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: Inbox Clean up the function by slightly simplifying the logic. Mostly witespace changes, so best reviewed using 'git diff -w'. Signed-off-by: Steffan Karger Acked-by: Antonio Quartulli --- v2: rebase on new version of preceding patches src/openvpn/buffer.c | 71 ++++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 38 deletions(-) diff --git a/src/openvpn/buffer.c b/src/openvpn/buffer.c index cfe6f2c..858bb08 100644 --- a/src/openvpn/buffer.c +++ b/src/openvpn/buffer.c @@ -1226,49 +1226,44 @@ void buffer_list_aggregate_separator(struct buffer_list *bl, const size_t max_len, const char *sep) { - int sep_len = strlen(sep); + const int sep_len = strlen(sep); + struct buffer_entry *more = bl->head; + size_t size = 0; + int count = 0; + for (count = 0; more; ++count) + { + size_t extra_len = BLEN(&more->buf) + sep_len; + if (size + extra_len > max_len) + { + break; + } + + size += extra_len; + more = more->next; + } - if (bl->head) + if (count >= 2) { - struct buffer_entry *more = bl->head; - size_t size = 0; - int count = 0; - for (count = 0; more; ++count) - { - size_t extra_len = BLEN(&more->buf) + sep_len; - if (size + extra_len > max_len) - { - break; - } + struct buffer_entry *f; + ALLOC_OBJ_CLEAR(f, struct buffer_entry); + f->buf = alloc_buf(size + 1); /* prevent 0-byte malloc */ - size += extra_len; - more = more->next; + struct buffer_entry *e = bl->head; + for (size_t i = 0; e && i < count; ++i) + { + struct buffer_entry *next = e->next; + buf_copy(&f->buf, &e->buf); + buf_write(&f->buf, sep, sep_len); + free_buf(&e->buf); + free(e); + e = next; } - - if (count >= 2) + bl->head = f; + bl->size -= count - 1; + f->next = more; + if (!more) { - int i; - struct buffer_entry *e = bl->head, *f; - - ALLOC_OBJ_CLEAR(f, struct buffer_entry); - f->buf = alloc_buf(size + 1); /* prevent 0-byte malloc */ - f->buf.capacity = size; - for (i = 0; e && i < count; ++i) - { - struct buffer_entry *next = e->next; - buf_copy(&f->buf, &e->buf); - buf_write(&f->buf, sep, sep_len); - free_buf(&e->buf); - free(e); - e = next; - } - bl->head = f; - bl->size -= count - 1; - f->next = more; - if (!more) - { - bl->tail = f; - } + bl->tail = f; } } }