diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-02-05 00:53:22 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-02-05 00:53:22 +0000 |
commit | 15dd8e6cc1199d611d804853e134882bf13b234a (patch) | |
tree | 7cc90886eabe8d0ffa397a319e12a87042d0ba28 /src/transport/plugin_transport_http_server.c | |
parent | bf6a2c9deeff7a3b384eb029d8267d6099066df3 (diff) | |
download | gnunet-15dd8e6cc1199d611d804853e134882bf13b234a.tar.gz gnunet-15dd8e6cc1199d611d804853e134882bf13b234a.zip |
Various changes:
- removed "in_use" from being passed to ATS, no
longer needed as we tell ATS when we cannot
follow a suggestion by removing the address;
simplifies the code a lot
- better handling of state machine, fallback to
primary session if address switch to new
session timed out
- nicer logging
- more comments
- new testcase failures, because of
#3652, #3651 and #3650 (or more that i missed).
Diffstat (limited to 'src/transport/plugin_transport_http_server.c')
-rw-r--r-- | src/transport/plugin_transport_http_server.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c index c7c145328..fc35b08fb 100644 --- a/src/transport/plugin_transport_http_server.c +++ b/src/transport/plugin_transport_http_server.c | |||
@@ -604,6 +604,7 @@ server_delete_session (struct Session *s) | |||
604 | plugin->env->session_end (plugin->env->cls, | 604 | plugin->env->session_end (plugin->env->cls, |
605 | s->address, | 605 | s->address, |
606 | s); | 606 | s); |
607 | s->known_to_service = GNUNET_NO; | ||
607 | } | 608 | } |
608 | if (NULL != s->msg_tk) | 609 | if (NULL != s->msg_tk) |
609 | { | 610 | { |
@@ -1522,7 +1523,7 @@ server_lookup_connection (struct HTTP_Server_Plugin *plugin, | |||
1522 | notify_session_monitor (plugin, | 1523 | notify_session_monitor (plugin, |
1523 | s, | 1524 | s, |
1524 | GNUNET_TRANSPORT_SS_UP); | 1525 | GNUNET_TRANSPORT_SS_UP); |
1525 | plugin->env->session_start (NULL, | 1526 | plugin->env->session_start (plugin->env->cls, |
1526 | s->address, | 1527 | s->address, |
1527 | s, | 1528 | s, |
1528 | NULL, 0); | 1529 | NULL, 0); |
@@ -1670,7 +1671,7 @@ server_receive_mst_cb (void *cls, | |||
1670 | if (GNUNET_NO == s->known_to_service) | 1671 | if (GNUNET_NO == s->known_to_service) |
1671 | { | 1672 | { |
1672 | s->known_to_service = GNUNET_YES; | 1673 | s->known_to_service = GNUNET_YES; |
1673 | plugin->env->session_start (NULL, | 1674 | plugin->env->session_start (plugin->env->cls, |
1674 | s->address, | 1675 | s->address, |
1675 | s, | 1676 | s, |
1676 | NULL, | 1677 | NULL, |