Update all header guards.

[meshlink] / src / meshlink_internal.h

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index b3ac72c40a2833f74abd78f68cb292b4a54f2e20..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"
@@ -33,10 +33,14 @@
 
 #define MAXSOCKETS 8    /* Probably overkill... */
 
-struct AvahiServer;
-struct AvahiSServiceBrowser;
-struct AvahiSimplePoll;
-struct AvahiSEntryGroup;
+static const char meshlink_invitation_label[] = "MeshLink invitation";
+static const char meshlink_tcp_label[] = "MeshLink TCP";
+static const char meshlink_udp_label[] = "MeshLink UDP";
+
+struct CattaServer;
+struct CattaSServiceBrowser;
+struct CattaSimplePoll;
+struct CattaSEntryGroup;
 
 typedef struct listen_socket_t {
        struct io_t tcp;
@@ -118,8 +122,8 @@ struct meshlink_handle {
        struct connection_t *everyone;
        struct ecdsa *invitation_key;
 
-       int pinginterval;       /* seconds between pings */
-       int pingtimeout;        /* seconds to wait for response */
+       int pinginterval;       /* seconds between pings */
+       int pingtimeout;        /* seconds to wait for response */
        int maxtimeout;
 
        int sock;
@@ -134,11 +138,11 @@ struct meshlink_handle {
 
        pthread_t discovery_thread;
        bool discovery_threadstarted;
-       struct AvahiServer *avahi_server;
-       struct AvahiSServiceBrowser *avahi_browser;
-       struct AvahiSimplePoll *avahi_poll;
-       struct AvahiSEntryGroup *avahi_group;
-       char* avahi_servicetype;
+       struct CattaServer *catta_server;
+       struct CattaSServiceBrowser *catta_browser;
+       struct CattaSimplePoll *catta_poll;
+       struct CattaSEntryGroup *catta_group;
+       char* catta_servicetype;
 };
 
 /// A handle for a MeshLink node.
@@ -161,7 +165,7 @@ struct meshlink_channel {
 typedef struct meshlink_packethdr {
        uint8_t destination[16];
        uint8_t source[16];
-} __attribute__ ((__packed__)) meshlink_packethdr_t;
+} __attribute__((__packed__)) meshlink_packethdr_t;
 
 extern void meshlink_send_from_queue(event_loop_t* el,meshlink_handle_t *mesh);
 extern void update_node_status(meshlink_handle_t *mesh, struct node_t *n);
@@ -177,4 +181,4 @@ typedef struct {
 
 extern dev_class_traits_t dev_class_traits[];
 
-#endif // MESHLINK_INTERNAL_H
+#endif