rustyrussell · Aug 3, 2014 · Aug 4, 2014 · Aug 4, 2014 · Aug 4, 2014 · Aug 4, 2014
Showing with 56 additions and 7 deletions.

+4 −1 netaddr.c

+10 −1 peer.c

+3 −1 recv_block.c

+17 −4 sync.c

+22 −0 tools/update-ccan.sh
diff --git a/netaddr.c b/netaddr.c
@@ -1,5 +1,6 @@
 #include "netaddr.h"
 #include "protocol_net.h"
+#include <assert.h>
 #include <errno.h>
 #include <netdb.h>
 #include <netinet/in.h>
@@ -110,7 +111,7 @@ bool get_fd_addr(int fd, struct protocol_net_address *addr)
 		struct sockaddr_in in;
 		struct sockaddr_in6 in6;
 	} u;
-	socklen_t len = sizeof(len);
+	socklen_t len = sizeof(u);
 
 	if (getsockname(fd, &u.sa, &len) != 0)
 		return false;
@@ -122,9 +123,11 @@ bool get_fd_addr(int fd, struct protocol_net_address *addr)
 	addr->unused = cpu_to_le16(0);
 	memset(&addr->uuid, 0, sizeof(addr->uuid));
 	if (u.sa.sa_family == AF_INET) {
+		assert(len == sizeof(u.in));
 		ipv4_netaddr(addr, &u.in);
 		return true;
 	} else if (u.sa.sa_family == AF_INET6) {
+		assert(len == sizeof(u.in6));
 		ipv6_netaddr(addr, &u.in6);
 		return true;
 	}

diff --git a/peer.c b/peer.c
@@ -1620,7 +1620,16 @@ static struct io_plan welcome_received(struct io_conn *conn, struct peer *peer)
 	}
 
 	/* Replace port we see with port they want us to connect to. */
-	peer->you.port = peer->welcome->listen_port;
+	if (peer->welcome->listen_port != peer->you.port) {
+		struct protocol_net_address to_addr;
+		log_debug(peer->log, "Peer wants us to connect to port %u",
+			  le16_to_cpu(peer->welcome->listen_port));
+		/* Don't remember this one, we can't connect there. */
+		peer_cache_del(state, &peer->you, true);
+		to_addr = peer->you;
+		to_addr.port = peer->welcome->listen_port;
+		peer_cache_add(state, &to_addr);
+	}
 
 	/* Create/update time for this peer. */
 	peer_cache_refresh(state, &peer->you);

diff --git a/recv_block.c b/recv_block.c
@@ -108,7 +108,6 @@ recv_block(struct state *state, struct log *log, struct peer *peer,
 				todo_done_get_block(peer, &sha, true);
 			} else
 				todo_done_get_block(peer, &sha, false);
-			return PROTOCOL_ECODE_NONE;
 		}
 		return e;
 	}
@@ -392,6 +391,9 @@ enum protocol_ecode recv_block_from_peer(struct peer *peer,
 			 le32_to_cpu(b->hdr->depth));
 		log_add_struct(peer->log, struct protocol_double_sha, &b->sha);
 	}
+	/* If we didn't know prev, this block is still OK so don't hang up. */
+	if (e == PROTOCOL_ECODE_PRIV_UNKNOWN_PREV)
+		return PROTOCOL_ECODE_NONE;
 	return e;
 }
 

diff --git a/sync.c b/sync.c
@@ -203,17 +203,30 @@ enum protocol_ecode recv_children(struct peer *peer,
 	if (len % sizeof(struct protocol_net_syncblock))
 		return PROTOCOL_ECODE_INVALID_LEN;
 
+	log_debug(peer->log, "Gave us %u children for ", num);
+	log_add_struct(peer->log, struct protocol_double_sha, &parent->sha);
+
 	s = (void *)(pkt + 1);
 	for (i = 0; i < num; i++) {
-		const struct block *b = block_find_any(peer->state, &s->block);
+		const struct block *b;
+
+		b = block_find_any(peer->state, &s[i].block);
 		if (!b) {
 			/* We'd better find out about this one... */
-			todo_add_get_block(peer->state, &s->block);
+			log_debug(peer->log, "Asking about unknown block ");
+			log_add_struct(peer->log, struct protocol_double_sha,
+				       &s[i].block);
+			todo_add_get_block(peer->state, &s[i].block);
 		} else {
 			/* If they have more children than us, ask deeper. */
 			if (num_children(b, NULL, 0)
-			    < le32_to_cpu(s[i].children))
-				todo_add_get_children(peer->state, &b->sha);
+			    < le32_to_cpu(s[i].children)) {
+				log_debug(peer->log, "Getting more kids for ");
+				log_add_struct(peer->log, struct protocol_double_sha,
+					       &s[i].block);
+
+				todo_add_get_children(peer->state, &s[i].block);
+			}
 		}
 	}
 

diff --git a/tools/update-ccan.sh b/tools/update-ccan.sh
@@ -0,0 +1,22 @@
+#! /bin/sh
+
+set -e
+
+CCANDIR=${1:-../ccan}
+NEW_VERSION=$(git --git-dir=$CCANDIR/.git describe --always)
+OLD_VERSION=$(grep '^CCAN version: ' ccan/README | cut -d: -f2)
+
+# Make sure we have a clean tree.
+if git status --porcelain | grep -v '^\?\?'; then
+    echo "Dirty tree" >&2
+    exit 1
+fi
+
+(cd $CCANDIR && git diff $OLD_VERSION $NEW_VERSION ccan/ licenses/ tools/configurator) > ccan/diff
+(cd ccan && patch -p1 < diff)
+rm ccan/diff
+grep -v '^CCAN version: ' ccan/README > ccan/README.new
+echo "CCAN version: $NEW_VERSION" >> ccan/README.new
+mv ccan/README.new ccan/README
+
+echo "Updated to $NEW_VERSION"