New upstream version 2.4.0upstream/2.4.0

1 files changed, 61 insertions, 52 deletions

diff --git a/src/openvpn/init.h b/src/openvpn/init.h
index 524bc64..3b97d84 100644
--- a/src/openvpn/init.h
+++ b/src/openvpn/init.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
@@ -33,103 +33,112 @@
  */
 #define BASE_N_EVENTS 4
 
-void context_clear (struct context *c);
-void context_clear_1 (struct context *c);
-void context_clear_2 (struct context *c);
-void context_init_1 (struct context *c);
-void context_clear_all_except_first_time (struct context *c);
+void context_clear(struct context *c);
 
-bool init_static (void);
+void context_clear_1(struct context *c);
 
-void uninit_static (void);
+void context_clear_2(struct context *c);
 
-#define IVM_LEVEL_1 (1<<0) 
+void context_init_1(struct context *c);
+
+void context_clear_all_except_first_time(struct context *c);
+
+bool init_static(void);
+
+void uninit_static(void);
+
+#define IVM_LEVEL_1 (1<<0)
 #define IVM_LEVEL_2 (1<<1)
-void init_verb_mute (struct context *c, unsigned int flags);
+void init_verb_mute(struct context *c, unsigned int flags);
 
-void init_options_dev (struct options *options);
+void init_options_dev(struct options *options);
 
-bool print_openssl_info (const struct options *options);
+bool print_openssl_info(const struct options *options);
 
-bool do_genkey (const struct options *options);
+bool do_genkey(const struct options *options);
 
-bool do_persist_tuntap (const struct options *options);
+bool do_persist_tuntap(const struct options *options);
 
-bool possibly_become_daemon (const struct options *options);
+bool possibly_become_daemon(const struct options *options);
 
-void pre_setup (const struct options *options);
+void pre_setup(const struct options *options);
 
-void init_instance_handle_signals (struct context *c, const struct env_set *env, const unsigned int flags);
+void init_instance_handle_signals(struct context *c, const struct env_set *env, const unsigned int flags);
 
-void init_instance (struct context *c, const struct env_set *env, const unsigned int flags);
+void init_instance(struct context *c, const struct env_set *env, const unsigned int flags);
 
 /**
  * Query for private key and auth-user-pass username/passwords.
  */
-void init_query_passwords (const struct context *c);
+void init_query_passwords(const struct context *c);
 
-void do_route (const struct options *options,
-	       struct route_list *route_list,
-	       struct route_ipv6_list *route_ipv6_list,
-	       const struct tuntap *tt,
-	       const struct plugin_list *plugins,
-	       struct env_set *es);
+void do_route(const struct options *options,
+              struct route_list *route_list,
+              struct route_ipv6_list *route_ipv6_list,
+              const struct tuntap *tt,
+              const struct plugin_list *plugins,
+              struct env_set *es);
 
-void close_instance (struct context *c);
+void close_instance(struct context *c);
 
-bool do_test_crypto (const struct options *o);
+bool do_test_crypto(const struct options *o);
 
-void context_gc_free (struct context *c);
+void context_gc_free(struct context *c);
 
-bool do_up (struct context *c,
-	    bool pulled_options,
-	    unsigned int option_types_found);
+bool do_up(struct context *c,
+           bool pulled_options,
+           unsigned int option_types_found);
 
-unsigned int pull_permission_mask (const struct context *c);
+unsigned int pull_permission_mask(const struct context *c);
 
-const char *format_common_name (struct context *c, struct gc_arena *gc);
+const char *format_common_name(struct context *c, struct gc_arena *gc);
 
-void reset_coarse_timers (struct context *c);
+void reset_coarse_timers(struct context *c);
 
-bool do_deferred_options (struct context *c, const unsigned int found);
+bool do_deferred_options(struct context *c, const unsigned int found);
 
-void inherit_context_child (struct context *dest,
-			    const struct context *src);
+void inherit_context_child(struct context *dest,
+                           const struct context *src);
 
-void inherit_context_top (struct context *dest,
-			  const struct context *src);
+void inherit_context_top(struct context *dest,
+                         const struct context *src);
 
 #define CC_GC_FREE          (1<<0)
 #define CC_USR1_TO_HUP      (1<<1)
 #define CC_HARD_USR1_TO_HUP (1<<2)
 #define CC_NO_CLOSE         (1<<3)
 
-void close_context (struct context *c, int sig, unsigned int flags);
+void close_context(struct context *c, int sig, unsigned int flags);
 
-struct context_buffers *init_context_buffers (const struct frame *frame);
+struct context_buffers *init_context_buffers(const struct frame *frame);
 
-void free_context_buffers (struct context_buffers *b);
+void free_context_buffers(struct context_buffers *b);
 
 #define ISC_ERRORS (1<<0)
 #define ISC_SERVER (1<<1)
-void initialization_sequence_completed (struct context *c, const unsigned int flags);
+void initialization_sequence_completed(struct context *c, const unsigned int flags);
 
 #ifdef ENABLE_MANAGEMENT
 
-void init_management (struct context *c);
-bool open_management (struct context *c);
-void close_management (void);
+void init_management(struct context *c);
+
+bool open_management(struct context *c);
 
-void management_show_net_callback (void *arg, const int msglevel);
+void close_management(void);
+
+void management_show_net_callback(void *arg, const int msglevel);
 
 #endif
 
-void init_management_callback_p2p (struct context *c);
-void uninit_management_callback (void);
+void init_management_callback_p2p(struct context *c);
+
+void uninit_management_callback(void);
 
 #ifdef ENABLE_PLUGIN
-void init_plugins (struct context *c);
-void open_plugins (struct context *c, const bool import_options, int init_point);
-#endif
+void init_plugins(struct context *c);
+
+void open_plugins(struct context *c, const bool import_options, int init_point);
 
 #endif
+
+#endif /* ifndef INIT_H */