Merge branch 'everbase' into discovery

diff --git a/README.avahi b/README.avahi
index f2a73224704698ec1c9ffecab157a60436317283..81d545f842edfabf00e23db59ffff83a22100db8 100644 (file)
--- a/README.avahi
+++ b/README.avahi
@@ -1,5 +1,5 @@
 
 cd avahi
 ./bootstrap.sh
-./configure --disable-qt3 CFLAGS=-fPIC
+./configure --disable-nls --disable-glib --disable-gobject --disable-qt3 --disable-qt4 --disable-gtk --disable-gtk3 --disable-dbus --disable-gdbm --disable-libdaemon --disable-python --disable-pygtk --disable-python-dbus --disable-mono --disable-monodoc --disable-autoipd --disable-doxygen-doc --disable-doxygen-dot --disable-doxygen-xml --disable-doxygen-html --disable-manpages --disable-xmltoman CFLAGS=-fPIC
 make

diff --git a/src/Makefile.am b/src/Makefile.am
index bead49e64acaaa2fa06b237864f4a0c95f05144c..0c681acbc533cc7c836972a1367533c700000ab9 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -104,7 +104,7 @@ libmeshlink_la_SOURCES = \
 
 libmeshlink_la_CFLAGS = -fPIC -I../avahi/
 
-libmeshlink_la_LIBADD = -lpthread -luuid ../avahi/avahi-core/.libs/libavahi-core.a ../avahi/avahi-common/.libs/libavahi-common.a ../avahi/avahi-client/.libs/libavahi-client.a
+libmeshlink_la_LIBADD = -lpthread -luuid ../avahi/avahi-core/.libs/libavahi-core.a ../avahi/avahi-common/.libs/libavahi-common.a
 
 libmeshlink_la_SOURCES += \
        ed25519/ecdh.c \

