New upstream version 2.4.0upstream/2.4.0

1 files changed, 33 insertions, 30 deletions

diff --git a/src/openvpn/pf.h b/src/openvpn/pf.h
index 04adf0e..3832683 100644
--- a/src/openvpn/pf.h
+++ b/src/openvpn/pf.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
@@ -35,68 +35,71 @@
 struct context;
 
 struct ipv4_subnet {
-  bool exclude;
-  in_addr_t network;
-  in_addr_t netmask;
+    bool exclude;
+    in_addr_t network;
+    in_addr_t netmask;
 };
 
 struct pf_subnet {
-  struct pf_subnet *next;
-  struct ipv4_subnet rule;
+    struct pf_subnet *next;
+    struct ipv4_subnet rule;
 };
 
 struct pf_subnet_set {
-  bool default_allow;
-  struct pf_subnet *list;
+    bool default_allow;
+    struct pf_subnet *list;
 };
 
 struct pf_cn {
-  bool exclude;
-  char *cn;
+    bool exclude;
+    char *cn;
 };
 
 struct pf_cn_elem {
-  struct pf_cn_elem *next;
-  struct pf_cn rule;
+    struct pf_cn_elem *next;
+    struct pf_cn rule;
 };
 
 struct pf_cn_set {
-  bool default_allow;
-  struct pf_cn_elem *list;
-  struct hash *hash_table;
+    bool default_allow;
+    struct pf_cn_elem *list;
+    struct hash *hash_table;
 };
 
 struct pf_set {
-  bool kill;
-  struct pf_subnet_set sns;
-  struct pf_cn_set cns;
+    bool kill;
+    struct pf_subnet_set sns;
+    struct pf_cn_set cns;
 };
 
 struct pf_context {
-  bool enabled;
-  struct pf_set *pfs;
+    bool enabled;
+    struct pf_set *pfs;
 #ifdef PLUGIN_PF
-  char *filename;
-  time_t file_last_mod;
-  unsigned int n_check_reload;
-  struct event_timeout reload;
+    char *filename;
+    time_t file_last_mod;
+    unsigned int n_check_reload;
+    struct event_timeout reload;
 #endif
 };
 
-void pf_init_context (struct context *c);
+void pf_init_context(struct context *c);
 
-void pf_destroy_context (struct pf_context *pfc);
+void pf_destroy_context(struct pf_context *pfc);
 
 #ifdef PLUGIN_PF
-void pf_check_reload (struct context *c);
+void pf_check_reload(struct context *c);
+
 #endif
 
 #ifdef MANAGEMENT_PF
-bool pf_load_from_buffer_list (struct context *c, const struct buffer_list *config);
+bool pf_load_from_buffer_list(struct context *c, const struct buffer_list *config);
+
 #endif
 
 #ifdef ENABLE_DEBUG
-void pf_context_print (const struct pf_context *pfc, const char *prefix, const int lev);
-#endif
+void pf_context_print(const struct pf_context *pfc, const char *prefix, const int lev);
 
 #endif
+
+#endif /* if defined(ENABLE_PF) && !defined(OPENVPN_PF_H) */