rustyrussell · Aug 5, 2014 · Aug 5, 2014 · Aug 5, 2014
Showing with 20 additions and 4 deletions.

+12 −1 dns.c

+1 −0 generating.c

+6 −3 peer.c

+1 −0 pettycoin-gateway.c
diff --git a/dns.c b/dns.c
@@ -7,8 +7,10 @@
 #include <ccan/read_write_all/read_write_all.h>
 #include <ccan/tal/tal.h>
 #include <netdb.h>
+#include <stdio.h>
 #include <sys/socket.h>
 #include <sys/types.h>
+#include <sys/wait.h>
 
 /* Async dns helper. */
 struct dns_info {
@@ -17,6 +19,7 @@ struct dns_info {
 				struct protocol_net_address *);
 	void *pkt;
 	size_t num_addresses;
+	int pid;
 	struct protocol_net_address *addresses;
 };
 
@@ -120,6 +123,11 @@ static struct io_plan *init_dns_conn(struct io_conn *conn, struct dns_info *d)
 	return io_read_packet(conn, &d->pkt, start_connecting, d);
 }
 
+static void reap_child(struct io_conn *conn, struct dns_info *d)
+{
+	waitpid(d->pid, NULL, 0);
+}
+
 tal_t *dns_resolve_and_connect(struct state *state,
 			       const char *name, const char *port,
 			       struct io_plan *(*init)(struct io_conn *,
@@ -139,7 +147,9 @@ tal_t *dns_resolve_and_connect(struct state *state,
 		return NULL;
 	}
 
-	switch (fork()) {
+	fflush(stdout);
+	d->pid = fork();
+	switch (d->pid) {
 	case -1:
 		warn("Forking for dns lookup");
 		return NULL;
@@ -151,6 +161,7 @@ tal_t *dns_resolve_and_connect(struct state *state,
 
 	close(pfds[1]);
 	conn = io_new_conn(state, pfds[0], init_dns_conn, d);
+	io_set_finish(conn, reap_child, d);
 	tal_steal(conn, d);
 	return d;
 }
diff --git a/generating.c b/generating.c
@@ -270,6 +270,7 @@ static void exec_generator(struct generator *gen)
 	if (pipe(outfd) != 0 || pipe(infd) != 0)
 		fatal(gen->state, "pipe: %s", strerror(errno));
 
+	fflush(stdout);
 	gen->pid = fork();
 	if (gen->pid == -1)
 		fatal(gen->state, "fork: %s", strerror(errno));

diff --git a/peer.c b/peer.c
@@ -1704,7 +1704,8 @@ struct io_plan *peer_connected(struct io_conn *conn, struct state *state,
 {
 	/* Conn owns peer; peer vanishes if conn does. */
 	struct peer *peer = tal(conn, struct peer);
-	char prefix[INET6_ADDRSTRLEN + strlen(":65000:")];
+	char prefix[strlen("Peer ") + STR_MAX_CHARS(unsigned int) + strlen(" @")
+		    + INET6_ADDRSTRLEN + strlen(":65000:")];
 
 	peer->peer_num = get_peernum(state->peer_map);
 	if (peer->peer_num == MAX_PEERS) {
@@ -1727,8 +1728,10 @@ struct io_plan *peer_connected(struct io_conn *conn, struct state *state,
 	peer->fd = io_conn_fd(conn);
 
 	/* Use address as log prefix. */
-	if (inet_ntop(AF_INET6, addr->addr, prefix, sizeof(prefix)) == NULL)
-		strcpy(prefix, "UNCONVERTABLE-IPV6");
+	sprintf(prefix, "Peer %u @", peer->peer_num);
+	if (inet_ntop(AF_INET6, addr->addr, prefix + strlen(prefix),
+		      INET6_ADDRSTRLEN) == NULL)
+		strcat(prefix, "UNCONVERTABLE-IPV6");
 	sprintf(prefix + strlen(prefix), ":%u:", le16_to_cpu(addr->port));
 	peer->log = new_log(peer, state->log,
 			    prefix, state->log_level, PEER_LOG_MAX);

diff --git a/pettycoin-gateway.c b/pettycoin-gateway.c
@@ -201,6 +201,7 @@ static char *ask_process(const tal_t *ctx,
 	if (pipe(fds) != 0)
 		return NULL;
 
+	fflush(stdout);
 	switch (fork()) {
 	case -1:
 		return NULL;