From: Guus Sliepen <guus@meshlink.io>
Date: Sun, 25 May 2014 19:21:10 +0000 (+0200)
Subject: Replace __TINC with __MESHLINK in the include guards.
X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=9415f4b08fb2ca9ae933edd0bf8b096db195ebae;p=meshlink

Replace __TINC with __MESHLINK in the include guards.
---

diff --git a/src/buffer.h b/src/buffer.h
index a96c15aa..e7bfb058 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -1,5 +1,5 @@
-#ifndef __TINC_BUFFER_H__
-#define __TINC_BUFFER_H__
+#ifndef __MESHLINK_BUFFER_H__
+#define __MESHLINK_BUFFER_H__
 
 typedef struct buffer_t {
 	char *data;
diff --git a/src/conf.h b/src/conf.h
index b7d8cb2b..7c0335d7 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -17,8 +17,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_CONF_H__
-#define __TINC_CONF_H__
+#ifndef __MESHLINK_CONF_H__
+#define __MESHLINK_CONF_H__
 
 #include "list.h"
 #include "meshlink_internal.h"
@@ -50,4 +50,4 @@ extern bool read_server_config(struct meshlink_handle *mesh);
 extern bool read_host_config(struct meshlink_handle *mesh, struct splay_tree_t *, const char *);
 extern bool append_config_file(struct meshlink_handle *mesh, const char *, const char *, const char *);
 
-#endif /* __TINC_CONF_H__ */
+#endif /* __MESHLINK_CONF_H__ */
diff --git a/src/connection.h b/src/connection.h
index 443930b5..5c112175 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -17,8 +17,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_CONNECTION_H__
-#define __TINC_CONNECTION_H__
+#ifndef __MESHLINK_CONNECTION_H__
+#define __MESHLINK_CONNECTION_H__
 
 #include "buffer.h"
 #include "list.h"
@@ -96,4 +96,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 /* __TINC_CONNECTION_H__ */
+#endif /* __MESHLINK_CONNECTION_H__ */
diff --git a/src/crypto.h b/src/crypto.h
index 9e640e3d..4514f8da 100644
--- a/src/crypto.h
+++ b/src/crypto.h
@@ -17,8 +17,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_CRYPTO_H__
-#define __TINC_CRYPTO_H__
+#ifndef __MESHLINK_CRYPTO_H__
+#define __MESHLINK_CRYPTO_H__
 
 extern void crypto_init();
 extern void crypto_exit();
diff --git a/src/ecdh.h b/src/ecdh.h
index 03ff77ae..ac6bf029 100644
--- a/src/ecdh.h
+++ b/src/ecdh.h
@@ -17,13 +17,13 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_ECDH_H__
-#define __TINC_ECDH_H__
+#ifndef __MESHLINK_ECDH_H__
+#define __MESHLINK_ECDH_H__
 
 #define ECDH_SIZE 32
 #define ECDH_SHARED_SIZE 32
 
-#ifndef __TINC_ECDH_INTERNAL__
+#ifndef __MESHLINK_ECDH_INTERNAL__
 typedef struct ecdh ecdh_t;
 #endif
 
diff --git a/src/ecdsa.h b/src/ecdsa.h
index 5c14f75b..707b02cf 100644
--- a/src/ecdsa.h
+++ b/src/ecdsa.h
@@ -17,10 +17,10 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_ECDSA_H__
-#define __TINC_ECDSA_H__
+#ifndef __MESHLINK_ECDSA_H__
+#define __MESHLINK_ECDSA_H__
 
-#ifndef __TINC_ECDSA_INTERNAL__
+#ifndef __MESHLINK_ECDSA_INTERNAL__
 typedef struct ecdsa ecdsa_t;
 #endif
 
diff --git a/src/ecdsagen.h b/src/ecdsagen.h
index 31b7a6a2..ed36b50e 100644
--- a/src/ecdsagen.h
+++ b/src/ecdsagen.h
@@ -17,8 +17,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_ECDSAGEN_H__
-#define __TINC_ECDSAGEN_H__
+#ifndef __MESHLINK_ECDSAGEN_H__
+#define __MESHLINK_ECDSAGEN_H__
 
 #include "ecdsa.h"
 
diff --git a/src/ed25519/ecdh.c b/src/ed25519/ecdh.c
index d0cd7e0a..f9a0ff06 100644
--- a/src/ed25519/ecdh.c
+++ b/src/ed25519/ecdh.c
@@ -21,7 +21,7 @@
 
 #include "ed25519.h"
 
-#define __TINC_ECDH_INTERNAL__
+#define __MESHLINK_ECDH_INTERNAL__
 typedef struct ecdh_t {
 	uint8_t private[64];
 } ecdh_t;
diff --git a/src/ed25519/ecdsa.c b/src/ed25519/ecdsa.c
index 4515131a..ff769ae4 100644
--- a/src/ed25519/ecdsa.c
+++ b/src/ed25519/ecdsa.c
@@ -21,7 +21,7 @@
 
 #include "ed25519.h"
 
-#define __TINC_ECDSA_INTERNAL__
+#define __MESHLINK_ECDSA_INTERNAL__
 typedef struct {
 	uint8_t private[64];
 	uint8_t public[32];
diff --git a/src/ed25519/ecdsagen.c b/src/ed25519/ecdsagen.c
index 13707e02..18afaf8c 100644
--- a/src/ed25519/ecdsagen.c
+++ b/src/ed25519/ecdsagen.c
@@ -22,7 +22,7 @@
 #include "../crypto.h"
 #include "ed25519.h"
 
-#define __TINC_ECDSA_INTERNAL__
+#define __MESHLINK_ECDSA_INTERNAL__
 typedef struct {
 	uint8_t private[64];
 	uint8_t public[32];
diff --git a/src/edge.h b/src/edge.h
index 1e1801e5..2a62cb75 100644
--- a/src/edge.h
+++ b/src/edge.h
@@ -17,8 +17,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_EDGE_H__
-#define __TINC_EDGE_H__
+#ifndef __MESHLINK_EDGE_H__
+#define __MESHLINK_EDGE_H__
 
 #include "splay_tree.h"
 #include "connection.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 /* __TINC_EDGE_H__ */
+#endif /* __MESHLINK_EDGE_H__ */
diff --git a/src/event.h b/src/event.h
index 90a59056..272243ff 100644
--- a/src/event.h
+++ b/src/event.h
@@ -17,8 +17,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_EVENT_H__
-#define __TINC_EVENT_H__
+#ifndef __MESHLINK_EVENT_H__
+#define __MESHLINK_EVENT_H__
 
 #include "splay_tree.h"
 
diff --git a/src/graph.h b/src/graph.h
index e1bae597..925fe2ff 100644
--- a/src/graph.h
+++ b/src/graph.h
@@ -17,9 +17,9 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_GRAPH_H__
-#define __TINC_GRAPH_H__
+#ifndef __MESHLINK_GRAPH_H__
+#define __MESHLINK_GRAPH_H__
 
 extern void graph(struct meshlink_handle *mesh);
 
-#endif /* __TINC_GRAPH_H__ */
+#endif /* __MESHLINK_GRAPH_H__ */
diff --git a/src/hash.h b/src/hash.h
index 578bfdb5..702091d0 100644
--- a/src/hash.h
+++ b/src/hash.h
@@ -17,8 +17,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_HASH_H__
-#define __TINC_HASH_H__
+#ifndef __MESHLINK_HASH_H__
+#define __MESHLINK_HASH_H__
 
 typedef struct hash_t {
 	size_t n;
@@ -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 /* __TINC_HASH_H__ */
+#endif /* __MESHLINK_HASH_H__ */
diff --git a/src/have.h b/src/have.h
index 07411724..2b5f2463 100644
--- a/src/have.h
+++ b/src/have.h
@@ -17,8 +17,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_HAVE_H__
-#define __TINC_HAVE_H__
+#ifndef __MESHLINK_HAVE_H__
+#define __MESHLINK_HAVE_H__
 
 #ifdef HAVE_MINGW
 #ifdef WITH_WINDOWS2000
@@ -126,4 +126,4 @@
 #define SLASH "/"
 #endif
 
-#endif /* __TINC_SYSTEM_H__ */
+#endif /* __MESHLINK_SYSTEM_H__ */
diff --git a/src/list.h b/src/list.h
index d0641521..c9908284 100644
--- a/src/list.h
+++ b/src/list.h
@@ -17,8 +17,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_LIST_H__
-#define __TINC_LIST_H__
+#ifndef __MESHLINK_LIST_H__
+#define __MESHLINK_LIST_H__
 
 typedef struct list_node_t {
 	struct list_node_t *prev;
@@ -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 /* __TINC_LIST_H__ */
+#endif /* __MESHLINK_LIST_H__ */
diff --git a/src/logger.h b/src/logger.h
index b882612f..af75e307 100644
--- a/src/logger.h
+++ b/src/logger.h
@@ -17,8 +17,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_LOGGER_H__
-#define __TINC_LOGGER_H__
+#ifndef __MESHLINK_LOGGER_H__
+#define __MESHLINK_LOGGER_H__
 
 typedef enum debug_t {
 	DEBUG_NOTHING = 0,              /* Quiet mode, only show starting/stopping of the daemon */
@@ -65,4 +65,4 @@ enum {
 
 extern void logger(int, int, const char *, ...) __attribute__ ((__format__(printf, 3, 4)));
 
-#endif /* __TINC_LOGGER_H__ */
+#endif /* __MESHLINK_LOGGER_H__ */
diff --git a/src/meta.h b/src/meta.h
index 5aae67dd..38c9b811 100644
--- a/src/meta.h
+++ b/src/meta.h
@@ -17,8 +17,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_META_H__
-#define __TINC_META_H__
+#ifndef __MESHLINK_META_H__
+#define __MESHLINK_META_H__
 
 #include "connection.h"
 
@@ -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 /* __TINC_META_H__ */
+#endif /* __MESHLINK_META_H__ */
diff --git a/src/net.h b/src/net.h
index 2f3a93ac..34f8acc4 100644
--- a/src/net.h
+++ b/src/net.h
@@ -17,8 +17,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_NET_H__
-#define __TINC_NET_H__
+#ifndef __MESHLINK_NET_H__
+#define __MESHLINK_NET_H__
 
 #include "event.h"
 #include "sockaddr.h"
@@ -114,4 +114,4 @@ extern void retry(struct meshlink_handle *mesh);
 extern CRITICAL_SECTION mutex;
 #endif
 
-#endif /* __TINC_NET_H__ */
+#endif /* __MESHLINK_NET_H__ */
diff --git a/src/netutl.h b/src/netutl.h
index 27c4f025..2d402c2e 100644
--- a/src/netutl.h
+++ b/src/netutl.h
@@ -17,8 +17,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_NETUTL_H__
-#define __TINC_NETUTL_H__
+#ifndef __MESHLINK_NETUTL_H__
+#define __MESHLINK_NETUTL_H__
 
 #include "net.h"
 
@@ -34,4 +34,4 @@ extern void sockaddrunmap(sockaddr_t *);
 extern void sockaddrfree(sockaddr_t *);
 extern void sockaddrcpy(sockaddr_t *, const sockaddr_t *);
 
-#endif /* __TINC_NETUTL_H__ */
+#endif /* __MESHLINK_NETUTL_H__ */
diff --git a/src/node.h b/src/node.h
index f3930895..4f0f1308 100644
--- a/src/node.h
+++ b/src/node.h
@@ -17,8 +17,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_NODE_H__
-#define __TINC_NODE_H__
+#ifndef __MESHLINK_NODE_H__
+#define __MESHLINK_NODE_H__
 
 #include "event.h"
 #include "sockaddr.h"
@@ -101,4 +101,4 @@ extern node_t *lookup_node(struct meshlink_handle *mesh, 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 /* __TINC_NODE_H__ */
+#endif /* __MESHLINK_NODE_H__ */
diff --git a/src/prf.h b/src/prf.h
index 596d2744..54c11f5f 100644
--- a/src/prf.h
+++ b/src/prf.h
@@ -17,8 +17,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_PRF_H__
-#define __TINC_PRF_H__
+#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__));
 
diff --git a/src/protocol.h b/src/protocol.h
index c3b3b383..5869cff4 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -17,8 +17,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_PROTOCOL_H__
-#define __TINC_PROTOCOL_H__
+#ifndef __MESHLINK_PROTOCOL_H__
+#define __MESHLINK_PROTOCOL_H__
 
 #include "ecdsa.h"
 
@@ -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 /* __TINC_PROTOCOL_H__ */
+#endif /* __MESHLINK_PROTOCOL_H__ */
diff --git a/src/route.h b/src/route.h
index 0d13ad60..ea3a7760 100644
--- a/src/route.h
+++ b/src/route.h
@@ -17,8 +17,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_ROUTE_H__
-#define __TINC_ROUTE_H__
+#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 /* __TINC_ROUTE_H__ */
+#endif /* __MESHLINK_ROUTE_H__ */
diff --git a/src/system.h b/src/system.h
index 73b8273c..69622b2c 100644
--- a/src/system.h
+++ b/src/system.h
@@ -17,8 +17,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_SYSTEM_H__
-#define __TINC_SYSTEM_H__
+#ifndef __MESHLINK_SYSTEM_H__
+#define __MESHLINK_SYSTEM_H__
 
 #include "../config.h"
 
@@ -42,4 +42,4 @@ typedef int bool;
 typedef int socklen_t;
 #endif
 
-#endif /* __TINC_SYSTEM_H__ */
+#endif /* __MESHLINK_SYSTEM_H__ */
diff --git a/src/tincctl.h b/src/tincctl.h
index 8bb96c4e..cfed58b4 100644
--- a/src/tincctl.h
+++ b/src/tincctl.h
@@ -17,8 +17,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_TINCCTL_H__
-#define __TINC_TINCCTL_H__
+#ifndef __MESHLINK_TINCCTL_H__
+#define __MESHLINK_TINCCTL_H__
 
 extern bool tty;
 extern char line[4096];
diff --git a/src/utils.h b/src/utils.h
index c0e20e0b..1ea1026a 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -17,8 +17,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_UTILS_H__
-#define __TINC_UTILS_H__
+#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 /* __TINC_UTILS_H__ */
+#endif /* __MESHLINK_UTILS_H__ */
diff --git a/src/xalloc.h b/src/xalloc.h
index 4c3e741a..e08e66f7 100644
--- a/src/xalloc.h
+++ b/src/xalloc.h
@@ -17,8 +17,8 @@
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_XALLOC_H__
-#define __TINC_XALLOC_H__
+#ifndef __MESHLINK_XALLOC_H__
+#define __MESHLINK_XALLOC_H__
 
 static inline void *xmalloc(size_t n) __attribute__ ((__malloc__));
 static inline void *xmalloc(size_t n) {