if(tv0.tv_sec == 0)
gettimeofday(&tv0, NULL);
gettimeofday(&tv, NULL);
- fprintf(stderr, "%u.%.03u ", (unsigned int)(tv.tv_sec-tv0.tv_sec), (unsigned int)tv.tv_usec/1000);
+ fprintf(stderr, "%u.%.03u ", (unsigned int)(tv.tv_sec - tv0.tv_sec), (unsigned int)tv.tv_usec / 1000);
if(mesh)
fprintf(stderr, "(%s) ", mesh->name);
}
void status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) {
- printf("status_cb: %s %sreachable\n", node->name, reachable?"":"un");
+ printf("status_cb: %s %sreachable\n", node->name, reachable ? "" : "un");
if(!strcmp(node->name, "bar"))
bar_reachable = reachable;
}
void bar_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *data, size_t len) {
printf("bar_receive_cb %zu: ", len);
fwrite(data, 1, len, stdout);
+ printf("\n");
// Echo the data back.
meshlink_channel_send(mesh, channel, data, len);
}
bool accept_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, uint16_t port, const void *data, size_t len) {
printf("accept_cb: (from %s on port %u) ", channel->node->name, (unsigned int)port);
- if(data) {
+ if(data)
fwrite(data, 1, len, stdout);
- printf("\n");
- }
+ printf("\n");
if(port != 7)
return false;
return 1;
}
+ meshlink_enable_discovery(mesh1, false);
+ meshlink_enable_discovery(mesh2, false);
meshlink_set_log_cb(mesh1, MESHLINK_DEBUG, log_cb);
meshlink_set_log_cb(mesh2, MESHLINK_DEBUG, log_cb);
return 1;
}
- // XXX not enough to wait for reachable, must wait for SPTPS to complete
- for(int i=0; i < 20; i++) {
- sleep(1);
- if(((node_t *)bar)->status.validkey)
- break;
- }
- if(!((node_t *)bar)->status.validkey) {
- fprintf(stderr, "No key exchange after 20 seconds\n");
- return 1;
- }
-
meshlink_channel_t *channel = meshlink_channel_open(mesh1, bar, 7, foo_receive_cb, NULL, 0);
meshlink_set_channel_poll_cb(mesh1, channel, poll_cb);
- for(int i = 0; i < 5; i++) {
+ for(int i = 0; i < 20; i++) {
sleep(1);
if(bar_responded)
break;