Add meshlink_set_channel_listen_cb().

[meshlink] / test / channels-fork.c

diff --git a/test/channels-fork.c b/test/channels-fork.c
index 9168168c8db54ab237d0ed0c992c582e7e2cee24..74aa84b7f525a8370771d2ebeb8118ed69c9f96b 100644 (file)
--- a/test/channels-fork.c
+++ b/test/channels-fork.c
@@ -51,16 +51,6 @@ static void bar_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel,
        }
 }
 
-static bool reject_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, uint16_t port, const void *data, size_t len) {
-       (void)mesh;
-       (void)channel;
-       (void)port;
-       (void)data;
-       (void)len;
-
-       return false;
-}
-
 static bool accept_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, uint16_t port, const void *data, size_t len) {
        if(port != 7) {
                return false;
@@ -91,12 +81,12 @@ static int main1(int rfd, int wfd) {
        meshlink_set_log_cb(NULL, MESHLINK_DEBUG, log_cb);
 
        assert(meshlink_destroy("channels_fork_conf.1"));
-       meshlink_handle_t *mesh = meshlink_open("channels_fork_conf.1", "foo", "channels", DEV_CLASS_BACKBONE);
+       meshlink_handle_t *mesh = meshlink_open("channels_fork_conf.1", "foo", "channels-fork", DEV_CLASS_BACKBONE);
        assert(mesh);
 
        meshlink_enable_discovery(mesh, false);
 
-       assert(meshlink_add_address(mesh, "localhost"));
+       assert(meshlink_set_canonical_address(mesh, meshlink_get_self(mesh), "localhost", NULL));
 
        char *data = meshlink_export(mesh);
        assert(data);
@@ -113,8 +103,6 @@ static int main1(int rfd, int wfd) {
 
        assert(meshlink_import(mesh, indata));
 
-       meshlink_set_channel_accept_cb(mesh, reject_cb);
-
        assert(meshlink_start(mesh));
 
        // Open a channel from foo to bar.
@@ -147,12 +135,12 @@ static int main2(int rfd, int wfd) {
        meshlink_set_log_cb(NULL, MESHLINK_DEBUG, log_cb);
 
        assert(meshlink_destroy("channels_fork_conf.2"));
-       meshlink_handle_t *mesh = meshlink_open("channels_fork_conf.2", "bar", "channels", DEV_CLASS_BACKBONE);
+       meshlink_handle_t *mesh = meshlink_open("channels_fork_conf.2", "bar", "channels-fork", DEV_CLASS_BACKBONE);
        assert(mesh);
 
        meshlink_enable_discovery(mesh, false);
 
-       assert(meshlink_add_address(mesh, "localhost"));
+       assert(meshlink_set_canonical_address(mesh, meshlink_get_self(mesh), "localhost", NULL));
 
        char *data = meshlink_export(mesh);
        assert(data);
@@ -186,11 +174,15 @@ static void alarm_handler(int sig) {
        assert(0);
 }
 
-int main() {
+int main(void) {
+       init_sync_flag(&bar_responded);
+       init_sync_flag(&foo_connected);
+       init_sync_flag(&foo_gone);
+
        int fda[2], fdb[2];
 
-       assert(pipe2(fda, 0) != -1);
-       assert(pipe2(fdb, 0) != -1);
+       assert(pipe(fda) != -1);
+       assert(pipe(fdb) != -1);
 
        if(!fork()) {
                return main2(fdb[0], fda[1]);