Commit 401f92ea authored by Fong's avatar Fong
Browse files

wait longer

parent b435fd9e
...@@ -77,7 +77,7 @@ static int punch_hole(struct sockaddr_in peer_addr, int ttl) { ...@@ -77,7 +77,7 @@ static int punch_hole(struct sockaddr_in peer_addr, int ttl) {
} */ } */
/* TODO we can use traceroute to get the number of hops to the peer /* TODO we can use traceroute to get the number of hops to the peer
* to make sure this packet woudn't reach the peer but get through the NAT of itself * to make sure this packet woudn't reach the peer but get through the NAT in front of itself
*/ */
setsockopt(hole, IPPROTO_IP, IP_TTL, &ttl, sizeof(ttl)); setsockopt(hole, IPPROTO_IP, IP_TTL, &ttl, sizeof(ttl));
...@@ -195,7 +195,7 @@ static int connect_to_symmetric_nat(client* c, uint32_t peer_id, struct peer_inf ...@@ -195,7 +195,7 @@ static int connect_to_symmetric_nat(client* c, uint32_t peer_id, struct peer_inf
c->msg_buf = encode32(c->msg_buf, peer_id); c->msg_buf = encode32(c->msg_buf, peer_id);
send_to_punch_server(c); send_to_punch_server(c);
struct timeval timeout={10, 0}; struct timeval timeout={100, 0};
int fd = wait_for_peer(holes, i, &timeout); int fd = wait_for_peer(holes, i, &timeout);
if (fd > 0) { if (fd > 0) {
on_connected(fd); on_connected(fd);
...@@ -340,9 +340,9 @@ void on_connected(int sock) { ...@@ -340,9 +340,9 @@ void on_connected(int sock) {
struct sockaddr_in remote_addr; struct sockaddr_in remote_addr;
socklen_t fromlen = sizeof remote_addr; socklen_t fromlen = sizeof remote_addr;
recvfrom(sock, buf, MSG_BUF_SIZE, 0, (struct sockaddr *)&remote_addr, &fromlen); recvfrom(sock, buf, MSG_BUF_SIZE, 0, (struct sockaddr *)&remote_addr, &fromlen);
printf("recv %s\n", buf);
printf("connected with peer from %s:%d\n", inet_ntoa(remote_addr.sin_addr), ntohs(remote_addr.sin_port)); printf("connected with peer from %s:%d\n", inet_ntoa(remote_addr.sin_addr), ntohs(remote_addr.sin_port));
printf("recv %s\n", buf);
// restore the ttl // restore the ttl
int ttl = 64; int ttl = 64;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment