X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2Fblackbox%2Ftest_case_optimal_pmtu_01%2Fnode_sim_nut.c;h=6e745b75521aff3d2211dd70bda53fa8e5c0647e;hb=5f2e8877486869471041b0eca1aaed841c41a1a9;hp=1b8083b7628289c3a3e577cd9e9a8fd651d0feeb;hpb=a65fbef9ae9c314940e8977d10bdd761cc52b0ad;p=meshlink diff --git a/test/blackbox/test_case_optimal_pmtu_01/node_sim_nut.c b/test/blackbox/test_case_optimal_pmtu_01/node_sim_nut.c index 1b8083b7..6e745b75 100644 --- a/test/blackbox/test_case_optimal_pmtu_01/node_sim_nut.c +++ b/test/blackbox/test_case_optimal_pmtu_01/node_sim_nut.c @@ -18,6 +18,11 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + +#ifdef NDEBUG +#undef NDEBUG +#endif + #include #include #include @@ -43,7 +48,6 @@ static struct sync_flag channel_opened = {.mutex = PTHREAD_MUTEX_INITIALIZER, . static void node_status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable); static void channel_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *dat, size_t len); -static bool channel_accept(meshlink_handle_t *mesh, meshlink_channel_t *channel, uint16_t port, const void *dat, size_t len); pmtu_attr_t node_pmtu[2]; static time_t node_shutdown_time = 0; @@ -68,8 +72,9 @@ static void print_mtu_calc(pmtu_attr_t node_pmtu) { } // Node status callback -static void node_status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, - bool reachable) { +static void node_status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) { + (void)mesh; + // Signal pthread_cond_wait if peer is reachable if(!strcasecmp(node->name, "peer") && reachable) { set_sync_flag(&peer_reachable, true); @@ -88,23 +93,6 @@ static void poll_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, size_t return; } -static bool channel_accept(meshlink_handle_t *mesh, meshlink_channel_t *channel, uint16_t port, const void *dat, size_t len) { - (void)dat; - (void)len; - - assert(port == CHANNEL_PORT); - - // If the channel is from peer node set receive callback for it else reject the channel - if(!strcmp(channel->node->name, "peer")) { - meshlink_set_channel_receive_cb(mesh, channel, channel_receive_cb); - mesh->priv = channel; - - return true; - } - - return false; -} - /* channel receive callback */ static void channel_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *dat, size_t len) { if(len == 0) { @@ -140,8 +128,6 @@ static void meshlink_logger(meshlink_handle_t *mesh, meshlink_log_level_t level, cur_time = time(NULL); assert(cur_time != -1); - bool mtu_probe = false; - if(node_shutdown_time && cur_time >= node_shutdown_time) { test_pmtu_nut_running = false; } @@ -203,7 +189,7 @@ static void meshlink_logger(meshlink_handle_t *mesh, meshlink_log_level_t level, node_pmtu[i].mtu_discovery.count += 1; node_pmtu[i].mtu_size = mtu_len; - } else if(sscanf(text, "SPTPS key exchange with %s succesful", node_name) == 1) { + } else if(sscanf(text, "SPTPS key exchange with %s successful", node_name) == 1) { find_node_index(i, node_name); node_pmtu[i].mtu_start.time = cur_time; node_pmtu[i].mtu_start.count += 1; @@ -300,7 +286,7 @@ void *node_sim_pmtu_nut_01(void *arg) { if(time_stamp >= send_time) { send_time = time_stamp + 10; - meshlink_channel_send(mesh, channel, "ping", 5); + assert(meshlink_channel_send(mesh, channel, "ping", 5) == 5); } } } @@ -313,4 +299,6 @@ void *node_sim_pmtu_nut_01(void *arg) { print_mtu_calc(node_pmtu[NODE_PMTU_PEER]); fprintf(stderr, "\nNODE_PMTU_RELAY :\n"); print_mtu_calc(node_pmtu[NODE_PMTU_RELAY]); + + return NULL; }