Merge remote-tracking branch 'guus/1.1' into thkr-1.1-ponyhof

This commit is contained in:
thorkill 2016-06-06 22:00:58 +02:00
commit 6e6bc9f443

View file

@ -876,7 +876,8 @@ bool ack_h(connection_t *c, const char *request) {
c->edge = new_edge();
c->edge->from = myself;
c->edge->to = n;
sockaddr_setport(&c->address, hisport);
sockaddrcpy(&c->edge->address, &c->address);
sockaddr_setport(&c->edge->address, hisport);
sockaddr_t local_sa;
socklen_t local_salen = sizeof local_sa;
if (getsockname(c->socket, &local_sa.sa, &local_salen) < 0)