From patchwork Tue Jan 9 21:34:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffan Karger X-Patchwork-Id: 174 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 C9FTAGXQVVoVHwAAgoeIoA for ; Wed, 10 Jan 2018 03:35:49 -0500 Received: from proxy4.mail.ord1d.rsapps.net ([172.30.191.6]) by director2.mail.ord1d.rsapps.net (Dovecot) with LMTP id G9wuAGXQVVqgcAAAgYhSiA ; Wed, 10 Jan 2018 03:35:49 -0500 Received: from smtp20.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy4.mail.ord1d.rsapps.net (Dovecot) with LMTP id bwTaDmTQVVpOcAAAiYrejw ; Wed, 10 Jan 2018 03:35:49 -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: smtp20.gate.ord1c.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=fox-it.com X-Classification-ID: 425057aa-f5e1-11e7-928e-bc305bf03180-1-1 Received: from [216.34.181.88] ([216.34.181.88:2808] helo=lists.sourceforge.net) by smtp20.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 12/84-02522-460D55A5; Wed, 10 Jan 2018 03:35:48 -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 1eZBqL-00060k-Ko; Wed, 10 Jan 2018 08:34:41 +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 1eZBqK-00060d-Qm for openvpn-devel@lists.sourceforge.net; Wed, 10 Jan 2018 08:34:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:MIME-Version: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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=f/FY0P0OpRFGpckJDKBRWCJDJKSbf3soPhsAcwJPkw0=; b=fxWlA1YY34SE0xXG2ZDDCe2MWS nDGgtseZnHu5TnrvMIDmaOl9dm/qAPqveMiKzPY3QBDZ9fSJP+/lRPP8PoyyVO0PEjDEy7t5KxuzY I+WRWoGZe0mHcqqUOx6AnL1RNxjR0BR3Hxll8BYPLtSbuNsYEXUdsWf4o4uA8eZhRyq8=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:MIME-Version: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:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=f/FY0P0OpRFGpckJDKBRWCJDJKSbf3soPhsAcwJPkw0=; b=i cQZI+6O+u0ogupkg/M+Yqz+6vFFYqtQBA5OM0Kye+xQPhhuxY1lB7u87Gnu6nZ4bli1WjFRfgXoA2 1g9F0z4uSbWnPh8Q1LhDFyBLc8iUeuAOhf5bf5NTTUfMTPokdKFE/R840CPhw4X3Tslj/nqqFPCqk SHl/l49H270p4jvs=; 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 1eZBqJ-0003F2-Fv for openvpn-devel@lists.sourceforge.net; Wed, 10 Jan 2018 08:34:40 +0000 Received: from FOXDFT52.FOX.local (unknown [10.0.0.129]) by ns2.fox-it.com (Postfix) with ESMTPS id 627F71AF7C2 for ; Wed, 10 Jan 2018 09:34:33 +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; Wed, 10 Jan 2018 09:34:33 +0100 From: Steffan Karger To: Date: Wed, 10 Jan 2018 09:34:19 +0100 Message-ID: <1515573259-20968-1-git-send-email-steffan.karger@fox-it.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 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: 1eZBqJ-0003F2-Fv Subject: [Openvpn-devel] [PATCH] Fix types around buffer_list_push(_data) 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-getmail-retrieved-from-mailbox: Inbox In C, strings are char pointers, not unsigned char pointers. And arbitrary data is represented by a void pointer. Change buffer_list_push and buffer_list_push_data to follow these rules, and remove any now unneeded casts. Signed-off-by: Steffan Karger Acked-by: Gert Doering --- src/openvpn/buffer.c | 6 +++--- src/openvpn/buffer.h | 4 ++-- src/openvpn/manage.c | 12 ++++++------ src/openvpn/manage.h | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/openvpn/buffer.c b/src/openvpn/buffer.c index a0c2393..858bb08 100644 --- a/src/openvpn/buffer.c +++ b/src/openvpn/buffer.c @@ -1169,7 +1169,7 @@ buffer_list_reset(struct buffer_list *ol) } void -buffer_list_push(struct buffer_list *ol, const unsigned char *str) +buffer_list_push(struct buffer_list *ol, const char *str) { if (str) { @@ -1183,7 +1183,7 @@ buffer_list_push(struct buffer_list *ol, const unsigned char *str) } struct buffer_entry * -buffer_list_push_data(struct buffer_list *ol, const uint8_t *data, size_t size) +buffer_list_push_data(struct buffer_list *ol, const void *data, size_t size) { struct buffer_entry *e = NULL; if (data && (!ol->max_size || ol->size < ol->max_size)) @@ -1319,7 +1319,7 @@ buffer_list_file(const char *fn, int max_line_len) bl = buffer_list_new(0); while (fgets(line, max_line_len, fp) != NULL) { - buffer_list_push(bl, (unsigned char *)line); + buffer_list_push(bl, line); } free(line); } diff --git a/src/openvpn/buffer.h b/src/openvpn/buffer.h index 8579cea..e588b80 100644 --- a/src/openvpn/buffer.h +++ b/src/openvpn/buffer.h @@ -1095,9 +1095,9 @@ bool buffer_list_defined(const struct buffer_list *ol); void buffer_list_reset(struct buffer_list *ol); -void buffer_list_push(struct buffer_list *ol, const unsigned char *str); +void buffer_list_push(struct buffer_list *ol, const char *str); -struct buffer_entry *buffer_list_push_data(struct buffer_list *ol, const uint8_t *data, size_t size); +struct buffer_entry *buffer_list_push_data(struct buffer_list *ol, const void *data, size_t size); struct buffer *buffer_list_peek(struct buffer_list *ol); diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c index 55b106c..650f9e0 100644 --- a/src/openvpn/manage.c +++ b/src/openvpn/manage.c @@ -250,7 +250,7 @@ man_output_list_push_str(struct management *man, const char *str) { if (management_connected(man) && str) { - buffer_list_push(man->connection.out, (const unsigned char *) str); + buffer_list_push(man->connection.out, str); } } @@ -2190,13 +2190,13 @@ man_read(struct management *man) * process command line if complete */ { - const unsigned char *line; + const char *line; while ((line = command_line_get(man->connection.in))) { #ifdef MANAGEMENT_IN_EXTRA if (man->connection.in_extra) { - if (!strcmp((char *)line, "END")) + if (!strcmp(line, "END")) { in_extra_dispatch(man); } @@ -3791,18 +3791,18 @@ command_line_add(struct command_line *cl, const unsigned char *buf, const int le } } -const unsigned char * +const char * command_line_get(struct command_line *cl) { int i; - const unsigned char *ret = NULL; + const char *ret = NULL; i = buf_substring_len(&cl->buf, '\n'); if (i >= 0) { buf_copy_excess(&cl->residual, &cl->buf, i); buf_chomp(&cl->buf); - ret = (const unsigned char *) BSTR(&cl->buf); + ret = BSTR(&cl->buf); } return ret; } diff --git a/src/openvpn/manage.h b/src/openvpn/manage.h index 676be64..364488f 100644 --- a/src/openvpn/manage.h +++ b/src/openvpn/manage.h @@ -70,7 +70,7 @@ void command_line_free(struct command_line *cl); void command_line_add(struct command_line *cl, const unsigned char *buf, const int len); -const unsigned char *command_line_get(struct command_line *cl); +const char *command_line_get(struct command_line *cl); void command_line_reset(struct command_line *cl);