Update all header guards.

Don't start with underscores, as those are reserved for system
libraries. Make sure all start with MESHLINK_, and that they appear at
the top of the file.

diff --git a/src/buffer.h b/src/buffer.h
index e7bfb05856df5730a84e9ee0fec211658e6e5a8c..493d3293c593ca3c9035ae8f72ce1b25b73eff99 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -1,5 +1,24 @@
-#ifndef __MESHLINK_BUFFER_H__
-#define __MESHLINK_BUFFER_H__
+#ifndef MESHLINK_BUFFER_H
+#define MESHLINK_BUFFER_H
+
+/*
+    conf.h -- header for conf.c
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
 
 typedef struct buffer_t {
        char *data;

diff --git a/src/conf.h b/src/conf.h
index 74849a2145799864f2b3f52f13981b5c45597780..715f9965f6293366ea200bcee5a435e6e90b4204 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_CONF_H
+#define MESHLINK_CONF_H
+
 /*
     conf.h -- header for conf.c
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __MESHLINK_CONF_H__
-#define __MESHLINK_CONF_H__
-
 #include "list.h"
 #include "meshlink_internal.h"
 #include "splay_tree.h"
@@ -55,4 +55,4 @@ extern bool write_host_config(struct meshlink_handle *mesh, const struct splay_t
 extern bool modify_config_file(struct meshlink_handle *mesh, const char *, const char *, const char *, bool);
 extern bool append_config_file(struct meshlink_handle *mesh, const char *, const char *, const char *);
 
-#endif /* __MESHLINK_CONF_H__ */
+#endif

diff --git a/src/connection.h b/src/connection.h
index a79d6b13ceb058b178fb65f2b30cb126395c456e..35dd19828ea706d6b26d786173fcfd021ec9def4 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_CONNECTION_H
+#define MESHLINK_CONNECTION_H
+
 /*
     connection.h -- header for connection.c
-    Copyright (C) 2000-2013 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2000-2013, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __MESHLINK_CONNECTION_H__
-#define __MESHLINK_CONNECTION_H__
-
 #include "buffer.h"
 #include "list.h"
 #include "sptps.h"
@@ -94,4 +94,4 @@ extern void free_connection(connection_t *);
 extern void connection_add(struct meshlink_handle *mesh, connection_t *);
 extern void connection_del(struct meshlink_handle *mesh, connection_t *);
 
-#endif /* __MESHLINK_CONNECTION_H__ */
+#endif

diff --git a/src/crypto.h b/src/crypto.h
index 4514f8dadf2e7c1ec5c2b13ded7864a1e99e60f1..779f4522b01b4e6bb9e99526a720bd5a2c7ce594 100644 (file)
--- a/src/crypto.h
+++ b/src/crypto.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_CRYPTO_H
+#define MESHLINK_CRYPTO_H
+
 /*
     crypto.h -- header for crypto.c
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __MESHLINK_CRYPTO_H__
-#define __MESHLINK_CRYPTO_H__
-
 extern void crypto_init();
 extern void crypto_exit();
 extern void randomize(void *, size_t);

diff --git a/src/devtools.h b/src/devtools.h
index 9ac58d52956e43632e4b0c4aa7e8bba38333e6b0..53755187601362975058d8eac81679fbf9e16d9c 100644 (file)
--- a/src/devtools.h
+++ b/src/devtools.h
@@ -1,5 +1,24 @@
-#ifndef __MESHLINK_DEVTOOLS_H__
-#define __MESHLINK_DEVTOOLS_H__
+#ifndef MESHLINK_DEVTOOLS_H
+#define MESHLINK_DEVTOOLS_H
+
+/*
+    devtools.h -- header for devtools.h
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
 
 extern bool devtool_export_json_all_edges_state(meshlink_handle_t *mesh, FILE* stream);
 

diff --git a/src/discovery.h b/src/discovery.h
index 0455d6ed1853617ef6f946086a5675c2b196dbea..055aa9deb483cb856bfb6db1fafe6bf0bac91cb7 100644 (file)
--- a/src/discovery.h
+++ b/src/discovery.h
@@ -1,6 +1,24 @@
+#ifndef MESHLINK_DISCOVERY_H
+#define MESHLINK_DISCOVERY_H
 
-#ifndef __MESHLINK_DISCOVERY_H__
-#define __MESHLINK_DISCOVERY_H__
+/*
+    discovery.h -- header for dicovery.c
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
 
 #include <stdbool.h>
 

diff --git a/src/dropin.h b/src/dropin.h
index 78c0760f42c1122f8ece769cd8b9471c578148d7..06db98b05eee6535204b3596534c992aae7641a1 100644 (file)
--- a/src/dropin.h
+++ b/src/dropin.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_DROPIN_H
+#define MESHLINK_DROPIN_H
+
 /*
     dropin.h -- header file for dropin.c
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __DROPIN_H__
-#define __DROPIN_H__
-
 #include "fake-getaddrinfo.h"
 #include "fake-getnameinfo.h"
 
@@ -65,4 +65,4 @@ extern int usleep(long long usec);
 #endif
 #endif
 
-#endif /* __DROPIN_H__ */
+#endif

