commit - 3668869eac0eb1676f0f695fb6767dece4cd65b4
commit + a999abe24e04a394cc07482a75408689d8f0fc1c
blob - 08883bde1fd5eec74bb68b3a2f7203791ab11650
blob + 34e8ddde5256b86ed58c4dd6a93b1ca67615e142
--- thingsd/client.c
+++ thingsd/client.c
thing->fd = -1;
} else {
if (thing->fd != -1) {
- bufferevent_write_buffer(thing->bev, client->evb);
+ bufferevent_write_buffer(thing->bev,
+ client->evb);
evbuffer_drain(client->evb, len);
}
}
blob - 441381b4142211cab1b9091709c21b74e937ff07
blob + b0ee8071857615961b89dcf7bb778ca7af857273
--- thingsd/sockets.c
+++ thingsd/sockets.c
if (csock == -1 || conn_csock == -1)
fatalx("socket creation failed");
-
else if (csock == -2 || conn_csock == -2) {
fail = true;
fatalx("setsockopt error");
}
+
/* non-blocking */
flags = fcntl(socket_fd, F_GETFL);
flags |= O_NONBLOCK;
free(pkt);
pkt = NULL;
-
}
}
free(pkt);
blob - bf516a27d3bc9900d2410be5664e922ae3d9f967
blob + 81a2845aee4c29fc99fa93c2226f1a47d9ebd26d
--- thingsd/things.c
+++ thingsd/things.c
struct packet_client *packet_client;
packet_client = calloc(1, sizeof(*packet_client));
+
if (packet_client == NULL)
fatalx("no calloc packet_client");
packet_client->ps = *ps;
packet_client->imsg = *imsg;
+
memcpy(packet_client->name, imsg->data, sizeof(packet_client->name));
log_debug("control packet echo request for %s", packet_client->name);
+
TAILQ_INSERT_TAIL(thingsd_env->packet_clients, packet_client, entry);
}
imsg->hdr.peerid, -1, &nti,
sizeof(nti)) == -1)
return;
-
}
}
packet_client->imsg.hdr.peerid, -1,
pkt, len) == -1)
return;
-
-
}
}
\ No newline at end of file