From 62c0455e0fd48b4640251dc879c25d4f66ae3ed2 Mon Sep 17 00:00:00 2001 From: Antonio Quartulli Date: Thu, 12 Jul 2018 09:29:55 +0800 Subject: [PATCH] socket: make stream_buf_* functions static stream_buf_init(), stream_buf_close() and stream_buf_added() are only used within socket.c, therefore there is noneed to have them declared in socket.h. Make them static and remove useless declarations. This change reuired adding function prototypes in socket.c to avoid useless code re-ordering. Signed-off-by: Antonio Quartulli Acked-by: Gert Doering Message-Id: <20180712012955.24050-1-a@unstable.cc> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg17246.html Signed-off-by: Gert Doering --- src/openvpn/socket.c | 22 +++++++++++++++++++--- src/openvpn/socket.h | 15 --------------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c index 911b2335a..0eda25ccc 100644 --- a/src/openvpn/socket.c +++ b/src/openvpn/socket.c @@ -1492,6 +1492,22 @@ done: gc_free(&gc); } +/* + * Stream buffer handling prototypes -- stream_buf is a helper class + * to assist in the packetization of stream transport protocols + * such as TCP. + */ + +static void +stream_buf_init(struct stream_buf *sb, struct buffer *buf, + const unsigned int sockflags, const int proto); + +static void +stream_buf_close(struct stream_buf *sb); + +static bool +stream_buf_added(struct stream_buf *sb, int length_added); + /* For stream protocols, allocate a buffer to build up packet. * Called after frame has been finalized. */ @@ -2501,7 +2517,7 @@ stream_buf_reset(struct stream_buf *sb) sb->len = -1; } -void +static void stream_buf_init(struct stream_buf *sb, struct buffer *buf, const unsigned int sockflags, @@ -2575,7 +2591,7 @@ stream_buf_read_setup_dowork(struct link_socket *sock) return !sock->stream_buf.residual_fully_formed; } -bool +static bool stream_buf_added(struct stream_buf *sb, int length_added) { @@ -2642,7 +2658,7 @@ stream_buf_added(struct stream_buf *sb, } } -void +static void stream_buf_close(struct stream_buf *sb) { free_buf(&sb->residual); diff --git a/src/openvpn/socket.h b/src/openvpn/socket.h index 479d11505..7329a5185 100644 --- a/src/openvpn/socket.h +++ b/src/openvpn/socket.h @@ -994,21 +994,6 @@ link_socket_set_outgoing_addr(const struct buffer *buf, } } -/* - * Stream buffer handling -- stream_buf is a helper class - * to assist in the packetization of stream transport protocols - * such as TCP. - */ - -void stream_buf_init(struct stream_buf *sb, - struct buffer *buf, - const unsigned int sockflags, - const int proto); - -void stream_buf_close(struct stream_buf *sb); - -bool stream_buf_added(struct stream_buf *sb, int length_added); - static inline bool stream_buf_read_setup(struct link_socket *sock) { -- 2.47.2