diff --git a/src/ecdh.h b/src/ecdh.h
index 92be3ed5bc8c05ef0d64779b80dee87d0ccf2b87..eb66ec0d17713bcd706ce747b60aef1b5a8ceeb4 100644 (file)
--- a/src/ecdh.h
+++ b/src/ecdh.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_ECDH_H
+#define MESHLINK_ECDH_H
+
 /*
     ecdh.h -- header file for ecdh.c
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __MESHLINK_ECDH_H__
-#define __MESHLINK_ECDH_H__
-
 #define ECDH_SIZE 32
 #define ECDH_SHARED_SIZE 32
 

diff --git a/src/ecdsa.h b/src/ecdsa.h
index ef10fe718363b7f87220eeae141d6492c1940f7c..364b2726f443ec9bf2f86a013aaa453f1eaba288 100644 (file)
--- a/src/ecdsa.h
+++ b/src/ecdsa.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_ECDSA_H
+#define MESHLINK_ECDSA_H
+
 /*
     ecdsa.h -- ECDSA key handling
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __MESHLINK_ECDSA_H__
-#define __MESHLINK_ECDSA_H__
-
 #ifndef __MESHLINK_ECDSA_INTERNAL__
 typedef struct ecdsa ecdsa_t;
 #endif

diff --git a/src/ecdsagen.h b/src/ecdsagen.h
index f4578be657327e4835ab5bda70940ffad9fc18bb..812a98b48524949200baaceab4ee80a5ff657f48 100644 (file)
--- a/src/ecdsagen.h
+++ b/src/ecdsagen.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_ECDSAGEN_H
+#define MESHLINK_ECDSAGEN_H
+
 /*
     ecdsagen.h -- ECDSA key generation and export
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __MESHLINK_ECDSAGEN_H__
-#define __MESHLINK_ECDSAGEN_H__
-
 #include "ecdsa.h"
 
 extern ecdsa_t *ecdsa_generate(void) __attribute__((__malloc__));

diff --git a/src/edge.h b/src/edge.h
index 53ef354cb245aea1708602bed64af55b9d640c7f..cc7a449b7e4b56fe6b962d61b22c5e36f3f27b6f 100644 (file)
--- a/src/edge.h
+++ b/src/edge.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_EDGE_H
+#define MESHLINK_EDGE_H
+
 /*
     edge.h -- header for edge.c
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __MESHLINK_EDGE_H__
-#define __MESHLINK_EDGE_H__
-
 #include "splay_tree.h"
 #include "connection.h"
 #include "net.h"
@@ -47,4 +47,4 @@ extern void edge_add(struct meshlink_handle *mesh, edge_t *);
 extern void edge_del(struct meshlink_handle *mesh, edge_t *);
 extern edge_t *lookup_edge(struct node_t *, struct node_t *);
 
-#endif /* __MESHLINK_EDGE_H__ */
+#endif

