Replace __TINC with __MESHLINK in the include guards.

diff --git a/src/buffer.h b/src/buffer.h
index a96c15aa7a89e00e9f6088e5cc573869c25729fb..e7bfb05856df5730a84e9ee0fec211658e6e5a8c 100644 (file)
--- 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 b7d8cb2bdd87f239e7a98152e1746562044950cc..7c0335d78b2d6e7fa98fed28ad05d5bec5254fc8 100644 (file)
--- 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 443930b50a9d7fb030a512b37006441921da62aa..5c11217593906d8dc3f1d93a00d56ad6b357777e 100644 (file)
--- 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 9e640e3d896ae7d38e5d8161a129d83372d8bed6..4514f8dadf2e7c1ec5c2b13ded7864a1e99e60f1 100644 (file)
--- 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 03ff77ae9f2429f5eb1b7a06814faed902fe6075..ac6bf0297cecab55ac364981a642d2fdad842155 100644 (file)
--- 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 5c14f75b3833373d5d0c85a5ca8f0f9b08134070..707b02cfc282d8150f1d9425d0d4c5508a399a12 100644 (file)
--- 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 31b7a6a2dd8f73b96bb8009167f6cf81da8219df..ed36b50e5540685bf200a2a1fe36215e782b6e75 100644 (file)
--- 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 d0cd7e0aae80168b03940a13c880513f9599ef89..f9a0ff06bdf69da097fccdf28f515a3343d773ca 100644 (file)
--- 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 4515131a0cd1c9c56648d5fd7e6dd622618a827f..ff769ae4a5ac2fe2f8419c949ff024fe400f5117 100644 (file)
--- 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 13707e0255d10f35f758c416a8bd0f58b5338789..18afaf8cdb3fb25cf13e49b24a61726ec1c806b5 100644 (file)
--- 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 1e1801e597ba52179d03fb31d19fad71ccb6f483..2a62cb754ab878dd4bbd11325f5f5f125744a451 100644 (file)
--- 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 90a5905654629c4fcd71ae858cbc6c56cfc5c466..272243ff489330483d1293194bffb67c722eef9e 100644 (file)
--- 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 e1bae59787014cb3838a58cb4b85f6311bbaf933..925fe2ffa7d46652ba85c264beef8513501ad0aa 100644 (file)
--- 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 578bfdb5876bacbc8a30c6bc4fa7a7c21d934820..702091d034765338cd98fecb412ca466868c5038 100644 (file)
--- 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 07411724a0e28158f47f1b1faa5791fdb33c2ec0..2b5f24637ae683f41d890959cc9844abbf814b69 100644 (file)
--- 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 d06415216367a9c53683c70473018b46ba565c46..c99082844916e210770c7ede8ba7552e93389b19 100644 (file)
--- 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 b882612f34658cf796301a5aa311aed4a918281c..af75e307fb9e1f51a424d1ede9de4448205b7169 100644 (file)
--- 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 5aae67dd4ab375893bb6db9d6b8290304d4c9e8a..38c9b8115d8c5c683fe4be5a920f9c2f8ec57bae 100644 (file)
--- 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 2f3a93aca93593274fcc713192d0f9ead21d1380..34f8acc49fe383ac23267cf2fae655a261d16e60 100644 (file)
--- 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 27c4f0258c3f719df0a392c4b6af796d2aeda6e8..2d402c2e917b5858245e5c30ebc909e9224c671d 100644 (file)
--- 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 f393089527c310303fb491ea463141ad499790ef..4f0f13089bf6b1901f401a9b1787bc6ac055c9be 100644 (file)
--- 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 596d274407a9a2da569f9e3bdb9eb0d77aa99635..54c11f5f16fe913de828a9c71f16e340d9d8ce32 100644 (file)
--- 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 c3b3b383c3b1122aac301c92f1d8fe63dd15ddaa..5869cff444f0ff2cfa16844419cade1895b8712e 100644 (file)
--- 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 0d13ad601e78883fefe179b2423c27654f5056fb..ea3a7760e1613411fc02ab1f7192597f0dcd56e1 100644 (file)
--- 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 73b8273c9930f58065d64479a8c67dd34d59555e..69622b2ca412a47eaf58954f072b5c892ed93af9 100644 (file)
--- 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 8bb96c4e125cd52879e4eadf29b8573321e92e7b..cfed58b4234dcc1c3bec12d98258ec904beb3b0b 100644 (file)
--- 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 c0e20e0b0e2d51ef0b80b5759bb53b13b94aa96f..1ea1026a52303bfa82681eb1dc025eb45a323a7c 100644 (file)
--- 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 4c3e741a929a32602ba086c6262e138f7c8d6f16..e08e66f7ad3a9f89a8fe588b92fd6d9aaf3caa12 100644 (file)
--- 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) {