Merge branch 'master' into update

Change-Id: I2cd34ed5bb1903736ae8ce109acebaf13bf49805
This commit is contained in:
Tim Newsome
2018-02-02 13:36:58 -08:00
83 changed files with 3490 additions and 883 deletions
+4 -3
View File
@@ -301,10 +301,11 @@ int add_service(char *name,
}
struct sockaddr_in addr_in;
addr_in.sin_port = 0;
socklen_t addr_in_size = sizeof(addr_in);
getsockname(c->fd, (struct sockaddr *)&addr_in, &addr_in_size);
LOG_INFO("Listening on port %d for %s connections",
ntohs(addr_in.sin_port), name);
if (getsockname(c->fd, (struct sockaddr *)&addr_in, &addr_in_size) == 0)
LOG_INFO("Listening on port %hu for %s connections",
ntohs(addr_in.sin_port), name);
} else if (c->type == CONNECTION_STDINOUT) {
c->fd = fileno(stdin);