diff --git a/src/event.h b/src/event.h
index fe64413e85be7cdfd94654a7e03ffb97f13026f2..cf3c70a163b531b331bef39a9b797d8cff53d875 100644 (file)
--- a/src/event.h
+++ b/src/event.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_EVENT_H
+#define MESHLINK_EVENT_H
+
 /*
     event.h -- I/O, timeout and signal event handling
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __MESHLINK_EVENT_H__
-#define __MESHLINK_EVENT_H__
-
 #include "splay_tree.h"
 #include "system.h"
 #include <pthread.h>

diff --git a/src/fake-gai-errnos.h b/src/fake-gai-errnos.h
index 2f41d8f03cd68e890882b81444954c75d88e2f96..5ec371ca24c123410503d453faaa9360cdc249b8 100644 (file)
--- a/src/fake-gai-errnos.h
+++ b/src/fake-gai-errnos.h
@@ -1,11 +1,6 @@
-/*
- * fake library for ssh
- *
- * This file is included in getaddrinfo.c and getnameinfo.c.
- * See getaddrinfo.c and getnameinfo.c.
- */
+#ifndef MESHLINK_FAKE_GAI_ERRNOS_H
+#define MESHLINK_FAKE_GAI_ERRNOS_H
 
-/* for old netdb.h */
 #ifndef EAI_NODATA
 #define EAI_NODATA 1
 #endif
@@ -21,3 +16,5 @@
 #ifndef EAI_SYSTEM
 #define EAI_SYSTEM 4
 #endif
+
+#endif

diff --git a/src/fake-getaddrinfo.h b/src/fake-getaddrinfo.h
index 5809985bdaf43e84621e83cee3ea864106c652a1..db3621b4fc9d89b4fc735bf7e386ce71ba40a3da 100644 (file)
--- a/src/fake-getaddrinfo.h
+++ b/src/fake-getaddrinfo.h
@@ -1,5 +1,5 @@
-#ifndef _FAKE_GETADDRINFO_H
-#define _FAKE_GETADDRINFO_H
+#ifndef MESHLINK_FAKE_GETADDRINFO_H
+#define MESHLINK_FAKE_GETADDRINFO_H
 
 #include "fake-gai-errnos.h"
 
@@ -43,4 +43,4 @@ char *gai_strerror(int ecode);
 void freeaddrinfo(struct addrinfo *ai);
 #endif /* !HAVE_FREEADDRINFO */
 
-#endif /* _FAKE_GETADDRINFO_H */
+#endif

diff --git a/src/fake-getnameinfo.h b/src/fake-getnameinfo.h
index 043ed978e99098a03d83675debee676c6a167ab2..e6951642922e37a8b684465a66e8bfd25c2d774c 100644 (file)
--- a/src/fake-getnameinfo.h
+++ b/src/fake-getnameinfo.h
@@ -1,5 +1,5 @@
-#ifndef _FAKE_GETNAMEINFO_H
-#define _FAKE_GETNAMEINFO_H
+#ifndef MESHLINK_FAKE_GETNAMEINFO_H
+#define MESHLINK_FAKE_GETNAMEINFO_H
 
 #if !HAVE_DECL_GETNAMEINFO
 int getnameinfo(const struct sockaddr *sa, size_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags);
