Merge tag 'upstream/2.4.0'

Upstream version 2.4.0

1 files changed, 22 insertions, 18 deletions

diff --git a/src/openvpn/forward.h b/src/openvpn/forward.h
index 0856aa7..ae86e7a 100644
--- a/src/openvpn/forward.h
+++ b/src/openvpn/forward.h
@@ -5,7 +5,7 @@
  *             packet encryption, packet authentication, and
  *             packet compression.
  *
- *  Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
+ *  Copyright (C) 2002-2017 OpenVPN Technologies, Inc. <sales@openvpn.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
@@ -41,7 +41,7 @@
 #define ANY_OUT(c)      (TUN_OUT(c) || LINK_OUT(c))
 
 #ifdef ENABLE_FRAGMENT
-#define TO_LINK_FRAG(c) ((c)->c2.fragment && fragment_outgoing_defined ((c)->c2.fragment))
+#define TO_LINK_FRAG(c) ((c)->c2.fragment && fragment_outgoing_defined((c)->c2.fragment))
 #else
 #define TO_LINK_FRAG(c) (false)
 #endif
@@ -62,11 +62,13 @@
 #define IOW_READ            (IOW_READ_TUN|IOW_READ_LINK)
 
 
-void pre_select (struct context *c);
-void process_io (struct context *c);
+void pre_select(struct context *c);
 
-const char *wait_status_string (struct context *c, struct gc_arena *gc);
-void show_wait_status (struct context *c);
+void process_io(struct context *c);
+
+const char *wait_status_string(struct context *c, struct gc_arena *gc);
+
+void show_wait_status(struct context *c);
 
 
 /**********************************************************************/
@@ -102,8 +104,9 @@ void show_wait_status (struct context *c);
  *     the packet then gets fragmented, this function will be called again
  *     once for each remaining fragment with this parameter set to false.
  */
-void encrypt_sign (struct context *c, bool comp_frag);
-int get_server_poll_remaining_time (struct event_timeout* server_poll_timeout);
+void encrypt_sign(struct context *c, bool comp_frag);
+
+int get_server_poll_remaining_time(struct event_timeout *server_poll_timeout);
 
 /**********************************************************************/
 /**
@@ -125,7 +128,7 @@ int get_server_poll_remaining_time (struct event_timeout* server_poll_timeout);
  * @param c - The context structure which contains the external
  *     network socket from which to read incoming packets.
  */
-void read_incoming_link (struct context *c);
+void read_incoming_link(struct context *c);
 
 /**
  * Starts processing a packet read from the external network interface.
@@ -153,7 +156,7 @@ void read_incoming_link (struct context *c);
  *
  * @return true if packet is authenticated, false otherwise.
  */
-bool process_incoming_link_part1 (struct context *c, struct link_socket_info *lsi, bool floated);
+bool process_incoming_link_part1(struct context *c, struct link_socket_info *lsi, bool floated);
 
 /**
  * Continues processing a packet read from the external network interface.
@@ -180,7 +183,7 @@ bool process_incoming_link_part1 (struct context *c, struct link_socket_info *ls
  * @param orig_buf - Pointer to a buffer data.
  *
  */
-void process_incoming_link_part2 (struct context *c, struct link_socket_info *lsi, const uint8_t *orig_buf);
+void process_incoming_link_part2(struct context *c, struct link_socket_info *lsi, const uint8_t *orig_buf);
 
 /**
  * Write a packet to the external network interface.
@@ -194,7 +197,7 @@ void process_incoming_link_part2 (struct context *c, struct link_socket_info *ls
  * @param c - The context structure of the VPN tunnel associated with the
  *     packet.
  */
-void process_outgoing_link (struct context *c);
+void process_outgoing_link(struct context *c);
 
 
 /**************************************************************************/
@@ -210,7 +213,7 @@ void process_outgoing_link (struct context *c);
  * @param c - The context structure in which to store the received
  *     packet.
  */
-void read_incoming_tun (struct context *c);
+void read_incoming_tun(struct context *c);
 
 
 /**
@@ -225,7 +228,7 @@ void read_incoming_tun (struct context *c);
  * @param c - The context structure of the VPN tunnel associated with the
  *     packet.
  */
-void process_incoming_tun (struct context *c);
+void process_incoming_tun(struct context *c);
 
 
 /**
@@ -240,12 +243,12 @@ void process_incoming_tun (struct context *c);
  * @param c - The context structure of the VPN tunnel associated with
  *     the packet.
  */
-void process_outgoing_tun (struct context *c);
+void process_outgoing_tun(struct context *c);
 
 
 /**************************************************************************/
 
-bool send_control_channel_string (struct context *c, const char *str, int msglevel);
+bool send_control_channel_string(struct context *c, const char *str, int msglevel);
 
 #define PIPV4_PASSTOS         (1<<0)
 #define PIP_MSSFIX            (1<<1)         /* v4 and v6 */
@@ -253,10 +256,11 @@ bool send_control_channel_string (struct context *c, const char *str, int msglev
 #define PIPV4_EXTRACT_DHCP_ROUTER (1<<3)
 #define PIPV4_CLIENT_NAT      (1<<4)
 
-void process_ip_header (struct context *c, unsigned int flags, struct buffer *buf);
+void process_ip_header(struct context *c, unsigned int flags, struct buffer *buf);
 
 #if P2MP
-void schedule_exit (struct context *c, const int n_seconds, const int signal);
+void schedule_exit(struct context *c, const int n_seconds, const int signal);
+
 #endif
 
 #endif /* FORWARD_H */