commit - 6108e77593e71f070dfc86a3e07a2cbb8cb194a6
commit + d0d77bc8025f3394c738d061dc3073bd202be30e
blob - 5e0d899f9f92ee4007fccefa5bc9f97ffbd8b28e
blob + d364288283d4f2b2db6724332b16d517c2df28e6
--- thingsd/sockets.c
+++ thingsd/sockets.c
create_socks(struct thgsd *pthgsd, bool reconn)
{
struct thg *thg;
- struct sock *sock, *tsock, *conn_sock = NULL;
+ struct sock *sock = NULL, *tsock, *conn_sock = NULL;
char *iface = NULL;
- int csock, conn_csock;
+ int csock = -1, conn_csock = -1;
bool fail = false;
evbuffercb sockrd = sock_rd;
evbuffercb sockwr = sock_wr;
NI_NUMERICHOST))
log_warnx("getnameinfo error");
if ((strcmp(name, ifap->ifa_name) == 0) &&
- addr != '\0') {
+ *addr != '\0') {
freeifaddrs(ifap);
return addr;
}
blob - 5fc346ed91c5ad8bb72a457a03a65f088671e777
blob + d9aafd294d413c102a8352e9fa8c523d1cdfe371
--- thingsd/things.c
+++ thingsd/things.c
case IMSG_SHOW_PKTS:
TAILQ_FOREACH(thg, &pthgsd->thgs, entry) {
if (strncmp(thg->name, imsg.data,
- sizeof(imsg.data)) == 0) {
+ strlen(imsg.data)) == 0) {
if ((ctl_pkt->name =
strdup(imsg.data)) == NULL)
break;
break;
if (strncmp(clt->name, imsg.data, BUFF) == 0) {
log_debug("Control killed client: %s",
- imsg.data);
+ (char *)imsg.data);
clt_del(pthgsd, clt);
break;
}