diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-11-07 16:33:42 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-11-07 16:33:42 +0000 |
commit | 0c89b2a16eae49cb23635f6d6c0f13da070c5c66 (patch) | |
tree | 559186ca56ac1279a611d31f3bf3816bc971431c /src/transport/plugin_transport_unix.c | |
parent | 2e33b6fcbad3c1b8ebf7176c39a201c39b23c2b2 (diff) | |
download | gnunet-0c89b2a16eae49cb23635f6d6c0f13da070c5c66.tar.gz gnunet-0c89b2a16eae49cb23635f6d6c0f13da070c5c66.zip |
implementing plugin session monitoring API (#3452)
Diffstat (limited to 'src/transport/plugin_transport_unix.c')
-rw-r--r-- | src/transport/plugin_transport_unix.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/transport/plugin_transport_unix.c b/src/transport/plugin_transport_unix.c index 8a0aa72a0..a753db5ca 100644 --- a/src/transport/plugin_transport_unix.c +++ b/src/transport/plugin_transport_unix.c | |||
@@ -490,7 +490,7 @@ unix_plugin_session_disconnect (void *cls, | |||
490 | } | 490 | } |
491 | notify_session_monitor (plugin, | 491 | notify_session_monitor (plugin, |
492 | session, | 492 | session, |
493 | GNUNET_TRANSPORT_SS_DOWN); | 493 | GNUNET_TRANSPORT_SS_DONE); |
494 | GNUNET_HELLO_address_free (session->address); | 494 | GNUNET_HELLO_address_free (session->address); |
495 | GNUNET_break (0 == session->bytes_in_queue); | 495 | GNUNET_break (0 == session->bytes_in_queue); |
496 | GNUNET_break (0 == session->msgs_in_queue); | 496 | GNUNET_break (0 == session->msgs_in_queue); |
@@ -520,7 +520,7 @@ session_timeout (void *cls, | |||
520 | the monitor, it may think we're about to die ... */ | 520 | the monitor, it may think we're about to die ... */ |
521 | notify_session_monitor (session->plugin, | 521 | notify_session_monitor (session->plugin, |
522 | session, | 522 | session, |
523 | GNUNET_TRANSPORT_SS_UP); | 523 | GNUNET_TRANSPORT_SS_UPDATE); |
524 | session->timeout_task = GNUNET_SCHEDULER_add_delayed (left, | 524 | session->timeout_task = GNUNET_SCHEDULER_add_delayed (left, |
525 | &session_timeout, | 525 | &session_timeout, |
526 | session); | 526 | session); |
@@ -898,6 +898,9 @@ unix_plugin_get_session (void *cls, | |||
898 | GNUNET_NO); | 898 | GNUNET_NO); |
899 | notify_session_monitor (plugin, | 899 | notify_session_monitor (plugin, |
900 | session, | 900 | session, |
901 | GNUNET_TRANSPORT_SS_INIT); | ||
902 | notify_session_monitor (plugin, | ||
903 | session, | ||
901 | GNUNET_TRANSPORT_SS_UP); | 904 | GNUNET_TRANSPORT_SS_UP); |
902 | return session; | 905 | return session; |
903 | } | 906 | } |
@@ -973,9 +976,6 @@ unix_demultiplexer (struct Plugin *plugin, | |||
973 | session->address, | 976 | session->address, |
974 | session, | 977 | session, |
975 | &plugin->ats_network, 1); | 978 | &plugin->ats_network, 1); |
976 | notify_session_monitor (plugin, | ||
977 | session, | ||
978 | GNUNET_TRANSPORT_SS_UP); | ||
979 | } | 979 | } |
980 | else | 980 | else |
981 | { | 981 | { |
@@ -1141,7 +1141,7 @@ unix_plugin_do_write (struct Plugin *plugin) | |||
1141 | if (GNUNET_YES == did_delete) | 1141 | if (GNUNET_YES == did_delete) |
1142 | notify_session_monitor (plugin, | 1142 | notify_session_monitor (plugin, |
1143 | session, | 1143 | session, |
1144 | GNUNET_TRANSPORT_SS_UP); | 1144 | GNUNET_TRANSPORT_SS_UPDATE); |
1145 | return; /* Nothing to send at the moment */ | 1145 | return; /* Nothing to send at the moment */ |
1146 | } | 1146 | } |
1147 | 1147 | ||
@@ -1163,7 +1163,7 @@ unix_plugin_do_write (struct Plugin *plugin) | |||
1163 | 1, GNUNET_NO); | 1163 | 1, GNUNET_NO); |
1164 | notify_session_monitor (plugin, | 1164 | notify_session_monitor (plugin, |
1165 | session, | 1165 | session, |
1166 | GNUNET_TRANSPORT_SS_UP); | 1166 | GNUNET_TRANSPORT_SS_UPDATE); |
1167 | return; | 1167 | return; |
1168 | } | 1168 | } |
1169 | GNUNET_CONTAINER_DLL_remove (plugin->msg_head, | 1169 | GNUNET_CONTAINER_DLL_remove (plugin->msg_head, |
@@ -1180,7 +1180,7 @@ unix_plugin_do_write (struct Plugin *plugin) | |||
1180 | plugin->bytes_in_queue, GNUNET_NO); | 1180 | plugin->bytes_in_queue, GNUNET_NO); |
1181 | notify_session_monitor (plugin, | 1181 | notify_session_monitor (plugin, |
1182 | session, | 1182 | session, |
1183 | GNUNET_TRANSPORT_SS_UP); | 1183 | GNUNET_TRANSPORT_SS_UPDATE); |
1184 | if (GNUNET_SYSERR == sent) | 1184 | if (GNUNET_SYSERR == sent) |
1185 | { | 1185 | { |
1186 | /* failed and no retry */ | 1186 | /* failed and no retry */ |
@@ -1358,7 +1358,7 @@ unix_plugin_send (void *cls, | |||
1358 | GNUNET_NO); | 1358 | GNUNET_NO); |
1359 | notify_session_monitor (plugin, | 1359 | notify_session_monitor (plugin, |
1360 | session, | 1360 | session, |
1361 | GNUNET_TRANSPORT_SS_UP); | 1361 | GNUNET_TRANSPORT_SS_UPDATE); |
1362 | if (GNUNET_SCHEDULER_NO_TASK == plugin->write_task) | 1362 | if (GNUNET_SCHEDULER_NO_TASK == plugin->write_task) |
1363 | plugin->write_task = | 1363 | plugin->write_task = |
1364 | GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL, | 1364 | GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL, |
@@ -1703,6 +1703,9 @@ send_session_info_iter (void *cls, | |||
1703 | 1703 | ||
1704 | notify_session_monitor (plugin, | 1704 | notify_session_monitor (plugin, |
1705 | session, | 1705 | session, |
1706 | GNUNET_TRANSPORT_SS_INIT); | ||
1707 | notify_session_monitor (plugin, | ||
1708 | session, | ||
1706 | GNUNET_TRANSPORT_SS_UP); | 1709 | GNUNET_TRANSPORT_SS_UP); |
1707 | return GNUNET_OK; | 1710 | return GNUNET_OK; |
1708 | } | 1711 | } |