@@ -12,4 +12,4 @@ int getnameinfo(const struct sockaddr *sa, size_t salen, char *host, size_t host
 # define NI_MAXHOST 1025
 #endif /* !NI_MAXHOST */
 
-#endif /* _FAKE_GETNAMEINFO_H */
+#endif

diff --git a/src/graph.h b/src/graph.h
index 925fe2ffa7d46652ba85c264beef8513501ad0aa..2375cc6c99724a5d7ae8d9f207bf94d8e79269ad 100644 (file)
--- a/src/graph.h
+++ b/src/graph.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_GRAPH_H
+#define MESHLINK_GRAPH_H
+
 /*
     graph.h -- header for graph.c
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __MESHLINK_GRAPH_H__
-#define __MESHLINK_GRAPH_H__
-
 extern void graph(struct meshlink_handle *mesh);
 
-#endif /* __MESHLINK_GRAPH_H__ */
+#endif

diff --git a/src/hash.h b/src/hash.h
index 182a1c95d5212ddb271f423a9e469e1cdb1ae6c0..de96f888128885ff419769a12a53a67e6b054d1b 100644 (file)
--- a/src/hash.h
+++ b/src/hash.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_HASH_H
+#define MESHLINK_HASH_H
+
 /*
     hash.h -- header file for hash.c
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __MESHLINK_HASH_H__
-#define __MESHLINK_HASH_H__
-
 typedef struct hash_t {
        size_t n;
        size_t size;
@@ -38,4 +38,4 @@ extern void *hash_search_or_insert(hash_t *, const void *key, const void *value)
 extern void hash_clear(hash_t *);
 extern void hash_resize(hash_t *, size_t n);
 
-#endif /* __MESHLINK_HASH_H__ */
+#endif

diff --git a/src/have.h b/src/have.h
index 2b5f24637ae683f41d890959cc9844abbf814b69..7695adc16b1a4c277c260fc231e88a4bd79ef59f 100644 (file)
--- a/src/have.h
+++ b/src/have.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_HAVE_H
+#define MESHLINK_HAVE_H
+
 /*
     have.h -- include headers which are known to exist
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __MESHLINK_HAVE_H__
-#define __MESHLINK_HAVE_H__
-
 #ifdef HAVE_MINGW
 #ifdef WITH_WINDOWS2000
 #define WINVER Windows2000
@@ -126,4 +126,4 @@
 #define SLASH "/"
 #endif
 
-#endif /* __MESHLINK_SYSTEM_H__ */
+#endif

diff --git a/src/list.h b/src/list.h
index 3cda17a6a3269963a0ab71c9ab7f182c5636e4fd..254fbffdefaecb9f8d0c1680d58f90a25e818a4b 100644 (file)
--- a/src/list.h
+++ b/src/list.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_LIST_H
+#define MESHLINK_LIST_H
+
 /*
     list.h -- header file for list.c
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __MESHLINK_LIST_H__
-#define __MESHLINK_LIST_H__
-
 typedef struct list_node_t {
        struct list_node_t *prev;
        struct list_node_t *next;
@@ -80,4 +80,4 @@ extern void list_foreach_node(list_t *, list_action_node_t);
 
 #define list_each(type, item, list) (type *item = (type *)1; item; item = NULL) for(list_node_t *node = (list)->head, *next; item = node ? node->data : NULL, next = node ? node->next : NULL, node; node = next)
 
-#endif /* __MESHLINK_LIST_H__ */
+#endif

diff --git a/src/logger.h b/src/logger.h
index 05773d6c63b6271cdc2b3c2d92a9a0fc0f917c4a..d6a28c59efe2f452c7d75ae28229bc6b80d7088c 100644 (file)
--- a/src/logger.h
+++ b/src/logger.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_LOGGER_H
+#define MESHLINK_LOGGER_H
+
 /*
     logger.h -- header file for logger.c
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,11 +20,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __MESHLINK_LOGGER_H__
-#define __MESHLINK_LOGGER_H__
-
 #include "meshlink_internal.h"
 
 extern void logger(meshlink_handle_t *mesh, meshlink_log_level_t level, const char *format, ...) __attribute__((__format__(printf, 3, 4)));
 
-#endif /* __MESHLINK_LOGGER_H__ */
+#endif

diff --git a/src/meshlink++.h b/src/meshlink++.h
index df0a72b594431cf779df8cabbc9e87375c56bc94..f1c415a95c869a21d6767fff25e87ab5e423def0 100644 (file)
--- a/src/meshlink++.h
+++ b/src/meshlink++.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINKPP_H
+#define MESHLINKPP_H
+
 /*
     meshlink++.h -- MeshLink C++ API
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef MESHLINKPP_H
-#define MESHLINKPP_H
-
 #include <meshlink.h>
 #include <new> // for 'placement new'
 
@@ -633,4 +633,4 @@ static bool destroy(const char *confbase) {
 }
 }
 
-#endif // MESHLINKPP_H
+#endif

diff --git a/src/meshlink.h b/src/meshlink.h
index e307128f157327b34cbd008f2a130755c50fee16..30491b0016d73dab462e8e0e5bba0e32b8b14344 100644 (file)
--- a/src/meshlink.h
+++ b/src/meshlink.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_H
+#define MESHLINK_H
+
 /*
     meshlink.h -- MeshLink API
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef MESHLINK_H
-#define MESHLINK_H
-
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>
@@ -836,4 +836,4 @@ extern meshlink_edge_t **meshlink_get_all_edges_state(meshlink_handle_t *mesh, m
 }
 #endif
 
-#endif // MESHLINK_H
+#endif

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 710acdd794c40e1d67d30a5dcb0966c5ce1765df..fa5e60ea44fbf099ef77e9dafc0123f1c19735eb 100644 (file)
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_INTERNAL_H
+#define MESHLINK_INTERNAL_H
+
 /*
     meshlink_internal.h -- Internal parts of the public API.
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef MESHLINK_INTERNAL_H
-#define MESHLINK_INTERNAL_H
-
 #include "system.h"
 
 #include "event.h"
@@ -181,4 +181,4 @@ typedef struct {
 
 extern dev_class_traits_t dev_class_traits[];
 
-#endif // MESHLINK_INTERNAL_H
+#endif

diff --git a/src/meshlink_queue.h b/src/meshlink_queue.h
index c86bf660ed22af5c4ea262932cf4e0a3de640ab0..511d0b3ccf5c52b72bed6a0a02c54b09a25ea65a 100644 (file)
--- a/src/meshlink_queue.h
+++ b/src/meshlink_queue.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_QUEUE_H
+#define MESHLINK_QUEUE_H
+
 /*
     queue.h -- Thread-safe queue
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef MESHLINK_QUEUE_H
-#define MESHLINK_QUEUE_H
-
 #include <pthread.h>
 #include <stdbool.h>
 #include <stddef.h>

diff --git a/src/meta.h b/src/meta.h
index 38c9b8115d8c5c683fe4be5a920f9c2f8ec57bae..6372e34af91dfb562a9d9aeaa072a27983072b5b 100644 (file)
--- a/src/meta.h
+++ b/src/meta.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_META_H
+#define MESHLINK_META_H
+
 /*
     meta.h -- header for meta.c
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __MESHLINK_META_H__
-#define __MESHLINK_META_H__
-
 #include "connection.h"
 
 extern bool send_meta(struct meshlink_handle *mesh, struct connection_t *, const char *, int);
@@ -28,4 +28,4 @@ extern bool receive_meta_sptps(void *, uint8_t, const void *, uint16_t);
 extern void broadcast_meta(struct meshlink_handle *mesh, struct connection_t *, const char *, int);
 extern bool receive_meta(struct meshlink_handle *mesh, struct connection_t *);
 
-#endif /* __MESHLINK_META_H__ */
+#endif

diff --git a/src/net.h b/src/net.h
index 6c5a0a6fd3779c635fed0368fc370fa773f67faf..1eed88d12aa166a1d3ff8bec9c9d891c2de66ce0 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_NET_H
+#define MESHLINK_NET_H
+
 /*
     net.h -- header for net.c
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __MESHLINK_NET_H__
-#define __MESHLINK_NET_H__
-
 #include "event.h"
 #include "sockaddr.h"
 
@@ -115,4 +115,4 @@ extern void retry(struct meshlink_handle *mesh);
 extern CRITICAL_SECTION mutex;
 #endif
 
-#endif /* __MESHLINK_NET_H__ */
+#endif

diff --git a/src/netutl.h b/src/netutl.h
index 065f4b20fcce842446815a7a83006d0a3ab82f49..2f68e8325b35a579efce6c54e578a1e3e0de73ec 100644 (file)
--- a/src/netutl.h
+++ b/src/netutl.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_NETUTL_H
+#define MESHLINK_NETUTL_H
+
 /*
     netutl.h -- header file for netutl.c
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __MESHLINK_NETUTL_H__
-#define __MESHLINK_NETUTL_H__
-
 #include "net.h"
 
 extern bool hostnames;
@@ -34,4 +34,4 @@ extern void sockaddrunmap(sockaddr_t *);
 extern void sockaddrfree(sockaddr_t *);
 extern void sockaddrcpy(sockaddr_t *, const sockaddr_t *);
 
-#endif /* __MESHLINK_NETUTL_H__ */
+#endif

diff --git a/src/node.h b/src/node.h
index 0140bb382d9f0e280da1fe1ea86d12b7e1f746d2..33bac25649cddbdb5597493360bc6334a319cbcf 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_NODE_H
+#define MESHLINK_NODE_H
+
 /*
     node.h -- header for node.c
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __MESHLINK_NODE_H__
-#define __MESHLINK_NODE_H__
-
 #include "event.h"
 #include "sockaddr.h"
 #include "sptps.h"
@@ -97,4 +97,4 @@ extern node_t *lookup_node(struct meshlink_handle *mesh, const char *);
 extern node_t *lookup_node_udp(struct meshlink_handle *mesh, const sockaddr_t *);
 extern void update_node_udp(struct meshlink_handle *mesh, node_t *, const sockaddr_t *);
 
-#endif /* __MESHLINK_NODE_H__ */
+#endif

diff --git a/src/prf.h b/src/prf.h
index 67d6845fc868fd3d982a2a3618da12063d561225..1fc0ee199c4df63291708897cd330c410e9a33f8 100644 (file)
--- a/src/prf.h
+++ b/src/prf.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_PRF_H
+#define MESHLINK_PRF_H
+
 /*
     prf.h -- header file for prf.c
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __MESHLINK_PRF_H__
-#define __MESHLINK_PRF_H__
-
 extern bool prf(const char *secret, size_t secretlen, char *seed, size_t seedlen, char *out, size_t outlen) __attribute__((__warn_unused_result__));
 
 #endif

diff --git a/src/protocol.h b/src/protocol.h
index dd042ec68cd2a38b916ad5f4e189e1ee069361d3..0070cd0298627ba64c639669faf83a0d3f7bcbe6 100644 (file)
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_PROTOCOL_H
+#define MESHLINK_PROTOCOL_H
+
 /*
     protocol.h -- header for protocol.c
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __MESHLINK_PROTOCOL_H__
-#define __MESHLINK_PROTOCOL_H__
-
 #include "ecdsa.h"
 
 /* Protocol version. Different major versions are incompatible. */
@@ -111,4 +111,4 @@ extern bool req_key_h(struct meshlink_handle *mesh, struct connection_t *, const
 extern bool ans_key_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
 extern bool tcppacket_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
 
-#endif /* __MESHLINK_PROTOCOL_H__ */
+#endif

diff --git a/src/route.h b/src/route.h
index ea3a7760e1613411fc02ab1f7192597f0dcd56e1..16e3a97d275417819d2fcbdb26c07272f9ac4a14 100644 (file)
--- a/src/route.h
+++ b/src/route.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_ROUTE_H
+#define MESHLINK_ROUTE_H
+
 /*
     route.h -- header file for route.c
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __MESHLINK_ROUTE_H__
-#define __MESHLINK_ROUTE_H__
-
 #include "net.h"
 #include "node.h"
 
@@ -27,4 +27,4 @@ extern bool decrement_ttl;
 
 extern void route(struct meshlink_handle *mesh, struct node_t *, struct vpn_packet_t *);
 
-#endif /* __MESHLINK_ROUTE_H__ */
+#endif

diff --git a/src/sockaddr.h b/src/sockaddr.h
index 775f81f6a36409dfcbee42a7183582885f4339be..1a98d47897f87f57e530115330a1fec17c377655 100644 (file)
--- a/src/sockaddr.h
+++ b/src/sockaddr.h
@@ -1,5 +1,5 @@
-#ifndef SOCKADDR_H
-#define SOCKADDR_H
+#ifndef MESHLINK_SOCKADDR_H
+#define MESHLINK_SOCKADDR_H
 
 #define AF_UNKNOWN 255
 
@@ -25,4 +25,4 @@ typedef union sockaddr_t {
        struct sockaddr_storage storage;
 } sockaddr_t;
 
-#endif // SOCKADDR_H
+#endif

diff --git a/src/splay_tree.h b/src/splay_tree.h
index 4b4f18eb43b23ceca33bbd019d2c75b52a8b6851..f1ff7db9d201a47924014c75bfb20ec9f4808d95 100644 (file)
--- a/src/splay_tree.h
+++ b/src/splay_tree.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_SPLAY_TREE_H
+#define MESHLINK_SPLAY_TREE_H
+
 /*
     splay_tree.h -- header file for splay_tree.c
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,10 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-
-#ifndef __SPLAY_TREE_H__
-#define __SPLAY_TREE_H__
-
 typedef struct splay_node_t {
 
        /* Linked list part */

diff --git a/src/sptps.h b/src/sptps.h
index ab163442a18afc19605dee842e2b12bbbb17fd5a..11c0d2e66846390df29b12edf4b88a9c45c9ec79 100644 (file)
--- a/src/sptps.h
+++ b/src/sptps.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_SPTPS_H
+#define MESHLINK_SPTPS_H
+
 /*
     sptps.h -- Simple Peer-to-Peer Security
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __SPTPS_H__
-#define __SPTPS_H__
-
 #include "system.h"
 
 #include "chacha-poly1305/chacha-poly1305.h"

diff --git a/src/system.h b/src/system.h
index 69622b2ca412a47eaf58954f072b5c892ed93af9..2c09551530e871d1127235c15769c547c9046303 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_SYSTEM_H
+#define MESHLINK_SYSTEM_H
+
 /*
     system.h -- system headers
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __MESHLINK_SYSTEM_H__
-#define __MESHLINK_SYSTEM_H__
-
 #include "../config.h"
 
 #include "have.h"
@@ -42,4 +42,4 @@ typedef int bool;
 typedef int socklen_t;
 #endif
 
-#endif /* __MESHLINK_SYSTEM_H__ */
+#endif

diff --git a/src/utils.h b/src/utils.h
index 1ea1026a52303bfa82681eb1dc025eb45a323a7c..371a327df08d3286dd75dd4047ead817426d7fa0 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_UTILS_H
+#define MESHLINK_UTILS_H
+
 /*
     utils.h -- header file for utils.c
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __MESHLINK_UTILS_H__
-#define __MESHLINK_UTILS_H__
-
 extern int hex2bin(const char *src, void *dst, int length);
 extern int bin2hex(const void *src, char *dst, int length);
 
@@ -47,4 +47,4 @@ extern const char *winerror(int);
 
 extern unsigned int bitfield_to_int(const void *bitfield, size_t size);
 
-#endif /* __MESHLINK_UTILS_H__ */
+#endif

diff --git a/src/xalloc.h b/src/xalloc.h
index fba0be90f7442c75b8079ec6b047517384c50c99..f6b895a5a61ae06456b4065324e55e8e13158208 100644 (file)
--- a/src/xalloc.h
+++ b/src/xalloc.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_XALLOC_H
+#define MESHLINK_XALLOC_H
+
 /*
    xalloc.h -- malloc and related fuctions with out of memory checking
-   Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+   Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __MESHLINK_XALLOC_H__
-#define __MESHLINK_XALLOC_H__
-
 static inline void *xmalloc(size_t n) __attribute__((__malloc__));
 static inline void *xmalloc(size_t n) {
        void *p = malloc(n);