Consistent include files and directives

* Import system headers as `#include <...>`.
* Import local headers as `#include "..."`.
* Use consistent header guards (starting with `OC_`).

Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>

src/acct/pam.c

@@ -17,13 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <vpn.h>
+#include "vpn.h"
-#include "pam.h"
+#include "acct/pam.h"
-#include <sec-mod-acct.h>
+#include "sec-mod-acct.h"
 
 #include "log.h"
 
@@ -33,8 +33,8 @@
 #include <sys/types.h>
 #include <pwd.h>
 #include <grp.h>
-#include <pcl.h>
+#include "pcl.h"
-#include <str.h>
+#include "str.h"
 #include "auth/pam.h"
 
 static int ocserv_conv(int msg_size, const struct pam_message **msg,

src/acct/pam.h

@@ -18,10 +18,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
-#ifndef ACCT_PAM_H
+#ifndef OC_ACCT_PAM_H
-#define ACCT_PAM_H
+#define OC_ACCT_PAM_H
 
-#include <sec-mod-acct.h>
+#include "sec-mod-acct.h"
 
 extern const struct acct_mod_st pam_acct_funcs;
 

src/acct/radius.c

@@ -17,16 +17,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
 #include <unistd.h>
-#include <vpn.h>
+#include "vpn.h"
 #include <ctype.h>
 #include <arpa/inet.h> /* inet_ntop */
-#include "radius.h"
+#include "acct/radius.h"
 #include "auth/common.h"
 
 #include "log.h"
@@ -39,9 +39,8 @@
 #include <radcli/radcli.h>
 #endif
 
-#include <sec-mod-acct.h>
+#include "sec-mod-acct.h"
 #include "auth/radius.h"
-#include "acct/radius.h"
 #include "common-config.h"
 
 static void acct_radius_vhost_init(void **_vctx, void *pool, void *additional)

src/acct/radius.h

@@ -18,10 +18,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
-#ifndef ACCT_RADIUS_H
+#ifndef OC_ACCT_RADIUS_H
-#define ACCT_RADIUS_H
+#define OC_ACCT_RADIUS_H
 
-#include <sec-mod-auth.h>
+#include "sec-mod-auth.h"
 
 extern const struct acct_mod_st radius_acct_funcs;
 

src/auth-unix.c

@@ -17,13 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <pwd.h>
 #include <grp.h>
-#include <sec-mod-auth.h>
+#include "sec-mod-auth.h"
 #include "auth-unix.h"
 #include "log.h"
 

src/auth-unix.h

@@ -1,7 +1,7 @@
 #ifndef OC_AUTH_UNIX_H
 #define OC_AUTH_UNIX_H
 
-#include <config.h>
+#include "config.h"
 
 #if defined(HAVE_GSSAPI) || defined(HAVE_PAM)
 #define HAVE_GET_USER_AUTH_GROUP

src/auth/common.c

@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
-#include <auth/common.h>
+#include "auth/common.h"
 
 const char pass_msg_second[] = "Please enter your challenge password.";
 const char pass_msg_failed[] = "Login failed.\nPlease enter your password.";

src/auth/common.h

@@ -1,5 +1,5 @@
-#ifndef AUTH_COMMON_H
+#ifndef OC_AUTH_COMMON_H
-#define AUTH_COMMON_H
+#define OC_AUTH_COMMON_H
 
 #define MAX_PASSWORD_TRIES 3
 

src/auth/gssapi.c

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
 #ifdef HAVE_GSSAPI
 
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <vpn.h>
+#include "vpn.h"
 #include <ctype.h>
 #include "gssapi.h"
 #include "auth/common.h"
@@ -33,7 +33,7 @@
 #include <gssapi/gssapi.h>
 #include <gssapi/gssapi_ext.h>
 #include <gssapi/gssapi_krb5.h>
-#include <base64-helper.h>
+#include "common/base64-helper.h"
 #include "common-config.h"
 
 #include "log.h"

src/auth/gssapi.h

@@ -18,10 +18,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
-#ifndef GSSAPI_H
+#ifndef OC_AUTH_GSSAPI_H
-#define GSSAPI_H
+#define OC_AUTH_GSSAPI_H
 
-#include <sec-mod-auth.h>
+#include "sec-mod-auth.h"
 
 extern const struct auth_mod_st gssapi_auth_funcs;
 

src/auth/openidconnect.c

@@ -14,14 +14,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <vpn.h>
+#include "vpn.h"
 #include <ctype.h>
-#include "plain.h"
+#include "auth/plain.h"
 #include "common-config.h"
 #include "auth/common.h"
 

src/auth/openidconnect.h

@@ -13,10 +13,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
-#ifndef OPENIDCONNECT_H
+#ifndef OC_AUTH_OPENIDCONNECT_H
-#define OPENIDCONNECT_H
+#define OC_AUTH_OPENIDCONNECT_H
 
-#include <sec-mod-auth.h>
+#include "sec-mod-auth.h"
 
 extern const struct auth_mod_st oidc_auth_funcs;
 

src/auth/pam-stack.h

@@ -19,7 +19,7 @@
 #ifndef PAM_STACK_H
 #define PAM_STACK_H
 
-#include <config.h>
+#include "config.h"
 #include <stdlib.h>
 #ifdef __linux__
 #include <sys/mman.h>

src/auth/pam.c

@@ -17,16 +17,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <vpn.h>
+#include "vpn.h"
 #include "pam.h"
 #include "common-config.h"
 #include "auth-unix.h"
-#include <sec-mod-auth.h>
+#include "sec-mod-auth.h"
-#include <ccan/hash/hash.h>
+#include "ccan/hash/hash.h"
 #include "log.h"
 
 #ifdef HAVE_PAM

src/auth/pam.h

@@ -18,17 +18,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
-#ifndef PAM_H
+#ifndef OC_AUTH_PAM_H
-#define PAM_H
+#define OC_AUTH_PAM_H
 
-#include <config.h>
+#include "config.h"
-#include <sec-mod-auth.h>
+#include "sec-mod-auth.h"
 
 #ifdef HAVE_PAM
 
 #include <security/pam_appl.h>
-#include <str.h>
+#include "str.h"
-#include <pcl.h>
+#include "pcl.h"
 #include "pam-stack.h"
 
 extern const struct auth_mod_st pam_auth_funcs;

src/auth/plain.c

@@ -18,18 +18,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <vpn.h>
+#include "vpn.h"
 #include <ctype.h>
-#include "plain.h"
+#include "auth/plain.h"
 #include "common-config.h"
 #include "auth/common.h"
-#include <ccan/htable/htable.h>
+#include "ccan/htable/htable.h"
-#include <ccan/hash/hash.h>
+#include "ccan/hash/hash.h"
 #ifdef HAVE_LIBOATH
 #include <liboath/oath.h>
 #endif

src/auth/plain.h

@@ -18,10 +18,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
-#ifndef PLAIN_H
+#ifndef OC_AUTH_PLAIN_H
-#define PLAIN_H
+#define OC_AUTH_PLAIN_H
 
-#include <sec-mod-auth.h>
+#include "sec-mod-auth.h"
 
 extern const struct auth_mod_st plain_auth_funcs;
 

src/auth/radius.c

@@ -18,18 +18,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <vpn.h>
+#include "vpn.h"
 #include <ctype.h>
 #include <arpa/inet.h> /* inet_ntop */
 #include "radius.h"
 #include "auth/common.h"
 #include "str.h"
-#include <ccan/hash/hash.h>
+#include "ccan/hash/hash.h"
 
 #ifdef HAVE_RADIUS
 

src/auth/radius.h

@@ -18,10 +18,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
-#ifndef RADIUS_H
+#ifndef OC_AUTH_RADIUS_H
-#define RADIUS_H
+#define OC_AUTH_RADIUS_H
 
-#include <sec-mod-auth.h>
+#include "sec-mod-auth.h"
 #include "common/common.h"
 
 #ifdef HAVE_RADIUS

src/common-config.h

@@ -21,9 +21,9 @@
 #ifndef OC_COMMON_CONFIG_H
 #define OC_COMMON_CONFIG_H
 
-#include <config.h>
+#include "config.h"
-#include <vpn.h>
+#include "vpn.h"
-#include <ipc.pb-c.h>
+#include "ipc.pb-c.h"
 
 char *sanitize_config_value(void *pool, const char *value);
 int _add_multi_line_val(void *pool, char ***varname, size_t *num,

src/common/base64-helper.c

@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 #include <nettle/base64.h>
 #include <talloc.h>
-#include "base64-helper.h"
+#include "common/base64-helper.h"
 
 void oc_base64_encode(const char *in, size_t inlen, char *out, size_t outlen)
 {

src/common/base64-helper.h

@@ -18,8 +18,8 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
-#ifndef BASE64_HELPER_H
+#ifndef OC_COMMON_BASE64_HELPER_H
-#define BASE64_HELPER_H
+#define OC_COMMON_BASE64_HELPER_H
 
 #include <nettle/base64.h>
 

src/common/common.c

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdint.h>
@@ -34,7 +34,7 @@
 #include <assert.h>
 #include <nettle/sha1.h>
 #include <nettle/version.h>
-#include "common.h"
+#include "common/common.h"
 #include "defs.h"
 #include "common/base64-helper.h"
 #include "log.h"

src/common/common.h

@@ -19,12 +19,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
-#ifndef COMMON_H
+#ifndef OC_COMMON_COMMON_H
-#define COMMON_H
+#define OC_COMMON_COMMON_H
 
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <ipc.pb-c.h>
+#include "ipc.pb-c.h"
 #include <talloc.h>
 #include <time.h>
 #include <string.h>

src/common/hmac.c

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 
-#include <config.h>
+#include "config.h"
 #include <string.h>
 
 #include <gnutls/gnutls.h>
@@ -27,8 +27,8 @@
 #include <gnutls/abstract.h>
 #include <nettle/hmac.h>
 #include <nettle/version.h>
-#include <common.h>
+#include "common/common.h"
-#include <hmac.h>
+#include "common/hmac.h"
 #include <stdbool.h>
 
 bool hmac_init_key(size_t key_length, uint8_t *key)

src/common/hmac.h

@@ -18,9 +18,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
+#ifndef OC_COMMON_HMAC_H
+#define OC_COMMON_HMAC_H
 
-#ifndef HMAC_H
-#define HMAC_H
 #include <stdbool.h>
 
 #define HMAC_DIGEST_SIZE 32

src/common/snapshot.c

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -30,12 +30,12 @@
 #include <errno.h>
 #include <talloc.h>
 #include <sys/stat.h>
-#include <common/common.h>
+#include "common/common.h"
 
-#include <ccan/htable/htable.h>
+#include "ccan/htable/htable.h"
-#include <ccan/hash/hash.h>
+#include "ccan/hash/hash.h"
 
-#include <snapshot.h>
+#include "snapshot.h"
 
 #define ERRSTR "error: "
 #define WARNSTR "warning: "

src/common/snapshot.h

@@ -18,9 +18,8 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
-
+#ifndef OC_COMMON_SNAPSHOT_H
-#ifndef SNAPSHOT_H
+#define OC_COMMON_SNAPSHOT_H
-#define SNAPSHOT_H
 
 struct snapshot_t;
 struct snapshot_iter_t;

src/common/sockdiag.c

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 #include <errno.h>
 #include <inttypes.h>
 #include <stdio.h>

src/common/sockdiag.h

@@ -18,11 +18,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
+#ifndef OC_COMMON_SOCKDIAG_H
+#define OC_COMMON_SOCKDIAG_H
 
-#ifndef SOCKDIAG_H
+#include "config.h"
-#define SOCKDIAG_H
-
-#include <config.h>
 
 int sockdiag_query_unix_domain_socket_queue_length(const char *socket_name,
 						   int *sock_rqueue,

src/common/system.c

@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
-#include <system.h>
+#include "common/system.h"
 #include <unistd.h>
 #ifdef __linux__
 #include <sys/prctl.h>
@@ -32,7 +32,7 @@
 #include <errno.h>
 #include <signal.h>
 #include <string.h>
-#include <defs.h>
+#include "defs.h"
 #include "log.h"
 
 void kill_on_parent_kill(int sig)

src/common/system.h

@@ -18,10 +18,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
-#ifndef DIE_H
+#ifndef OC_COMMON_SYSTEM_H
-#define DIE_H
+#define OC_COMMON_SYSTEM_H
 
-#include <config.h>
+#include "config.h"
 #include <signal.h>
 #include <unistd.h>
 

src/config-kkdcp.c

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

src/config-ports.c

@@ -15,17 +15,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <common-config.h>
+#include "common-config.h"
 #include <ctype.h>
 #include <talloc.h>
 #include "log.h"
 
-#include <vpn.h>
+#include "vpn.h"
 
 static int append_port(void *pool, FwPortSt ***fw_ports, size_t *n_fw_ports,
 		       int port, fw_proto_t proto, unsigned int negate)

src/config.c

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -27,20 +27,20 @@
 #include <grp.h>
 #include <fcntl.h>
 #include <limits.h>
-#include <common.h>
+#include "common/common.h"
-#include <ip-util.h>
+#include "ip-util.h"
 #include <ctype.h>
-#include <auth/pam.h>
+#include "auth/pam.h"
-#include <acct/pam.h>
+#include "acct/pam.h"
-#include <auth/radius.h>
+#include "auth/radius.h"
-#include <acct/radius.h>
+#include "acct/radius.h"
-#include <auth/plain.h>
+#include "auth/plain.h"
-#include <auth/gssapi.h>
+#include "auth/gssapi.h"
-#include <auth/openidconnect.h>
+#include "auth/openidconnect.h"
-#include <auth/common.h>
+#include "auth/common.h"
-#include <sec-mod-sup-config.h>
+#include "sec-mod-sup-config.h"
-#include <sec-mod-acct.h>
+#include "sec-mod-acct.h"
-#include "inih/ini.h"
+#include <inih/ini.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -48,16 +48,16 @@
 #include <netdb.h>
 #include <assert.h>
 
-#include <vpn.h>
+#include "vpn.h"
-#include <cfg.pb-c.h>
+#include "cfg.pb-c.h"
-#include <main.h>
+#include "main.h"
-#include <tlslib.h>
+#include "tlslib.h"
-#include <occtl/ctl.h>
+#include "occtl/ctl.h"
 #include <gnutls/crypto.h>
 #include "common-config.h"
 
 #include <getopt.h>
-#include <snapshot.h>
+#include "common/snapshot.h"
 
 #define OLD_DEFAULT_CFG_FILE "/etc/ocserv.conf"
 #define DEFAULT_CFG_FILE "/etc/ocserv/ocserv.conf"

src/gettime.h

@@ -18,11 +18,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
-
 #ifndef OC_GETTIME_H
 #define OC_GETTIME_H
 
-#include <config.h>
+#include "config.h"
 #include <time.h>
 #include <sys/time.h>
 

src/html.c

@@ -15,14 +15,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
 #include <unistd.h>
-#include <common.h>
+#include "common/common.h"
 #include <ctype.h>
 #include <wchar.h>
 

src/http-heads.h

@@ -1,5 +1,5 @@
-#ifndef HTTP_HEADS_H
+#ifndef OC_HTTP_HEADS_H
-#define HTTP_HEADS_H
+#define OC_HTTP_HEADS_H
 
 #include <stddef.h>
 
@@ -10,4 +10,4 @@ struct http_headers_st {
 
 const struct http_headers_st *in_word_set(const char *str, size_t len);
 
-#endif /* HTTP_HEADS_H */
+#endif

src/icmp-ping.c

@@ -70,8 +70,8 @@
 
 /* Ported to ocserv by Nikos Mavrogiannopoulos */
 
-#include <config.h>
+#include "config.h"
-#include <main.h>
+#include "main.h"
 #include <net/if.h>
 #ifdef HAVE_NETINET_IN_SYSTM_H
 #include <netinet/in_systm.h>
@@ -85,7 +85,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <gnutls/crypto.h>
-#include <icmp-ping.h>
+#include "icmp-ping.h"
 #include <poll.h>
 
 #ifndef ICMP_DEST_UNREACH

src/icmp-ping.h

@@ -21,7 +21,7 @@
 #ifndef OC_ICMP_PING_H
 #define OC_ICMP_PING_H
 
-#include <main.h>
+#include "main.h"
 
 /* returns the number of positive replies received or
  * 0 if no host with this IP exists. */

src/inih/ini.c

@@ -17,7 +17,7 @@ https://github.com/benhoyt/inih
 
 /* This is ocserv's addition; needed for our definitions
  * to take precedence over defaults. */
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <ctype.h>

src/ip-lease.c

@@ -15,16 +15,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdbool.h>
 
 #include <stdio.h>
 
-#include <ip-lease.h>
+#include "ip-lease.h"
-#include <main.h>
+#include "main.h"
-#include <ip-util.h>
+#include "ip-util.h"
 #include <gnutls/crypto.h>
-#include <icmp-ping.h>
+#include "icmp-ping.h"
 #include <arpa/inet.h>
 
 static void ip_from_seed(uint8_t *seed, unsigned int seed_size, void *ip,

src/ip-lease.h

@@ -21,11 +21,11 @@
 #ifndef OC_IP_LEASE_H
 #define OC_IP_LEASE_H
 
-#include <vpn.h>
+#include "vpn.h"
 #include <string.h>
 #include <sys/socket.h>
-#include <ccan/hash/hash.h>
+#include "ccan/hash/hash.h"
-#include <main.h>
+#include "main.h"
 
 struct ip_lease_st {
 	/* In IPv4 this is the same as rip, in IPv6

src/ip-util.c

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 #include "ip-util.h"
 #include "common/common.h"
 #include <string.h>

src/isolate.c

@@ -16,14 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <fcntl.h>
 #include <stdio.h>
 #include <sys/resource.h>
 #include <grp.h>
-#include <worker.h>
+#include "worker.h"
-#include <main.h>
+#include "main.h"
 #include <limits.h>
 #include <unistd.h>
 

src/isolate.h

@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #ifndef OC_ISOLATE_H
 #define OC_ISOLATE_H
 

src/log.c

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 #include <syslog.h>
 #include <fcntl.h>
 #include <sys/socket.h>
@@ -24,10 +24,10 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <arpa/inet.h>
-#include <base64-helper.h>
+#include "common/base64-helper.h"
 
-#include <worker.h>
+#include "worker.h"
-#include <main.h>
+#include "main.h"
 #include "sec-mod.h"
 #include "log.h"
 

src/log.h

@@ -183,4 +183,4 @@ inline static unsigned int log_check_priority(int oc_priority, int log_prio,
 	return 1;
 }
 
-#endif /* OC_LOG_H */
+#endif

src/lzs.c

@@ -15,7 +15,7 @@
  * Lesser General Public License for more details.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <string.h>

src/lzs.h

@@ -14,7 +14,6 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  */
-
 #ifndef OC_LZS_H
 #define OC_LZS_H
 

src/main-auth.c

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -33,17 +33,17 @@
 #include <sys/ioctl.h>
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>
-#include <tlslib.h>
+#include "tlslib.h"
-#include <script-list.h>
+#include "script-list.h"
-#include <ip-lease.h>
+#include "ip-lease.h"
-#include <proc-search.h>
+#include "proc-search.h"
 #include "str.h"
 
-#include <vpn.h>
+#include "vpn.h"
-#include <tun.h>
+#include "tun.h"
-#include <main.h>
+#include "main.h"
-#include <ccan/list/list.h>
+#include "ccan/list/list.h"
-#include <common.h>
+#include "common/common.h"
 
 int send_cookie_auth_reply(main_server_st *s, struct proc_st *proc, AUTHREP r)
 {

src/main-ban.c

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -30,18 +30,18 @@
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <netdb.h>
-#include <system.h>
+#include "common/system.h"
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <sys/un.h>
-#include <common.h>
+#include "common/common.h"
-#include <vpn.h>
+#include "vpn.h"
-#include <tlslib.h>
+#include "tlslib.h"
-#include <main.h>
+#include "main.h"
-#include <main-ban.h>
+#include "main-ban.h"
 #include <arpa/inet.h>
-#include <ccan/hash/hash.h>
+#include "ccan/hash/hash.h"
-#include <ccan/htable/htable.h>
+#include "ccan/htable/htable.h"
 #include <ifaddrs.h>
 #include <sys/socket.h>
 

src/main-ctl-unix.c

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -26,20 +26,20 @@
 #include <sys/socket.h>
 #include <signal.h>
 #include <sys/un.h>
-#include <main.h>
+#include "main.h"
-#include <vpn.h>
+#include "vpn.h"
 #include "gnulib/cloexec.h"
-#include <ip-lease.h>
+#include "ip-lease.h"
 
 #include <errno.h>
-#include <system.h>
+#include "common/system.h"
-#include <main-ctl.h>
+#include "main-ctl.h"
-#include <main-ban.h>
+#include "main-ban.h"
-#include <ccan/container_of/container_of.h>
+#include "ccan/container_of/container_of.h"
 
-#include <ctl.pb-c.h>
+#include "ctl.pb-c.h"
-#include <ipc.pb-c.h>
+#include "ipc.pb-c.h"
-#include <str.h>
+#include "str.h"
 
 typedef struct method_ctx {
 	main_server_st *s;

src/main-ctl.h

@@ -1,7 +1,7 @@
 #ifndef OC_MAIN_CTL_H
 #define OC_MAIN_CTL_H
 
-#include <occtl/ctl.h>
+#include "occtl/ctl.h"
 #include <ev.h>
 
 int ctl_handler_init(main_server_st *s);

src/main-limits.c

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <fcntl.h>
 #include <sys/resource.h>
 #include <grp.h>
 
-#include <main.h>
+#include "main.h"
 #include <limits.h>
 
 void init_fd_limits_default(main_server_st *s)

src/main-limits.h

@@ -15,9 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
+#ifndef OC_MAIN_LIMITS_H
-#ifndef MAIN_LIMITS_H
+#define OC_MAIN_LIMITS_H
-#define MAIN_LIMITS_H
 
 void init_fd_limits_default(struct main_server_st *s);
 

src/main-log.c

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 #include <syslog.h>
 #include <fcntl.h>
 #include <sys/socket.h>
@@ -24,10 +24,10 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <arpa/inet.h>
-#include <base64-helper.h>
+#include "common/base64-helper.h"
 
-#include <worker.h>
+#include "worker.h"
-#include <main.h>
+#include "main.h"
 #include "sec-mod.h"
 #include "log.h"
 

src/main-proc.c

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,32 +29,32 @@
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <netdb.h>
-#include <system.h>
+#include "common/system.h"
 #include <errno.h>
 #include <limits.h>
 #include <sys/ioctl.h>
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>
-#include <tlslib.h>
+#include "tlslib.h"
 #include <sys/un.h>
 #include "gnulib/cloexec.h"
-#include "common.h"
+#include "common/common.h"
 #include "str.h"
 #include "setproctitle.h"
-#include <sec-mod.h>
+#include "sec-mod.h"
-#include <route-add.h>
+#include "route-add.h"
-#include <ip-lease.h>
+#include "ip-lease.h"
-#include <proc-search.h>
+#include "proc-search.h"
-#include <ipc.pb-c.h>
+#include "ipc.pb-c.h"
-#include <script-list.h>
+#include "script-list.h"
 #include <inttypes.h>
 #include <ev.h>
 
-#include <vpn.h>
+#include "vpn.h"
-#include <tun.h>
+#include "tun.h"
-#include <main.h>
+#include "main.h"
-#include <main-ban.h>
+#include "main-ban.h"
-#include <ccan/list/list.h>
+#include "ccan/list/list.h"
 
 struct proc_st *new_proc(main_server_st *s, pid_t pid, int cmd_fd,
 			 struct sockaddr_storage *remote_addr,

src/main-sec-mod-cmd.c

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,27 +29,27 @@
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <netdb.h>
-#include <system.h>
+#include "common/system.h"
 #include <errno.h>
 #include <limits.h>
 #include <sys/ioctl.h>
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>
-#include <tlslib.h>
+#include "tlslib.h"
-#include "common.h"
+#include "common/common.h"
 #include "str.h"
 #include "setproctitle.h"
-#include <sec-mod.h>
+#include "sec-mod.h"
-#include <ip-lease.h>
+#include "ip-lease.h"
-#include <route-add.h>
+#include "route-add.h"
-#include <ipc.pb-c.h>
+#include "ipc.pb-c.h"
-#include <script-list.h>
+#include "script-list.h"
 #include "gnulib/cloexec.h"
 
-#include <vpn.h>
+#include "vpn.h"
-#include <main.h>
+#include "main.h"
-#include <main-ban.h>
+#include "main-ban.h"
-#include <ccan/list/list.h>
+#include "ccan/list/list.h"
 
 #ifdef HAVE_MALLOC_TRIM
 #include <malloc.h>

src/main-user.c

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -32,20 +32,20 @@
 #include <sys/ioctl.h>
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>
-#include <tlslib.h>
+#include "tlslib.h"
 #ifdef HAVE_LIBUTIL
 #include <utmpx.h>
 #endif
-#include <gettime.h>
+#include "gettime.h"
 
-#include <vpn.h>
+#include "vpn.h"
-#include <str.h>
+#include "str.h"
-#include <tun.h>
+#include "tun.h"
-#include <main.h>
+#include "main.h"
-#include <main-ctl.h>
+#include "main-ctl.h"
-#include <ip-lease.h>
+#include "ip-lease.h"
-#include <script-list.h>
+#include "script-list.h"
-#include <ccan/list/list.h>
+#include "ccan/list/list.h"
 
 #ifndef OCSERV_FW_SCRIPT
 #define OCSERV_FW_SCRIPT "/usr/libexec/ocserv-fw"

src/main-worker-cmd.c

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,32 +29,32 @@
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <netdb.h>
-#include <system.h>
+#include "common/system.h"
 #include <errno.h>
 #include <limits.h>
 #include <sys/ioctl.h>
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>
-#include <tlslib.h>
+#include "tlslib.h"
 #include <sys/un.h>
 #include "gnulib/cloexec.h"
-#include "common.h"
+#include "common/common.h"
 #include "str.h"
 #include "setproctitle.h"
-#include <sec-mod.h>
+#include "sec-mod.h"
-#include <route-add.h>
+#include "route-add.h"
-#include <ip-lease.h>
+#include "ip-lease.h"
-#include <proc-search.h>
+#include "proc-search.h"
-#include <ipc.pb-c.h>
+#include "ipc.pb-c.h"
-#include <script-list.h>
+#include "script-list.h"
 #include <inttypes.h>
 #include <ev.h>
 
-#include <vpn.h>
+#include "vpn.h"
-#include <tun.h>
+#include "tun.h"
-#include <main.h>
+#include "main.h"
-#include <main-ban.h>
+#include "main-ban.h"
-#include <ccan/list/list.h>
+#include "ccan/list/list.h"
 
 int set_tun_mtu(main_server_st *s, struct proc_st *proc, unsigned int mtu)
 {

src/main.c

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,18 +28,18 @@
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <netdb.h>
-#include <system.h>
+#include "common/system.h"
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <sys/resource.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "gnulib/cloexec.h"
-#include <script-list.h>
+#include "script-list.h"
 
 #include <gnutls/x509.h>
 #include <gnutls/crypto.h>
-#include <tlslib.h>
+#include "tlslib.h"
 #include "setproctitle.h"
 #ifdef HAVE_LIBWRAP
 #include <tcpd.h>
@@ -50,22 +50,22 @@
 #ifdef HAVE_LIBSYSTEMD
 #include <systemd/sd-daemon.h>
 #endif
-#include <main.h>
+#include "main.h"
-#include <main-ctl.h>
+#include "main-ctl.h"
-#include <main-ban.h>
+#include "main-ban.h"
-#include <route-add.h>
+#include "route-add.h"
-#include <worker.h>
+#include "worker.h"
-#include <proc-search.h>
+#include "proc-search.h"
-#include <tun.h>
+#include "tun.h"
 #include <grp.h>
-#include <ip-lease.h>
+#include "ip-lease.h"
-#include <ccan/list/list.h>
+#include "ccan/list/list.h"
-#include <hmac.h>
+#include "common/hmac.h"
-#include <base64-helper.h>
+#include "common/base64-helper.h"
-#include <snapshot.h>
+#include "common/snapshot.h"
-#include <main-limits.h>
+#include "main-limits.h"
-#include <sockdiag.h>
+#include "common/sockdiag.h"
-#include <namespace.h>
+#include "namespace.h"
 
 #ifdef HAVE_GSSAPI
 #include <libtasn1.h>

src/main.h

@@ -27,17 +27,17 @@
 #include <sys/resource.h>
 #include <unistd.h>
 #include <net/if.h>
-#include <vpn.h>
+#include "vpn.h"
-#include <tlslib.h>
+#include "tlslib.h"
 #include "ipc.pb-c.h"
-#include <common.h>
+#include "common/common.h"
 #include <sys/un.h>
 #include <sys/uio.h>
 #include <signal.h>
 #include <ev.h>
-#include <hmac.h>
+#include "common/hmac.h"
 #include "vhost.h"
-#include <namespace.h>
+#include "namespace.h"
 
 #if defined(__FreeBSD__) || defined(__OpenBSD__)
 #include <limits.h>

src/namespace.c

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
 #if defined(LINUX_NAMESPACES)
 
@@ -30,8 +30,8 @@
 #include <errno.h>
 #include <string.h>
 
-#include <common-config.h>
+#include "common-config.h"
-#include <namespace.h>
+#include "namespace.h"
 
 /* get default namespace file descriptor to be able to place fd in a given
  * namespace

src/namespace.h

@@ -14,11 +14,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #ifndef OC_NAMESPACE_H
 #define OC_NAMESPACE_H
 
-#include <config.h>
+#include "config.h"
 
 struct netns_fds {
 	int default_fd;

src/occtl/cache.c

@@ -19,11 +19,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <occtl/occtl.h>
+#include "occtl/occtl.h"
 
 typedef struct uid_entries_st {
 	char *user;

src/occtl/ctl.h

@@ -1,5 +1,5 @@
-#ifndef CTL_H
+#ifndef OC_OCCTL_CTL_H
-#define CTL_H
+#define OC_OCCTL_CTL_H
 
 #define OCCTL_UNIX_SOCKET "/var/run/occtl.socket"
 

src/occtl/geoip.c

@@ -17,7 +17,7 @@
  *   Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
  */
 
-#include <config.h>
+#include "config.h"
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>

src/occtl/geoip.h

@@ -16,7 +16,6 @@
  * Authors:
  *   Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
  */
-
 #ifndef GEOIP_H
 #define GEOIP_H
 

src/occtl/ip-cache.c

@@ -19,12 +19,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <occtl/occtl.h>
+#include "occtl/occtl.h"
-#include <common.h>
+#include "common/common.h"
 
 typedef struct ip_entries_st {
 	char ip[MAX_IP_STR];

src/occtl/json.c

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 

src/occtl/json.h

@@ -18,9 +18,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #ifndef JSON_H
 #define JSON_H
+
 char *json_escape_val(char *tmp, unsigned int tmp_size, const char *val);
 
 #endif

src/occtl/maxmind.c

@@ -18,7 +18,7 @@
  *   Nikos Mavrogiannopoulos
  */
 
-#include <config.h>
+#include "config.h"
 #include <sys/socket.h>
 #include <stdio.h>
 #include <stdlib.h>

src/occtl/nl.c

@@ -19,12 +19,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <occtl/occtl.h>
+#include "occtl/occtl.h"
 
 #if defined(HAVE_LIBNL) && defined(__linux__)
 

src/occtl/occtl.c

@@ -19,16 +19,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <system.h>
+#include "common/system.h"
 #include <ctype.h>
 #include <locale.h>
-#include <occtl/occtl.h>
+#include "occtl/occtl.h"
 
 static int handle_reset_cmd(CONN_TYPE *conn, const char *arg,
 			    cmd_params_st *params);

src/occtl/occtl.h

@@ -4,7 +4,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <time.h>
-#include "common.h"
+#include "common/common.h"
 
 #ifdef HAVE_ORIG_READLINE
 #include <readline/readline.h>

src/occtl/pager.c

@@ -19,12 +19,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <occtl/occtl.h>
+#include "occtl/occtl.h"
 
 static const char *get_pager(void)
 {

src/occtl/print.c

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,10 +28,10 @@
 #include <errno.h>
 #include <signal.h>
 #include <ctype.h>
-#include <occtl/occtl.h>
+#include "occtl/occtl.h"
-#include <common.h>
+#include "common/common.h"
-#include <json.h>
+#include "occtl/json.h"
-#include <vpn.h>
+#include "vpn.h"
 
 #define MAX_STR_SIZE 512
 

src/occtl/session-cache.c

@@ -19,12 +19,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <occtl/occtl.h>
+#include "occtl/occtl.h"
-#include <common.h>
+#include "common/common.h"
 
 typedef struct session_entries_st {
 	char session[SAFE_ID_SIZE];

src/occtl/time.c

@@ -23,11 +23,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include <occtl/occtl.h>
+#include "occtl/occtl.h"
 
 #define _(x) x
 

src/occtl/unix.c

@@ -20,7 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdbool.h>
 #include <inttypes.h>
 #include <stdio.h>
@@ -30,12 +30,12 @@
 #include <errno.h>
 #include <signal.h>
 #include <ctype.h>
-#include <ctl.h>
+#include "occtl/ctl.h"
-#include <ctl.pb-c.h>
+#include "ctl.pb-c.h"
-#include <occtl/occtl.h>
+#include "occtl/occtl.h"
-#include <common.h>
+#include "common/common.h"
 #include <arpa/inet.h>
-#include <system.h>
+#include "common/system.h"
 #include <termios.h>
 #include <unistd.h>
 #include <sys/select.h>
@@ -45,10 +45,10 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <assert.h>
-#include <ccan/str/hex/hex.h>
+#include "ccan/str/hex/hex.h"
 #include "geoip.h"
-#include <vpn.h>
+#include "vpn.h"
-#include <base64-helper.h>
+#include "common/base64-helper.h"
 
 /* In JSON output include fields which were no longer available after 0.11.7
  */

src/ocpasswd/ocpasswd.c

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>

src/proc-search.c

@@ -15,13 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 
-#include <proc-search.h>
+#include "proc-search.h"
-#include <main.h>
+#include "main.h"
-#include <common.h>
+#include "common/common.h"
 
 struct find_ip_st {
 	struct sockaddr_storage *sockaddr;

src/proc-search.h

@@ -21,11 +21,11 @@
 #ifndef OC_PROC_SEARCH_H
 #define OC_PROC_SEARCH_H
 
-#include <vpn.h>
+#include "vpn.h"
 #include <string.h>
 #include <sys/socket.h>
-#include <ccan/hash/hash.h>
+#include "ccan/hash/hash.h"
-#include <main.h>
+#include "main.h"
 
 struct proc_st *proc_search_single_ip(struct main_server_st *s,
 				      struct sockaddr_storage *sockaddr,

src/route-add.c

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdbool.h>
 
 #include <stdio.h>
@@ -29,10 +29,10 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include <route-add.h>
+#include "route-add.h"
-#include <main.h>
+#include "main.h"
-#include <str.h>
+#include "str.h"
-#include <common.h>
+#include "common/common.h"
 
 static int call_script(main_server_st *s, proc_st *proc, const char *cmd)
 {

src/route-add.h

@@ -21,8 +21,8 @@
 #ifndef OC_ROUTE_ADD_H
 #define OC_ROUTE_ADD_H
 
-#include <vpn.h>
+#include "vpn.h"
-#include <main.h>
+#include "main.h"
 
 int apply_iroutes(struct main_server_st *s, struct proc_st *proc);
 void remove_iroutes(struct main_server_st *s, struct proc_st *proc);

src/script-list.h

@@ -21,7 +21,7 @@
 #ifndef OC_SCRIPT_LIST_H
 #define OC_SCRIPT_LIST_H
 
-#include <main.h>
+#include "main.h"
 #include <sys/types.h>
 #include <signal.h>
 #include <ev.h>

src/sec-mod-acct.h

@@ -21,8 +21,8 @@
 #ifndef OC_SEC_MOD_ACCT_H
 #define OC_SEC_MOD_ACCT_H
 
-#include <main.h>
+#include "main.h"
-#include <sec-mod-auth.h>
+#include "sec-mod-auth.h"
 
 typedef struct acct_mod_st {
 	unsigned int type; /* ACCT_TYPE_ */

src/sec-mod-auth.c

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -33,25 +33,24 @@
 #include <sys/ioctl.h>
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>
-#include <tlslib.h>
+#include "tlslib.h"
-#include <script-list.h>
+#include "script-list.h"
-#include <ip-lease.h>
+#include "ip-lease.h"
 #include "str.h"
 
-#include <vpn.h>
+#include "vpn.h"
-#include <tun.h>
+#include "tun.h"
-#include <main.h>
+#include "main.h"
-#include <ccan/list/list.h>
+#include "ccan/list/list.h"
-#include <sec-mod-auth.h>
+#include "sec-mod-auth.h"
-#include <auth/plain.h>
+#include "auth/plain.h"
-#include <common.h>
+#include "common/common.h"
-#include <auth/pam.h>
+#include "auth/pam.h"
-#include <sec-mod.h>
+#include "sec-mod.h"
-#include <vpn.h>
+#include "common/base64-helper.h"
-#include <base64-helper.h>
+#include "sec-mod-sup-config.h"
-#include <sec-mod-sup-config.h>
+#include "sec-mod-acct.h"
-#include <sec-mod-acct.h>
+#include "common/hmac.h"
-#include <hmac.h>
 
 #ifdef HAVE_GSSAPI
 #include <gssapi/gssapi.h>

src/sec-mod-auth.h

@@ -21,8 +21,8 @@
 #ifndef OC_SEC_MOD_AUTH_H
 #define OC_SEC_MOD_AUTH_H
 
-#include <main.h>
+#include "main.h"
-#include <sec-mod.h>
+#include "sec-mod.h"
 
 #define MAX_AUTH_REQS 8
 

src/sec-mod-cookies.c

@@ -15,17 +15,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <vpn.h>
+#include "vpn.h"
-#include <main.h>
+#include "main.h"
-#include <sec-mod.h>
+#include "sec-mod.h"
-#include <ccan/hash/hash.h>
+#include "ccan/hash/hash.h"
-#include <ccan/htable/htable.h>
+#include "ccan/htable/htable.h"
 
 static void send_empty_reply(void *pool, int fd, sec_mod_st *sec)
 {

src/sec-mod-db.c

@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -32,18 +32,18 @@
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <netdb.h>
-#include <system.h>
+#include "common/system.h"
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <sys/un.h>
-#include <common.h>
+#include "common/common.h"
 #include <syslog.h>
-#include <vpn.h>
+#include "vpn.h"
-#include <base64-helper.h>
+#include "common/base64-helper.h"
-#include <tlslib.h>
+#include "tlslib.h"
-#include <sec-mod.h>
+#include "sec-mod.h"
-#include <ccan/hash/hash.h>
+#include "ccan/hash/hash.h"
-#include <ccan/htable/htable.h>
+#include "ccan/htable/htable.h"
 
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>

src/sec-mod-resume.c

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,13 +31,13 @@
 #include <sys/ioctl.h>
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>
-#include <ccan/hash/hash.h>
+#include "ccan/hash/hash.h"
 
-#include <main.h>
+#include "main.h"
-#include <sec-mod-resume.h>
+#include "sec-mod-resume.h"
-#include <common.h>
+#include "common/common.h"
-#include <ip-util.h>
+#include "ip-util.h"
-#include <tlslib.h>
+#include "tlslib.h"
 
 int handle_resume_delete_req(sec_mod_st *sec, const SessionResumeFetchMsg *req)
 {

src/sec-mod-resume.h

@@ -21,7 +21,7 @@
 #ifndef OC_SEC_MOD_RESUME_H
 #define OC_SEC_MOD_RESUME_H
 
-#include <sec-mod.h>
+#include "sec-mod.h"
 
 int handle_resume_delete_req(sec_mod_st *sec, const SessionResumeFetchMsg *req);
 

src/sec-mod-sup-config.c

@@ -15,20 +15,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <vpn.h>
+#include "vpn.h"
-#include <tun.h>
+#include "tun.h"
-#include <main.h>
+#include "main.h"
-#include <common.h>
+#include "common/common.h"
-#include <vpn.h>
+#include "vpn.h"
-#include <sec-mod-sup-config.h>
+#include "sec-mod-sup-config.h"
-#include <sup-config/file.h>
+#include "sup-config/file.h"
-#include <sup-config/radius.h>
+#include "sup-config/radius.h"
 
 void sup_config_init(sec_mod_st *sec)
 {

src/sec-mod-sup-config.h

@@ -21,7 +21,7 @@
 #ifndef OC_SEC_MOD_SUP_CONFIG_H
 #define OC_SEC_MOD_SUP_CONFIG_H
 
-#include <sec-mod.h>
+#include "sec-mod.h"
 
 #define SUP_CONFIG_FILE 1
 #define SUP_CONFIG_RADIUS 2

src/sec-mod.c

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -30,17 +30,17 @@
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <netdb.h>
-#include <system.h>
+#include "common/system.h"
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <sys/un.h>
-#include <common.h>
+#include "common/common.h"
-#include <main.h>
+#include "main.h"
-#include <sec-mod.h>
+#include "sec-mod.h"
-#include <tlslib.h>
+#include "tlslib.h"
-#include <ipc.pb-c.h>
+#include "ipc.pb-c.h"
-#include <sec-mod-sup-config.h>
+#include "sec-mod-sup-config.h"
-#include <sec-mod-resume.h>
+#include "sec-mod-resume.h"
 #include "gnulib/cloexec.h"
 #include <assert.h>
 

src/sec-mod.h

@@ -22,10 +22,10 @@
 #define OC_SEC_MOD_H
 
 #include <gnutls/abstract.h>
-#include <ccan/htable/htable.h>
+#include "ccan/htable/htable.h"
 #include <nettle/base64.h>
-#include <tlslib.h>
+#include "tlslib.h"
-#include <hmac.h>
+#include "common/hmac.h"
 #include "common/common.h"
 
 #include "vhost.h"

src/setproctitle.c

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include "main.h"

src/setproctitle.h

@@ -21,7 +21,7 @@
 #ifndef OC_SETPROCTITLE_H
 #define OC_SETPROCTITLE_H
 
-#include <config.h>
+#include "config.h"
 
 #ifndef HAVE_SETPROCTILE