diff --git a/test/basic.c b/test/basic.c
index 9b09455afb8c0c6e145c5ded0dc14039271d989f..002c5769df4f43288d6a1df0acc9193729a20dde 100644 (file)
--- a/test/basic.c
+++ b/test/basic.c
@@ -6,7 +6,7 @@
 int main(int argc, char *argv[]) {
        // Open a new meshlink instance.
 
-       meshlink_handle_t *mesh = meshlink_open("basic_conf", "foo");
+       meshlink_handle_t *mesh = meshlink_open("basic_conf", "foo", "basic");
        if(!mesh) {
                fprintf(stderr, "Could not initialize configuration for foo\n");
                return 1;
@@ -46,7 +46,7 @@ int main(int argc, char *argv[]) {
 
        // Check that the name is ignored now, and that we still are "foo".
 
-       mesh = meshlink_open("basic_conf", "bar");
+       mesh = meshlink_open("basic_conf", "bar", "basic");
        if(!mesh) {
                fprintf(stderr, "Could not open configuration for foo a second time\n");
                return 1;

diff --git a/test/basicpp.cpp b/test/basicpp.cpp
index 3b8b77f790e10e9ca10545f7e985cdc9c578dfab..e1c103663b91b8e4903b39a20710cb5518e57561 100644 (file)
--- a/test/basicpp.cpp
+++ b/test/basicpp.cpp
@@ -8,7 +8,7 @@ using namespace std;
 int main(int argc, char *argv[]) {
        // Open a new meshlink instance.
 
-       meshlink::mesh *mesh = meshlink::open<meshlink::mesh>("basicpp_conf", "foo");
+       meshlink::mesh *mesh = meshlink::open<meshlink::mesh>("basicpp_conf", "foo", "basicpp");
        if(!mesh) {
                cerr << "Could not initialize configuration for foo\n";
                return 1;
@@ -48,7 +48,7 @@ int main(int argc, char *argv[]) {
 
        // Check that the name is ignored now, and that we still are "foo".
 
-       mesh = meshlink::open<meshlink::mesh>("basic_conf", "bar");
+       mesh = meshlink::open<meshlink::mesh>("basic_conf", "bar", "basicpp");
        if(!mesh) {
                cerr << "Could not open configuration for foo a second time\n";
                return 1;

diff --git a/test/channels.c b/test/channels.c
index 8327e8ed651a020ffdc53eb5672f3977990528b2..280902cbedd81dc76c68b02c386ca999a279cc27 100644 (file)
--- a/test/channels.c
+++ b/test/channels.c
@@ -35,13 +35,13 @@ bool accept_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, meshlink_no
 int main(int argc, char *argv[]) {
        // Open two new meshlink instance.
 
-       meshlink_handle_t *mesh1 = meshlink_open("channels_conf.1", "foo");
+       meshlink_handle_t *mesh1 = meshlink_open("channels_conf.1", "foo", "channels");
        if(!mesh1) {
                fprintf(stderr, "Could not initialize configuration for foo\n");
                return 1;
        }
 
-       meshlink_handle_t *mesh2 = meshlink_open("channels_conf.2", "bar");
+       meshlink_handle_t *mesh2 = meshlink_open("channels_conf.2", "bar", "channels");
        if(!mesh2) {
                fprintf(stderr, "Could not initialize configuration for bar\n");
                return 1;

diff --git a/test/import-export.c b/test/import-export.c
index d6498c24b6647828a1fffb45f676623ee67eb2fc..f2229589ab5da907870561820df3fc5e8bff3814 100644 (file)
--- a/test/import-export.c
+++ b/test/import-export.c
@@ -15,13 +15,13 @@ void status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) {
 int main(int argc, char *argv[]) {
        // Open two new meshlink instance.
 
-       meshlink_handle_t *mesh1 = meshlink_open("import_export_conf.1", "foo");
+       meshlink_handle_t *mesh1 = meshlink_open("import_export_conf.1", "foo", "import-export");
        if(!mesh1) {
                fprintf(stderr, "Could not initialize configuration for foo\n");
                return 1;
        }
 
-       meshlink_handle_t *mesh2 = meshlink_open("import_export_conf.2", "bar");
+       meshlink_handle_t *mesh2 = meshlink_open("import_export_conf.2", "bar", "import-export");
        if(!mesh2) {
                fprintf(stderr, "Could not initialize configuration for bar\n");
                return 1;

diff --git a/test/invite-join.c b/test/invite-join.c
index 50b79fb47531b0a59c79275e26611427e6dedc2d..a7bee95c0f9b9440812a4bc0745b8a38174e09fb 100644 (file)
--- a/test/invite-join.c
+++ b/test/invite-join.c
@@ -15,13 +15,13 @@ void status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) {
 int main(int argc, char *argv[]) {
        // Open two new meshlink instance.
 
-       meshlink_handle_t *mesh1 = meshlink_open("invite_join_conf.1", "foo");
+       meshlink_handle_t *mesh1 = meshlink_open("invite_join_conf.1", "foo", "invite-join");
        if(!mesh1) {
                fprintf(stderr, "Could not initialize configuration for foo\n");
                return 1;
        }
 
-       meshlink_handle_t *mesh2 = meshlink_open("invite_join_conf.2", "bar");
+       meshlink_handle_t *mesh2 = meshlink_open("invite_join_conf.2", "bar", "invite-join");
        if(!mesh2) {
                fprintf(stderr, "Could not initialize configuration for bar\n");
                return 1;

diff --git a/test/sign-verify.c b/test/sign-verify.c
index a7f9a5af5b7e22bf55d9f085eac3a4cb1b4a3a0b..6c7ccfec545488e4a9a91bb12b1a5f4945fc7ae1 100644 (file)
--- a/test/sign-verify.c
+++ b/test/sign-verify.c
@@ -8,13 +8,13 @@
 int main(int argc, char *argv[]) {
        // Open two new meshlink instance.
 
-       meshlink_handle_t *mesh1 = meshlink_open("sign_verify_conf.1", "foo");
+       meshlink_handle_t *mesh1 = meshlink_open("sign_verify_conf.1", "foo", "sign-verify");
        if(!mesh1) {
                fprintf(stderr, "Could not initialize configuration for foo\n");
                return 1;
        }
 
-       meshlink_handle_t *mesh2 = meshlink_open("sign_verify_conf.2", "bar");
+       meshlink_handle_t *mesh2 = meshlink_open("sign_verify_conf.2", "bar", "sign-verify");
        if(!mesh2) {
                fprintf(stderr, "Could not initialize configuration for bar\n");
                return 1;