diff options
Diffstat (limited to 'src/transport/plugin_transport_tcp.c')
-rw-r--r-- | src/transport/plugin_transport_tcp.c | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c index 770525f21..89d270cc8 100644 --- a/src/transport/plugin_transport_tcp.c +++ b/src/transport/plugin_transport_tcp.c | |||
@@ -1529,20 +1529,22 @@ tcp_plugin_get_session (void *cls, | |||
1529 | #endif | 1529 | #endif |
1530 | 1530 | ||
1531 | addrlen = address->address_length; | 1531 | addrlen = address->address_length; |
1532 | LOG(GNUNET_ERROR_TYPE_DEBUG, | 1532 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1533 | "Trying to get session for `%s' address of peer `%s'\n", | 1533 | "Trying to get session for `%s' address of peer `%s'\n", |
1534 | tcp_plugin_address_to_string(NULL, address->address, address->address_length), | 1534 | tcp_plugin_address_to_string(NULL, address->address, address->address_length), |
1535 | GNUNET_i2s (&address->peer)); | 1535 | GNUNET_i2s (&address->peer)); |
1536 | 1536 | ||
1537 | if (GNUNET_HELLO_address_check_option(address, GNUNET_HELLO_ADDRESS_INFO_INBOUND)) | 1537 | if (GNUNET_HELLO_address_check_option (address, |
1538 | GNUNET_HELLO_ADDRESS_INFO_INBOUND)) | ||
1538 | { | 1539 | { |
1539 | GNUNET_break (0); | 1540 | GNUNET_break (0); |
1540 | return NULL; | 1541 | return NULL; |
1541 | } | 1542 | } |
1542 | 1543 | ||
1543 | /* look for existing session */ | 1544 | /* look for existing session */ |
1544 | if (GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains (plugin->sessionmap, | 1545 | if (GNUNET_YES == |
1545 | &address->peer)) | 1546 | GNUNET_CONTAINER_multipeermap_contains (plugin->sessionmap, |
1547 | &address->peer)) | ||
1546 | { | 1548 | { |
1547 | struct SessionItCtx si_ctx; | 1549 | struct SessionItCtx si_ctx; |
1548 | 1550 | ||
@@ -1550,15 +1552,18 @@ tcp_plugin_get_session (void *cls, | |||
1550 | si_ctx.result = NULL; | 1552 | si_ctx.result = NULL; |
1551 | 1553 | ||
1552 | GNUNET_CONTAINER_multipeermap_get_multiple (plugin->sessionmap, | 1554 | GNUNET_CONTAINER_multipeermap_get_multiple (plugin->sessionmap, |
1553 | &address->peer, &session_lookup_it, &si_ctx); | 1555 | &address->peer, |
1554 | if (si_ctx.result != NULL) | 1556 | &session_lookup_it, &si_ctx); |
1557 | if (NULL != si_ctx.result) | ||
1555 | { | 1558 | { |
1556 | session = si_ctx.result; | 1559 | session = si_ctx.result; |
1557 | LOG(GNUNET_ERROR_TYPE_DEBUG, | 1560 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1558 | "Found existing session for `%s' address `%s' session %p\n", | 1561 | "Found existing session for `%s' address `%s' session %p\n", |
1559 | GNUNET_i2s (&address->peer), | 1562 | GNUNET_i2s (&address->peer), |
1560 | tcp_plugin_address_to_string(NULL, address->address, address->address_length), | 1563 | tcp_plugin_address_to_string (NULL, |
1561 | session); | 1564 | address->address, |
1565 | address->address_length), | ||
1566 | session); | ||
1562 | return session; | 1567 | return session; |
1563 | } | 1568 | } |
1564 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1569 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
@@ -1637,8 +1642,9 @@ tcp_plugin_get_session (void *cls, | |||
1637 | } | 1642 | } |
1638 | 1643 | ||
1639 | if ((is_natd == GNUNET_YES) && (NULL != plugin->nat) && | 1644 | if ((is_natd == GNUNET_YES) && (NULL != plugin->nat) && |
1640 | (GNUNET_NO == GNUNET_CONTAINER_multipeermap_contains (plugin->nat_wait_conns, | 1645 | (GNUNET_NO == |
1641 | &address->peer))) | 1646 | GNUNET_CONTAINER_multipeermap_contains (plugin->nat_wait_conns, |
1647 | &address->peer))) | ||
1642 | { | 1648 | { |
1643 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1649 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1644 | "Found valid IPv4 NAT address (creating session)!\n"); | 1650 | "Found valid IPv4 NAT address (creating session)!\n"); |