address[0] = '\0';
address++;
- if (GNUNET_OK !=
+ if (GNUNET_OK !=
GNUNET_STRINGS_to_address_ip (address,
strlen (address),
&socket_address))
lookup_session_by_client (struct Plugin *plugin,
struct GNUNET_SERVER_Client *client)
{
- return GNUNET_SERVER_client_get_user_context (client, struct Session);
+ return GNUNET_SERVER_client_get_user_context (client,
+ struct Session);
}
session))
{
GNUNET_STATISTICS_update (session->plugin->env->stats,
- gettext_noop ("# TCP sessions active"),
+ gettext_noop ("# TCP sessions active"),
-1,
GNUNET_NO);
}
if (NULL != session->receive_delay_task)
{
GNUNET_SCHEDULER_cancel (session->receive_delay_task);
- if (NULL != session->client)
- GNUNET_SERVER_receive_done (session->client, GNUNET_SYSERR);
+ session->receive_delay_task = NULL;
}
if (NULL != session->client)
{
GNUNET_SERVER_client_disconnect (session->client);
- GNUNET_SERVER_client_drop (session->client);
session->client = NULL;
}
GNUNET_HELLO_address_free (session->address);
- GNUNET_assert(NULL == session->transmit_handle);
- GNUNET_free(session);
+ GNUNET_assert (NULL == session->transmit_handle);
+ GNUNET_free (session);
return GNUNET_OK;
}
GNUNET_STRINGS_relative_time_to_string (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
GNUNET_YES));
/* call session destroy function */
- tcp_plugin_disconnect_session (s->plugin,
+ tcp_plugin_disconnect_session (s->plugin,
s);
}
*
* @param plugin the plugin
* @param address the address to create the session for
+ * @param scope network scope the address is from
* @param client client to use, reference counter must have already been increased
* @param is_nat this a NAT session, we should wait for a client to
* connect to us from an address, then assign that to
static struct Session *
create_session (struct Plugin *plugin,
const struct GNUNET_HELLO_Address *address,
+ enum GNUNET_ATS_Network_Type scope,
struct GNUNET_SERVER_Client *client,
int is_nat)
{
session->last_activity = GNUNET_TIME_absolute_get ();
session->plugin = plugin;
session->is_nat = is_nat;
- session->client = client;
+ if (NULL != client)
+ {
+ session->client = client;
+ GNUNET_SERVER_client_set_user_context (client,
+ session);
+ }
session->address = GNUNET_HELLO_address_copy (address);
session->target = address->peer;
session->expecting_welcome = GNUNET_YES;
- session->scope = GNUNET_ATS_NET_UNSPECIFIED;
+ session->scope = scope;
pm = GNUNET_malloc (sizeof (struct PendingMessage) +
sizeof (struct WelcomeMessage));
pm->msg = (const char *) &pm[1];
* @return number of bytes written to @a buf
*/
static size_t
-do_transmit (void *cls,
+do_transmit (void *cls,
size_t size,
void *buf)
{
if (NULL == (pm = session->pending_messages_head))
return;
- session->transmit_handle = GNUNET_SERVER_notify_transmit_ready (session->client,
- pm->message_size,
- GNUNET_TIME_absolute_get_remaining (pm->timeout),
- &do_transmit,
- session);
+ session->transmit_handle
+ = GNUNET_SERVER_notify_transmit_ready (session->client,
+ pm->message_size,
+ GNUNET_TIME_absolute_get_remaining (pm->timeout),
+ &do_transmit,
+ session);
}
session->receive_delay_task = NULL;
reschedule_session_timeout (session);
- GNUNET_SERVER_receive_done (session->client,
+ GNUNET_SERVER_receive_done (session->client,
GNUNET_OK);
}
si_ctx.result = NULL;
GNUNET_CONTAINER_multipeermap_get_multiple (plugin->sessionmap,
&address->peer,
- &session_lookup_it,
+ &session_lookup_it,
&si_ctx);
if (NULL != si_ctx.result)
{
sbs);
GNUNET_break (net_type != GNUNET_ATS_NET_UNSPECIFIED);
- if ( (is_natd == GNUNET_YES) &&
+ if ( (is_natd == GNUNET_YES) &&
(addrlen == sizeof(struct IPv6TcpAddress)) )
{
/* NAT client only works with IPv4 addresses */
}
if ( (is_natd == GNUNET_YES) &&
- (GNUNET_YES ==
+ (GNUNET_YES ==
GNUNET_CONTAINER_multipeermap_contains (plugin->nat_wait_conns,
&address->peer)))
{
"Found valid IPv4 NAT address (creating session)!\n");
session = create_session (plugin,
address,
+ net_type,
NULL,
GNUNET_YES);
- session->scope = net_type;
session->nat_connection_timeout = GNUNET_SCHEDULER_add_delayed (NAT_TIMEOUT,
&nat_connect_timeout,
session);
- GNUNET_assert(GNUNET_OK ==
- GNUNET_CONTAINER_multipeermap_put (plugin->nat_wait_conns,
- &session->target,
- session,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multipeermap_put (plugin->nat_wait_conns,
+ &session->target,
+ session,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Created NAT WAIT connection to `%4s' at `%s'\n",
session = create_session (plugin,
address,
- GNUNET_SERVER_connect_socket (plugin->server, sa),
+ net_type,
+ GNUNET_SERVER_connect_socket (plugin->server,
+ sa),
GNUNET_NO);
- session->scope = net_type;
- GNUNET_SERVER_client_set_user_context (session->client,
- session);
- GNUNET_CONTAINER_multipeermap_put (plugin->sessionmap,
- &session->target,
- session,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+ (void) GNUNET_CONTAINER_multipeermap_put (plugin->sessionmap,
+ &session->target,
+ session,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
/* Send TCP Welcome */
process_pending_messages (session);
* @param key the peer which the session belongs to (unused)
* @param value the `struct Session`
* @return #GNUNET_YES (continue to iterate)
- */
+ */
static int
session_disconnect_it (void *cls,
const struct GNUNET_PeerIdentity *key,
* @return #GNUNET_OK if port is either open_port or adv_port
*/
static int
-check_port (struct Plugin *plugin,
+check_port (struct Plugin *plugin,
uint16_t in_port)
{
- if ( (in_port == plugin->adv_port) ||
+ if ( (in_port == plugin->adv_port) ||
(in_port == plugin->open_port) )
return GNUNET_OK;
return GNUNET_SYSERR;
* and transport, #GNUNET_SYSERR if not
*/
static int
-tcp_plugin_check_address (void *cls,
+tcp_plugin_check_address (void *cls,
const void *addr,
size_t addrlen)
{
GNUNET_break (0);
return GNUNET_SYSERR;
}
- if (GNUNET_OK != check_port (plugin,
+ if (GNUNET_OK != check_port (plugin,
ntohs (v6->t6_port)))
return GNUNET_SYSERR;
- if (GNUNET_OK !=
+ if (GNUNET_OK !=
GNUNET_NAT_test_address (plugin->nat,
&v6->ipv6_addr,
sizeof(struct in6_addr)))
if (ntohs (message->size) != sizeof(struct TCP_NAT_ProbeMessage))
{
GNUNET_break_op(0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
return;
}
sizeof(struct GNUNET_PeerIdentity)))
{
/* refuse connections from ourselves */
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
return;
}
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Did NOT find session for NAT probe!\n");
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
return;
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
session->nat_connection_timeout = NULL;
}
- if (GNUNET_OK !=
- GNUNET_SERVER_client_get_address (client,
+ if (GNUNET_OK !=
+ GNUNET_SERVER_client_get_address (client,
&vaddr,
&alen))
{
GNUNET_break(0);
- GNUNET_SERVER_receive_done (client,
+ GNUNET_SERVER_receive_done (client,
GNUNET_SYSERR);
tcp_plugin_disconnect_session (plugin,
session);
}
GNUNET_assert (GNUNET_YES ==
GNUNET_CONTAINER_multipeermap_remove (plugin->nat_wait_conns,
- &tcp_nat_probe->clientIdentity,
+ &tcp_nat_probe->clientIdentity,
session));
GNUNET_SERVER_client_set_user_context (client,
session);
(void) GNUNET_CONTAINER_multipeermap_put (plugin->sessionmap,
&session->target,
- session,
+ session,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
session->last_activity = GNUNET_TIME_absolute_get ();
LOG (GNUNET_ERROR_TYPE_DEBUG,
LOG(GNUNET_ERROR_TYPE_DEBUG,
"Bad address for incoming connection!\n");
GNUNET_free(vaddr);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
tcp_plugin_disconnect_session (plugin,
session);
return;
}
GNUNET_free (vaddr);
GNUNET_break (NULL == session->client);
- GNUNET_SERVER_client_keep (client);
session->client = client;
GNUNET_STATISTICS_update (plugin->env->stats,
gettext_noop ("# TCP sessions active"),
- 1,
+ 1,
GNUNET_NO);
process_pending_messages (session);
- GNUNET_SERVER_receive_done (client,
+ GNUNET_SERVER_receive_done (client,
GNUNET_OK);
}
}
else
{
- GNUNET_SERVER_client_keep (client);
if (GNUNET_OK ==
GNUNET_SERVER_client_get_address (client, &vaddr, &alen))
{
{
GNUNET_break (0);
GNUNET_free_non_null (vaddr);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
return;
}
session = create_session (plugin,
address,
+ plugin->env->get_address_type (plugin->env->cls,
+ vaddr,
+ alen),
client,
GNUNET_NO);
+ GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != session->scope);
GNUNET_HELLO_address_free (address);
- session->scope
- = plugin->env->get_address_type (plugin->env->cls,
- vaddr,
- alen);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Creating new%s session %p for peer `%s' client %p\n",
GNUNET_HELLO_address_check_option (session->address,
session->address->address_length),
client);
GNUNET_free (vaddr);
- GNUNET_SERVER_client_set_user_context (session->client, session);
- GNUNET_CONTAINER_multipeermap_put (plugin->sessionmap,
- &session->target,
- session,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+ (void) GNUNET_CONTAINER_multipeermap_put (plugin->sessionmap,
+ &session->target,
+ session,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
/* Notify transport and ATS about new session */
plugin->env->session_start (plugin->env->cls,
session->address,
session,
session->scope);
- notify_session_monitor (plugin,
- session,
- GNUNET_TRANSPORT_SS_INIT);
}
else
{
LOG(GNUNET_ERROR_TYPE_DEBUG,
"Did not obtain TCP socket address for incoming connection\n");
GNUNET_break(0);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
return;
}
}
if (session->expecting_welcome != GNUNET_YES)
{
GNUNET_break_op(0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
GNUNET_break(0);
return;
}
process_pending_messages (session);
GNUNET_SERVER_client_set_timeout (client,
- GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
}
reschedule_session_timeout (session);
if (0 == delay.rel_value_us)
{
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
}
else
{
- LOG(GNUNET_ERROR_TYPE_DEBUG,
- "Throttling receiving from `%s' for %s\n",
- GNUNET_i2s (&session->target),
- GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Throttling receiving from `%s' for %s\n",
+ GNUNET_i2s (&session->target),
+ GNUNET_STRINGS_relative_time_to_string (delay,
+ GNUNET_YES));
GNUNET_SERVER_disable_receive_done_warning (client);
+ GNUNET_assert (NULL == session->receive_delay_task);
session->receive_delay_task = GNUNET_SCHEDULER_add_delayed (delay,
- &delayed_done, session);
+ &delayed_done,
+ session);
}
}
struct Plugin *plugin = cls;
plugin->cur_connections++;
+ GNUNET_STATISTICS_set (plugin->env->stats,
+ gettext_noop ("# TCP server connections active"),
+ plugin->cur_connections,
+ GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ gettext_noop ("# TCP server connect events"),
+ 1,
+ GNUNET_NO);
if (plugin->cur_connections != plugin->max_connections)
return;
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
}
GNUNET_assert (plugin->cur_connections >= 1);
plugin->cur_connections--;
+ GNUNET_STATISTICS_set (plugin->env->stats,
+ gettext_noop ("# TCP server connections active"),
+ plugin->cur_connections,
+ GNUNET_NO);
GNUNET_STATISTICS_update (session->plugin->env->stats,
gettext_noop ("# network-level TCP disconnect events"),
1,
GNUNET_NO);
- tcp_plugin_disconnect_session (plugin,
+ tcp_plugin_disconnect_session (plugin,
session);
}
return 0;
}
GNUNET_assert(size >= sizeof(tcp_probe_ctx->message));
- memcpy (buf,
- &tcp_probe_ctx->message,
+ memcpy (buf,
+ &tcp_probe_ctx->message,
sizeof(tcp_probe_ctx->message));
GNUNET_SERVER_connect_socket (tcp_probe_ctx->plugin->server,
tcp_probe_ctx->sock);
* We have received an ICMP response, ostensibly from a peer
* that wants to connect to us! Send a message to establish a connection.
*/
- sock = GNUNET_CONNECTION_create_from_sockaddr (AF_INET,
+ sock = GNUNET_CONNECTION_create_from_sockaddr (AF_INET,
addr,
addrlen);
if (NULL == sock)
}
plugin->server
= GNUNET_SERVER_create_with_sockets (NULL,
- plugin,
+ plugin,
NULL,
- idle_timeout,
+ idle_timeout,
GNUNET_YES);
}
plugin->handlers = GNUNET_malloc (sizeof (my_handlers));
cur);
GNUNET_RESOLVER_request_cancel (cur->resolver_handle);
cur->asc (cur->asc_cls,
- NULL,
+ NULL,
GNUNET_OK);
GNUNET_free (cur);
}
GNUNET_SERVICE_stop (plugin->service);
else
GNUNET_SERVER_destroy (plugin->server);
- GNUNET_free(plugin->handlers);
+ GNUNET_free (plugin->handlers);
if (NULL != plugin->nat)
GNUNET_NAT_unregister (plugin->nat);
while (NULL != (tcp_probe = plugin->probe_head))
plugin->probe_tail,
tcp_probe);
GNUNET_CONNECTION_destroy (tcp_probe->sock);
- GNUNET_free(tcp_probe);
+ GNUNET_free (tcp_probe);
}
GNUNET_CONTAINER_multipeermap_destroy (plugin->nat_wait_conns);
GNUNET_CONTAINER_multipeermap_destroy (plugin->sessionmap);
- GNUNET_free(plugin);
- GNUNET_free(api);
+ GNUNET_break (0 == plugin->cur_connections);
+ GNUNET_free (plugin);
+ GNUNET_free (api);
return NULL;
}
projects / oweals / gnunet.git / blobdiff