diff options
Diffstat (limited to 'src')
34 files changed, 1595 insertions, 7502 deletions
diff --git a/src/ats/gnunet-service-ats-new.c b/src/ats/gnunet-service-ats-new.c index a1666d8d3..f2bc1de7f 100644 --- a/src/ats/gnunet-service-ats-new.c +++ b/src/ats/gnunet-service-ats-new.c | |||
@@ -304,7 +304,7 @@ prop_ntoh (const struct PropertiesNBO *properties, | |||
304 | */ | 304 | */ |
305 | static void | 305 | static void |
306 | handle_suggest (void *cls, | 306 | handle_suggest (void *cls, |
307 | const struct ExpressPreferenceMessage *msg) | 307 | const struct ExpressPreferenceMessage *msg) |
308 | { | 308 | { |
309 | struct Client *c = cls; | 309 | struct Client *c = cls; |
310 | struct ClientPreference *cp; | 310 | struct ClientPreference *cp; |
@@ -344,7 +344,7 @@ handle_suggest (void *cls, | |||
344 | */ | 344 | */ |
345 | static void | 345 | static void |
346 | handle_suggest_cancel (void *cls, | 346 | handle_suggest_cancel (void *cls, |
347 | const struct ExpressPreferenceMessage *msg) | 347 | const struct ExpressPreferenceMessage *msg) |
348 | { | 348 | { |
349 | struct Client *c = cls; | 349 | struct Client *c = cls; |
350 | struct ClientPreference *cp; | 350 | struct ClientPreference *cp; |
@@ -772,13 +772,13 @@ GNUNET_SERVICE_MAIN | |||
772 | &client_disconnect_cb, | 772 | &client_disconnect_cb, |
773 | NULL, | 773 | NULL, |
774 | GNUNET_MQ_hd_fixed_size (suggest, | 774 | GNUNET_MQ_hd_fixed_size (suggest, |
775 | GNUNET_MESSAGE_TYPE_ATS_SUGGEST, | 775 | GNUNET_MESSAGE_TYPE_ATS_SUGGEST, |
776 | struct ExpressPreferenceMessage, | 776 | struct ExpressPreferenceMessage, |
777 | NULL), | 777 | NULL), |
778 | GNUNET_MQ_hd_fixed_size (suggest_cancel, | 778 | GNUNET_MQ_hd_fixed_size (suggest_cancel, |
779 | GNUNET_MESSAGE_TYPE_ATS_SUGGEST_CANCEL, | 779 | GNUNET_MESSAGE_TYPE_ATS_SUGGEST_CANCEL, |
780 | struct ExpressPreferenceMessage, | 780 | struct ExpressPreferenceMessage, |
781 | NULL), | 781 | NULL), |
782 | GNUNET_MQ_hd_fixed_size (start, | 782 | GNUNET_MQ_hd_fixed_size (start, |
783 | GNUNET_MESSAGE_TYPE_ATS_START, | 783 | GNUNET_MESSAGE_TYPE_ATS_START, |
784 | struct GNUNET_MessageHeader, | 784 | struct GNUNET_MessageHeader, |
diff --git a/src/include/Makefile.am b/src/include/Makefile.am index ca0f6050d..bd8eca256 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am | |||
@@ -127,6 +127,7 @@ gnunetinclude_HEADERS = \ | |||
127 | gnunet_time_lib.h \ | 127 | gnunet_time_lib.h \ |
128 | gnunet_transport_service.h \ | 128 | gnunet_transport_service.h \ |
129 | gnunet_transport_address_service.h \ | 129 | gnunet_transport_address_service.h \ |
130 | gnunet_transport_application_service.h \ | ||
130 | gnunet_transport_communication_service.h \ | 131 | gnunet_transport_communication_service.h \ |
131 | gnunet_transport_core_service.h \ | 132 | gnunet_transport_core_service.h \ |
132 | gnunet_transport_hello_service.h \ | 133 | gnunet_transport_hello_service.h \ |
diff --git a/src/include/gnunet_ats_application_service.h b/src/include/gnunet_ats_application_service.h index e942ca4d8..fbc6f48ac 100644 --- a/src/include/gnunet_ats_application_service.h +++ b/src/include/gnunet_ats_application_service.h | |||
@@ -83,9 +83,9 @@ struct GNUNET_ATS_ApplicationSuggestHandle; | |||
83 | */ | 83 | */ |
84 | struct GNUNET_ATS_ApplicationSuggestHandle * | 84 | struct GNUNET_ATS_ApplicationSuggestHandle * |
85 | GNUNET_ATS_application_suggest (struct GNUNET_ATS_ApplicationHandle *ch, | 85 | GNUNET_ATS_application_suggest (struct GNUNET_ATS_ApplicationHandle *ch, |
86 | const struct GNUNET_PeerIdentity *peer, | 86 | const struct GNUNET_PeerIdentity *peer, |
87 | enum GNUNET_MQ_PreferenceKind pk, | 87 | enum GNUNET_MQ_PreferenceKind pk, |
88 | struct GNUNET_BANDWIDTH_Value32NBO bw); | 88 | struct GNUNET_BANDWIDTH_Value32NBO bw); |
89 | 89 | ||
90 | 90 | ||
91 | /** | 91 | /** |
diff --git a/src/include/gnunet_peerstore_service.h b/src/include/gnunet_peerstore_service.h index 55f371399..31567c004 100644 --- a/src/include/gnunet_peerstore_service.h +++ b/src/include/gnunet_peerstore_service.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet | 2 | This file is part of GNUnet |
3 | Copyright (C) | 3 | Copyright (C) GNUnet e.V. 2004--2019 |
4 | 4 | ||
5 | GNUnet is free software: you can redistribute it and/or modify it | 5 | GNUnet is free software: you can redistribute it and/or modify it |
6 | under the terms of the GNU Affero General Public License as published | 6 | under the terms of the GNU Affero General Public License as published |
@@ -11,7 +11,7 @@ | |||
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Affero General Public License for more details. | 13 | Affero General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Affero General Public License | 15 | You should have received a copy of the GNU Affero General Public License |
16 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
17 | 17 | ||
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h index 46620b829..7f1667d51 100644 --- a/src/include/gnunet_protocols.h +++ b/src/include/gnunet_protocols.h | |||
@@ -3177,6 +3177,18 @@ extern "C" | |||
3177 | */ | 3177 | */ |
3178 | #define GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_FC_LIMITS 1276 | 3178 | #define GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_FC_LIMITS 1276 |
3179 | 3179 | ||
3180 | /** | ||
3181 | * Type of the 'struct ExpressPreferenceMessage' send by clients to TRANSPORT | ||
3182 | * to establish bandwidth preference. | ||
3183 | */ | ||
3184 | #define GNUNET_MESSAGE_TYPE_TRANSPORT_SUGGEST 1300 | ||
3185 | |||
3186 | /** | ||
3187 | * Type of the 'struct ExpressPreferenceMessage' send by clients to TRANSPORT | ||
3188 | * to abandon bandwidth preference. | ||
3189 | */ | ||
3190 | #define GNUNET_MESSAGE_TYPE_TRANSPORT_SUGGEST_CANCEL 1301 | ||
3191 | |||
3180 | 3192 | ||
3181 | /* ************** NEW (NG) ATS Messages ************* */ | 3193 | /* ************** NEW (NG) ATS Messages ************* */ |
3182 | 3194 | ||
diff --git a/src/include/gnunet_transport_application_service.h b/src/include/gnunet_transport_application_service.h new file mode 100644 index 000000000..31097b88e --- /dev/null +++ b/src/include/gnunet_transport_application_service.h | |||
@@ -0,0 +1,100 @@ | |||
1 | /* | ||
2 | This file is part of GNUnet. | ||
3 | Copyright (C) 2010-2015, 2018, 2019 GNUnet e.V. | ||
4 | |||
5 | GNUnet is free software: you can redistribute it and/or modify it | ||
6 | under the terms of the GNU Affero General Public License as published | ||
7 | by the Free Software Foundation, either version 3 of the License, | ||
8 | or (at your option) any later version. | ||
9 | |||
10 | GNUnet is distributed in the hope that it will be useful, but | ||
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
13 | Affero General Public License for more details. | ||
14 | |||
15 | You should have received a copy of the GNU Affero General Public License | ||
16 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
17 | |||
18 | SPDX-License-Identifier: AGPL3.0-or-later | ||
19 | */ | ||
20 | /** | ||
21 | * @file | ||
22 | * Bandwidth allocation API for applications to interact with | ||
23 | * | ||
24 | * @author Christian Grothoff | ||
25 | * @author Matthias Wachs | ||
26 | * | ||
27 | * @defgroup TRANSPORT service | ||
28 | * Bandwidth allocation | ||
29 | * | ||
30 | * @{ | ||
31 | */ | ||
32 | #ifndef GNUNET_TRANSPORT_APPLICATION_SERVICE_H | ||
33 | #define GNUNET_TRANSPORT_APPLICATION_SERVICE_H | ||
34 | |||
35 | #include "gnunet_constants.h" | ||
36 | #include "gnunet_util_lib.h" | ||
37 | |||
38 | /** | ||
39 | * Handle to the TRANSPORT subsystem for making suggestions about | ||
40 | * connections the peer would like to have. | ||
41 | */ | ||
42 | struct GNUNET_TRANSPORT_ApplicationHandle; | ||
43 | |||
44 | |||
45 | /** | ||
46 | * Initialize the TRANSPORT application client handle. | ||
47 | * | ||
48 | * @param cfg configuration to use | ||
49 | * @return ats application handle, NULL on error | ||
50 | */ | ||
51 | struct GNUNET_TRANSPORT_ApplicationHandle * | ||
52 | GNUNET_TRANSPORT_application_init (const struct GNUNET_CONFIGURATION_Handle *cfg); | ||
53 | |||
54 | |||
55 | /** | ||
56 | * Shutdown TRANSPORT application client. | ||
57 | * | ||
58 | * @param ch handle to destroy | ||
59 | */ | ||
60 | void | ||
61 | GNUNET_TRANSPORT_application_done (struct GNUNET_TRANSPORT_ApplicationHandle *ch); | ||
62 | |||
63 | |||
64 | /** | ||
65 | * Handle for suggestion requests. | ||
66 | */ | ||
67 | struct GNUNET_TRANSPORT_ApplicationSuggestHandle; | ||
68 | |||
69 | |||
70 | /** | ||
71 | * An application would like to communicate with a peer. TRANSPORT should | ||
72 | * allocate bandwith using a suitable address for requiremetns @a pk | ||
73 | * to transport. | ||
74 | * | ||
75 | * @param ch handle | ||
76 | * @param peer identity of the peer we need an address for | ||
77 | * @param pk what kind of application will the application require (can be | ||
78 | * #GNUNET_MQ_PREFERENCE_NONE, we will still try to connect) | ||
79 | * @param bw desired bandwith, can be zero (we will still try to connect) | ||
80 | * @return suggestion handle, NULL if request is already pending | ||
81 | */ | ||
82 | struct GNUNET_TRANSPORT_ApplicationSuggestHandle * | ||
83 | GNUNET_TRANSPORT_application_suggest (struct GNUNET_TRANSPORT_ApplicationHandle *ch, | ||
84 | const struct GNUNET_PeerIdentity *peer, | ||
85 | enum GNUNET_MQ_PreferenceKind pk, | ||
86 | struct GNUNET_BANDWIDTH_Value32NBO bw); | ||
87 | |||
88 | |||
89 | /** | ||
90 | * We no longer care about communicating with a peer. | ||
91 | * | ||
92 | * @param sh handle | ||
93 | */ | ||
94 | void | ||
95 | GNUNET_TRANSPORT_application_suggest_cancel (struct GNUNET_TRANSPORT_ApplicationSuggestHandle *sh); | ||
96 | |||
97 | /** @} */ /* end of group */ | ||
98 | |||
99 | #endif | ||
100 | /* end of file gnunet_ats_application_service.h */ | ||
diff --git a/src/include/gnunet_util_lib.h b/src/include/gnunet_util_lib.h index 40a0ca641..a7bd7ce4b 100644 --- a/src/include/gnunet_util_lib.h +++ b/src/include/gnunet_util_lib.h | |||
@@ -11,7 +11,7 @@ | |||
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Affero General Public License for more details. | 13 | Affero General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Affero General Public License | 15 | You should have received a copy of the GNU Affero General Public License |
16 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
17 | 17 | ||
diff --git a/src/namestore/test_namestore_delete.sh b/src/namestore/test_namestore_delete.sh index 8c776104a..44ea1e66c 100755 --- a/src/namestore/test_namestore_delete.sh +++ b/src/namestore/test_namestore_delete.sh | |||
@@ -61,15 +61,15 @@ for LINE in $OUTPUT ; | |||
61 | stop_peer | 61 | stop_peer |
62 | 62 | ||
63 | 63 | ||
64 | if [ $FOUND_NAME == false -a $FOUND_IP != false ] | 64 | if [ $FOUND_NAME = false -a $FOUND_IP != false ] |
65 | then | 65 | then |
66 | echo "PASS: Delete name in namestore" | 66 | echo "PASS: Delete name in namestore" |
67 | exit 0 | 67 | exit 0 |
68 | elif [ $FOUND_NAME == true ] | 68 | elif [ $FOUND_NAME = true ] |
69 | then | 69 | then |
70 | echo "FAIL: Delete name in namestore: name returned" | 70 | echo "FAIL: Delete name in namestore: name returned" |
71 | exit 1 | 71 | exit 1 |
72 | elif [ $FOUND_IP == true ] | 72 | elif [ $FOUND_IP = true ] |
73 | then | 73 | then |
74 | echo "FAIL: Delete name in namestore: IP returned" | 74 | echo "FAIL: Delete name in namestore: IP returned" |
75 | exit 1 | 75 | exit 1 |
diff --git a/src/namestore/test_namestore_lookup.sh b/src/namestore/test_namestore_lookup.sh index 90735b17e..1c96e102a 100755 --- a/src/namestore/test_namestore_lookup.sh +++ b/src/namestore/test_namestore_lookup.sh | |||
@@ -19,20 +19,10 @@ TEST_IP_PLUS="127.0.0.1" | |||
19 | TEST_RECORD_NAME_DNS="www3" | 19 | TEST_RECORD_NAME_DNS="www3" |
20 | which timeout &> /dev/null && DO_TIMEOUT="timeout 5" | 20 | which timeout &> /dev/null && DO_TIMEOUT="timeout 5" |
21 | 21 | ||
22 | function start_peer | 22 | # start peer |
23 | { | 23 | gnunet-arm -s -c $CONFIGURATION |
24 | gnunet-arm -s -c $CONFIGURATION | 24 | gnunet-identity -C testego -c $CONFIGURATION |
25 | gnunet-identity -C testego -c $CONFIGURATION | ||
26 | } | ||
27 | 25 | ||
28 | function stop_peer | ||
29 | { | ||
30 | gnunet-identity -D testego -c $CONFIGURATION | ||
31 | gnunet-arm -e -c $CONFIGURATION | ||
32 | } | ||
33 | |||
34 | |||
35 | start_peer | ||
36 | # Create a public record | 26 | # Create a public record |
37 | gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME_DNS -t A -V $TEST_IP_PLUS -e never -c $CONFIGURATION | 27 | gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME_DNS -t A -V $TEST_IP_PLUS -e never -c $CONFIGURATION |
38 | NAMESTORE_RES=$? | 28 | NAMESTORE_RES=$? |
@@ -52,19 +42,21 @@ for LINE in $OUTPUT ; | |||
52 | FOUND_IP=true; | 42 | FOUND_IP=true; |
53 | #echo $FOUND_IP | 43 | #echo $FOUND_IP |
54 | fi | 44 | fi |
55 | done | 45 | done |
56 | stop_peer | 46 | # stop peer |
47 | gnunet-identity -D testego -c $CONFIGURATION | ||
48 | gnunet-arm -e -c $CONFIGURATION | ||
57 | 49 | ||
58 | 50 | ||
59 | if [ $FOUND_NAME == true -a $FOUND_IP == true ] | 51 | if [ $FOUND_NAME = true -a $FOUND_IP = true ] |
60 | then | 52 | then |
61 | echo "PASS: Lookup name in namestore" | 53 | echo "PASS: Lookup name in namestore" |
62 | exit 0 | 54 | exit 0 |
63 | elif [ $FOUND_NAME == false ] | 55 | elif [ $FOUND_NAME = false ] |
64 | then | 56 | then |
65 | echo "FAIL: Lookup name in namestore: name not returned" | 57 | echo "FAIL: Lookup name in namestore: name not returned" |
66 | exit 1 | 58 | exit 1 |
67 | elif [ $FOUND_IP == false ] | 59 | elif [ $FOUND_IP = false ] |
68 | then | 60 | then |
69 | echo "FAIL: Lookup name in namestore: IP not returned" | 61 | echo "FAIL: Lookup name in namestore: IP not returned" |
70 | exit 1 | 62 | exit 1 |
diff --git a/src/namestore/test_namestore_put.sh b/src/namestore/test_namestore_put.sh index 6b6647d5f..eaf7d44b4 100755 --- a/src/namestore/test_namestore_put.sh +++ b/src/namestore/test_namestore_put.sh | |||
@@ -46,7 +46,7 @@ gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME_DNS -t A -V $TEST_IP_PLUS | |||
46 | NAMESTORE_RES=$? | 46 | NAMESTORE_RES=$? |
47 | stop_peer | 47 | stop_peer |
48 | 48 | ||
49 | if [ $NAMESTORE_RES == 0 ] | 49 | if [ $NAMESTORE_RES = 0 ] |
50 | then | 50 | then |
51 | echo "PASS: Creating name in namestore" | 51 | echo "PASS: Creating name in namestore" |
52 | else | 52 | else |
diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am index 429224650..a5fd60246 100644 --- a/src/peerinfo-tool/Makefile.am +++ b/src/peerinfo-tool/Makefile.am | |||
@@ -10,11 +10,33 @@ if USE_COVERAGE | |||
10 | XLIB = -lgcov | 10 | XLIB = -lgcov |
11 | endif | 11 | endif |
12 | 12 | ||
13 | if HAVE_MHD | ||
14 | if HAVE_JSON | ||
15 | REST_PLUGIN = libgnunet_plugin_rest_peerinfo.la | ||
16 | endif | ||
17 | endif | ||
18 | |||
13 | plugindir = $(libdir)/gnunet | 19 | plugindir = $(libdir)/gnunet |
14 | 20 | ||
21 | plugin_LTLIBRARIES = $(REST_PLUGIN) | ||
22 | |||
15 | bin_PROGRAMS = \ | 23 | bin_PROGRAMS = \ |
16 | gnunet-peerinfo | 24 | gnunet-peerinfo |
17 | 25 | ||
26 | libgnunet_plugin_rest_peerinfo_la_SOURCES = \ | ||
27 | plugin_rest_peerinfo.c | ||
28 | libgnunet_plugin_rest_peerinfo_la_LIBADD = \ | ||
29 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
30 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | ||
31 | $(top_builddir)/src/transport/libgnunettransport.la \ | ||
32 | $(top_builddir)/src/rest/libgnunetrest.la \ | ||
33 | $(top_builddir)/src/json/libgnunetjson.la \ | ||
34 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | ||
35 | $(LTLIBINTL) -ljansson -lmicrohttpd | ||
36 | libgnunet_plugin_rest_peerinfo_la_LDFLAGS = \ | ||
37 | $(GN_PLUGIN_LDFLAGS) | ||
38 | |||
39 | |||
18 | gnunet_peerinfo_SOURCES = \ | 40 | gnunet_peerinfo_SOURCES = \ |
19 | gnunet-peerinfo.c \ | 41 | gnunet-peerinfo.c \ |
20 | gnunet-peerinfo_plugins.c gnunet-peerinfo_plugins.h | 42 | gnunet-peerinfo_plugins.c gnunet-peerinfo_plugins.h |
diff --git a/src/peerinfo/plugin_rest_peerinfo.c b/src/peerinfo-tool/plugin_rest_peerinfo.c index 24af2c193..24af2c193 100644 --- a/src/peerinfo/plugin_rest_peerinfo.c +++ b/src/peerinfo-tool/plugin_rest_peerinfo.c | |||
diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am index 3c710eb93..d07ed3a5b 100644 --- a/src/peerinfo/Makefile.am +++ b/src/peerinfo/Makefile.am | |||
@@ -19,28 +19,8 @@ if USE_COVERAGE | |||
19 | XLIB = -lgcov | 19 | XLIB = -lgcov |
20 | endif | 20 | endif |
21 | 21 | ||
22 | if HAVE_MHD | ||
23 | if HAVE_JSON | ||
24 | REST_PLUGIN = libgnunet_plugin_rest_peerinfo.la | ||
25 | endif | ||
26 | endif | ||
27 | |||
28 | lib_LTLIBRARIES = libgnunetpeerinfo.la | 22 | lib_LTLIBRARIES = libgnunetpeerinfo.la |
29 | 23 | ||
30 | plugin_LTLIBRARIES = $(REST_PLUGIN) | ||
31 | |||
32 | libgnunet_plugin_rest_peerinfo_la_SOURCES = \ | ||
33 | plugin_rest_peerinfo.c | ||
34 | libgnunet_plugin_rest_peerinfo_la_LIBADD = \ | ||
35 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
36 | libgnunetpeerinfo.la \ | ||
37 | $(top_builddir)/src/rest/libgnunetrest.la \ | ||
38 | $(top_builddir)/src/json/libgnunetjson.la \ | ||
39 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | ||
40 | $(LTLIBINTL) -ljansson -lmicrohttpd | ||
41 | libgnunet_plugin_rest_peerinfo_la_LDFLAGS = \ | ||
42 | $(GN_PLUGIN_LDFLAGS) | ||
43 | |||
44 | 24 | ||
45 | libgnunetpeerinfo_la_SOURCES = \ | 25 | libgnunetpeerinfo_la_SOURCES = \ |
46 | peerinfo_api.c peerinfo.h \ | 26 | peerinfo_api.c peerinfo.h \ |
diff --git a/src/rps/Makefile.am b/src/rps/Makefile.am index b391eb8ae..ce73caa0f 100644 --- a/src/rps/Makefile.am +++ b/src/rps/Makefile.am | |||
@@ -36,6 +36,7 @@ libgnunetrps_la_SOURCES = \ | |||
36 | rps-sampler_client.h rps-sampler_client.c \ | 36 | rps-sampler_client.h rps-sampler_client.c \ |
37 | rps_api.c rps.h | 37 | rps_api.c rps.h |
38 | libgnunetrps_la_LIBADD = \ | 38 | libgnunetrps_la_LIBADD = \ |
39 | $(top_builddir)/src/nse/libgnunetnse.la \ | ||
39 | $(top_builddir)/src/util/libgnunetutil.la \ | 40 | $(top_builddir)/src/util/libgnunetutil.la \ |
40 | $(GN_LIBINTL) $(XLIB) | 41 | $(GN_LIBINTL) $(XLIB) |
41 | libgnunetrps_la_LDFLAGS = \ | 42 | libgnunetrps_la_LDFLAGS = \ |
@@ -87,11 +88,14 @@ check_PROGRAMS = \ | |||
87 | test_rps_sub \ | 88 | test_rps_sub \ |
88 | test_rps_seed_request \ | 89 | test_rps_seed_request \ |
89 | test_rps_seed_big \ | 90 | test_rps_seed_big \ |
90 | test_rps_churn \ | 91 | test_rps_churn |
92 | if ENABLE_MALICIOUS | ||
93 | check_PROGRAMS += \ | ||
91 | test_rps_malicious_1 \ | 94 | test_rps_malicious_1 \ |
92 | test_rps_malicious_2 \ | 95 | test_rps_malicious_2 \ |
93 | test_rps_malicious_3 | 96 | test_rps_malicious_3 |
94 | endif | 97 | endif |
98 | endif | ||
95 | 99 | ||
96 | rps_test_src = \ | 100 | rps_test_src = \ |
97 | test_rps.c \ | 101 | test_rps.c \ |
diff --git a/src/rps/gnunet-rps-profiler.c b/src/rps/gnunet-rps-profiler.c index af27546f2..a852d94b1 100644 --- a/src/rps/gnunet-rps-profiler.c +++ b/src/rps/gnunet-rps-profiler.c | |||
@@ -1041,7 +1041,9 @@ cancel_request (struct PendingReply *pending_rep) | |||
1041 | "Cancelling rps get reply\n"); | 1041 | "Cancelling rps get reply\n"); |
1042 | GNUNET_assert (NULL != pending_rep->req_handle); | 1042 | GNUNET_assert (NULL != pending_rep->req_handle); |
1043 | GNUNET_RPS_request_cancel (pending_rep->req_handle); | 1043 | GNUNET_RPS_request_cancel (pending_rep->req_handle); |
1044 | pending_rep->req_handle = NULL; | ||
1044 | GNUNET_free (pending_rep); | 1045 | GNUNET_free (pending_rep); |
1046 | pending_rep = NULL; | ||
1045 | } | 1047 | } |
1046 | 1048 | ||
1047 | void | 1049 | void |
@@ -2061,29 +2063,8 @@ profiler_eval (void) | |||
2061 | return evaluate (); | 2063 | return evaluate (); |
2062 | } | 2064 | } |
2063 | 2065 | ||
2064 | static uint32_t fac (uint32_t x) | ||
2065 | { | ||
2066 | if (1 >= x) | ||
2067 | { | ||
2068 | return x; | ||
2069 | } | ||
2070 | return x * fac (x - 1); | ||
2071 | } | ||
2072 | 2066 | ||
2073 | static uint32_t binom (uint32_t n, uint32_t k) | 2067 | /** @brief is b in view of a? |
2074 | { | ||
2075 | //GNUNET_assert (n >= k); | ||
2076 | if (k > n) return 0; | ||
2077 | /* if (0 > n) return 0; - always false */ | ||
2078 | /* if (0 > k) return 0; - always false */ | ||
2079 | if (0 == k) return 1; | ||
2080 | return fac (n) | ||
2081 | / | ||
2082 | fac(k) * fac(n - k); | ||
2083 | } | ||
2084 | |||
2085 | /** | ||
2086 | * @brief is b in view of a? | ||
2087 | * | 2068 | * |
2088 | * @param a | 2069 | * @param a |
2089 | * @param b | 2070 | * @param b |
diff --git a/src/rps/gnunet-service-rps_sampler.h b/src/rps/gnunet-service-rps_sampler.h index 921570f7d..d8e5f3efd 100644 --- a/src/rps/gnunet-service-rps_sampler.h +++ b/src/rps/gnunet-service-rps_sampler.h | |||
@@ -70,7 +70,7 @@ RPS_sampler_resize (struct RPS_Sampler *sampler, unsigned int new_size); | |||
70 | */ | 70 | */ |
71 | struct RPS_Sampler * | 71 | struct RPS_Sampler * |
72 | RPS_sampler_init (size_t init_size, | 72 | RPS_sampler_init (size_t init_size, |
73 | struct GNUNET_TIME_Relative max_round_interval); | 73 | struct GNUNET_TIME_Relative max_round_interval); |
74 | 74 | ||
75 | 75 | ||
76 | /** | 76 | /** |
diff --git a/src/rps/profiler_rps.conf b/src/rps/profiler_rps.conf index 6049da5a0..5edd6d3ff 100644 --- a/src/rps/profiler_rps.conf +++ b/src/rps/profiler_rps.conf | |||
@@ -22,6 +22,9 @@ FILENAME_VALID_PEERS = $GNUNET_DATA_HOME/rps/valid_peers.txt | |||
22 | # So, 50 is enough for a network of size 50^3 = 125000 | 22 | # So, 50 is enough for a network of size 50^3 = 125000 |
23 | MINSIZE = 4 | 23 | MINSIZE = 4 |
24 | 24 | ||
25 | DESIRED_PROBABILITY = 0.75 | ||
26 | |||
27 | DEFICIENCY_FACTOR = 0.4 | ||
25 | 28 | ||
26 | 29 | ||
27 | [testbed] | 30 | [testbed] |
diff --git a/src/rps/rps-sampler_client.c b/src/rps/rps-sampler_client.c index 1ba60e1a8..0de25df07 100644 --- a/src/rps/rps-sampler_client.c +++ b/src/rps/rps-sampler_client.c | |||
@@ -219,6 +219,41 @@ RPS_sampler_mod_init (size_t init_size, | |||
219 | 219 | ||
220 | 220 | ||
221 | /** | 221 | /** |
222 | * @brief Compute the probability that we already observed all peers from a | ||
223 | * biased stream of peer ids. | ||
224 | * | ||
225 | * Deficiency factor: | ||
226 | * As introduced by Brahms: Factor between the number of unique ids in a | ||
227 | * truly random stream and number of unique ids in the gossip stream. | ||
228 | * | ||
229 | * @param num_peers_estim The estimated number of peers in the network | ||
230 | * @param num_peers_observed The number of peers the given element has observed | ||
231 | * @param deficiency_factor A factor that catches the 'bias' of a random stream | ||
232 | * of peer ids | ||
233 | * | ||
234 | * @return The estimated probability | ||
235 | */ | ||
236 | static double | ||
237 | prob_observed_n_peers (uint32_t num_peers_estim, | ||
238 | uint32_t num_peers_observed, | ||
239 | double deficiency_factor) | ||
240 | { | ||
241 | uint32_t num_peers = num_peers_estim * (1/deficiency_factor); | ||
242 | uint64_t sum = 0; | ||
243 | |||
244 | for (uint32_t i = 0; i < num_peers; i++) | ||
245 | { | ||
246 | uint64_t a = pow (-1, num_peers-i); | ||
247 | uint64_t b = binom (num_peers, i); | ||
248 | uint64_t c = pow (i, num_peers_observed); | ||
249 | sum += a * b * c; | ||
250 | } | ||
251 | |||
252 | return sum / (double) pow (num_peers, num_peers_observed); | ||
253 | } | ||
254 | |||
255 | |||
256 | /** | ||
222 | * Get one random peer out of the sampled peers. | 257 | * Get one random peer out of the sampled peers. |
223 | * | 258 | * |
224 | * This reinitialises the queried sampler element. | 259 | * This reinitialises the queried sampler element. |
@@ -230,6 +265,7 @@ sampler_mod_get_rand_peer (void *cls) | |||
230 | struct RPS_SamplerElement *s_elem; | 265 | struct RPS_SamplerElement *s_elem; |
231 | struct GNUNET_TIME_Relative last_request_diff; | 266 | struct GNUNET_TIME_Relative last_request_diff; |
232 | struct RPS_Sampler *sampler; | 267 | struct RPS_Sampler *sampler; |
268 | double prob_observed_n; | ||
233 | 269 | ||
234 | gpc->get_peer_task = NULL; | 270 | gpc->get_peer_task = NULL; |
235 | gpc->notify_ctx = NULL; | 271 | gpc->notify_ctx = NULL; |
@@ -294,6 +330,24 @@ sampler_mod_get_rand_peer (void *cls) | |||
294 | gpc); | 330 | gpc); |
295 | return; | 331 | return; |
296 | } | 332 | } |
333 | /* compute probability */ | ||
334 | prob_observed_n = prob_observed_n_peers (sampler->num_peers_estim, | ||
335 | s_elem->num_peers, | ||
336 | sampler->deficiency_factor); | ||
337 | /* check if probability is above desired */ | ||
338 | if (prob_observed_n >= sampler->desired_probability) | ||
339 | { | ||
340 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
341 | "Probability of having observed all peers (%d) too small ( < %d).\n", | ||
342 | prob_observed_n, | ||
343 | sampler->desired_probability); | ||
344 | GNUNET_assert (NULL == gpc->notify_ctx); | ||
345 | gpc->notify_ctx = | ||
346 | sampler_notify_on_update (sampler, | ||
347 | &sampler_mod_get_rand_peer, | ||
348 | gpc); | ||
349 | return; | ||
350 | } | ||
297 | /* More reasons to wait could be added here */ | 351 | /* More reasons to wait could be added here */ |
298 | 352 | ||
299 | // GNUNET_STATISTICS_set (stats, | 353 | // GNUNET_STATISTICS_set (stats, |
diff --git a/src/rps/rps-sampler_common.c b/src/rps/rps-sampler_common.c index 2b0569c61..3ed4ef989 100644 --- a/src/rps/rps-sampler_common.c +++ b/src/rps/rps-sampler_common.c | |||
@@ -116,6 +116,60 @@ struct RPS_SamplerRequestHandle | |||
116 | 116 | ||
117 | 117 | ||
118 | /** | 118 | /** |
119 | * @brief Update the current estimate of the network size stored at the sampler | ||
120 | * | ||
121 | * Used for computing the condition when to return elements to the client | ||
122 | * | ||
123 | * Only used/useful with the client sampler | ||
124 | * (Maybe move to rps-sampler_client.{h|c} ?) | ||
125 | * | ||
126 | * @param sampler The sampler to update | ||
127 | * @param num_peers The estimated value | ||
128 | */ | ||
129 | void | ||
130 | RPS_sampler_update_with_nw_size (struct RPS_Sampler *sampler, | ||
131 | uint32_t num_peers) | ||
132 | { | ||
133 | sampler->num_peers_estim = num_peers; | ||
134 | } | ||
135 | |||
136 | |||
137 | /** | ||
138 | * @brief Set the probability that is needed at least with what a sampler | ||
139 | * element has to have observed all elements from the network. | ||
140 | * | ||
141 | * Only used/useful with the client sampler | ||
142 | * (Maybe move to rps-sampler_client.{h|c} ?) | ||
143 | * | ||
144 | * @param sampler | ||
145 | * @param desired_probability | ||
146 | */ | ||
147 | void | ||
148 | RPS_sampler_set_desired_probability (struct RPS_Sampler *sampler, | ||
149 | double desired_probability) | ||
150 | { | ||
151 | sampler->desired_probability = desired_probability; | ||
152 | } | ||
153 | |||
154 | |||
155 | /** | ||
156 | * @brief Set the deficiency factor. | ||
157 | * | ||
158 | * Only used/useful with the client sampler | ||
159 | * (Maybe move to rps-sampler_client.{h|c} ?) | ||
160 | * | ||
161 | * @param sampler | ||
162 | * @param desired_probability | ||
163 | */ | ||
164 | void | ||
165 | RPS_sampler_set_deficiency_factor (struct RPS_Sampler *sampler, | ||
166 | double deficiency_factor) | ||
167 | { | ||
168 | sampler->deficiency_factor = deficiency_factor; | ||
169 | } | ||
170 | |||
171 | |||
172 | /** | ||
119 | * @brief Add a callback that will be called when the next peer is inserted | 173 | * @brief Add a callback that will be called when the next peer is inserted |
120 | * into the sampler | 174 | * into the sampler |
121 | * | 175 | * |
diff --git a/src/rps/rps-sampler_common.h b/src/rps/rps-sampler_common.h index e36f6e834..1abe43720 100644 --- a/src/rps/rps-sampler_common.h +++ b/src/rps/rps-sampler_common.h | |||
@@ -147,6 +147,25 @@ struct RPS_Sampler | |||
147 | struct GNUNET_TIME_Relative max_round_interval; | 147 | struct GNUNET_TIME_Relative max_round_interval; |
148 | 148 | ||
149 | /** | 149 | /** |
150 | * @brief The estimated total number of peers in the network | ||
151 | */ | ||
152 | uint32_t num_peers_estim; | ||
153 | |||
154 | /** | ||
155 | * @brief The desired probability with which we want to have observed all | ||
156 | * peers. | ||
157 | */ | ||
158 | double desired_probability; | ||
159 | |||
160 | /** | ||
161 | * @brief A factor that catches the 'bias' of a random stream of peer ids. | ||
162 | * | ||
163 | * As introduced by Brahms: Factor between the number of unique ids in a | ||
164 | * truly random stream and number of unique ids in the gossip stream. | ||
165 | */ | ||
166 | double deficiency_factor; | ||
167 | |||
168 | /** | ||
150 | * Stores the function to return peers. Which one it is depends on whether | 169 | * Stores the function to return peers. Which one it is depends on whether |
151 | * the Sampler is the modified one or not. | 170 | * the Sampler is the modified one or not. |
152 | */ | 171 | */ |
@@ -164,6 +183,48 @@ struct RPS_Sampler | |||
164 | 183 | ||
165 | 184 | ||
166 | /** | 185 | /** |
186 | * @brief Update the current estimate of the network size stored at the sampler | ||
187 | * | ||
188 | * Used for computing the condition when to return elements to the client | ||
189 | * | ||
190 | * @param sampler The sampler to update | ||
191 | * @param num_peers The estimated value | ||
192 | */ | ||
193 | void | ||
194 | RPS_sampler_update_with_nw_size (struct RPS_Sampler *sampler, | ||
195 | uint32_t num_peers); | ||
196 | |||
197 | |||
198 | /** | ||
199 | * @brief Set the probability that is needed at least with what a sampler | ||
200 | * element has to have observed all elements from the network. | ||
201 | * | ||
202 | * Only used/useful with the client sampler | ||
203 | * (Maybe move to rps-sampler_client.{h|c} ?) | ||
204 | * | ||
205 | * @param sampler | ||
206 | * @param desired_probability | ||
207 | */ | ||
208 | void | ||
209 | RPS_sampler_set_desired_probability (struct RPS_Sampler *sampler, | ||
210 | double desired_probability); | ||
211 | |||
212 | |||
213 | /** | ||
214 | * @brief Set the deficiency factor. | ||
215 | * | ||
216 | * Only used/useful with the client sampler | ||
217 | * (Maybe move to rps-sampler_client.{h|c} ?) | ||
218 | * | ||
219 | * @param sampler | ||
220 | * @param desired_probability | ||
221 | */ | ||
222 | void | ||
223 | RPS_sampler_set_deficiency_factor (struct RPS_Sampler *sampler, | ||
224 | double deficiency_factor); | ||
225 | |||
226 | |||
227 | /** | ||
167 | * @brief Add a callback that will be called when the next peer is inserted | 228 | * @brief Add a callback that will be called when the next peer is inserted |
168 | * into the sampler | 229 | * into the sampler |
169 | * | 230 | * |
diff --git a/src/rps/rps-test_util.c b/src/rps/rps-test_util.c index 077750329..fcb4f59a0 100644 --- a/src/rps/rps-test_util.c +++ b/src/rps/rps-test_util.c | |||
@@ -487,4 +487,42 @@ store_prefix_file_name (const struct GNUNET_PeerIdentity *peer, | |||
487 | return file_name; | 487 | return file_name; |
488 | } | 488 | } |
489 | 489 | ||
490 | |||
491 | /** | ||
492 | * @brief Factorial | ||
493 | * | ||
494 | * @param x Number of which to compute the factorial | ||
495 | * | ||
496 | * @return Factorial of @a x | ||
497 | */ | ||
498 | uint32_t fac (uint32_t x) | ||
499 | { | ||
500 | if (1 >= x) | ||
501 | { | ||
502 | return x; | ||
503 | } | ||
504 | return x * fac (x - 1); | ||
505 | } | ||
506 | |||
507 | /** | ||
508 | * @brief Binomial coefficient (n choose k) | ||
509 | * | ||
510 | * @param n | ||
511 | * @param k | ||
512 | * | ||
513 | * @return Binomial coefficient of @a n and @a k | ||
514 | */ | ||
515 | uint32_t binom (uint32_t n, uint32_t k) | ||
516 | { | ||
517 | //GNUNET_assert (n >= k); | ||
518 | if (k > n) return 0; | ||
519 | /* if (0 > n) return 0; - always false */ | ||
520 | /* if (0 > k) return 0; - always false */ | ||
521 | if (0 == k) return 1; | ||
522 | return fac (n) | ||
523 | / | ||
524 | fac(k) * fac(n - k); | ||
525 | } | ||
526 | |||
527 | |||
490 | /* end of gnunet-service-rps.c */ | 528 | /* end of gnunet-service-rps.c */ |
diff --git a/src/rps/rps-test_util.h b/src/rps/rps-test_util.h index 5009073d0..6b5f568d7 100644 --- a/src/rps/rps-test_util.h +++ b/src/rps/rps-test_util.h | |||
@@ -107,5 +107,26 @@ to_file_raw_unaligned (const char *file_name, | |||
107 | size_t size_buf, | 107 | size_t size_buf, |
108 | unsigned bits_needed); | 108 | unsigned bits_needed); |
109 | 109 | ||
110 | |||
111 | /** | ||
112 | * @brief Factorial | ||
113 | * | ||
114 | * @param x Number of which to compute the factorial | ||
115 | * | ||
116 | * @return Factorial of @a x | ||
117 | */ | ||
118 | uint32_t fac (uint32_t x); | ||
119 | |||
120 | |||
121 | /** | ||
122 | * @brief Binomial coefficient (n choose k) | ||
123 | * | ||
124 | * @param n | ||
125 | * @param k | ||
126 | * | ||
127 | * @return Binomial coefficient of @a n and @a k | ||
128 | */ | ||
129 | uint32_t binom (uint32_t n, uint32_t k); | ||
130 | |||
110 | #endif /* RPS_TEST_UTIL_H */ | 131 | #endif /* RPS_TEST_UTIL_H */ |
111 | /* end of gnunet-service-rps.c */ | 132 | /* end of gnunet-service-rps.c */ |
diff --git a/src/rps/rps.conf.in b/src/rps/rps.conf.in index ff701e371..9619c9889 100644 --- a/src/rps/rps.conf.in +++ b/src/rps/rps.conf.in | |||
@@ -26,3 +26,13 @@ FILENAME_VALID_PEERS = $GNUNET_DATA_HOME/rps/valid_peers.txt | |||
26 | # Keep in mind, that (networksize)^(1/3) should be enough. | 26 | # Keep in mind, that (networksize)^(1/3) should be enough. |
27 | # So, 50 is enough for a network of size 50^3 = 125000 | 27 | # So, 50 is enough for a network of size 50^3 = 125000 |
28 | MINSIZE = 10 | 28 | MINSIZE = 10 |
29 | |||
30 | # The probability whith which we want a sampler element to have observed all | ||
31 | # peer ids in the network at least | ||
32 | DESIRED_PROBABILITY = 0.9 | ||
33 | |||
34 | # A factor that catches the 'bias' of a random stream of peer ids. | ||
35 | # | ||
36 | # As introduced by Brahms: Factor between the number of unique ids in a | ||
37 | # truly random stream and number of unique ids in the gossip stream. | ||
38 | DEFICIENCY_FACTOR = 0.4 | ||
diff --git a/src/rps/rps_api.c b/src/rps/rps_api.c index d0b241a2b..7a3adfa94 100644 --- a/src/rps/rps_api.c +++ b/src/rps/rps_api.c | |||
@@ -29,6 +29,8 @@ | |||
29 | #include "gnunet_rps_service.h" | 29 | #include "gnunet_rps_service.h" |
30 | #include "rps-sampler_client.h" | 30 | #include "rps-sampler_client.h" |
31 | 31 | ||
32 | #include "gnunet_nse_service.h" | ||
33 | |||
32 | #include <inttypes.h> | 34 | #include <inttypes.h> |
33 | 35 | ||
34 | #define LOG(kind,...) GNUNET_log_from (kind, "rps-api",__VA_ARGS__) | 36 | #define LOG(kind,...) GNUNET_log_from (kind, "rps-api",__VA_ARGS__) |
@@ -109,6 +111,35 @@ struct GNUNET_RPS_Handle | |||
109 | * @brief Tail of the DLL of stream requests | 111 | * @brief Tail of the DLL of stream requests |
110 | */ | 112 | */ |
111 | struct GNUNET_RPS_StreamRequestHandle *stream_requests_tail; | 113 | struct GNUNET_RPS_StreamRequestHandle *stream_requests_tail; |
114 | |||
115 | /** | ||
116 | * @brief Handle to nse service | ||
117 | */ | ||
118 | struct GNUNET_NSE_Handle *nse; | ||
119 | |||
120 | /** | ||
121 | * @brief Pointer to the head element in DLL of request handles | ||
122 | */ | ||
123 | struct GNUNET_RPS_Request_Handle *rh_head; | ||
124 | |||
125 | /** | ||
126 | * @brief Pointer to the tail element in DLL of request handles | ||
127 | */ | ||
128 | struct GNUNET_RPS_Request_Handle *rh_tail; | ||
129 | |||
130 | /** | ||
131 | * @brief The desired probability with which we want to have observed all | ||
132 | * peers. | ||
133 | */ | ||
134 | float desired_probability; | ||
135 | |||
136 | /** | ||
137 | * @brief A factor that catches the 'bias' of a random stream of peer ids. | ||
138 | * | ||
139 | * As introduced by Brahms: Factor between the number of unique ids in a | ||
140 | * truly random stream and number of unique ids in the gossip stream. | ||
141 | */ | ||
142 | float deficiency_factor; | ||
112 | }; | 143 | }; |
113 | 144 | ||
114 | 145 | ||
@@ -152,6 +183,16 @@ struct GNUNET_RPS_Request_Handle | |||
152 | * The closure for the callback. | 183 | * The closure for the callback. |
153 | */ | 184 | */ |
154 | void *ready_cb_cls; | 185 | void *ready_cb_cls; |
186 | |||
187 | /** | ||
188 | * @brief Pointer to next element in DLL | ||
189 | */ | ||
190 | struct GNUNET_RPS_Request_Handle *next; | ||
191 | |||
192 | /** | ||
193 | * @brief Pointer to previous element in DLL | ||
194 | */ | ||
195 | struct GNUNET_RPS_Request_Handle *prev; | ||
155 | }; | 196 | }; |
156 | 197 | ||
157 | 198 | ||
@@ -263,10 +304,7 @@ peers_ready_cb (const struct GNUNET_PeerIdentity *peers, | |||
263 | rh->ready_cb (rh->ready_cb_cls, | 304 | rh->ready_cb (rh->ready_cb_cls, |
264 | num_peers, | 305 | num_peers, |
265 | peers); | 306 | peers); |
266 | GNUNET_RPS_stream_cancel (rh->srh); | 307 | GNUNET_RPS_request_cancel (rh); |
267 | rh->srh = NULL; | ||
268 | RPS_sampler_destroy (rh->sampler); | ||
269 | rh->sampler = NULL; | ||
270 | } | 308 | } |
271 | 309 | ||
272 | 310 | ||
@@ -607,6 +645,37 @@ hash_from_share_val (const char *share_val, | |||
607 | 645 | ||
608 | 646 | ||
609 | /** | 647 | /** |
648 | * @brief Callback for network size estimate - called with new estimates about | ||
649 | * the network size, updates all samplers with the new estimate | ||
650 | * | ||
651 | * Implements #GNUNET_NSE_Callback | ||
652 | * | ||
653 | * @param cls the rps handle | ||
654 | * @param timestamp unused | ||
655 | * @param logestimate the estimate | ||
656 | * @param std_dev the standard distribution | ||
657 | */ | ||
658 | static void | ||
659 | nse_cb (void *cls, | ||
660 | struct GNUNET_TIME_Absolute timestamp, | ||
661 | double logestimate, | ||
662 | double std_dev) | ||
663 | { | ||
664 | struct GNUNET_RPS_Handle *h = cls; | ||
665 | (void) timestamp; | ||
666 | (void) std_dev; | ||
667 | |||
668 | for (struct GNUNET_RPS_Request_Handle *rh_iter = h->rh_head; | ||
669 | NULL != rh_iter && NULL != rh_iter->next; | ||
670 | rh_iter = rh_iter->next) | ||
671 | { | ||
672 | RPS_sampler_update_with_nw_size (rh_iter->sampler, | ||
673 | GNUNET_NSE_log_estimate_to_n (logestimate)); | ||
674 | } | ||
675 | } | ||
676 | |||
677 | |||
678 | /** | ||
610 | * Reconnect to the service | 679 | * Reconnect to the service |
611 | */ | 680 | */ |
612 | static void | 681 | static void |
@@ -631,6 +700,9 @@ reconnect (struct GNUNET_RPS_Handle *h) | |||
631 | mq_handlers, | 700 | mq_handlers, |
632 | &mq_error_handler, | 701 | &mq_error_handler, |
633 | h); | 702 | h); |
703 | if (NULL != h->nse) | ||
704 | GNUNET_NSE_disconnect (h->nse); | ||
705 | h->nse = GNUNET_NSE_connect (h->cfg, &nse_cb, h); | ||
634 | } | 706 | } |
635 | 707 | ||
636 | 708 | ||
@@ -638,7 +710,7 @@ reconnect (struct GNUNET_RPS_Handle *h) | |||
638 | * Connect to the rps service | 710 | * Connect to the rps service |
639 | * | 711 | * |
640 | * @param cfg configuration to use | 712 | * @param cfg configuration to use |
641 | * @return a handle to the service | 713 | * @return a handle to the service, NULL on error |
642 | */ | 714 | */ |
643 | struct GNUNET_RPS_Handle * | 715 | struct GNUNET_RPS_Handle * |
644 | GNUNET_RPS_connect (const struct GNUNET_CONFIGURATION_Handle *cfg) | 716 | GNUNET_RPS_connect (const struct GNUNET_CONFIGURATION_Handle *cfg) |
@@ -647,6 +719,44 @@ GNUNET_RPS_connect (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
647 | 719 | ||
648 | h = GNUNET_new (struct GNUNET_RPS_Handle); | 720 | h = GNUNET_new (struct GNUNET_RPS_Handle); |
649 | h->cfg = cfg; | 721 | h->cfg = cfg; |
722 | if (GNUNET_OK != | ||
723 | GNUNET_CONFIGURATION_get_value_float (cfg, | ||
724 | "RPS", | ||
725 | "DESIRED_PROBABILITY", | ||
726 | &h->desired_probability)) | ||
727 | { | ||
728 | GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, | ||
729 | "RPS", "DESIRED_PROBABILITY"); | ||
730 | GNUNET_free (h); | ||
731 | return NULL; | ||
732 | } | ||
733 | if (0 > h->desired_probability || | ||
734 | 1 < h->desired_probability) | ||
735 | { | ||
736 | LOG (GNUNET_ERROR_TYPE_ERROR, | ||
737 | "The desired probability must be in the interval [0;1]\n"); | ||
738 | GNUNET_free (h); | ||
739 | return NULL; | ||
740 | } | ||
741 | if (GNUNET_OK != | ||
742 | GNUNET_CONFIGURATION_get_value_float (cfg, | ||
743 | "RPS", | ||
744 | "DEFICIENCY_FACTOR", | ||
745 | &h->deficiency_factor)) | ||
746 | { | ||
747 | GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, | ||
748 | "RPS", "DEFICIENCY_FACTOR"); | ||
749 | GNUNET_free (h); | ||
750 | return NULL; | ||
751 | } | ||
752 | if (0 > h->desired_probability || | ||
753 | 1 < h->desired_probability) | ||
754 | { | ||
755 | LOG (GNUNET_ERROR_TYPE_ERROR, | ||
756 | "The deficiency factor must be in the interval [0;1]\n"); | ||
757 | GNUNET_free (h); | ||
758 | return NULL; | ||
759 | } | ||
650 | reconnect (h); | 760 | reconnect (h); |
651 | if (NULL == h->mq) | 761 | if (NULL == h->mq) |
652 | { | 762 | { |
@@ -725,6 +835,10 @@ GNUNET_RPS_request_peers (struct GNUNET_RPS_Handle *rps_handle, | |||
725 | rh->num_requests = num_req_peers; | 835 | rh->num_requests = num_req_peers; |
726 | rh->sampler = RPS_sampler_mod_init (num_req_peers, | 836 | rh->sampler = RPS_sampler_mod_init (num_req_peers, |
727 | GNUNET_TIME_UNIT_SECONDS); // TODO remove this time-stuff | 837 | GNUNET_TIME_UNIT_SECONDS); // TODO remove this time-stuff |
838 | RPS_sampler_set_desired_probability (rh->sampler, | ||
839 | rps_handle->desired_probability); | ||
840 | RPS_sampler_set_deficiency_factor (rh->sampler, | ||
841 | rps_handle->deficiency_factor); | ||
728 | rh->sampler_rh = RPS_sampler_get_n_rand_peers (rh->sampler, | 842 | rh->sampler_rh = RPS_sampler_get_n_rand_peers (rh->sampler, |
729 | num_req_peers, | 843 | num_req_peers, |
730 | peers_ready_cb, | 844 | peers_ready_cb, |
@@ -734,6 +848,9 @@ GNUNET_RPS_request_peers (struct GNUNET_RPS_Handle *rps_handle, | |||
734 | rh); /* cls */ | 848 | rh); /* cls */ |
735 | rh->ready_cb = ready_cb; | 849 | rh->ready_cb = ready_cb; |
736 | rh->ready_cb_cls = cls; | 850 | rh->ready_cb_cls = cls; |
851 | GNUNET_CONTAINER_DLL_insert (rps_handle->rh_head, | ||
852 | rps_handle->rh_tail, | ||
853 | rh); | ||
737 | 854 | ||
738 | return rh; | 855 | return rh; |
739 | } | 856 | } |
@@ -911,6 +1028,7 @@ GNUNET_RPS_request_cancel (struct GNUNET_RPS_Request_Handle *rh) | |||
911 | 1028 | ||
912 | h = rh->rps_handle; | 1029 | h = rh->rps_handle; |
913 | GNUNET_assert (NULL != rh); | 1030 | GNUNET_assert (NULL != rh); |
1031 | GNUNET_assert (NULL != rh->srh); | ||
914 | GNUNET_assert (h == rh->srh->rps_handle); | 1032 | GNUNET_assert (h == rh->srh->rps_handle); |
915 | GNUNET_RPS_stream_cancel (rh->srh); | 1033 | GNUNET_RPS_stream_cancel (rh->srh); |
916 | rh->srh = NULL; | 1034 | rh->srh = NULL; |
@@ -920,6 +1038,10 @@ GNUNET_RPS_request_cancel (struct GNUNET_RPS_Request_Handle *rh) | |||
920 | RPS_sampler_request_cancel (rh->sampler_rh); | 1038 | RPS_sampler_request_cancel (rh->sampler_rh); |
921 | } | 1039 | } |
922 | RPS_sampler_destroy (rh->sampler); | 1040 | RPS_sampler_destroy (rh->sampler); |
1041 | rh->sampler = NULL; | ||
1042 | GNUNET_CONTAINER_DLL_remove (h->rh_head, | ||
1043 | h->rh_tail, | ||
1044 | rh); | ||
923 | GNUNET_free (rh); | 1045 | GNUNET_free (rh); |
924 | } | 1046 | } |
925 | 1047 | ||
@@ -939,13 +1061,24 @@ GNUNET_RPS_disconnect (struct GNUNET_RPS_Handle *h) | |||
939 | LOG (GNUNET_ERROR_TYPE_WARNING, | 1061 | LOG (GNUNET_ERROR_TYPE_WARNING, |
940 | "Still waiting for replies\n"); | 1062 | "Still waiting for replies\n"); |
941 | for (struct GNUNET_RPS_StreamRequestHandle *srh_iter = h->stream_requests_head; | 1063 | for (struct GNUNET_RPS_StreamRequestHandle *srh_iter = h->stream_requests_head; |
942 | NULL != srh_iter; | 1064 | NULL != srh_iter; |
943 | srh_iter = srh_next) | 1065 | srh_iter = srh_next) |
944 | { | 1066 | { |
945 | srh_next = srh_iter->next; | 1067 | srh_next = srh_iter->next; |
946 | GNUNET_RPS_stream_cancel (srh_iter); | 1068 | GNUNET_RPS_stream_cancel (srh_iter); |
947 | } | 1069 | } |
948 | } | 1070 | } |
1071 | if (NULL != h->rh_head) | ||
1072 | { | ||
1073 | LOG (GNUNET_ERROR_TYPE_WARNING, | ||
1074 | "Not all requests were cancelled!\n"); | ||
1075 | for (struct GNUNET_RPS_Request_Handle *rh_iter = h->rh_head; | ||
1076 | h->rh_head != NULL; | ||
1077 | rh_iter = h->rh_head) | ||
1078 | { | ||
1079 | GNUNET_RPS_request_cancel (rh_iter); | ||
1080 | } | ||
1081 | } | ||
949 | if (NULL != srh_callback_peers) | 1082 | if (NULL != srh_callback_peers) |
950 | { | 1083 | { |
951 | GNUNET_free (srh_callback_peers); | 1084 | GNUNET_free (srh_callback_peers); |
@@ -957,6 +1090,8 @@ GNUNET_RPS_disconnect (struct GNUNET_RPS_Handle *h) | |||
957 | "Still waiting for view updates\n"); | 1090 | "Still waiting for view updates\n"); |
958 | GNUNET_RPS_view_request_cancel (h); | 1091 | GNUNET_RPS_view_request_cancel (h); |
959 | } | 1092 | } |
1093 | if (NULL != h->nse) | ||
1094 | GNUNET_NSE_disconnect (h->nse); | ||
960 | GNUNET_MQ_destroy (h->mq); | 1095 | GNUNET_MQ_destroy (h->mq); |
961 | GNUNET_free (h); | 1096 | GNUNET_free (h); |
962 | } | 1097 | } |
diff --git a/src/rps/test_rps.c b/src/rps/test_rps.c index 26066bf10..7fc91743b 100644 --- a/src/rps/test_rps.c +++ b/src/rps/test_rps.c | |||
@@ -1964,26 +1964,6 @@ profiler_eval (void) | |||
1964 | return evaluate (); | 1964 | return evaluate (); |
1965 | } | 1965 | } |
1966 | 1966 | ||
1967 | static uint32_t fac (uint32_t x) | ||
1968 | { | ||
1969 | if (1 >= x) | ||
1970 | { | ||
1971 | return x; | ||
1972 | } | ||
1973 | return x * fac (x - 1); | ||
1974 | } | ||
1975 | |||
1976 | static uint32_t binom (uint32_t n, uint32_t k) | ||
1977 | { | ||
1978 | //GNUNET_assert (n >= k); | ||
1979 | if (k > n) return 0; | ||
1980 | if (0 > n) return 0; | ||
1981 | if (0 > k) return 0; | ||
1982 | if (0 == k) return 1; | ||
1983 | return fac (n) | ||
1984 | / | ||
1985 | fac(k) * fac(n - k); | ||
1986 | } | ||
1987 | 1967 | ||
1988 | /** | 1968 | /** |
1989 | * @brief is b in view of a? | 1969 | * @brief is b in view of a? |
diff --git a/src/rps/test_rps.conf b/src/rps/test_rps.conf index c22113af5..68f3982ec 100644 --- a/src/rps/test_rps.conf +++ b/src/rps/test_rps.conf | |||
@@ -22,6 +22,10 @@ FILENAME_VALID_PEERS = $GNUNET_DATA_HOME/rps/valid_peers.txt | |||
22 | # So, 50 is enough for a network of size 50^3 = 125000 | 22 | # So, 50 is enough for a network of size 50^3 = 125000 |
23 | MINSIZE = 4 | 23 | MINSIZE = 4 |
24 | 24 | ||
25 | DESIRED_PROBABILITY = 0.75 | ||
26 | |||
27 | DEFICIENCY_FACTOR = 0.4 | ||
28 | |||
25 | 29 | ||
26 | 30 | ||
27 | [testbed] | 31 | [testbed] |
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 9cf16ddb6..2865460fd 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -155,6 +155,7 @@ endif | |||
155 | lib_LTLIBRARIES = \ | 155 | lib_LTLIBRARIES = \ |
156 | libgnunettransport.la \ | 156 | libgnunettransport.la \ |
157 | libgnunettransportaddress.la \ | 157 | libgnunettransportaddress.la \ |
158 | libgnunettransportapplication.la \ | ||
158 | libgnunettransportcore.la \ | 159 | libgnunettransportcore.la \ |
159 | libgnunettransportcommunicator.la \ | 160 | libgnunettransportcommunicator.la \ |
160 | libgnunettransportmonitor.la \ | 161 | libgnunettransportmonitor.la \ |
@@ -196,6 +197,14 @@ libgnunettransport_la_LDFLAGS = \ | |||
196 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ | 197 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ |
197 | -version-info 4:0:2 | 198 | -version-info 4:0:2 |
198 | 199 | ||
200 | libgnunettransportapplication_la_SOURCES = \ | ||
201 | transport_api2_application.c | ||
202 | libgnunettransportapplication_la_LIBADD = \ | ||
203 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
204 | $(LTLIBINTL) | ||
205 | libgnunettransportapplication_la_LDFLAGS = \ | ||
206 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ | ||
207 | -version-info 0:0:0 | ||
199 | 208 | ||
200 | 209 | ||
201 | libgnunettransportaddress_la_SOURCES = \ | 210 | libgnunettransportaddress_la_SOURCES = \ |
@@ -360,7 +369,6 @@ gnunet_service_transport_CFLAGS = \ | |||
360 | gnunet_service_tng_SOURCES = \ | 369 | gnunet_service_tng_SOURCES = \ |
361 | gnunet-service-tng.c | 370 | gnunet-service-tng.c |
362 | gnunet_service_tng_LDADD = \ | 371 | gnunet_service_tng_LDADD = \ |
363 | $(top_builddir)/src/ats/libgnunetatstransport.la \ | ||
364 | $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ | 372 | $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ |
365 | $(top_builddir)/src/hello/libgnunethello.la \ | 373 | $(top_builddir)/src/hello/libgnunethello.la \ |
366 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 374 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
@@ -378,12 +386,6 @@ plugin_LTLIBRARIES = \ | |||
378 | $(WLAN_PLUGIN_LA) \ | 386 | $(WLAN_PLUGIN_LA) \ |
379 | $(BT_PLUGIN_LA) | 387 | $(BT_PLUGIN_LA) |
380 | 388 | ||
381 | if HAVE_EXPERIMENTAL | ||
382 | plugin_LTLIBRARIES += \ | ||
383 | libgnunet_plugin_transport_xt.la \ | ||
384 | libgnunet_plugin_transport_xu.la | ||
385 | endif | ||
386 | |||
387 | # Note: real plugins of course need to be added | 389 | # Note: real plugins of course need to be added |
388 | # to the plugin_LTLIBRARIES above | 390 | # to the plugin_LTLIBRARIES above |
389 | noinst_LTLIBRARIES = \ | 391 | noinst_LTLIBRARIES = \ |
@@ -401,18 +403,6 @@ libgnunet_plugin_transport_tcp_la_LIBADD = \ | |||
401 | libgnunet_plugin_transport_tcp_la_LDFLAGS = \ | 403 | libgnunet_plugin_transport_tcp_la_LDFLAGS = \ |
402 | $(GN_PLUGIN_LDFLAGS) | 404 | $(GN_PLUGIN_LDFLAGS) |
403 | 405 | ||
404 | libgnunet_plugin_transport_xt_la_SOURCES = \ | ||
405 | plugin_transport_xt.c | ||
406 | libgnunet_plugin_transport_xt_la_LIBADD = \ | ||
407 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
408 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | ||
409 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | ||
410 | $(top_builddir)/src/nat/libgnunetnatnew.la \ | ||
411 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
412 | $(LTLIBINTL) | ||
413 | libgnunet_plugin_transport_xt_la_LDFLAGS = \ | ||
414 | $(GN_PLUGIN_LDFLAGS) | ||
415 | |||
416 | libgnunet_plugin_transport_template_la_SOURCES = \ | 406 | libgnunet_plugin_transport_template_la_SOURCES = \ |
417 | plugin_transport_template.c | 407 | plugin_transport_template.c |
418 | libgnunet_plugin_transport_template_la_LIBADD = \ | 408 | libgnunet_plugin_transport_template_la_LIBADD = \ |
@@ -461,19 +451,6 @@ libgnunet_plugin_transport_udp_la_LIBADD = \ | |||
461 | libgnunet_plugin_transport_udp_la_LDFLAGS = \ | 451 | libgnunet_plugin_transport_udp_la_LDFLAGS = \ |
462 | $(GN_PLUGIN_LDFLAGS) | 452 | $(GN_PLUGIN_LDFLAGS) |
463 | 453 | ||
464 | libgnunet_plugin_transport_xu_la_SOURCES = \ | ||
465 | plugin_transport_xu.c plugin_transport_xu.h | ||
466 | libgnunet_plugin_transport_xu_la_LIBADD = \ | ||
467 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
468 | $(top_builddir)/src/fragmentation/libgnunetfragmentation.la \ | ||
469 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | ||
470 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | ||
471 | $(top_builddir)/src/nat/libgnunetnatnew.la \ | ||
472 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
473 | $(LTLIBINTL) | ||
474 | libgnunet_plugin_transport_xu_la_LDFLAGS = \ | ||
475 | $(GN_PLUGIN_LDFLAGS) | ||
476 | |||
477 | libgnunet_plugin_transport_unix_la_SOURCES = \ | 454 | libgnunet_plugin_transport_unix_la_SOURCES = \ |
478 | plugin_transport_unix.c | 455 | plugin_transport_unix.c |
479 | libgnunet_plugin_transport_unix_la_LIBADD = \ | 456 | libgnunet_plugin_transport_unix_la_LIBADD = \ |
diff --git a/src/transport/gnunet-service-tng.c b/src/transport/gnunet-service-tng.c index 7d7d04375..6494a5dfd 100644 --- a/src/transport/gnunet-service-tng.c +++ b/src/transport/gnunet-service-tng.c | |||
@@ -41,11 +41,11 @@ | |||
41 | * #3 transport should use validation to also establish | 41 | * #3 transport should use validation to also establish |
42 | * effective flow control (for uni-directional transports!) | 42 | * effective flow control (for uni-directional transports!) |
43 | * #4 UDP broadcasting logic must be extended to use the new API | 43 | * #4 UDP broadcasting logic must be extended to use the new API |
44 | * #5 only validated addresses go to ATS for scheduling; that | 44 | * #5 only validated addresses are selected for scheduling; that |
45 | * also ensures we know the RTT | 45 | * also ensures we know the RTT |
46 | * #6 to ensure flow control and RTT are OK, we always do the | 46 | * #6 to ensure flow control and RTT are OK, we always do the |
47 | * 'validation', even if address comes from PEERSTORE | 47 | * 'validation', even if address comes from PEERSTORE |
48 | * #7 | 48 | * #7 |
49 | * - ACK handling / retransmission | 49 | * - ACK handling / retransmission |
50 | * - address verification | 50 | * - address verification |
51 | * - track RTT, distance, loss, etc. | 51 | * - track RTT, distance, loss, etc. |
@@ -59,10 +59,7 @@ | |||
59 | * - | 59 | * - |
60 | * | 60 | * |
61 | * Easy: | 61 | * Easy: |
62 | * - use ATS bandwidth allocation callback and schedule transmissions! | 62 | * - figure out how to call XXX_suggestion_cb! |
63 | * | ||
64 | * Plan: | ||
65 | * - inform ATS about RTT, goodput/loss, overheads, etc. (GNUNET_ATS_session_update()) | ||
66 | * | 63 | * |
67 | * Later: | 64 | * Later: |
68 | * - change transport-core API to provide proper flow control in both | 65 | * - change transport-core API to provide proper flow control in both |
@@ -98,8 +95,6 @@ | |||
98 | * "latest timestamps seen" data | 95 | * "latest timestamps seen" data |
99 | * - if transport implements DV, we likely need a 3rd peermap | 96 | * - if transport implements DV, we likely need a 3rd peermap |
100 | * in addition to ephemerals and (direct) neighbours | 97 | * in addition to ephemerals and (direct) neighbours |
101 | * => in this data structure, we should track ATS metrics (distance, RTT, etc.) | ||
102 | * as well as latest timestamps seen, goodput, fragments for transmission, etc. | ||
103 | * ==> check if stuff needs to be moved out of "Neighbour" | 98 | * ==> check if stuff needs to be moved out of "Neighbour" |
104 | * - transport should encapsualte core-level messages and do its | 99 | * - transport should encapsualte core-level messages and do its |
105 | * own ACKing for RTT/goodput/loss measurements _and_ fragment | 100 | * own ACKing for RTT/goodput/loss measurements _and_ fragment |
@@ -111,7 +106,6 @@ | |||
111 | #include "gnunet_transport_monitor_service.h" | 106 | #include "gnunet_transport_monitor_service.h" |
112 | #include "gnunet_peerstore_service.h" | 107 | #include "gnunet_peerstore_service.h" |
113 | #include "gnunet_hello_lib.h" | 108 | #include "gnunet_hello_lib.h" |
114 | #include "gnunet_ats_transport_service.h" | ||
115 | #include "gnunet_signatures.h" | 109 | #include "gnunet_signatures.h" |
116 | #include "transport.h" | 110 | #include "transport.h" |
117 | 111 | ||
@@ -148,18 +142,11 @@ | |||
148 | #define COMMUNICATOR_TOTAL_QUEUE_LIMIT 512 | 142 | #define COMMUNICATOR_TOTAL_QUEUE_LIMIT 512 |
149 | 143 | ||
150 | /** | 144 | /** |
151 | * How many messages can we have pending for a given session (queue to | 145 | * How many messages can we have pending for a given queue (queue to |
152 | * a particular peer via a communicator) process before we start to | 146 | * a particular peer via a communicator) process before we start to |
153 | * throttle that queue? | 147 | * throttle that queue? |
154 | * | ||
155 | * Used if ATS assigns more bandwidth to a particular transmission | ||
156 | * method than that transmission method can right now handle. (Yes, | ||
157 | * ATS should eventually notice utilization below allocation and | ||
158 | * adjust, but we don't want to queue up tons of messages in the | ||
159 | * meantime). Must be significantly below | ||
160 | * #COMMUNICATOR_TOTAL_QUEUE_LIMIT. | ||
161 | */ | 148 | */ |
162 | #define SESSION_QUEUE_LIMIT 32 | 149 | #define QUEUE_LENGTH_LIMIT 32 |
163 | 150 | ||
164 | 151 | ||
165 | GNUNET_NETWORK_STRUCT_BEGIN | 152 | GNUNET_NETWORK_STRUCT_BEGIN |
@@ -547,7 +534,6 @@ struct TransportDVBox | |||
547 | GNUNET_NETWORK_STRUCT_END | 534 | GNUNET_NETWORK_STRUCT_END |
548 | 535 | ||
549 | 536 | ||
550 | |||
551 | /** | 537 | /** |
552 | * What type of client is the `struct TransportClient` about? | 538 | * What type of client is the `struct TransportClient` about? |
553 | */ | 539 | */ |
@@ -571,7 +557,12 @@ enum ClientType | |||
571 | /** | 557 | /** |
572 | * It is a communicator, use for communication. | 558 | * It is a communicator, use for communication. |
573 | */ | 559 | */ |
574 | CT_COMMUNICATOR = 3 | 560 | CT_COMMUNICATOR = 3, |
561 | |||
562 | /** | ||
563 | * "Application" telling us where to connect (i.e. TOPOLOGY, DHT or CADET). | ||
564 | */ | ||
565 | CT_APPLICATION = 4 | ||
575 | }; | 566 | }; |
576 | 567 | ||
577 | 568 | ||
@@ -725,11 +716,18 @@ struct DistanceVector | |||
725 | 716 | ||
726 | 717 | ||
727 | /** | 718 | /** |
719 | * A queue is a message queue provided by a communicator | ||
720 | * via which we can reach a particular neighbour. | ||
721 | */ | ||
722 | struct Queue; | ||
723 | |||
724 | |||
725 | /** | ||
728 | * Entry identifying transmission in one of our `struct | 726 | * Entry identifying transmission in one of our `struct |
729 | * GNUNET_ATS_Sessions` which still awaits an ACK. This is used to | 727 | * Queue` which still awaits an ACK. This is used to |
730 | * ensure we do not overwhelm a communicator and limit the number of | 728 | * ensure we do not overwhelm a communicator and limit the number of |
731 | * messages outstanding per communicator (say in case communicator is | 729 | * messages outstanding per communicator (say in case communicator is |
732 | * CPU bound) and per queue (in case ATS bandwidth allocation exceeds | 730 | * CPU bound) and per queue (in case bandwidth allocation exceeds |
733 | * what the communicator can actually provide towards a particular | 731 | * what the communicator can actually provide towards a particular |
734 | * peer/target). | 732 | * peer/target). |
735 | */ | 733 | */ |
@@ -747,9 +745,9 @@ struct QueueEntry | |||
747 | struct QueueEntry *prev; | 745 | struct QueueEntry *prev; |
748 | 746 | ||
749 | /** | 747 | /** |
750 | * ATS session this entry is queued with. | 748 | * Queue this entry is queued with. |
751 | */ | 749 | */ |
752 | struct GNUNET_ATS_Session *session; | 750 | struct Queue *queue; |
753 | 751 | ||
754 | /** | 752 | /** |
755 | * Message ID used for this message with the queue used for transmission. | 753 | * Message ID used for this message with the queue used for transmission. |
@@ -759,30 +757,30 @@ struct QueueEntry | |||
759 | 757 | ||
760 | 758 | ||
761 | /** | 759 | /** |
762 | * An ATS session is a message queue provided by a communicator | 760 | * A queue is a message queue provided by a communicator |
763 | * via which we can reach a particular neighbour. | 761 | * via which we can reach a particular neighbour. |
764 | */ | 762 | */ |
765 | struct GNUNET_ATS_Session | 763 | struct Queue |
766 | { | 764 | { |
767 | /** | 765 | /** |
768 | * Kept in a MDLL. | 766 | * Kept in a MDLL. |
769 | */ | 767 | */ |
770 | struct GNUNET_ATS_Session *next_neighbour; | 768 | struct Queue *next_neighbour; |
771 | 769 | ||
772 | /** | 770 | /** |
773 | * Kept in a MDLL. | 771 | * Kept in a MDLL. |
774 | */ | 772 | */ |
775 | struct GNUNET_ATS_Session *prev_neighbour; | 773 | struct Queue *prev_neighbour; |
776 | 774 | ||
777 | /** | 775 | /** |
778 | * Kept in a MDLL. | 776 | * Kept in a MDLL. |
779 | */ | 777 | */ |
780 | struct GNUNET_ATS_Session *prev_client; | 778 | struct Queue *prev_client; |
781 | 779 | ||
782 | /** | 780 | /** |
783 | * Kept in a MDLL. | 781 | * Kept in a MDLL. |
784 | */ | 782 | */ |
785 | struct GNUNET_ATS_Session *next_client; | 783 | struct Queue *next_client; |
786 | 784 | ||
787 | /** | 785 | /** |
788 | * Head of DLL of unacked transmission requests. | 786 | * Head of DLL of unacked transmission requests. |
@@ -795,33 +793,28 @@ struct GNUNET_ATS_Session | |||
795 | struct QueueEntry *queue_tail; | 793 | struct QueueEntry *queue_tail; |
796 | 794 | ||
797 | /** | 795 | /** |
798 | * Which neighbour is this ATS session for? | 796 | * Which neighbour is this queue for? |
799 | */ | 797 | */ |
800 | struct Neighbour *neighbour; | 798 | struct Neighbour *neighbour; |
801 | 799 | ||
802 | /** | 800 | /** |
803 | * Which communicator offers this ATS session? | 801 | * Which communicator offers this queue? |
804 | */ | 802 | */ |
805 | struct TransportClient *tc; | 803 | struct TransportClient *tc; |
806 | 804 | ||
807 | /** | 805 | /** |
808 | * Address served by the ATS session. | 806 | * Address served by the queue. |
809 | */ | 807 | */ |
810 | const char *address; | 808 | const char *address; |
811 | 809 | ||
812 | /** | 810 | /** |
813 | * Handle by which we inform ATS about this queue. | ||
814 | */ | ||
815 | struct GNUNET_ATS_SessionRecord *sr; | ||
816 | |||
817 | /** | ||
818 | * Task scheduled for the time when this queue can (likely) transmit the | 811 | * Task scheduled for the time when this queue can (likely) transmit the |
819 | * next message. Still needs to check with the @e tracker_out to be sure. | 812 | * next message. Still needs to check with the @e tracker_out to be sure. |
820 | */ | 813 | */ |
821 | struct GNUNET_SCHEDULER_Task *transmit_task; | 814 | struct GNUNET_SCHEDULER_Task *transmit_task; |
822 | 815 | ||
823 | /** | 816 | /** |
824 | * Our current RTT estimate for this ATS session. | 817 | * Our current RTT estimate for this queue. |
825 | */ | 818 | */ |
826 | struct GNUNET_TIME_Relative rtt; | 819 | struct GNUNET_TIME_Relative rtt; |
827 | 820 | ||
@@ -831,17 +824,17 @@ struct GNUNET_ATS_Session | |||
831 | uint64_t mid_gen; | 824 | uint64_t mid_gen; |
832 | 825 | ||
833 | /** | 826 | /** |
834 | * Unique identifier of this ATS session with the communicator. | 827 | * Unique identifier of this queue with the communicator. |
835 | */ | 828 | */ |
836 | uint32_t qid; | 829 | uint32_t qid; |
837 | 830 | ||
838 | /** | 831 | /** |
839 | * Maximum transmission unit supported by this ATS session. | 832 | * Maximum transmission unit supported by this queue. |
840 | */ | 833 | */ |
841 | uint32_t mtu; | 834 | uint32_t mtu; |
842 | 835 | ||
843 | /** | 836 | /** |
844 | * Distance to the target of this ATS session. | 837 | * Distance to the target of this queue. |
845 | */ | 838 | */ |
846 | uint32_t distance; | 839 | uint32_t distance; |
847 | 840 | ||
@@ -861,22 +854,22 @@ struct GNUNET_ATS_Session | |||
861 | unsigned int queue_length; | 854 | unsigned int queue_length; |
862 | 855 | ||
863 | /** | 856 | /** |
864 | * Network type offered by this ATS session. | 857 | * Network type offered by this queue. |
865 | */ | 858 | */ |
866 | enum GNUNET_NetworkType nt; | 859 | enum GNUNET_NetworkType nt; |
867 | 860 | ||
868 | /** | 861 | /** |
869 | * Connection status for this ATS session. | 862 | * Connection status for this queue. |
870 | */ | 863 | */ |
871 | enum GNUNET_TRANSPORT_ConnectionStatus cs; | 864 | enum GNUNET_TRANSPORT_ConnectionStatus cs; |
872 | 865 | ||
873 | /** | 866 | /** |
874 | * How much outbound bandwidth do we have available for this session? | 867 | * How much outbound bandwidth do we have available for this queue? |
875 | */ | 868 | */ |
876 | struct GNUNET_BANDWIDTH_Tracker tracker_out; | 869 | struct GNUNET_BANDWIDTH_Tracker tracker_out; |
877 | 870 | ||
878 | /** | 871 | /** |
879 | * How much inbound bandwidth do we have available for this session? | 872 | * How much inbound bandwidth do we have available for this queue? |
880 | */ | 873 | */ |
881 | struct GNUNET_BANDWIDTH_Tracker tracker_in; | 874 | struct GNUNET_BANDWIDTH_Tracker tracker_in; |
882 | }; | 875 | }; |
@@ -1025,14 +1018,14 @@ struct Neighbour | |||
1025 | struct DistanceVectorHop *dv_tail; | 1018 | struct DistanceVectorHop *dv_tail; |
1026 | 1019 | ||
1027 | /** | 1020 | /** |
1028 | * Head of DLL of ATS sessions to this peer. | 1021 | * Head of DLL of queues to this peer. |
1029 | */ | 1022 | */ |
1030 | struct GNUNET_ATS_Session *session_head; | 1023 | struct Queue *queue_head; |
1031 | 1024 | ||
1032 | /** | 1025 | /** |
1033 | * Tail of DLL of ATS sessions to this peer. | 1026 | * Tail of DLL of queues to this peer. |
1034 | */ | 1027 | */ |
1035 | struct GNUNET_ATS_Session *session_tail; | 1028 | struct Queue *queue_tail; |
1036 | 1029 | ||
1037 | /** | 1030 | /** |
1038 | * Task run to cleanup pending messages that have exceeded their timeout. | 1031 | * Task run to cleanup pending messages that have exceeded their timeout. |
@@ -1040,13 +1033,12 @@ struct Neighbour | |||
1040 | struct GNUNET_SCHEDULER_Task *timeout_task; | 1033 | struct GNUNET_SCHEDULER_Task *timeout_task; |
1041 | 1034 | ||
1042 | /** | 1035 | /** |
1043 | * Quota at which CORE is allowed to transmit to this peer | 1036 | * Quota at which CORE is allowed to transmit to this peer. |
1044 | * according to ATS. | ||
1045 | * | 1037 | * |
1046 | * FIXME: not yet used, tricky to get right given multiple queues! | 1038 | * FIXME: not yet used, tricky to get right given multiple queues! |
1047 | * (=> Idea: let ATS set a quota per queue and we add them up here?) | 1039 | * (=> Idea: measure???) |
1048 | * FIXME: how do we set this value initially when we tell CORE? | 1040 | * FIXME: how do we set this value initially when we tell CORE? |
1049 | * Options: start at a minimum value or at literally zero (before ATS?) | 1041 | * Options: start at a minimum value or at literally zero? |
1050 | * (=> Current thought: clean would be zero!) | 1042 | * (=> Current thought: clean would be zero!) |
1051 | */ | 1043 | */ |
1052 | struct GNUNET_BANDWIDTH_Value32NBO quota_out; | 1044 | struct GNUNET_BANDWIDTH_Value32NBO quota_out; |
@@ -1060,6 +1052,40 @@ struct Neighbour | |||
1060 | 1052 | ||
1061 | 1053 | ||
1062 | /** | 1054 | /** |
1055 | * A peer that an application (client) would like us to talk to directly. | ||
1056 | */ | ||
1057 | struct PeerRequest | ||
1058 | { | ||
1059 | |||
1060 | /** | ||
1061 | * Which peer is this about? | ||
1062 | */ | ||
1063 | struct GNUNET_PeerIdentity pid; | ||
1064 | |||
1065 | /** | ||
1066 | * Client responsible for the request. | ||
1067 | */ | ||
1068 | struct TransportClient *tc; | ||
1069 | |||
1070 | /** | ||
1071 | * Handle for watching the peerstore for HELLOs for this peer. | ||
1072 | */ | ||
1073 | struct GNUNET_PEERSTORE_WatchContext *wc; | ||
1074 | |||
1075 | /** | ||
1076 | * What kind of performance preference does this @e tc have? | ||
1077 | */ | ||
1078 | enum GNUNET_MQ_PreferenceKind pk; | ||
1079 | |||
1080 | /** | ||
1081 | * How much bandwidth would this @e tc like to see? | ||
1082 | */ | ||
1083 | struct GNUNET_BANDWIDTH_Value32NBO bw; | ||
1084 | |||
1085 | }; | ||
1086 | |||
1087 | |||
1088 | /** | ||
1063 | * Types of different pending messages. | 1089 | * Types of different pending messages. |
1064 | */ | 1090 | */ |
1065 | enum PendingMessageType | 1091 | enum PendingMessageType |
@@ -1362,12 +1388,12 @@ struct TransportClient | |||
1362 | /** | 1388 | /** |
1363 | * Head of DLL of queues offered by this communicator. | 1389 | * Head of DLL of queues offered by this communicator. |
1364 | */ | 1390 | */ |
1365 | struct GNUNET_ATS_Session *session_head; | 1391 | struct Queue *queue_head; |
1366 | 1392 | ||
1367 | /** | 1393 | /** |
1368 | * Tail of DLL of queues offered by this communicator. | 1394 | * Tail of DLL of queues offered by this communicator. |
1369 | */ | 1395 | */ |
1370 | struct GNUNET_ATS_Session *session_tail; | 1396 | struct Queue *queue_tail; |
1371 | 1397 | ||
1372 | /** | 1398 | /** |
1373 | * Head of list of the addresses of this peer offered by this communicator. | 1399 | * Head of list of the addresses of this peer offered by this communicator. |
@@ -1393,6 +1419,19 @@ struct TransportClient | |||
1393 | 1419 | ||
1394 | } communicator; | 1420 | } communicator; |
1395 | 1421 | ||
1422 | /** | ||
1423 | * Information for @e type #CT_APPLICATION | ||
1424 | */ | ||
1425 | struct { | ||
1426 | |||
1427 | /** | ||
1428 | * Map of requests for peers the given client application would like to | ||
1429 | * see connections for. Maps from PIDs to `struct PeerRequest`. | ||
1430 | */ | ||
1431 | struct GNUNET_CONTAINER_MultiPeerMap *requests; | ||
1432 | |||
1433 | } application; | ||
1434 | |||
1396 | } details; | 1435 | } details; |
1397 | 1436 | ||
1398 | }; | 1437 | }; |
@@ -1465,11 +1504,6 @@ static struct GNUNET_CONTAINER_MultiPeerMap *ephemeral_map; | |||
1465 | */ | 1504 | */ |
1466 | static struct GNUNET_SCHEDULER_Task *ephemeral_task; | 1505 | static struct GNUNET_SCHEDULER_Task *ephemeral_task; |
1467 | 1506 | ||
1468 | /** | ||
1469 | * Our connection to ATS for allocation and bootstrapping. | ||
1470 | */ | ||
1471 | static struct GNUNET_ATS_TransportHandle *ats; | ||
1472 | |||
1473 | 1507 | ||
1474 | /** | 1508 | /** |
1475 | * Free cached ephemeral key. | 1509 | * Free cached ephemeral key. |
@@ -1497,7 +1531,7 @@ static struct Neighbour * | |||
1497 | lookup_neighbour (const struct GNUNET_PeerIdentity *pid) | 1531 | lookup_neighbour (const struct GNUNET_PeerIdentity *pid) |
1498 | { | 1532 | { |
1499 | return GNUNET_CONTAINER_multipeermap_get (neighbours, | 1533 | return GNUNET_CONTAINER_multipeermap_get (neighbours, |
1500 | pid); | 1534 | pid); |
1501 | } | 1535 | } |
1502 | 1536 | ||
1503 | 1537 | ||
@@ -1561,9 +1595,9 @@ free_distance_vector_hop (struct DistanceVectorHop *dvh) | |||
1561 | if (NULL == dv->dv_head) | 1595 | if (NULL == dv->dv_head) |
1562 | { | 1596 | { |
1563 | GNUNET_assert (GNUNET_YES == | 1597 | GNUNET_assert (GNUNET_YES == |
1564 | GNUNET_CONTAINER_multipeermap_remove (dv_routes, | 1598 | GNUNET_CONTAINER_multipeermap_remove (dv_routes, |
1565 | &dv->target, | 1599 | &dv->target, |
1566 | dv)); | 1600 | dv)); |
1567 | if (NULL != dv->timeout_task) | 1601 | if (NULL != dv->timeout_task) |
1568 | GNUNET_SCHEDULER_cancel (dv->timeout_task); | 1602 | GNUNET_SCHEDULER_cancel (dv->timeout_task); |
1569 | GNUNET_free (dv); | 1603 | GNUNET_free (dv); |
@@ -1602,18 +1636,18 @@ free_dv_route (struct DistanceVector *dv) | |||
1602 | */ | 1636 | */ |
1603 | static void | 1637 | static void |
1604 | notify_monitor (struct TransportClient *tc, | 1638 | notify_monitor (struct TransportClient *tc, |
1605 | const struct GNUNET_PeerIdentity *peer, | 1639 | const struct GNUNET_PeerIdentity *peer, |
1606 | const char *address, | 1640 | const char *address, |
1607 | enum GNUNET_NetworkType nt, | 1641 | enum GNUNET_NetworkType nt, |
1608 | const struct MonitorEvent *me) | 1642 | const struct MonitorEvent *me) |
1609 | { | 1643 | { |
1610 | struct GNUNET_MQ_Envelope *env; | 1644 | struct GNUNET_MQ_Envelope *env; |
1611 | struct GNUNET_TRANSPORT_MonitorData *md; | 1645 | struct GNUNET_TRANSPORT_MonitorData *md; |
1612 | size_t addr_len = strlen (address) + 1; | 1646 | size_t addr_len = strlen (address) + 1; |
1613 | 1647 | ||
1614 | env = GNUNET_MQ_msg_extra (md, | 1648 | env = GNUNET_MQ_msg_extra (md, |
1615 | addr_len, | 1649 | addr_len, |
1616 | GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_DATA); | 1650 | GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_DATA); |
1617 | md->nt = htonl ((uint32_t) nt); | 1651 | md->nt = htonl ((uint32_t) nt); |
1618 | md->peer = *peer; | 1652 | md->peer = *peer; |
1619 | md->last_validation = GNUNET_TIME_absolute_hton (me->last_validation); | 1653 | md->last_validation = GNUNET_TIME_absolute_hton (me->last_validation); |
@@ -1624,10 +1658,10 @@ notify_monitor (struct TransportClient *tc, | |||
1624 | md->num_msg_pending = htonl (me->num_msg_pending); | 1658 | md->num_msg_pending = htonl (me->num_msg_pending); |
1625 | md->num_bytes_pending = htonl (me->num_bytes_pending); | 1659 | md->num_bytes_pending = htonl (me->num_bytes_pending); |
1626 | memcpy (&md[1], | 1660 | memcpy (&md[1], |
1627 | address, | 1661 | address, |
1628 | addr_len); | 1662 | addr_len); |
1629 | GNUNET_MQ_send (tc->mq, | 1663 | GNUNET_MQ_send (tc->mq, |
1630 | env); | 1664 | env); |
1631 | } | 1665 | } |
1632 | 1666 | ||
1633 | 1667 | ||
@@ -1642,9 +1676,9 @@ notify_monitor (struct TransportClient *tc, | |||
1642 | */ | 1676 | */ |
1643 | static void | 1677 | static void |
1644 | notify_monitors (const struct GNUNET_PeerIdentity *peer, | 1678 | notify_monitors (const struct GNUNET_PeerIdentity *peer, |
1645 | const char *address, | 1679 | const char *address, |
1646 | enum GNUNET_NetworkType nt, | 1680 | enum GNUNET_NetworkType nt, |
1647 | const struct MonitorEvent *me) | 1681 | const struct MonitorEvent *me) |
1648 | { | 1682 | { |
1649 | static struct GNUNET_PeerIdentity zero; | 1683 | static struct GNUNET_PeerIdentity zero; |
1650 | 1684 | ||
@@ -1657,17 +1691,17 @@ notify_monitors (const struct GNUNET_PeerIdentity *peer, | |||
1657 | if (tc->details.monitor.one_shot) | 1691 | if (tc->details.monitor.one_shot) |
1658 | continue; | 1692 | continue; |
1659 | if ( (0 != memcmp (&tc->details.monitor.peer, | 1693 | if ( (0 != memcmp (&tc->details.monitor.peer, |
1660 | &zero, | 1694 | &zero, |
1661 | sizeof (zero))) && | 1695 | sizeof (zero))) && |
1662 | (0 != memcmp (&tc->details.monitor.peer, | 1696 | (0 != memcmp (&tc->details.monitor.peer, |
1663 | peer, | 1697 | peer, |
1664 | sizeof (*peer))) ) | 1698 | sizeof (*peer))) ) |
1665 | continue; | 1699 | continue; |
1666 | notify_monitor (tc, | 1700 | notify_monitor (tc, |
1667 | peer, | 1701 | peer, |
1668 | address, | 1702 | address, |
1669 | nt, | 1703 | nt, |
1670 | me); | 1704 | me); |
1671 | } | 1705 | } |
1672 | } | 1706 | } |
1673 | 1707 | ||
@@ -1683,8 +1717,8 @@ notify_monitors (const struct GNUNET_PeerIdentity *peer, | |||
1683 | */ | 1717 | */ |
1684 | static void * | 1718 | static void * |
1685 | client_connect_cb (void *cls, | 1719 | client_connect_cb (void *cls, |
1686 | struct GNUNET_SERVICE_Client *client, | 1720 | struct GNUNET_SERVICE_Client *client, |
1687 | struct GNUNET_MQ_Handle *mq) | 1721 | struct GNUNET_MQ_Handle *mq) |
1688 | { | 1722 | { |
1689 | struct TransportClient *tc; | 1723 | struct TransportClient *tc; |
1690 | 1724 | ||
@@ -1712,11 +1746,11 @@ free_reassembly_context (struct ReassemblyContext *rc) | |||
1712 | struct Neighbour *n = rc->neighbour; | 1746 | struct Neighbour *n = rc->neighbour; |
1713 | 1747 | ||
1714 | GNUNET_assert (rc == | 1748 | GNUNET_assert (rc == |
1715 | GNUNET_CONTAINER_heap_remove_node (rc->hn)); | 1749 | GNUNET_CONTAINER_heap_remove_node (rc->hn)); |
1716 | GNUNET_assert (GNUNET_OK == | 1750 | GNUNET_assert (GNUNET_OK == |
1717 | GNUNET_CONTAINER_multishortmap_remove (n->reassembly_map, | 1751 | GNUNET_CONTAINER_multishortmap_remove (n->reassembly_map, |
1718 | &rc->msg_uuid, | 1752 | &rc->msg_uuid, |
1719 | rc)); | 1753 | rc)); |
1720 | GNUNET_free (rc); | 1754 | GNUNET_free (rc); |
1721 | } | 1755 | } |
1722 | 1756 | ||
@@ -1742,8 +1776,8 @@ reassembly_cleanup_task (void *cls) | |||
1742 | } | 1776 | } |
1743 | GNUNET_assert (NULL == n->reassembly_timeout_task); | 1777 | GNUNET_assert (NULL == n->reassembly_timeout_task); |
1744 | n->reassembly_timeout_task = GNUNET_SCHEDULER_add_at (rc->reassembly_timeout, | 1778 | n->reassembly_timeout_task = GNUNET_SCHEDULER_add_at (rc->reassembly_timeout, |
1745 | &reassembly_cleanup_task, | 1779 | &reassembly_cleanup_task, |
1746 | n); | 1780 | n); |
1747 | return; | 1781 | return; |
1748 | } | 1782 | } |
1749 | } | 1783 | } |
@@ -1781,18 +1815,18 @@ free_neighbour (struct Neighbour *neighbour) | |||
1781 | { | 1815 | { |
1782 | struct DistanceVectorHop *dvh; | 1816 | struct DistanceVectorHop *dvh; |
1783 | 1817 | ||
1784 | GNUNET_assert (NULL == neighbour->session_head); | 1818 | GNUNET_assert (NULL == neighbour->queue_head); |
1785 | GNUNET_assert (GNUNET_YES == | 1819 | GNUNET_assert (GNUNET_YES == |
1786 | GNUNET_CONTAINER_multipeermap_remove (neighbours, | 1820 | GNUNET_CONTAINER_multipeermap_remove (neighbours, |
1787 | &neighbour->pid, | 1821 | &neighbour->pid, |
1788 | neighbour)); | 1822 | neighbour)); |
1789 | if (NULL != neighbour->timeout_task) | 1823 | if (NULL != neighbour->timeout_task) |
1790 | GNUNET_SCHEDULER_cancel (neighbour->timeout_task); | 1824 | GNUNET_SCHEDULER_cancel (neighbour->timeout_task); |
1791 | if (NULL != neighbour->reassembly_map) | 1825 | if (NULL != neighbour->reassembly_map) |
1792 | { | 1826 | { |
1793 | GNUNET_CONTAINER_multishortmap_iterate (neighbour->reassembly_map, | 1827 | GNUNET_CONTAINER_multishortmap_iterate (neighbour->reassembly_map, |
1794 | &free_reassembly_cb, | 1828 | &free_reassembly_cb, |
1795 | NULL); | 1829 | NULL); |
1796 | GNUNET_CONTAINER_multishortmap_destroy (neighbour->reassembly_map); | 1830 | GNUNET_CONTAINER_multishortmap_destroy (neighbour->reassembly_map); |
1797 | neighbour->reassembly_map = NULL; | 1831 | neighbour->reassembly_map = NULL; |
1798 | GNUNET_CONTAINER_heap_destroy (neighbour->reassembly_heap); | 1832 | GNUNET_CONTAINER_heap_destroy (neighbour->reassembly_heap); |
@@ -1815,15 +1849,15 @@ free_neighbour (struct Neighbour *neighbour) | |||
1815 | */ | 1849 | */ |
1816 | static void | 1850 | static void |
1817 | core_send_connect_info (struct TransportClient *tc, | 1851 | core_send_connect_info (struct TransportClient *tc, |
1818 | const struct GNUNET_PeerIdentity *pid, | 1852 | const struct GNUNET_PeerIdentity *pid, |
1819 | struct GNUNET_BANDWIDTH_Value32NBO quota_out) | 1853 | struct GNUNET_BANDWIDTH_Value32NBO quota_out) |
1820 | { | 1854 | { |
1821 | struct GNUNET_MQ_Envelope *env; | 1855 | struct GNUNET_MQ_Envelope *env; |
1822 | struct ConnectInfoMessage *cim; | 1856 | struct ConnectInfoMessage *cim; |
1823 | 1857 | ||
1824 | GNUNET_assert (CT_CORE == tc->type); | 1858 | GNUNET_assert (CT_CORE == tc->type); |
1825 | env = GNUNET_MQ_msg (cim, | 1859 | env = GNUNET_MQ_msg (cim, |
1826 | GNUNET_MESSAGE_TYPE_TRANSPORT_CONNECT); | 1860 | GNUNET_MESSAGE_TYPE_TRANSPORT_CONNECT); |
1827 | cim->quota_out = quota_out; | 1861 | cim->quota_out = quota_out; |
1828 | cim->id = *pid; | 1862 | cim->id = *pid; |
1829 | GNUNET_MQ_send (tc->mq, | 1863 | GNUNET_MQ_send (tc->mq, |
@@ -1839,7 +1873,7 @@ core_send_connect_info (struct TransportClient *tc, | |||
1839 | */ | 1873 | */ |
1840 | static void | 1874 | static void |
1841 | cores_send_connect_info (const struct GNUNET_PeerIdentity *pid, | 1875 | cores_send_connect_info (const struct GNUNET_PeerIdentity *pid, |
1842 | struct GNUNET_BANDWIDTH_Value32NBO quota_out) | 1876 | struct GNUNET_BANDWIDTH_Value32NBO quota_out) |
1843 | { | 1877 | { |
1844 | for (struct TransportClient *tc = clients_head; | 1878 | for (struct TransportClient *tc = clients_head; |
1845 | NULL != tc; | 1879 | NULL != tc; |
@@ -1848,8 +1882,8 @@ cores_send_connect_info (const struct GNUNET_PeerIdentity *pid, | |||
1848 | if (CT_CORE != tc->type) | 1882 | if (CT_CORE != tc->type) |
1849 | continue; | 1883 | continue; |
1850 | core_send_connect_info (tc, | 1884 | core_send_connect_info (tc, |
1851 | pid, | 1885 | pid, |
1852 | quota_out); | 1886 | quota_out); |
1853 | } | 1887 | } |
1854 | } | 1888 | } |
1855 | 1889 | ||
@@ -1872,10 +1906,10 @@ cores_send_disconnect_info (const struct GNUNET_PeerIdentity *pid) | |||
1872 | if (CT_CORE != tc->type) | 1906 | if (CT_CORE != tc->type) |
1873 | continue; | 1907 | continue; |
1874 | env = GNUNET_MQ_msg (dim, | 1908 | env = GNUNET_MQ_msg (dim, |
1875 | GNUNET_MESSAGE_TYPE_TRANSPORT_DISCONNECT); | 1909 | GNUNET_MESSAGE_TYPE_TRANSPORT_DISCONNECT); |
1876 | dim->peer = *pid; | 1910 | dim->peer = *pid; |
1877 | GNUNET_MQ_send (tc->mq, | 1911 | GNUNET_MQ_send (tc->mq, |
1878 | env); | 1912 | env); |
1879 | } | 1913 | } |
1880 | } | 1914 | } |
1881 | 1915 | ||
@@ -1886,7 +1920,7 @@ cores_send_disconnect_info (const struct GNUNET_PeerIdentity *pid) | |||
1886 | * communicator for transmission (updating the tracker, and re-scheduling | 1920 | * communicator for transmission (updating the tracker, and re-scheduling |
1887 | * itself if applicable). | 1921 | * itself if applicable). |
1888 | * | 1922 | * |
1889 | * @param cls the `struct GNUNET_ATS_Session` to process transmissions for | 1923 | * @param cls the `struct Queue` to process transmissions for |
1890 | */ | 1924 | */ |
1891 | static void | 1925 | static void |
1892 | transmit_on_queue (void *cls); | 1926 | transmit_on_queue (void *cls); |
@@ -1902,7 +1936,7 @@ transmit_on_queue (void *cls); | |||
1902 | * @param queue the queue to do scheduling for | 1936 | * @param queue the queue to do scheduling for |
1903 | */ | 1937 | */ |
1904 | static void | 1938 | static void |
1905 | schedule_transmit_on_queue (struct GNUNET_ATS_Session *queue) | 1939 | schedule_transmit_on_queue (struct Queue *queue) |
1906 | { | 1940 | { |
1907 | struct Neighbour *n = queue->neighbour; | 1941 | struct Neighbour *n = queue->neighbour; |
1908 | struct PendingMessage *pm = n->pending_msg_head; | 1942 | struct PendingMessage *pm = n->pending_msg_head; |
@@ -1910,20 +1944,21 @@ schedule_transmit_on_queue (struct GNUNET_ATS_Session *queue) | |||
1910 | unsigned int wsize; | 1944 | unsigned int wsize; |
1911 | 1945 | ||
1912 | GNUNET_assert (NULL != pm); | 1946 | GNUNET_assert (NULL != pm); |
1913 | if (queue->tc->details.communicator.total_queue_length >= COMMUNICATOR_TOTAL_QUEUE_LIMIT) | 1947 | if (queue->tc->details.communicator.total_queue_length >= |
1948 | COMMUNICATOR_TOTAL_QUEUE_LIMIT) | ||
1914 | { | 1949 | { |
1915 | GNUNET_STATISTICS_update (GST_stats, | 1950 | GNUNET_STATISTICS_update (GST_stats, |
1916 | "# Transmission throttled due to communicator queue limit", | 1951 | "# Transmission throttled due to communicator queue limit", |
1917 | 1, | 1952 | 1, |
1918 | GNUNET_NO); | 1953 | GNUNET_NO); |
1919 | return; | 1954 | return; |
1920 | } | 1955 | } |
1921 | if (queue->queue_length >= SESSION_QUEUE_LIMIT) | 1956 | if (queue->queue_length >= QUEUE_LENGTH_LIMIT) |
1922 | { | 1957 | { |
1923 | GNUNET_STATISTICS_update (GST_stats, | 1958 | GNUNET_STATISTICS_update (GST_stats, |
1924 | "# Transmission throttled due to session queue limit", | 1959 | "# Transmission throttled due to queue queue limit", |
1925 | 1, | 1960 | 1, |
1926 | GNUNET_NO); | 1961 | GNUNET_NO); |
1927 | return; | 1962 | return; |
1928 | } | 1963 | } |
1929 | 1964 | ||
@@ -1931,40 +1966,41 @@ schedule_transmit_on_queue (struct GNUNET_ATS_Session *queue) | |||
1931 | ? pm->bytes_msg /* FIXME: add overheads? */ | 1966 | ? pm->bytes_msg /* FIXME: add overheads? */ |
1932 | : queue->mtu; | 1967 | : queue->mtu; |
1933 | out_delay = GNUNET_BANDWIDTH_tracker_get_delay (&queue->tracker_out, | 1968 | out_delay = GNUNET_BANDWIDTH_tracker_get_delay (&queue->tracker_out, |
1934 | wsize); | 1969 | wsize); |
1935 | out_delay = GNUNET_TIME_relative_max (GNUNET_TIME_absolute_get_remaining (pm->next_attempt), | 1970 | out_delay = GNUNET_TIME_relative_max (GNUNET_TIME_absolute_get_remaining (pm->next_attempt), |
1936 | out_delay); | 1971 | out_delay); |
1937 | if (0 == out_delay.rel_value_us) | 1972 | if (0 == out_delay.rel_value_us) |
1938 | return; /* we should run immediately! */ | 1973 | return; /* we should run immediately! */ |
1939 | /* queue has changed since we were scheduled, reschedule again */ | 1974 | /* queue has changed since we were scheduled, reschedule again */ |
1940 | queue->transmit_task = GNUNET_SCHEDULER_add_delayed (out_delay, | 1975 | queue->transmit_task |
1941 | &transmit_on_queue, | 1976 | = GNUNET_SCHEDULER_add_delayed (out_delay, |
1942 | queue); | 1977 | &transmit_on_queue, |
1978 | queue); | ||
1943 | if (out_delay.rel_value_us > DELAY_WARN_THRESHOLD.rel_value_us) | 1979 | if (out_delay.rel_value_us > DELAY_WARN_THRESHOLD.rel_value_us) |
1944 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 1980 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
1945 | "Next transmission on queue `%s' in %s (high delay)\n", | 1981 | "Next transmission on queue `%s' in %s (high delay)\n", |
1946 | queue->address, | 1982 | queue->address, |
1947 | GNUNET_STRINGS_relative_time_to_string (out_delay, | 1983 | GNUNET_STRINGS_relative_time_to_string (out_delay, |
1948 | GNUNET_YES)); | 1984 | GNUNET_YES)); |
1949 | else | 1985 | else |
1950 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1986 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1951 | "Next transmission on queue `%s' in %s\n", | 1987 | "Next transmission on queue `%s' in %s\n", |
1952 | queue->address, | 1988 | queue->address, |
1953 | GNUNET_STRINGS_relative_time_to_string (out_delay, | 1989 | GNUNET_STRINGS_relative_time_to_string (out_delay, |
1954 | GNUNET_YES)); | 1990 | GNUNET_YES)); |
1955 | } | 1991 | } |
1956 | 1992 | ||
1957 | 1993 | ||
1958 | /** | 1994 | /** |
1959 | * Free @a session. | 1995 | * Free @a queue. |
1960 | * | 1996 | * |
1961 | * @param session the session to free | 1997 | * @param queue the queue to free |
1962 | */ | 1998 | */ |
1963 | static void | 1999 | static void |
1964 | free_session (struct GNUNET_ATS_Session *session) | 2000 | free_queue (struct Queue *queue) |
1965 | { | 2001 | { |
1966 | struct Neighbour *neighbour = session->neighbour; | 2002 | struct Neighbour *neighbour = queue->neighbour; |
1967 | struct TransportClient *tc = session->tc; | 2003 | struct TransportClient *tc = queue->tc; |
1968 | struct MonitorEvent me = { | 2004 | struct MonitorEvent me = { |
1969 | .cs = GNUNET_TRANSPORT_CS_DOWN, | 2005 | .cs = GNUNET_TRANSPORT_CS_DOWN, |
1970 | .rtt = GNUNET_TIME_UNIT_FOREVER_REL | 2006 | .rtt = GNUNET_TIME_UNIT_FOREVER_REL |
@@ -1972,52 +2008,51 @@ free_session (struct GNUNET_ATS_Session *session) | |||
1972 | struct QueueEntry *qe; | 2008 | struct QueueEntry *qe; |
1973 | int maxxed; | 2009 | int maxxed; |
1974 | 2010 | ||
1975 | if (NULL != session->transmit_task) | 2011 | if (NULL != queue->transmit_task) |
1976 | { | 2012 | { |
1977 | GNUNET_SCHEDULER_cancel (session->transmit_task); | 2013 | GNUNET_SCHEDULER_cancel (queue->transmit_task); |
1978 | session->transmit_task = NULL; | 2014 | queue->transmit_task = NULL; |
1979 | } | 2015 | } |
1980 | GNUNET_CONTAINER_MDLL_remove (neighbour, | 2016 | GNUNET_CONTAINER_MDLL_remove (neighbour, |
1981 | neighbour->session_head, | 2017 | neighbour->queue_head, |
1982 | neighbour->session_tail, | 2018 | neighbour->queue_tail, |
1983 | session); | 2019 | queue); |
1984 | GNUNET_CONTAINER_MDLL_remove (client, | 2020 | GNUNET_CONTAINER_MDLL_remove (client, |
1985 | tc->details.communicator.session_head, | 2021 | tc->details.communicator.queue_head, |
1986 | tc->details.communicator.session_tail, | 2022 | tc->details.communicator.queue_tail, |
1987 | session); | 2023 | queue); |
1988 | maxxed = (COMMUNICATOR_TOTAL_QUEUE_LIMIT >= tc->details.communicator.total_queue_length); | 2024 | maxxed = (COMMUNICATOR_TOTAL_QUEUE_LIMIT >= tc->details.communicator.total_queue_length); |
1989 | while (NULL != (qe = session->queue_head)) | 2025 | while (NULL != (qe = queue->queue_head)) |
1990 | { | 2026 | { |
1991 | GNUNET_CONTAINER_DLL_remove (session->queue_head, | 2027 | GNUNET_CONTAINER_DLL_remove (queue->queue_head, |
1992 | session->queue_tail, | 2028 | queue->queue_tail, |
1993 | qe); | 2029 | qe); |
1994 | session->queue_length--; | 2030 | queue->queue_length--; |
1995 | tc->details.communicator.total_queue_length--; | 2031 | tc->details.communicator.total_queue_length--; |
1996 | GNUNET_free (qe); | 2032 | GNUNET_free (qe); |
1997 | } | 2033 | } |
1998 | GNUNET_assert (0 == session->queue_length); | 2034 | GNUNET_assert (0 == queue->queue_length); |
1999 | if ( (maxxed) && | 2035 | if ( (maxxed) && |
2000 | (COMMUNICATOR_TOTAL_QUEUE_LIMIT < tc->details.communicator.total_queue_length) ) | 2036 | (COMMUNICATOR_TOTAL_QUEUE_LIMIT < tc->details.communicator.total_queue_length) ) |
2001 | { | 2037 | { |
2002 | /* Communicator dropped below threshold, resume all queues */ | 2038 | /* Communicator dropped below threshold, resume all queues */ |
2003 | GNUNET_STATISTICS_update (GST_stats, | 2039 | GNUNET_STATISTICS_update (GST_stats, |
2004 | "# Transmission throttled due to communicator queue limit", | 2040 | "# Transmission throttled due to communicator queue limit", |
2005 | -1, | 2041 | -1, |
2006 | GNUNET_NO); | 2042 | GNUNET_NO); |
2007 | for (struct GNUNET_ATS_Session *s = tc->details.communicator.session_head; | 2043 | for (struct Queue *s = tc->details.communicator.queue_head; |
2008 | NULL != s; | 2044 | NULL != s; |
2009 | s = s->next_client) | 2045 | s = s->next_client) |
2010 | schedule_transmit_on_queue (s); | 2046 | schedule_transmit_on_queue (s); |
2011 | } | 2047 | } |
2012 | notify_monitors (&neighbour->pid, | 2048 | notify_monitors (&neighbour->pid, |
2013 | session->address, | 2049 | queue->address, |
2014 | session->nt, | 2050 | queue->nt, |
2015 | &me); | 2051 | &me); |
2016 | GNUNET_ATS_session_del (session->sr); | 2052 | GNUNET_BANDWIDTH_tracker_notification_stop (&queue->tracker_in); |
2017 | GNUNET_BANDWIDTH_tracker_notification_stop (&session->tracker_in); | 2053 | GNUNET_BANDWIDTH_tracker_notification_stop (&queue->tracker_out); |
2018 | GNUNET_BANDWIDTH_tracker_notification_stop (&session->tracker_out); | 2054 | GNUNET_free (queue); |
2019 | GNUNET_free (session); | 2055 | if (NULL == neighbour->queue_head) |
2020 | if (NULL == neighbour->session_head) | ||
2021 | { | 2056 | { |
2022 | cores_send_disconnect_info (&neighbour->pid); | 2057 | cores_send_disconnect_info (&neighbour->pid); |
2023 | free_neighbour (neighbour); | 2058 | free_neighbour (neighbour); |
@@ -2036,8 +2071,8 @@ free_address_list_entry (struct AddressListEntry *ale) | |||
2036 | struct TransportClient *tc = ale->tc; | 2071 | struct TransportClient *tc = ale->tc; |
2037 | 2072 | ||
2038 | GNUNET_CONTAINER_DLL_remove (tc->details.communicator.addr_head, | 2073 | GNUNET_CONTAINER_DLL_remove (tc->details.communicator.addr_head, |
2039 | tc->details.communicator.addr_tail, | 2074 | tc->details.communicator.addr_tail, |
2040 | ale); | 2075 | ale); |
2041 | if (NULL != ale->sc) | 2076 | if (NULL != ale->sc) |
2042 | { | 2077 | { |
2043 | GNUNET_PEERSTORE_store_cancel (ale->sc); | 2078 | GNUNET_PEERSTORE_store_cancel (ale->sc); |
@@ -2053,6 +2088,33 @@ free_address_list_entry (struct AddressListEntry *ale) | |||
2053 | 2088 | ||
2054 | 2089 | ||
2055 | /** | 2090 | /** |
2091 | * Stop the peer request in @a value. | ||
2092 | * | ||
2093 | * @param cls a `struct TransportClient` that no longer makes the request | ||
2094 | * @param pid the peer's identity | ||
2095 | * @param value a `struct PeerRequest` | ||
2096 | * @return #GNUNET_YES (always) | ||
2097 | */ | ||
2098 | static int | ||
2099 | stop_peer_request (void *cls, | ||
2100 | const struct GNUNET_PeerIdentity *pid, | ||
2101 | void *value) | ||
2102 | { | ||
2103 | struct TransportClient *tc = cls; | ||
2104 | struct PeerRequest *pr = value; | ||
2105 | |||
2106 | GNUNET_PEERSTORE_watch_cancel (pr->wc); | ||
2107 | GNUNET_assert (GNUNET_YES == | ||
2108 | GNUNET_CONTAINER_multipeermap_remove (tc->details.application.requests, | ||
2109 | pid, | ||
2110 | pr)); | ||
2111 | GNUNET_free (pr); | ||
2112 | |||
2113 | return GNUNET_OK; | ||
2114 | } | ||
2115 | |||
2116 | |||
2117 | /** | ||
2056 | * Called whenever a client is disconnected. Frees our | 2118 | * Called whenever a client is disconnected. Frees our |
2057 | * resources associated with that client. | 2119 | * resources associated with that client. |
2058 | * | 2120 | * |
@@ -2062,8 +2124,8 @@ free_address_list_entry (struct AddressListEntry *ale) | |||
2062 | */ | 2124 | */ |
2063 | static void | 2125 | static void |
2064 | client_disconnect_cb (void *cls, | 2126 | client_disconnect_cb (void *cls, |
2065 | struct GNUNET_SERVICE_Client *client, | 2127 | struct GNUNET_SERVICE_Client *client, |
2066 | void *app_ctx) | 2128 | void *app_ctx) |
2067 | { | 2129 | { |
2068 | struct TransportClient *tc = app_ctx; | 2130 | struct TransportClient *tc = app_ctx; |
2069 | 2131 | ||
@@ -2083,11 +2145,11 @@ client_disconnect_cb (void *cls, | |||
2083 | 2145 | ||
2084 | while (NULL != (pm = tc->details.core.pending_msg_head)) | 2146 | while (NULL != (pm = tc->details.core.pending_msg_head)) |
2085 | { | 2147 | { |
2086 | GNUNET_CONTAINER_MDLL_remove (client, | 2148 | GNUNET_CONTAINER_MDLL_remove (client, |
2087 | tc->details.core.pending_msg_head, | 2149 | tc->details.core.pending_msg_head, |
2088 | tc->details.core.pending_msg_tail, | 2150 | tc->details.core.pending_msg_tail, |
2089 | pm); | 2151 | pm); |
2090 | pm->client = NULL; | 2152 | pm->client = NULL; |
2091 | } | 2153 | } |
2092 | } | 2154 | } |
2093 | break; | 2155 | break; |
@@ -2095,16 +2157,22 @@ client_disconnect_cb (void *cls, | |||
2095 | break; | 2157 | break; |
2096 | case CT_COMMUNICATOR: | 2158 | case CT_COMMUNICATOR: |
2097 | { | 2159 | { |
2098 | struct GNUNET_ATS_Session *q; | 2160 | struct Queue *q; |
2099 | struct AddressListEntry *ale; | 2161 | struct AddressListEntry *ale; |
2100 | 2162 | ||
2101 | while (NULL != (q = tc->details.communicator.session_head)) | 2163 | while (NULL != (q = tc->details.communicator.queue_head)) |
2102 | free_session (q); | 2164 | free_queue (q); |
2103 | while (NULL != (ale = tc->details.communicator.addr_head)) | 2165 | while (NULL != (ale = tc->details.communicator.addr_head)) |
2104 | free_address_list_entry (ale); | 2166 | free_address_list_entry (ale); |
2105 | GNUNET_free (tc->details.communicator.address_prefix); | 2167 | GNUNET_free (tc->details.communicator.address_prefix); |
2106 | } | 2168 | } |
2107 | break; | 2169 | break; |
2170 | case CT_APPLICATION: | ||
2171 | GNUNET_CONTAINER_multipeermap_iterate (tc->details.application.requests, | ||
2172 | &stop_peer_request, | ||
2173 | tc); | ||
2174 | GNUNET_CONTAINER_multipeermap_destroy (tc->details.application.requests); | ||
2175 | break; | ||
2108 | } | 2176 | } |
2109 | GNUNET_free (tc); | 2177 | GNUNET_free (tc); |
2110 | } | 2178 | } |
@@ -2121,15 +2189,15 @@ client_disconnect_cb (void *cls, | |||
2121 | */ | 2189 | */ |
2122 | static int | 2190 | static int |
2123 | notify_client_connect_info (void *cls, | 2191 | notify_client_connect_info (void *cls, |
2124 | const struct GNUNET_PeerIdentity *pid, | 2192 | const struct GNUNET_PeerIdentity *pid, |
2125 | void *value) | 2193 | void *value) |
2126 | { | 2194 | { |
2127 | struct TransportClient *tc = cls; | 2195 | struct TransportClient *tc = cls; |
2128 | struct Neighbour *neighbour = value; | 2196 | struct Neighbour *neighbour = value; |
2129 | 2197 | ||
2130 | core_send_connect_info (tc, | 2198 | core_send_connect_info (tc, |
2131 | pid, | 2199 | pid, |
2132 | neighbour->quota_out); | 2200 | neighbour->quota_out); |
2133 | return GNUNET_OK; | 2201 | return GNUNET_OK; |
2134 | } | 2202 | } |
2135 | 2203 | ||
@@ -2144,7 +2212,7 @@ notify_client_connect_info (void *cls, | |||
2144 | */ | 2212 | */ |
2145 | static void | 2213 | static void |
2146 | handle_client_start (void *cls, | 2214 | handle_client_start (void *cls, |
2147 | const struct StartMessage *start) | 2215 | const struct StartMessage *start) |
2148 | { | 2216 | { |
2149 | struct TransportClient *tc = cls; | 2217 | struct TransportClient *tc = cls; |
2150 | uint32_t options; | 2218 | uint32_t options; |
@@ -2169,8 +2237,8 @@ handle_client_start (void *cls, | |||
2169 | } | 2237 | } |
2170 | tc->type = CT_CORE; | 2238 | tc->type = CT_CORE; |
2171 | GNUNET_CONTAINER_multipeermap_iterate (neighbours, | 2239 | GNUNET_CONTAINER_multipeermap_iterate (neighbours, |
2172 | ¬ify_client_connect_info, | 2240 | ¬ify_client_connect_info, |
2173 | tc); | 2241 | tc); |
2174 | GNUNET_SERVICE_client_continue (tc->client); | 2242 | GNUNET_SERVICE_client_continue (tc->client); |
2175 | } | 2243 | } |
2176 | 2244 | ||
@@ -2183,7 +2251,7 @@ handle_client_start (void *cls, | |||
2183 | */ | 2251 | */ |
2184 | static int | 2252 | static int |
2185 | check_client_send (void *cls, | 2253 | check_client_send (void *cls, |
2186 | const struct OutboundMessage *obm) | 2254 | const struct OutboundMessage *obm) |
2187 | { | 2255 | { |
2188 | struct TransportClient *tc = cls; | 2256 | struct TransportClient *tc = cls; |
2189 | uint16_t size; | 2257 | uint16_t size; |
@@ -2248,14 +2316,14 @@ free_pending_message (struct PendingMessage *pm) | |||
2248 | if (NULL != tc) | 2316 | if (NULL != tc) |
2249 | { | 2317 | { |
2250 | GNUNET_CONTAINER_MDLL_remove (client, | 2318 | GNUNET_CONTAINER_MDLL_remove (client, |
2251 | tc->details.core.pending_msg_head, | 2319 | tc->details.core.pending_msg_head, |
2252 | tc->details.core.pending_msg_tail, | 2320 | tc->details.core.pending_msg_tail, |
2253 | pm); | 2321 | pm); |
2254 | } | 2322 | } |
2255 | GNUNET_CONTAINER_MDLL_remove (neighbour, | 2323 | GNUNET_CONTAINER_MDLL_remove (neighbour, |
2256 | target->pending_msg_head, | 2324 | target->pending_msg_head, |
2257 | target->pending_msg_tail, | 2325 | target->pending_msg_tail, |
2258 | pm); | 2326 | pm); |
2259 | free_fragment_tree (pm); | 2327 | free_fragment_tree (pm); |
2260 | GNUNET_free_non_null (pm->bpm); | 2328 | GNUNET_free_non_null (pm->bpm); |
2261 | GNUNET_free (pm); | 2329 | GNUNET_free (pm); |
@@ -2276,8 +2344,8 @@ free_pending_message (struct PendingMessage *pm) | |||
2276 | */ | 2344 | */ |
2277 | static void | 2345 | static void |
2278 | client_send_response (struct PendingMessage *pm, | 2346 | client_send_response (struct PendingMessage *pm, |
2279 | int success, | 2347 | int success, |
2280 | uint32_t bytes_physical) | 2348 | uint32_t bytes_physical) |
2281 | { | 2349 | { |
2282 | struct TransportClient *tc = pm->client; | 2350 | struct TransportClient *tc = pm->client; |
2283 | struct Neighbour *target = pm->target; | 2351 | struct Neighbour *target = pm->target; |
@@ -2287,7 +2355,7 @@ client_send_response (struct PendingMessage *pm, | |||
2287 | if (NULL != tc) | 2355 | if (NULL != tc) |
2288 | { | 2356 | { |
2289 | env = GNUNET_MQ_msg (som, | 2357 | env = GNUNET_MQ_msg (som, |
2290 | GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK); | 2358 | GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK); |
2291 | som->success = htonl ((uint32_t) success); | 2359 | som->success = htonl ((uint32_t) success); |
2292 | som->bytes_msg = htons (pm->bytes_msg); | 2360 | som->bytes_msg = htons (pm->bytes_msg); |
2293 | som->bytes_physical = htonl (bytes_physical); | 2361 | som->bytes_physical = htonl (bytes_physical); |
@@ -2324,22 +2392,22 @@ check_queue_timeouts (void *cls) | |||
2324 | if (pos->timeout.abs_value_us <= now.abs_value_us) | 2392 | if (pos->timeout.abs_value_us <= now.abs_value_us) |
2325 | { | 2393 | { |
2326 | GNUNET_STATISTICS_update (GST_stats, | 2394 | GNUNET_STATISTICS_update (GST_stats, |
2327 | "# messages dropped (timeout before confirmation)", | 2395 | "# messages dropped (timeout before confirmation)", |
2328 | 1, | 2396 | 1, |
2329 | GNUNET_NO); | 2397 | GNUNET_NO); |
2330 | client_send_response (pm, | 2398 | client_send_response (pm, |
2331 | GNUNET_NO, | 2399 | GNUNET_NO, |
2332 | 0); | 2400 | 0); |
2333 | continue; | 2401 | continue; |
2334 | } | 2402 | } |
2335 | earliest_timeout = GNUNET_TIME_absolute_min (earliest_timeout, | 2403 | earliest_timeout = GNUNET_TIME_absolute_min (earliest_timeout, |
2336 | pos->timeout); | 2404 | pos->timeout); |
2337 | } | 2405 | } |
2338 | n->earliest_timeout = earliest_timeout; | 2406 | n->earliest_timeout = earliest_timeout; |
2339 | if (NULL != n->pending_msg_head) | 2407 | if (NULL != n->pending_msg_head) |
2340 | n->timeout_task = GNUNET_SCHEDULER_add_at (earliest_timeout, | 2408 | n->timeout_task = GNUNET_SCHEDULER_add_at (earliest_timeout, |
2341 | &check_queue_timeouts, | 2409 | &check_queue_timeouts, |
2342 | n); | 2410 | n); |
2343 | } | 2411 | } |
2344 | 2412 | ||
2345 | 2413 | ||
@@ -2351,13 +2419,14 @@ check_queue_timeouts (void *cls) | |||
2351 | */ | 2419 | */ |
2352 | static void | 2420 | static void |
2353 | handle_client_send (void *cls, | 2421 | handle_client_send (void *cls, |
2354 | const struct OutboundMessage *obm) | 2422 | const struct OutboundMessage *obm) |
2355 | { | 2423 | { |
2356 | struct TransportClient *tc = cls; | 2424 | struct TransportClient *tc = cls; |
2357 | struct PendingMessage *pm; | 2425 | struct PendingMessage *pm; |
2358 | const struct GNUNET_MessageHeader *obmm; | 2426 | const struct GNUNET_MessageHeader *obmm; |
2359 | struct Neighbour *target; | 2427 | struct Neighbour *target; |
2360 | uint32_t bytes_msg; | 2428 | uint32_t bytes_msg; |
2429 | int was_empty; | ||
2361 | 2430 | ||
2362 | GNUNET_assert (CT_CORE == tc->type); | 2431 | GNUNET_assert (CT_CORE == tc->type); |
2363 | obmm = (const struct GNUNET_MessageHeader *) &obm[1]; | 2432 | obmm = (const struct GNUNET_MessageHeader *) &obm[1]; |
@@ -2373,36 +2442,37 @@ handle_client_send (void *cls, | |||
2373 | struct SendOkMessage *som; | 2442 | struct SendOkMessage *som; |
2374 | 2443 | ||
2375 | env = GNUNET_MQ_msg (som, | 2444 | env = GNUNET_MQ_msg (som, |
2376 | GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK); | 2445 | GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK); |
2377 | som->success = htonl (GNUNET_SYSERR); | 2446 | som->success = htonl (GNUNET_SYSERR); |
2378 | som->bytes_msg = htonl (bytes_msg); | 2447 | som->bytes_msg = htonl (bytes_msg); |
2379 | som->bytes_physical = htonl (0); | 2448 | som->bytes_physical = htonl (0); |
2380 | som->peer = obm->peer; | 2449 | som->peer = obm->peer; |
2381 | GNUNET_MQ_send (tc->mq, | 2450 | GNUNET_MQ_send (tc->mq, |
2382 | env); | 2451 | env); |
2383 | GNUNET_SERVICE_client_continue (tc->client); | 2452 | GNUNET_SERVICE_client_continue (tc->client); |
2384 | GNUNET_STATISTICS_update (GST_stats, | 2453 | GNUNET_STATISTICS_update (GST_stats, |
2385 | "# messages dropped (neighbour unknown)", | 2454 | "# messages dropped (neighbour unknown)", |
2386 | 1, | 2455 | 1, |
2387 | GNUNET_NO); | 2456 | GNUNET_NO); |
2388 | return; | 2457 | return; |
2389 | } | 2458 | } |
2459 | was_empty = (NULL == target->pending_msg_head); | ||
2390 | pm = GNUNET_malloc (sizeof (struct PendingMessage) + bytes_msg); | 2460 | pm = GNUNET_malloc (sizeof (struct PendingMessage) + bytes_msg); |
2391 | pm->client = tc; | 2461 | pm->client = tc; |
2392 | pm->target = target; | 2462 | pm->target = target; |
2393 | pm->bytes_msg = bytes_msg; | 2463 | pm->bytes_msg = bytes_msg; |
2394 | pm->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_relative_ntoh (obm->timeout)); | 2464 | pm->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_relative_ntoh (obm->timeout)); |
2395 | memcpy (&pm[1], | 2465 | memcpy (&pm[1], |
2396 | &obm[1], | 2466 | &obm[1], |
2397 | bytes_msg); | 2467 | bytes_msg); |
2398 | GNUNET_CONTAINER_MDLL_insert (neighbour, | 2468 | GNUNET_CONTAINER_MDLL_insert (neighbour, |
2399 | target->pending_msg_head, | 2469 | target->pending_msg_head, |
2400 | target->pending_msg_tail, | 2470 | target->pending_msg_tail, |
2401 | pm); | 2471 | pm); |
2402 | GNUNET_CONTAINER_MDLL_insert (client, | 2472 | GNUNET_CONTAINER_MDLL_insert (client, |
2403 | tc->details.core.pending_msg_head, | 2473 | tc->details.core.pending_msg_head, |
2404 | tc->details.core.pending_msg_tail, | 2474 | tc->details.core.pending_msg_tail, |
2405 | pm); | 2475 | pm); |
2406 | if (target->earliest_timeout.abs_value_us > pm->timeout.abs_value_us) | 2476 | if (target->earliest_timeout.abs_value_us > pm->timeout.abs_value_us) |
2407 | { | 2477 | { |
2408 | target->earliest_timeout.abs_value_us = pm->timeout.abs_value_us; | 2478 | target->earliest_timeout.abs_value_us = pm->timeout.abs_value_us; |
@@ -2410,8 +2480,19 @@ handle_client_send (void *cls, | |||
2410 | GNUNET_SCHEDULER_cancel (target->timeout_task); | 2480 | GNUNET_SCHEDULER_cancel (target->timeout_task); |
2411 | target->timeout_task | 2481 | target->timeout_task |
2412 | = GNUNET_SCHEDULER_add_at (target->earliest_timeout, | 2482 | = GNUNET_SCHEDULER_add_at (target->earliest_timeout, |
2413 | &check_queue_timeouts, | 2483 | &check_queue_timeouts, |
2414 | target); | 2484 | target); |
2485 | } | ||
2486 | if (! was_empty) | ||
2487 | return; /* all queues must already be busy */ | ||
2488 | for (struct Queue *queue = target->queue_head; | ||
2489 | NULL != queue; | ||
2490 | queue = queue->next_neighbour) | ||
2491 | { | ||
2492 | /* try transmission on any queue that is idle */ | ||
2493 | if (NULL == queue->transmit_task) | ||
2494 | queue->transmit_task = GNUNET_SCHEDULER_add_now (&transmit_on_queue, | ||
2495 | queue); | ||
2415 | } | 2496 | } |
2416 | } | 2497 | } |
2417 | 2498 | ||
@@ -2476,7 +2557,7 @@ handle_communicator_available (void *cls, | |||
2476 | */ | 2557 | */ |
2477 | static int | 2558 | static int |
2478 | check_communicator_backchannel (void *cls, | 2559 | check_communicator_backchannel (void *cls, |
2479 | const struct GNUNET_TRANSPORT_CommunicatorBackchannel *cb) | 2560 | const struct GNUNET_TRANSPORT_CommunicatorBackchannel *cb) |
2480 | { | 2561 | { |
2481 | const struct GNUNET_MessageHeader *inbox; | 2562 | const struct GNUNET_MessageHeader *inbox; |
2482 | const char *is; | 2563 | const char *is; |
@@ -2550,10 +2631,10 @@ expire_ephemerals (void *cls) | |||
2550 | */ | 2631 | */ |
2551 | static void | 2632 | static void |
2552 | lookup_ephemeral (const struct GNUNET_PeerIdentity *pid, | 2633 | lookup_ephemeral (const struct GNUNET_PeerIdentity *pid, |
2553 | struct GNUNET_CRYPTO_EcdhePrivateKey *private_key, | 2634 | struct GNUNET_CRYPTO_EcdhePrivateKey *private_key, |
2554 | struct GNUNET_CRYPTO_EcdhePublicKey *ephemeral_key, | 2635 | struct GNUNET_CRYPTO_EcdhePublicKey *ephemeral_key, |
2555 | struct GNUNET_CRYPTO_EddsaSignature *ephemeral_sender_sig, | 2636 | struct GNUNET_CRYPTO_EddsaSignature *ephemeral_sender_sig, |
2556 | struct GNUNET_TIME_Absolute *ephemeral_validity) | 2637 | struct GNUNET_TIME_Absolute *ephemeral_validity) |
2557 | { | 2638 | { |
2558 | struct EphemeralCacheEntry *ece; | 2639 | struct EphemeralCacheEntry *ece; |
2559 | struct EphemeralConfirmation ec; | 2640 | struct EphemeralConfirmation ec; |
@@ -2628,7 +2709,7 @@ route_message (const struct GNUNET_PeerIdentity *target, | |||
2628 | */ | 2709 | */ |
2629 | static void | 2710 | static void |
2630 | handle_communicator_backchannel (void *cls, | 2711 | handle_communicator_backchannel (void *cls, |
2631 | const struct GNUNET_TRANSPORT_CommunicatorBackchannel *cb) | 2712 | const struct GNUNET_TRANSPORT_CommunicatorBackchannel *cb) |
2632 | { | 2713 | { |
2633 | struct TransportClient *tc = cls; | 2714 | struct TransportClient *tc = cls; |
2634 | struct GNUNET_CRYPTO_EcdhePrivateKey private_key; | 2715 | struct GNUNET_CRYPTO_EcdhePrivateKey private_key; |
@@ -2714,7 +2795,7 @@ store_pi (void *cls); | |||
2714 | */ | 2795 | */ |
2715 | static void | 2796 | static void |
2716 | peerstore_store_cb (void *cls, | 2797 | peerstore_store_cb (void *cls, |
2717 | int success) | 2798 | int success) |
2718 | { | 2799 | { |
2719 | struct AddressListEntry *ale = cls; | 2800 | struct AddressListEntry *ale = cls; |
2720 | 2801 | ||
@@ -3163,7 +3244,7 @@ handle_fragment_box (void *cls, | |||
3163 | if (65 == rc->num_acks) /* FIXME: maybe use smaller threshold? This is very aggressive. */ | 3244 | if (65 == rc->num_acks) /* FIXME: maybe use smaller threshold? This is very aggressive. */ |
3164 | ack_now = GNUNET_YES; /* maximum acks received */ | 3245 | ack_now = GNUNET_YES; /* maximum acks received */ |
3165 | // FIXME: possibly also ACK based on RTT (but for that we'd need to | 3246 | // FIXME: possibly also ACK based on RTT (but for that we'd need to |
3166 | // determine the session used for the ACK first!) | 3247 | // determine the queue used for the ACK first!) |
3167 | 3248 | ||
3168 | /* is reassembly complete? */ | 3249 | /* is reassembly complete? */ |
3169 | if (0 != rc->msg_missing) | 3250 | if (0 != rc->msg_missing) |
@@ -3274,7 +3355,7 @@ handle_reliability_box (void *cls, | |||
3274 | */ | 3355 | */ |
3275 | static void | 3356 | static void |
3276 | handle_reliability_ack (void *cls, | 3357 | handle_reliability_ack (void *cls, |
3277 | const struct TransportReliabilityAckMessage *ra) | 3358 | const struct TransportReliabilityAckMessage *ra) |
3278 | { | 3359 | { |
3279 | struct CommunicatorMessageContext *cmc = cls; | 3360 | struct CommunicatorMessageContext *cmc = cls; |
3280 | 3361 | ||
@@ -3293,7 +3374,7 @@ handle_reliability_ack (void *cls, | |||
3293 | */ | 3374 | */ |
3294 | static int | 3375 | static int |
3295 | check_backchannel_encapsulation (void *cls, | 3376 | check_backchannel_encapsulation (void *cls, |
3296 | const struct TransportBackchannelEncapsulationMessage *be) | 3377 | const struct TransportBackchannelEncapsulationMessage *be) |
3297 | { | 3378 | { |
3298 | uint16_t size = ntohs (be->header.size); | 3379 | uint16_t size = ntohs (be->header.size); |
3299 | 3380 | ||
@@ -3314,7 +3395,7 @@ check_backchannel_encapsulation (void *cls, | |||
3314 | */ | 3395 | */ |
3315 | static void | 3396 | static void |
3316 | handle_backchannel_encapsulation (void *cls, | 3397 | handle_backchannel_encapsulation (void *cls, |
3317 | const struct TransportBackchannelEncapsulationMessage *be) | 3398 | const struct TransportBackchannelEncapsulationMessage *be) |
3318 | { | 3399 | { |
3319 | struct CommunicatorMessageContext *cmc = cls; | 3400 | struct CommunicatorMessageContext *cmc = cls; |
3320 | 3401 | ||
@@ -3346,7 +3427,7 @@ handle_backchannel_encapsulation (void *cls, | |||
3346 | */ | 3427 | */ |
3347 | static int | 3428 | static int |
3348 | check_dv_learn (void *cls, | 3429 | check_dv_learn (void *cls, |
3349 | const struct TransportDVLearn *dvl) | 3430 | const struct TransportDVLearn *dvl) |
3350 | { | 3431 | { |
3351 | uint16_t size = ntohs (dvl->header.size); | 3432 | uint16_t size = ntohs (dvl->header.size); |
3352 | uint16_t num_hops = ntohs (dvl->num_hops); | 3433 | uint16_t num_hops = ntohs (dvl->num_hops); |
@@ -3360,15 +3441,15 @@ check_dv_learn (void *cls, | |||
3360 | for (unsigned int i=0;i<num_hops;i++) | 3441 | for (unsigned int i=0;i<num_hops;i++) |
3361 | { | 3442 | { |
3362 | if (0 == memcmp (&dvl->initiator, | 3443 | if (0 == memcmp (&dvl->initiator, |
3363 | &hops[i], | 3444 | &hops[i], |
3364 | sizeof (struct GNUNET_PeerIdentity))) | 3445 | sizeof (struct GNUNET_PeerIdentity))) |
3365 | { | 3446 | { |
3366 | GNUNET_break_op (0); | 3447 | GNUNET_break_op (0); |
3367 | return GNUNET_SYSERR; | 3448 | return GNUNET_SYSERR; |
3368 | } | 3449 | } |
3369 | if (0 == memcmp (&GST_my_identity, | 3450 | if (0 == memcmp (&GST_my_identity, |
3370 | &hops[i], | 3451 | &hops[i], |
3371 | sizeof (struct GNUNET_PeerIdentity))) | 3452 | sizeof (struct GNUNET_PeerIdentity))) |
3372 | { | 3453 | { |
3373 | GNUNET_break_op (0); | 3454 | GNUNET_break_op (0); |
3374 | return GNUNET_SYSERR; | 3455 | return GNUNET_SYSERR; |
@@ -3386,7 +3467,7 @@ check_dv_learn (void *cls, | |||
3386 | */ | 3467 | */ |
3387 | static void | 3468 | static void |
3388 | handle_dv_learn (void *cls, | 3469 | handle_dv_learn (void *cls, |
3389 | const struct TransportDVLearn *dvl) | 3470 | const struct TransportDVLearn *dvl) |
3390 | { | 3471 | { |
3391 | struct CommunicatorMessageContext *cmc = cls; | 3472 | struct CommunicatorMessageContext *cmc = cls; |
3392 | 3473 | ||
@@ -3405,7 +3486,7 @@ handle_dv_learn (void *cls, | |||
3405 | */ | 3486 | */ |
3406 | static int | 3487 | static int |
3407 | check_dv_box (void *cls, | 3488 | check_dv_box (void *cls, |
3408 | const struct TransportDVBox *dvb) | 3489 | const struct TransportDVBox *dvb) |
3409 | { | 3490 | { |
3410 | uint16_t size = ntohs (dvb->header.size); | 3491 | uint16_t size = ntohs (dvb->header.size); |
3411 | uint16_t num_hops = ntohs (dvb->num_hops); | 3492 | uint16_t num_hops = ntohs (dvb->num_hops); |
@@ -3599,12 +3680,12 @@ check_add_queue_message (void *cls, | |||
3599 | * Bandwidth tracker informs us that the delay until we should receive | 3680 | * Bandwidth tracker informs us that the delay until we should receive |
3600 | * more has changed. | 3681 | * more has changed. |
3601 | * | 3682 | * |
3602 | * @param cls a `struct GNUNET_ATS_Session` for which the delay changed | 3683 | * @param cls a `struct Queue` for which the delay changed |
3603 | */ | 3684 | */ |
3604 | static void | 3685 | static void |
3605 | tracker_update_in_cb (void *cls) | 3686 | tracker_update_in_cb (void *cls) |
3606 | { | 3687 | { |
3607 | struct GNUNET_ATS_Session *queue = cls; | 3688 | struct Queue *queue = cls; |
3608 | struct GNUNET_TIME_Relative in_delay; | 3689 | struct GNUNET_TIME_Relative in_delay; |
3609 | unsigned int rsize; | 3690 | unsigned int rsize; |
3610 | 3691 | ||
@@ -3801,12 +3882,12 @@ reliability_box_message (struct PendingMessage *pm) | |||
3801 | * communicator for transmission (updating the tracker, and re-scheduling | 3882 | * communicator for transmission (updating the tracker, and re-scheduling |
3802 | * itself if applicable). | 3883 | * itself if applicable). |
3803 | * | 3884 | * |
3804 | * @param cls the `struct GNUNET_ATS_Session` to process transmissions for | 3885 | * @param cls the `struct Queue` to process transmissions for |
3805 | */ | 3886 | */ |
3806 | static void | 3887 | static void |
3807 | transmit_on_queue (void *cls) | 3888 | transmit_on_queue (void *cls) |
3808 | { | 3889 | { |
3809 | struct GNUNET_ATS_Session *queue = cls; | 3890 | struct Queue *queue = cls; |
3810 | struct Neighbour *n = queue->neighbour; | 3891 | struct Neighbour *n = queue->neighbour; |
3811 | struct QueueEntry *qe; | 3892 | struct QueueEntry *qe; |
3812 | struct PendingMessage *pm; | 3893 | struct PendingMessage *pm; |
@@ -3835,9 +3916,9 @@ transmit_on_queue (void *cls) | |||
3835 | respect that even if MTU is 0 for | 3916 | respect that even if MTU is 0 for |
3836 | this queue */) ) | 3917 | this queue */) ) |
3837 | s = fragment_message (s, | 3918 | s = fragment_message (s, |
3838 | (0 == queue->mtu) | 3919 | (0 == queue->mtu) |
3839 | ? UINT16_MAX - sizeof (struct GNUNET_TRANSPORT_SendMessageTo) | 3920 | ? UINT16_MAX - sizeof (struct GNUNET_TRANSPORT_SendMessageTo) |
3840 | : queue->mtu); | 3921 | : queue->mtu); |
3841 | if (NULL == s) | 3922 | if (NULL == s) |
3842 | { | 3923 | { |
3843 | /* Fragmentation failed, try next message... */ | 3924 | /* Fragmentation failed, try next message... */ |
@@ -3856,7 +3937,7 @@ transmit_on_queue (void *cls) | |||
3856 | /* Pass 's' for transission to the communicator */ | 3937 | /* Pass 's' for transission to the communicator */ |
3857 | qe = GNUNET_new (struct QueueEntry); | 3938 | qe = GNUNET_new (struct QueueEntry); |
3858 | qe->mid = queue->mid_gen++; | 3939 | qe->mid = queue->mid_gen++; |
3859 | qe->session = queue; | 3940 | qe->queue = queue; |
3860 | // qe->pm = s; // FIXME: not so easy, reference management on 'free(s)'! | 3941 | // qe->pm = s; // FIXME: not so easy, reference management on 'free(s)'! |
3861 | GNUNET_CONTAINER_DLL_insert (queue->queue_head, | 3942 | GNUNET_CONTAINER_DLL_insert (queue->queue_head, |
3862 | queue->queue_tail, | 3943 | queue->queue_tail, |
@@ -3868,13 +3949,13 @@ transmit_on_queue (void *cls) | |||
3868 | smt->mid = qe->mid; | 3949 | smt->mid = qe->mid; |
3869 | smt->receiver = n->pid; | 3950 | smt->receiver = n->pid; |
3870 | memcpy (&smt[1], | 3951 | memcpy (&smt[1], |
3871 | &s[1], | 3952 | &s[1], |
3872 | s->bytes_msg); | 3953 | s->bytes_msg); |
3873 | GNUNET_assert (CT_COMMUNICATOR == queue->tc->type); | 3954 | GNUNET_assert (CT_COMMUNICATOR == queue->tc->type); |
3874 | queue->queue_length++; | 3955 | queue->queue_length++; |
3875 | queue->tc->details.communicator.total_queue_length++; | 3956 | queue->tc->details.communicator.total_queue_length++; |
3876 | GNUNET_MQ_send (queue->tc->mq, | 3957 | GNUNET_MQ_send (queue->tc->mq, |
3877 | env); | 3958 | env); |
3878 | 3959 | ||
3879 | // FIXME: do something similar to the logic below | 3960 | // FIXME: do something similar to the logic below |
3880 | // in defragmentation / reliability ACK handling! | 3961 | // in defragmentation / reliability ACK handling! |
@@ -3886,8 +3967,8 @@ transmit_on_queue (void *cls) | |||
3886 | { | 3967 | { |
3887 | /* Full message sent, and over reliabile channel */ | 3968 | /* Full message sent, and over reliabile channel */ |
3888 | client_send_response (pm, | 3969 | client_send_response (pm, |
3889 | GNUNET_YES, | 3970 | GNUNET_YES, |
3890 | pm->bytes_msg); | 3971 | pm->bytes_msg); |
3891 | } | 3972 | } |
3892 | else if ( (GNUNET_TRANSPORT_CC_RELIABLE == queue->tc->details.communicator.cc) && | 3973 | else if ( (GNUNET_TRANSPORT_CC_RELIABLE == queue->tc->details.communicator.cc) && |
3893 | (PMT_FRAGMENT_BOX == s->pmt) ) | 3974 | (PMT_FRAGMENT_BOX == s->pmt) ) |
@@ -3898,9 +3979,9 @@ transmit_on_queue (void *cls) | |||
3898 | free_fragment_tree (s); | 3979 | free_fragment_tree (s); |
3899 | pos = s->frag_parent; | 3980 | pos = s->frag_parent; |
3900 | GNUNET_CONTAINER_MDLL_remove (frag, | 3981 | GNUNET_CONTAINER_MDLL_remove (frag, |
3901 | pos->head_frag, | 3982 | pos->head_frag, |
3902 | pos->tail_frag, | 3983 | pos->tail_frag, |
3903 | s); | 3984 | s); |
3904 | GNUNET_free (s); | 3985 | GNUNET_free (s); |
3905 | /* check if subtree is done */ | 3986 | /* check if subtree is done */ |
3906 | while ( (NULL == pos->head_frag) && | 3987 | while ( (NULL == pos->head_frag) && |
@@ -3910,9 +3991,9 @@ transmit_on_queue (void *cls) | |||
3910 | s = pos; | 3991 | s = pos; |
3911 | pos = s->frag_parent; | 3992 | pos = s->frag_parent; |
3912 | GNUNET_CONTAINER_MDLL_remove (frag, | 3993 | GNUNET_CONTAINER_MDLL_remove (frag, |
3913 | pos->head_frag, | 3994 | pos->head_frag, |
3914 | pos->tail_frag, | 3995 | pos->tail_frag, |
3915 | s); | 3996 | s); |
3916 | GNUNET_free (s); | 3997 | GNUNET_free (s); |
3917 | } | 3998 | } |
3918 | 3999 | ||
@@ -3920,8 +4001,8 @@ transmit_on_queue (void *cls) | |||
3920 | if ( (NULL == pm->head_frag) && | 4001 | if ( (NULL == pm->head_frag) && |
3921 | (pm->frag_off == pm->bytes_msg) ) | 4002 | (pm->frag_off == pm->bytes_msg) ) |
3922 | client_send_response (pm, | 4003 | client_send_response (pm, |
3923 | GNUNET_YES, | 4004 | GNUNET_YES, |
3924 | pm->bytes_msg /* FIXME: calculate and add overheads! */); | 4005 | pm->bytes_msg /* FIXME: calculate and add overheads! */); |
3925 | } | 4006 | } |
3926 | else if (PMT_CORE != pm->pmt) | 4007 | else if (PMT_CORE != pm->pmt) |
3927 | { | 4008 | { |
@@ -3941,25 +4022,25 @@ transmit_on_queue (void *cls) | |||
3941 | message urgency and size when delaying ACKs, etc.) */ | 4022 | message urgency and size when delaying ACKs, etc.) */ |
3942 | s->next_attempt = GNUNET_TIME_relative_to_absolute | 4023 | s->next_attempt = GNUNET_TIME_relative_to_absolute |
3943 | (GNUNET_TIME_relative_multiply (queue->rtt, | 4024 | (GNUNET_TIME_relative_multiply (queue->rtt, |
3944 | 4)); | 4025 | 4)); |
3945 | if (s == pm) | 4026 | if (s == pm) |
3946 | { | 4027 | { |
3947 | struct PendingMessage *pos; | 4028 | struct PendingMessage *pos; |
3948 | 4029 | ||
3949 | /* re-insert sort in neighbour list */ | 4030 | /* re-insert sort in neighbour list */ |
3950 | GNUNET_CONTAINER_MDLL_remove (neighbour, | 4031 | GNUNET_CONTAINER_MDLL_remove (neighbour, |
3951 | neighbour->pending_msg_head, | 4032 | neighbour->pending_msg_head, |
3952 | neighbour->pending_msg_tail, | 4033 | neighbour->pending_msg_tail, |
3953 | pm); | 4034 | pm); |
3954 | pos = neighbour->pending_msg_tail; | 4035 | pos = neighbour->pending_msg_tail; |
3955 | while ( (NULL != pos) && | 4036 | while ( (NULL != pos) && |
3956 | (pm->next_attempt.abs_value_us > pos->next_attempt.abs_value_us) ) | 4037 | (pm->next_attempt.abs_value_us > pos->next_attempt.abs_value_us) ) |
3957 | pos = pos->prev_neighbour; | 4038 | pos = pos->prev_neighbour; |
3958 | GNUNET_CONTAINER_MDLL_insert_after (neighbour, | 4039 | GNUNET_CONTAINER_MDLL_insert_after (neighbour, |
3959 | neighbour->pending_msg_head, | 4040 | neighbour->pending_msg_head, |
3960 | neighbour->pending_msg_tail, | 4041 | neighbour->pending_msg_tail, |
3961 | pos, | 4042 | pos, |
3962 | pm); | 4043 | pm); |
3963 | } | 4044 | } |
3964 | else | 4045 | else |
3965 | { | 4046 | { |
@@ -3968,18 +4049,18 @@ transmit_on_queue (void *cls) | |||
3968 | struct PendingMessage *pos; | 4049 | struct PendingMessage *pos; |
3969 | 4050 | ||
3970 | GNUNET_CONTAINER_MDLL_remove (frag, | 4051 | GNUNET_CONTAINER_MDLL_remove (frag, |
3971 | fp->head_frag, | 4052 | fp->head_frag, |
3972 | fp->tail_frag, | 4053 | fp->tail_frag, |
3973 | s); | 4054 | s); |
3974 | pos = fp->tail_frag; | 4055 | pos = fp->tail_frag; |
3975 | while ( (NULL != pos) && | 4056 | while ( (NULL != pos) && |
3976 | (s->next_attempt.abs_value_us > pos->next_attempt.abs_value_us) ) | 4057 | (s->next_attempt.abs_value_us > pos->next_attempt.abs_value_us) ) |
3977 | pos = pos->prev_frag; | 4058 | pos = pos->prev_frag; |
3978 | GNUNET_CONTAINER_MDLL_insert_after (frag, | 4059 | GNUNET_CONTAINER_MDLL_insert_after (frag, |
3979 | fp->head_frag, | 4060 | fp->head_frag, |
3980 | fp->tail_frag, | 4061 | fp->tail_frag, |
3981 | pos, | 4062 | pos, |
3982 | s); | 4063 | s); |
3983 | } | 4064 | } |
3984 | } | 4065 | } |
3985 | 4066 | ||
@@ -3992,12 +4073,12 @@ transmit_on_queue (void *cls) | |||
3992 | * Bandwidth tracker informs us that the delay until we | 4073 | * Bandwidth tracker informs us that the delay until we |
3993 | * can transmit again changed. | 4074 | * can transmit again changed. |
3994 | * | 4075 | * |
3995 | * @param cls a `struct GNUNET_ATS_Session` for which the delay changed | 4076 | * @param cls a `struct Queue` for which the delay changed |
3996 | */ | 4077 | */ |
3997 | static void | 4078 | static void |
3998 | tracker_update_out_cb (void *cls) | 4079 | tracker_update_out_cb (void *cls) |
3999 | { | 4080 | { |
4000 | struct GNUNET_ATS_Session *queue = cls; | 4081 | struct Queue *queue = cls; |
4001 | struct Neighbour *n = queue->neighbour; | 4082 | struct Neighbour *n = queue->neighbour; |
4002 | 4083 | ||
4003 | if (NULL == n->pending_msg_head) | 4084 | if (NULL == n->pending_msg_head) |
@@ -4017,7 +4098,7 @@ tracker_update_out_cb (void *cls) | |||
4017 | * Bandwidth tracker informs us that excessive outbound bandwidth was | 4098 | * Bandwidth tracker informs us that excessive outbound bandwidth was |
4018 | * allocated which is not being used. | 4099 | * allocated which is not being used. |
4019 | * | 4100 | * |
4020 | * @param cls a `struct GNUNET_ATS_Session` for which the excess was noted | 4101 | * @param cls a `struct Queue` for which the excess was noted |
4021 | */ | 4102 | */ |
4022 | static void | 4103 | static void |
4023 | tracker_excess_out_cb (void *cls) | 4104 | tracker_excess_out_cb (void *cls) |
@@ -4026,11 +4107,11 @@ tracker_excess_out_cb (void *cls) | |||
4026 | this is done internally within transport_api2_core already, | 4107 | this is done internally within transport_api2_core already, |
4027 | but we probably want to change the logic and trigger it | 4108 | but we probably want to change the logic and trigger it |
4028 | from here via a message instead! */ | 4109 | from here via a message instead! */ |
4029 | /* TODO: maybe inform ATS at this point? */ | 4110 | /* TODO: maybe inform someone at this point? */ |
4030 | GNUNET_STATISTICS_update (GST_stats, | 4111 | GNUNET_STATISTICS_update (GST_stats, |
4031 | "# Excess outbound bandwidth reported", | 4112 | "# Excess outbound bandwidth reported", |
4032 | 1, | 4113 | 1, |
4033 | GNUNET_NO); | 4114 | GNUNET_NO); |
4034 | } | 4115 | } |
4035 | 4116 | ||
4036 | 4117 | ||
@@ -4039,16 +4120,16 @@ tracker_excess_out_cb (void *cls) | |||
4039 | * Bandwidth tracker informs us that excessive inbound bandwidth was allocated | 4120 | * Bandwidth tracker informs us that excessive inbound bandwidth was allocated |
4040 | * which is not being used. | 4121 | * which is not being used. |
4041 | * | 4122 | * |
4042 | * @param cls a `struct GNUNET_ATS_Session` for which the excess was noted | 4123 | * @param cls a `struct Queue` for which the excess was noted |
4043 | */ | 4124 | */ |
4044 | static void | 4125 | static void |
4045 | tracker_excess_in_cb (void *cls) | 4126 | tracker_excess_in_cb (void *cls) |
4046 | { | 4127 | { |
4047 | /* TODO: maybe inform ATS at this point? */ | 4128 | /* TODO: maybe inform somone at this point? */ |
4048 | GNUNET_STATISTICS_update (GST_stats, | 4129 | GNUNET_STATISTICS_update (GST_stats, |
4049 | "# Excess inbound bandwidth reported", | 4130 | "# Excess inbound bandwidth reported", |
4050 | 1, | 4131 | 1, |
4051 | GNUNET_NO); | 4132 | GNUNET_NO); |
4052 | } | 4133 | } |
4053 | 4134 | ||
4054 | 4135 | ||
@@ -4063,7 +4144,7 @@ handle_add_queue_message (void *cls, | |||
4063 | const struct GNUNET_TRANSPORT_AddQueueMessage *aqm) | 4144 | const struct GNUNET_TRANSPORT_AddQueueMessage *aqm) |
4064 | { | 4145 | { |
4065 | struct TransportClient *tc = cls; | 4146 | struct TransportClient *tc = cls; |
4066 | struct GNUNET_ATS_Session *queue; | 4147 | struct Queue *queue; |
4067 | struct Neighbour *neighbour; | 4148 | struct Neighbour *neighbour; |
4068 | const char *addr; | 4149 | const char *addr; |
4069 | uint16_t addr_len; | 4150 | uint16_t addr_len; |
@@ -4083,17 +4164,17 @@ handle_add_queue_message (void *cls, | |||
4083 | neighbour->earliest_timeout = GNUNET_TIME_UNIT_FOREVER_ABS; | 4164 | neighbour->earliest_timeout = GNUNET_TIME_UNIT_FOREVER_ABS; |
4084 | neighbour->pid = aqm->receiver; | 4165 | neighbour->pid = aqm->receiver; |
4085 | GNUNET_assert (GNUNET_OK == | 4166 | GNUNET_assert (GNUNET_OK == |
4086 | GNUNET_CONTAINER_multipeermap_put (neighbours, | 4167 | GNUNET_CONTAINER_multipeermap_put (neighbours, |
4087 | &neighbour->pid, | 4168 | &neighbour->pid, |
4088 | neighbour, | 4169 | neighbour, |
4089 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); | 4170 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); |
4090 | cores_send_connect_info (&neighbour->pid, | 4171 | cores_send_connect_info (&neighbour->pid, |
4091 | GNUNET_BANDWIDTH_ZERO); | 4172 | GNUNET_BANDWIDTH_ZERO); |
4092 | } | 4173 | } |
4093 | addr_len = ntohs (aqm->header.size) - sizeof (*aqm); | 4174 | addr_len = ntohs (aqm->header.size) - sizeof (*aqm); |
4094 | addr = (const char *) &aqm[1]; | 4175 | addr = (const char *) &aqm[1]; |
4095 | 4176 | ||
4096 | queue = GNUNET_malloc (sizeof (struct GNUNET_ATS_Session) + addr_len); | 4177 | queue = GNUNET_malloc (sizeof (struct Queue) + addr_len); |
4097 | queue->tc = tc; | 4178 | queue->tc = tc; |
4098 | queue->address = (const char *) &queue[1]; | 4179 | queue->address = (const char *) &queue[1]; |
4099 | queue->rtt = GNUNET_TIME_UNIT_FOREVER_REL; | 4180 | queue->rtt = GNUNET_TIME_UNIT_FOREVER_REL; |
@@ -4117,40 +4198,8 @@ handle_add_queue_message (void *cls, | |||
4117 | &tracker_excess_out_cb, | 4198 | &tracker_excess_out_cb, |
4118 | queue); | 4199 | queue); |
4119 | memcpy (&queue[1], | 4200 | memcpy (&queue[1], |
4120 | addr, | 4201 | addr, |
4121 | addr_len); | 4202 | addr_len); |
4122 | /* notify ATS about new queue */ | ||
4123 | { | ||
4124 | struct GNUNET_ATS_Properties prop = { | ||
4125 | .delay = GNUNET_TIME_UNIT_FOREVER_REL, | ||
4126 | .mtu = queue->mtu, | ||
4127 | .nt = queue->nt, | ||
4128 | .cc = tc->details.communicator.cc | ||
4129 | }; | ||
4130 | |||
4131 | queue->sr = GNUNET_ATS_session_add (ats, | ||
4132 | &neighbour->pid, | ||
4133 | queue->address, | ||
4134 | queue, | ||
4135 | &prop); | ||
4136 | if (NULL == queue->sr) | ||
4137 | { | ||
4138 | /* This can only happen if the 'address' was way too long for ATS | ||
4139 | (approaching 64k in strlen()!). In this case, the communicator | ||
4140 | must be buggy and we drop it. */ | ||
4141 | GNUNET_break (0); | ||
4142 | GNUNET_BANDWIDTH_tracker_notification_stop (&queue->tracker_in); | ||
4143 | GNUNET_BANDWIDTH_tracker_notification_stop (&queue->tracker_out); | ||
4144 | GNUNET_free (queue); | ||
4145 | if (NULL == neighbour->session_head) | ||
4146 | { | ||
4147 | cores_send_disconnect_info (&neighbour->pid); | ||
4148 | free_neighbour (neighbour); | ||
4149 | } | ||
4150 | GNUNET_SERVICE_client_drop (tc->client); | ||
4151 | return; | ||
4152 | } | ||
4153 | } | ||
4154 | /* notify monitors about new queue */ | 4203 | /* notify monitors about new queue */ |
4155 | { | 4204 | { |
4156 | struct MonitorEvent me = { | 4205 | struct MonitorEvent me = { |
@@ -4159,18 +4208,18 @@ handle_add_queue_message (void *cls, | |||
4159 | }; | 4208 | }; |
4160 | 4209 | ||
4161 | notify_monitors (&neighbour->pid, | 4210 | notify_monitors (&neighbour->pid, |
4162 | queue->address, | 4211 | queue->address, |
4163 | queue->nt, | 4212 | queue->nt, |
4164 | &me); | 4213 | &me); |
4165 | } | 4214 | } |
4166 | GNUNET_CONTAINER_MDLL_insert (neighbour, | 4215 | GNUNET_CONTAINER_MDLL_insert (neighbour, |
4167 | neighbour->session_head, | 4216 | neighbour->queue_head, |
4168 | neighbour->session_tail, | 4217 | neighbour->queue_tail, |
4169 | queue); | 4218 | queue); |
4170 | GNUNET_CONTAINER_MDLL_insert (client, | 4219 | GNUNET_CONTAINER_MDLL_insert (client, |
4171 | tc->details.communicator.session_head, | 4220 | tc->details.communicator.queue_head, |
4172 | tc->details.communicator.session_tail, | 4221 | tc->details.communicator.queue_tail, |
4173 | queue); | 4222 | queue); |
4174 | GNUNET_SERVICE_client_continue (tc->client); | 4223 | GNUNET_SERVICE_client_continue (tc->client); |
4175 | } | 4224 | } |
4176 | 4225 | ||
@@ -4193,18 +4242,18 @@ handle_del_queue_message (void *cls, | |||
4193 | GNUNET_SERVICE_client_drop (tc->client); | 4242 | GNUNET_SERVICE_client_drop (tc->client); |
4194 | return; | 4243 | return; |
4195 | } | 4244 | } |
4196 | for (struct GNUNET_ATS_Session *session = tc->details.communicator.session_head; | 4245 | for (struct Queue *queue = tc->details.communicator.queue_head; |
4197 | NULL != session; | 4246 | NULL != queue; |
4198 | session = session->next_client) | 4247 | queue = queue->next_client) |
4199 | { | 4248 | { |
4200 | struct Neighbour *neighbour = session->neighbour; | 4249 | struct Neighbour *neighbour = queue->neighbour; |
4201 | 4250 | ||
4202 | if ( (dqm->qid != session->qid) || | 4251 | if ( (dqm->qid != queue->qid) || |
4203 | (0 != memcmp (&dqm->receiver, | 4252 | (0 != memcmp (&dqm->receiver, |
4204 | &neighbour->pid, | 4253 | &neighbour->pid, |
4205 | sizeof (struct GNUNET_PeerIdentity))) ) | 4254 | sizeof (struct GNUNET_PeerIdentity))) ) |
4206 | continue; | 4255 | continue; |
4207 | free_session (session); | 4256 | free_queue (queue); |
4208 | GNUNET_SERVICE_client_continue (tc->client); | 4257 | GNUNET_SERVICE_client_continue (tc->client); |
4209 | return; | 4258 | return; |
4210 | } | 4259 | } |
@@ -4224,7 +4273,7 @@ handle_send_message_ack (void *cls, | |||
4224 | const struct GNUNET_TRANSPORT_SendMessageToAck *sma) | 4273 | const struct GNUNET_TRANSPORT_SendMessageToAck *sma) |
4225 | { | 4274 | { |
4226 | struct TransportClient *tc = cls; | 4275 | struct TransportClient *tc = cls; |
4227 | struct QueueEntry *queue; | 4276 | struct QueueEntry *qe; |
4228 | 4277 | ||
4229 | if (CT_COMMUNICATOR != tc->type) | 4278 | if (CT_COMMUNICATOR != tc->type) |
4230 | { | 4279 | { |
@@ -4234,37 +4283,37 @@ handle_send_message_ack (void *cls, | |||
4234 | } | 4283 | } |
4235 | 4284 | ||
4236 | /* find our queue entry matching the ACK */ | 4285 | /* find our queue entry matching the ACK */ |
4237 | queue = NULL; | 4286 | qe = NULL; |
4238 | for (struct GNUNET_ATS_Session *session = tc->details.communicator.session_head; | 4287 | for (struct Queue *queue = tc->details.communicator.queue_head; |
4239 | NULL != session; | 4288 | NULL != queue; |
4240 | session = session->next_client) | 4289 | queue = queue->next_client) |
4241 | { | 4290 | { |
4242 | if (0 != memcmp (&session->neighbour->pid, | 4291 | if (0 != memcmp (&queue->neighbour->pid, |
4243 | &sma->receiver, | 4292 | &sma->receiver, |
4244 | sizeof (struct GNUNET_PeerIdentity))) | 4293 | sizeof (struct GNUNET_PeerIdentity))) |
4245 | continue; | 4294 | continue; |
4246 | for (struct QueueEntry *qe = session->queue_head; | 4295 | for (struct QueueEntry *qep = queue->queue_head; |
4247 | NULL != qe; | 4296 | NULL != qep; |
4248 | qe = qe->next) | 4297 | qep = qep->next) |
4249 | { | 4298 | { |
4250 | if (qe->mid != sma->mid) | 4299 | if (qep->mid != sma->mid) |
4251 | continue; | 4300 | continue; |
4252 | queue = qe; | 4301 | qe = qep; |
4253 | break; | 4302 | break; |
4254 | } | 4303 | } |
4255 | break; | 4304 | break; |
4256 | } | 4305 | } |
4257 | if (NULL == queue) | 4306 | if (NULL == qe) |
4258 | { | 4307 | { |
4259 | /* this should never happen */ | 4308 | /* this should never happen */ |
4260 | GNUNET_break (0); | 4309 | GNUNET_break (0); |
4261 | GNUNET_SERVICE_client_drop (tc->client); | 4310 | GNUNET_SERVICE_client_drop (tc->client); |
4262 | return; | 4311 | return; |
4263 | } | 4312 | } |
4264 | GNUNET_CONTAINER_DLL_remove (queue->session->queue_head, | 4313 | GNUNET_CONTAINER_DLL_remove (qe->queue->queue_head, |
4265 | queue->session->queue_tail, | 4314 | qe->queue->queue_tail, |
4266 | queue); | 4315 | qe); |
4267 | queue->session->queue_length--; | 4316 | qe->queue->queue_length--; |
4268 | tc->details.communicator.total_queue_length--; | 4317 | tc->details.communicator.total_queue_length--; |
4269 | GNUNET_SERVICE_client_continue (tc->client); | 4318 | GNUNET_SERVICE_client_continue (tc->client); |
4270 | 4319 | ||
@@ -4273,22 +4322,22 @@ handle_send_message_ack (void *cls, | |||
4273 | { | 4322 | { |
4274 | /* Communicator dropped below threshold, resume all queues */ | 4323 | /* Communicator dropped below threshold, resume all queues */ |
4275 | GNUNET_STATISTICS_update (GST_stats, | 4324 | GNUNET_STATISTICS_update (GST_stats, |
4276 | "# Transmission throttled due to communicator queue limit", | 4325 | "# Transmission throttled due to communicator queue limit", |
4277 | -1, | 4326 | -1, |
4278 | GNUNET_NO); | 4327 | GNUNET_NO); |
4279 | for (struct GNUNET_ATS_Session *session = tc->details.communicator.session_head; | 4328 | for (struct Queue *queue = tc->details.communicator.queue_head; |
4280 | NULL != session; | 4329 | NULL != queue; |
4281 | session = session->next_client) | 4330 | queue = queue->next_client) |
4282 | schedule_transmit_on_queue (session); | 4331 | schedule_transmit_on_queue (queue); |
4283 | } | 4332 | } |
4284 | else if (SESSION_QUEUE_LIMIT - 1 == queue->session->queue_length) | 4333 | else if (QUEUE_LENGTH_LIMIT - 1 == qe->queue->queue_length) |
4285 | { | 4334 | { |
4286 | /* queue dropped below threshold; only resume this one queue */ | 4335 | /* queue dropped below threshold; only resume this one queue */ |
4287 | GNUNET_STATISTICS_update (GST_stats, | 4336 | GNUNET_STATISTICS_update (GST_stats, |
4288 | "# Transmission throttled due to session queue limit", | 4337 | "# Transmission throttled due to queue queue limit", |
4289 | -1, | 4338 | -1, |
4290 | GNUNET_NO); | 4339 | GNUNET_NO); |
4291 | schedule_transmit_on_queue (queue->session); | 4340 | schedule_transmit_on_queue (qe->queue); |
4292 | } | 4341 | } |
4293 | 4342 | ||
4294 | /* TODO: we also should react on the status! */ | 4343 | /* TODO: we also should react on the status! */ |
@@ -4296,7 +4345,7 @@ handle_send_message_ack (void *cls, | |||
4296 | // FIXME: react to communicator status about transmission request. We got: | 4345 | // FIXME: react to communicator status about transmission request. We got: |
4297 | sma->status; // OK success, SYSERR failure | 4346 | sma->status; // OK success, SYSERR failure |
4298 | 4347 | ||
4299 | GNUNET_free (queue); | 4348 | GNUNET_free (qe); |
4300 | } | 4349 | } |
4301 | 4350 | ||
4302 | 4351 | ||
@@ -4318,7 +4367,7 @@ notify_client_queues (void *cls, | |||
4318 | struct Neighbour *neighbour = value; | 4367 | struct Neighbour *neighbour = value; |
4319 | 4368 | ||
4320 | GNUNET_assert (CT_MONITOR == tc->type); | 4369 | GNUNET_assert (CT_MONITOR == tc->type); |
4321 | for (struct GNUNET_ATS_Session *q = neighbour->session_head; | 4370 | for (struct Queue *q = neighbour->queue_head; |
4322 | NULL != q; | 4371 | NULL != q; |
4323 | q = q->next_neighbour) | 4372 | q = q->next_neighbour) |
4324 | { | 4373 | { |
@@ -4361,39 +4410,14 @@ handle_monitor_start (void *cls, | |||
4361 | tc->details.monitor.peer = start->peer; | 4410 | tc->details.monitor.peer = start->peer; |
4362 | tc->details.monitor.one_shot = ntohl (start->one_shot); | 4411 | tc->details.monitor.one_shot = ntohl (start->one_shot); |
4363 | GNUNET_CONTAINER_multipeermap_iterate (neighbours, | 4412 | GNUNET_CONTAINER_multipeermap_iterate (neighbours, |
4364 | ¬ify_client_queues, | 4413 | ¬ify_client_queues, |
4365 | tc); | 4414 | tc); |
4366 | GNUNET_SERVICE_client_mark_monitor (tc->client); | 4415 | GNUNET_SERVICE_client_mark_monitor (tc->client); |
4367 | GNUNET_SERVICE_client_continue (tc->client); | 4416 | GNUNET_SERVICE_client_continue (tc->client); |
4368 | } | 4417 | } |
4369 | 4418 | ||
4370 | 4419 | ||
4371 | /** | 4420 | /** |
4372 | * Signature of a function called by ATS with the current bandwidth | ||
4373 | * allocation to be used as determined by ATS. | ||
4374 | * | ||
4375 | * @param cls closure, NULL | ||
4376 | * @param session session this is about | ||
4377 | * @param bandwidth_out assigned outbound bandwidth for the connection, | ||
4378 | * 0 to signal disconnect | ||
4379 | * @param bandwidth_in assigned inbound bandwidth for the connection, | ||
4380 | * 0 to signal disconnect | ||
4381 | */ | ||
4382 | static void | ||
4383 | ats_allocation_cb (void *cls, | ||
4384 | struct GNUNET_ATS_Session *session, | ||
4385 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out, | ||
4386 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in) | ||
4387 | { | ||
4388 | (void) cls; | ||
4389 | GNUNET_BANDWIDTH_tracker_update_quota (&session->tracker_out, | ||
4390 | bandwidth_out); | ||
4391 | GNUNET_BANDWIDTH_tracker_update_quota (&session->tracker_in, | ||
4392 | bandwidth_in); | ||
4393 | } | ||
4394 | |||
4395 | |||
4396 | /** | ||
4397 | * Find transport client providing communication service | 4421 | * Find transport client providing communication service |
4398 | * for the protocol @a prefix. | 4422 | * for the protocol @a prefix. |
4399 | * | 4423 | * |
@@ -4414,24 +4438,22 @@ lookup_communicator (const char *prefix) | |||
4414 | return tc; | 4438 | return tc; |
4415 | } | 4439 | } |
4416 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 4440 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
4417 | "ATS suggested use of communicator for `%s', but we do not have such a communicator!\n", | 4441 | "Somone suggested use of communicator for `%s', but we do not have such a communicator!\n", |
4418 | prefix); | 4442 | prefix); |
4419 | return NULL; | 4443 | return NULL; |
4420 | } | 4444 | } |
4421 | 4445 | ||
4422 | 4446 | ||
4423 | /** | 4447 | /** |
4424 | * Signature of a function called by ATS suggesting transport to | 4448 | * Signature of a function called with a communicator @a address of a peer |
4425 | * try connecting with a particular address. | 4449 | * @a pid that an application wants us to connect to. |
4426 | * | 4450 | * |
4427 | * @param cls closure, NULL | ||
4428 | * @param pid target peer | 4451 | * @param pid target peer |
4429 | * @param address the address to try | 4452 | * @param address the address to try |
4430 | */ | 4453 | */ |
4431 | static void | 4454 | static void |
4432 | ats_suggestion_cb (void *cls, | 4455 | suggest_to_connect (const struct GNUNET_PeerIdentity *pid, |
4433 | const struct GNUNET_PeerIdentity *pid, | 4456 | const char *address) |
4434 | const char *address) | ||
4435 | { | 4457 | { |
4436 | static uint32_t idgen; | 4458 | static uint32_t idgen; |
4437 | struct TransportClient *tc; | 4459 | struct TransportClient *tc; |
@@ -4440,32 +4462,31 @@ ats_suggestion_cb (void *cls, | |||
4440 | struct GNUNET_MQ_Envelope *env; | 4462 | struct GNUNET_MQ_Envelope *env; |
4441 | size_t alen; | 4463 | size_t alen; |
4442 | 4464 | ||
4443 | (void) cls; | ||
4444 | prefix = GNUNET_HELLO_address_to_prefix (address); | 4465 | prefix = GNUNET_HELLO_address_to_prefix (address); |
4445 | if (NULL == prefix) | 4466 | if (NULL == prefix) |
4446 | { | 4467 | { |
4447 | GNUNET_break (0); /* ATS gave invalid address!? */ | 4468 | GNUNET_break (0); /* We got an invalid address!? */ |
4448 | return; | 4469 | return; |
4449 | } | 4470 | } |
4450 | tc = lookup_communicator (prefix); | 4471 | tc = lookup_communicator (prefix); |
4451 | if (NULL == tc) | 4472 | if (NULL == tc) |
4452 | { | 4473 | { |
4453 | GNUNET_STATISTICS_update (GST_stats, | 4474 | GNUNET_STATISTICS_update (GST_stats, |
4454 | "# ATS suggestions ignored due to missing communicator", | 4475 | "# Suggestions ignored due to missing communicator", |
4455 | 1, | 4476 | 1, |
4456 | GNUNET_NO); | 4477 | GNUNET_NO); |
4457 | return; | 4478 | return; |
4458 | } | 4479 | } |
4459 | /* forward suggestion for queue creation to communicator */ | 4480 | /* forward suggestion for queue creation to communicator */ |
4460 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 4481 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
4461 | "Request #%u for `%s' communicator to create queue to `%s'\n", | 4482 | "Request #%u for `%s' communicator to create queue to `%s'\n", |
4462 | (unsigned int) idgen, | 4483 | (unsigned int) idgen, |
4463 | prefix, | 4484 | prefix, |
4464 | address); | 4485 | address); |
4465 | alen = strlen (address) + 1; | 4486 | alen = strlen (address) + 1; |
4466 | env = GNUNET_MQ_msg_extra (cqm, | 4487 | env = GNUNET_MQ_msg_extra (cqm, |
4467 | alen, | 4488 | alen, |
4468 | GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE); | 4489 | GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE); |
4469 | cqm->request_id = htonl (idgen++); | 4490 | cqm->request_id = htonl (idgen++); |
4470 | cqm->receiver = *pid; | 4491 | cqm->receiver = *pid; |
4471 | memcpy (&cqm[1], | 4492 | memcpy (&cqm[1], |
@@ -4485,7 +4506,7 @@ ats_suggestion_cb (void *cls, | |||
4485 | */ | 4506 | */ |
4486 | static void | 4507 | static void |
4487 | handle_queue_create_ok (void *cls, | 4508 | handle_queue_create_ok (void *cls, |
4488 | const struct GNUNET_TRANSPORT_CreateQueueResponse *cqr) | 4509 | const struct GNUNET_TRANSPORT_CreateQueueResponse *cqr) |
4489 | { | 4510 | { |
4490 | struct TransportClient *tc = cls; | 4511 | struct TransportClient *tc = cls; |
4491 | 4512 | ||
@@ -4496,12 +4517,12 @@ handle_queue_create_ok (void *cls, | |||
4496 | return; | 4517 | return; |
4497 | } | 4518 | } |
4498 | GNUNET_STATISTICS_update (GST_stats, | 4519 | GNUNET_STATISTICS_update (GST_stats, |
4499 | "# ATS suggestions succeeded at communicator", | 4520 | "# Suggestions succeeded at communicator", |
4500 | 1, | 4521 | 1, |
4501 | GNUNET_NO); | 4522 | GNUNET_NO); |
4502 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 4523 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
4503 | "Request #%u for communicator to create queue succeeded\n", | 4524 | "Request #%u for communicator to create queue succeeded\n", |
4504 | (unsigned int) ntohs (cqr->request_id)); | 4525 | (unsigned int) ntohs (cqr->request_id)); |
4505 | GNUNET_SERVICE_client_continue (tc->client); | 4526 | GNUNET_SERVICE_client_continue (tc->client); |
4506 | } | 4527 | } |
4507 | 4528 | ||
@@ -4516,7 +4537,7 @@ handle_queue_create_ok (void *cls, | |||
4516 | */ | 4537 | */ |
4517 | static void | 4538 | static void |
4518 | handle_queue_create_fail (void *cls, | 4539 | handle_queue_create_fail (void *cls, |
4519 | const struct GNUNET_TRANSPORT_CreateQueueResponse *cqr) | 4540 | const struct GNUNET_TRANSPORT_CreateQueueResponse *cqr) |
4520 | { | 4541 | { |
4521 | struct TransportClient *tc = cls; | 4542 | struct TransportClient *tc = cls; |
4522 | 4543 | ||
@@ -4527,12 +4548,137 @@ handle_queue_create_fail (void *cls, | |||
4527 | return; | 4548 | return; |
4528 | } | 4549 | } |
4529 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 4550 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
4530 | "Request #%u for communicator to create queue failed\n", | 4551 | "Request #%u for communicator to create queue failed\n", |
4531 | (unsigned int) ntohs (cqr->request_id)); | 4552 | (unsigned int) ntohs (cqr->request_id)); |
4532 | GNUNET_STATISTICS_update (GST_stats, | 4553 | GNUNET_STATISTICS_update (GST_stats, |
4533 | "# ATS suggestions failed in queue creation at communicator", | 4554 | "# Suggestions failed in queue creation at communicator", |
4534 | 1, | 4555 | 1, |
4535 | GNUNET_NO); | 4556 | GNUNET_NO); |
4557 | GNUNET_SERVICE_client_continue (tc->client); | ||
4558 | } | ||
4559 | |||
4560 | |||
4561 | /** | ||
4562 | * Function called by PEERSTORE for each matching record. | ||
4563 | * | ||
4564 | * @param cls closure | ||
4565 | * @param record peerstore record information | ||
4566 | * @param emsg error message, or NULL if no errors | ||
4567 | */ | ||
4568 | static void | ||
4569 | handle_hello (void *cls, | ||
4570 | const struct GNUNET_PEERSTORE_Record *record, | ||
4571 | const char *emsg) | ||
4572 | { | ||
4573 | struct PeerRequest *pr = cls; | ||
4574 | const char *val; | ||
4575 | |||
4576 | if (NULL != emsg) | ||
4577 | { | ||
4578 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | ||
4579 | "Got failure from PEERSTORE: %s\n", | ||
4580 | emsg); | ||
4581 | return; | ||
4582 | } | ||
4583 | val = record->value; | ||
4584 | if ( (0 == record->value_size) || | ||
4585 | ('\0' != val[record->value_size - 1]) ) | ||
4586 | { | ||
4587 | GNUNET_break (0); | ||
4588 | return; | ||
4589 | } | ||
4590 | suggest_to_connect (&pr->pid, | ||
4591 | (const char *) record->value); | ||
4592 | } | ||
4593 | |||
4594 | |||
4595 | /** | ||
4596 | * We have received a `struct ExpressPreferenceMessage` from an application client. | ||
4597 | * | ||
4598 | * @param cls handle to the client | ||
4599 | * @param msg the start message | ||
4600 | */ | ||
4601 | static void | ||
4602 | handle_suggest (void *cls, | ||
4603 | const struct ExpressPreferenceMessage *msg) | ||
4604 | { | ||
4605 | struct TransportClient *tc = cls; | ||
4606 | struct PeerRequest *pr; | ||
4607 | |||
4608 | if (CT_NONE == tc->type) | ||
4609 | { | ||
4610 | tc->type = CT_APPLICATION; | ||
4611 | tc->details.application.requests | ||
4612 | = GNUNET_CONTAINER_multipeermap_create (16, | ||
4613 | GNUNET_YES); | ||
4614 | } | ||
4615 | if (CT_APPLICATION != tc->type) | ||
4616 | { | ||
4617 | GNUNET_break (0); | ||
4618 | GNUNET_SERVICE_client_drop (tc->client); | ||
4619 | return; | ||
4620 | } | ||
4621 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
4622 | "Client suggested we talk to %s with preference %d at rate %u\n", | ||
4623 | GNUNET_i2s (&msg->peer), | ||
4624 | (int) ntohl (msg->pk), | ||
4625 | (int) ntohl (msg->bw.value__)); | ||
4626 | pr = GNUNET_new (struct PeerRequest); | ||
4627 | pr->tc = tc; | ||
4628 | pr->pid = msg->peer; | ||
4629 | pr->bw = msg->bw; | ||
4630 | pr->pk = (enum GNUNET_MQ_PreferenceKind) ntohl (msg->pk); | ||
4631 | if (GNUNET_YES != | ||
4632 | GNUNET_CONTAINER_multipeermap_put (tc->details.application.requests, | ||
4633 | &pr->pid, | ||
4634 | pr, | ||
4635 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)) | ||
4636 | { | ||
4637 | GNUNET_break (0); | ||
4638 | GNUNET_free (pr); | ||
4639 | GNUNET_SERVICE_client_drop (tc->client); | ||
4640 | return; | ||
4641 | } | ||
4642 | pr->wc = GNUNET_PEERSTORE_watch (peerstore, | ||
4643 | "transport", | ||
4644 | &pr->pid, | ||
4645 | "hello", | ||
4646 | &handle_hello, | ||
4647 | pr); | ||
4648 | GNUNET_SERVICE_client_continue (tc->client); | ||
4649 | } | ||
4650 | |||
4651 | |||
4652 | /** | ||
4653 | * We have received a `struct ExpressPreferenceMessage` from an application client. | ||
4654 | * | ||
4655 | * @param cls handle to the client | ||
4656 | * @param msg the start message | ||
4657 | */ | ||
4658 | static void | ||
4659 | handle_suggest_cancel (void *cls, | ||
4660 | const struct ExpressPreferenceMessage *msg) | ||
4661 | { | ||
4662 | struct TransportClient *tc = cls; | ||
4663 | struct PeerRequest *pr; | ||
4664 | |||
4665 | if (CT_APPLICATION != tc->type) | ||
4666 | { | ||
4667 | GNUNET_break (0); | ||
4668 | GNUNET_SERVICE_client_drop (tc->client); | ||
4669 | return; | ||
4670 | } | ||
4671 | pr = GNUNET_CONTAINER_multipeermap_get (tc->details.application.requests, | ||
4672 | &msg->peer); | ||
4673 | if (NULL == pr) | ||
4674 | { | ||
4675 | GNUNET_break (0); | ||
4676 | GNUNET_SERVICE_client_drop (tc->client); | ||
4677 | return; | ||
4678 | } | ||
4679 | (void) stop_peer_request (tc, | ||
4680 | &pr->pid, | ||
4681 | pr); | ||
4536 | GNUNET_SERVICE_client_continue (tc->client); | 4682 | GNUNET_SERVICE_client_continue (tc->client); |
4537 | } | 4683 | } |
4538 | 4684 | ||
@@ -4601,8 +4747,8 @@ handle_address_consider_verify (void *cls, | |||
4601 | */ | 4747 | */ |
4602 | static int | 4748 | static int |
4603 | free_neighbour_cb (void *cls, | 4749 | free_neighbour_cb (void *cls, |
4604 | const struct GNUNET_PeerIdentity *pid, | 4750 | const struct GNUNET_PeerIdentity *pid, |
4605 | void *value) | 4751 | void *value) |
4606 | { | 4752 | { |
4607 | struct Neighbour *neighbour = value; | 4753 | struct Neighbour *neighbour = value; |
4608 | 4754 | ||
@@ -4625,8 +4771,8 @@ free_neighbour_cb (void *cls, | |||
4625 | */ | 4771 | */ |
4626 | static int | 4772 | static int |
4627 | free_dv_routes_cb (void *cls, | 4773 | free_dv_routes_cb (void *cls, |
4628 | const struct GNUNET_PeerIdentity *pid, | 4774 | const struct GNUNET_PeerIdentity *pid, |
4629 | void *value) | 4775 | void *value) |
4630 | { | 4776 | { |
4631 | struct DistanceVector *dv = value; | 4777 | struct DistanceVector *dv = value; |
4632 | 4778 | ||
@@ -4648,8 +4794,8 @@ free_dv_routes_cb (void *cls, | |||
4648 | */ | 4794 | */ |
4649 | static int | 4795 | static int |
4650 | free_ephemeral_cb (void *cls, | 4796 | free_ephemeral_cb (void *cls, |
4651 | const struct GNUNET_PeerIdentity *pid, | 4797 | const struct GNUNET_PeerIdentity *pid, |
4652 | void *value) | 4798 | void *value) |
4653 | { | 4799 | { |
4654 | struct EphemeralCacheEntry *ece = value; | 4800 | struct EphemeralCacheEntry *ece = value; |
4655 | 4801 | ||
@@ -4677,13 +4823,8 @@ do_shutdown (void *cls) | |||
4677 | ephemeral_task = NULL; | 4823 | ephemeral_task = NULL; |
4678 | } | 4824 | } |
4679 | GNUNET_CONTAINER_multipeermap_iterate (neighbours, | 4825 | GNUNET_CONTAINER_multipeermap_iterate (neighbours, |
4680 | &free_neighbour_cb, | 4826 | &free_neighbour_cb, |
4681 | NULL); | 4827 | NULL); |
4682 | if (NULL != ats) | ||
4683 | { | ||
4684 | GNUNET_ATS_transport_done (ats); | ||
4685 | ats = NULL; | ||
4686 | } | ||
4687 | if (NULL != peerstore) | 4828 | if (NULL != peerstore) |
4688 | { | 4829 | { |
4689 | GNUNET_PEERSTORE_disconnect (peerstore, | 4830 | GNUNET_PEERSTORE_disconnect (peerstore, |
@@ -4734,9 +4875,9 @@ run (void *cls, | |||
4734 | /* setup globals */ | 4875 | /* setup globals */ |
4735 | GST_cfg = c; | 4876 | GST_cfg = c; |
4736 | neighbours = GNUNET_CONTAINER_multipeermap_create (1024, | 4877 | neighbours = GNUNET_CONTAINER_multipeermap_create (1024, |
4737 | GNUNET_YES); | 4878 | GNUNET_YES); |
4738 | dv_routes = GNUNET_CONTAINER_multipeermap_create (1024, | 4879 | dv_routes = GNUNET_CONTAINER_multipeermap_create (1024, |
4739 | GNUNET_YES); | 4880 | GNUNET_YES); |
4740 | ephemeral_map = GNUNET_CONTAINER_multipeermap_create (32, | 4881 | ephemeral_map = GNUNET_CONTAINER_multipeermap_create (32, |
4741 | GNUNET_YES); | 4882 | GNUNET_YES); |
4742 | ephemeral_heap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN); | 4883 | ephemeral_heap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN); |
@@ -4764,17 +4905,6 @@ run (void *cls, | |||
4764 | GNUNET_SCHEDULER_shutdown (); | 4905 | GNUNET_SCHEDULER_shutdown (); |
4765 | return; | 4906 | return; |
4766 | } | 4907 | } |
4767 | ats = GNUNET_ATS_transport_init (GST_cfg, | ||
4768 | &ats_allocation_cb, | ||
4769 | NULL, | ||
4770 | &ats_suggestion_cb, | ||
4771 | NULL); | ||
4772 | if (NULL == ats) | ||
4773 | { | ||
4774 | GNUNET_break (0); | ||
4775 | GNUNET_SCHEDULER_shutdown (); | ||
4776 | return; | ||
4777 | } | ||
4778 | } | 4908 | } |
4779 | 4909 | ||
4780 | 4910 | ||
@@ -4788,52 +4918,61 @@ GNUNET_SERVICE_MAIN | |||
4788 | &client_connect_cb, | 4918 | &client_connect_cb, |
4789 | &client_disconnect_cb, | 4919 | &client_disconnect_cb, |
4790 | NULL, | 4920 | NULL, |
4921 | /* communication with applications */ | ||
4922 | GNUNET_MQ_hd_fixed_size (suggest, | ||
4923 | GNUNET_MESSAGE_TYPE_TRANSPORT_SUGGEST, | ||
4924 | struct ExpressPreferenceMessage, | ||
4925 | NULL), | ||
4926 | GNUNET_MQ_hd_fixed_size (suggest_cancel, | ||
4927 | GNUNET_MESSAGE_TYPE_TRANSPORT_SUGGEST_CANCEL, | ||
4928 | struct ExpressPreferenceMessage, | ||
4929 | NULL), | ||
4791 | /* communication with core */ | 4930 | /* communication with core */ |
4792 | GNUNET_MQ_hd_fixed_size (client_start, | 4931 | GNUNET_MQ_hd_fixed_size (client_start, |
4793 | GNUNET_MESSAGE_TYPE_TRANSPORT_START, | 4932 | GNUNET_MESSAGE_TYPE_TRANSPORT_START, |
4794 | struct StartMessage, | 4933 | struct StartMessage, |
4795 | NULL), | 4934 | NULL), |
4796 | GNUNET_MQ_hd_var_size (client_send, | 4935 | GNUNET_MQ_hd_var_size (client_send, |
4797 | GNUNET_MESSAGE_TYPE_TRANSPORT_SEND, | 4936 | GNUNET_MESSAGE_TYPE_TRANSPORT_SEND, |
4798 | struct OutboundMessage, | 4937 | struct OutboundMessage, |
4799 | NULL), | 4938 | NULL), |
4800 | /* communication with communicators */ | 4939 | /* communication with communicators */ |
4801 | GNUNET_MQ_hd_var_size (communicator_available, | 4940 | GNUNET_MQ_hd_var_size (communicator_available, |
4802 | GNUNET_MESSAGE_TYPE_TRANSPORT_NEW_COMMUNICATOR, | 4941 | GNUNET_MESSAGE_TYPE_TRANSPORT_NEW_COMMUNICATOR, |
4803 | struct GNUNET_TRANSPORT_CommunicatorAvailableMessage, | 4942 | struct GNUNET_TRANSPORT_CommunicatorAvailableMessage, |
4804 | NULL), | 4943 | NULL), |
4805 | GNUNET_MQ_hd_var_size (communicator_backchannel, | 4944 | GNUNET_MQ_hd_var_size (communicator_backchannel, |
4806 | GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_BACKCHANNEL, | 4945 | GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_BACKCHANNEL, |
4807 | struct GNUNET_TRANSPORT_CommunicatorBackchannel, | 4946 | struct GNUNET_TRANSPORT_CommunicatorBackchannel, |
4808 | NULL), | 4947 | NULL), |
4809 | GNUNET_MQ_hd_var_size (add_address, | 4948 | GNUNET_MQ_hd_var_size (add_address, |
4810 | GNUNET_MESSAGE_TYPE_TRANSPORT_ADD_ADDRESS, | 4949 | GNUNET_MESSAGE_TYPE_TRANSPORT_ADD_ADDRESS, |
4811 | struct GNUNET_TRANSPORT_AddAddressMessage, | 4950 | struct GNUNET_TRANSPORT_AddAddressMessage, |
4812 | NULL), | 4951 | NULL), |
4813 | GNUNET_MQ_hd_fixed_size (del_address, | 4952 | GNUNET_MQ_hd_fixed_size (del_address, |
4814 | GNUNET_MESSAGE_TYPE_TRANSPORT_DEL_ADDRESS, | 4953 | GNUNET_MESSAGE_TYPE_TRANSPORT_DEL_ADDRESS, |
4815 | struct GNUNET_TRANSPORT_DelAddressMessage, | 4954 | struct GNUNET_TRANSPORT_DelAddressMessage, |
4816 | NULL), | 4955 | NULL), |
4817 | GNUNET_MQ_hd_var_size (incoming_msg, | 4956 | GNUNET_MQ_hd_var_size (incoming_msg, |
4818 | GNUNET_MESSAGE_TYPE_TRANSPORT_INCOMING_MSG, | 4957 | GNUNET_MESSAGE_TYPE_TRANSPORT_INCOMING_MSG, |
4819 | struct GNUNET_TRANSPORT_IncomingMessage, | 4958 | struct GNUNET_TRANSPORT_IncomingMessage, |
4820 | NULL), | 4959 | NULL), |
4821 | GNUNET_MQ_hd_fixed_size (queue_create_ok, | 4960 | GNUNET_MQ_hd_fixed_size (queue_create_ok, |
4822 | GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE_OK, | 4961 | GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE_OK, |
4823 | struct GNUNET_TRANSPORT_CreateQueueResponse, | 4962 | struct GNUNET_TRANSPORT_CreateQueueResponse, |
4824 | NULL), | 4963 | NULL), |
4825 | GNUNET_MQ_hd_fixed_size (queue_create_fail, | 4964 | GNUNET_MQ_hd_fixed_size (queue_create_fail, |
4826 | GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE_FAIL, | 4965 | GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE_FAIL, |
4827 | struct GNUNET_TRANSPORT_CreateQueueResponse, | 4966 | struct GNUNET_TRANSPORT_CreateQueueResponse, |
4828 | NULL), | 4967 | NULL), |
4829 | GNUNET_MQ_hd_var_size (add_queue_message, | 4968 | GNUNET_MQ_hd_var_size (add_queue_message, |
4830 | GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_SETUP, | 4969 | GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_SETUP, |
4831 | struct GNUNET_TRANSPORT_AddQueueMessage, | 4970 | struct GNUNET_TRANSPORT_AddQueueMessage, |
4832 | NULL), | 4971 | NULL), |
4833 | GNUNET_MQ_hd_var_size (address_consider_verify, | 4972 | GNUNET_MQ_hd_var_size (address_consider_verify, |
4834 | GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_CONSIDER_VERIFY, | 4973 | GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_CONSIDER_VERIFY, |
4835 | struct GNUNET_TRANSPORT_AddressToVerify, | 4974 | struct GNUNET_TRANSPORT_AddressToVerify, |
4836 | NULL), | 4975 | NULL), |
4837 | GNUNET_MQ_hd_fixed_size (del_queue_message, | 4976 | GNUNET_MQ_hd_fixed_size (del_queue_message, |
4838 | GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_TEARDOWN, | 4977 | GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_TEARDOWN, |
4839 | struct GNUNET_TRANSPORT_DelQueueMessage, | 4978 | struct GNUNET_TRANSPORT_DelQueueMessage, |
diff --git a/src/transport/plugin_transport_xt.c b/src/transport/plugin_transport_xt.c deleted file mode 100644 index df5e8a127..000000000 --- a/src/transport/plugin_transport_xt.c +++ /dev/null | |||
@@ -1,4107 +0,0 @@ | |||
1 | /* | ||
2 | This file is part of GNUnet | ||
3 | Copyright (C) 2002--2015 GNUnet e.V. | ||
4 | |||
5 | GNUnet is free software: you can redistribute it and/or modify it | ||
6 | under the terms of the GNU Affero General Public License as published | ||
7 | by the Free Software Foundation, either version 3 of the License, | ||
8 | or (at your option) any later version. | ||
9 | |||
10 | GNUnet is distributed in the hope that it will be useful, but | ||
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
13 | Affero General Public License for more details. | ||
14 | |||
15 | You should have received a copy of the GNU Affero General Public License | ||
16 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
17 | |||
18 | SPDX-License-Identifier: AGPL3.0-or-later | ||
19 | */ | ||
20 | /** | ||
21 | * @file transport/plugin_transport_xt.c | ||
22 | * @brief Implementation of the TCP transport service | ||
23 | * @author Christian Grothoff | ||
24 | */ | ||
25 | #include "platform.h" | ||
26 | #include "gnunet_hello_lib.h" | ||
27 | #include "gnunet_constants.h" | ||
28 | #include "gnunet_util_lib.h" | ||
29 | #include "gnunet_nat_service.h" | ||
30 | #include "gnunet_protocols.h" | ||
31 | #include "gnunet_resolver_service.h" | ||
32 | #include "gnunet_signatures.h" | ||
33 | #include "gnunet_statistics_service.h" | ||
34 | #include "gnunet_transport_service.h" | ||
35 | #include "gnunet_transport_plugin.h" | ||
36 | #include "transport.h" | ||
37 | |||
38 | #define LOG(kind,...) GNUNET_log_from (kind, "transport-xt",__VA_ARGS__) | ||
39 | |||
40 | #define PLUGIN_NAME "xt" | ||
41 | |||
42 | /** | ||
43 | * How long until we give up on establishing an NAT connection? | ||
44 | * Must be > 4 RTT | ||
45 | */ | ||
46 | #define NAT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10) | ||
47 | |||
48 | /** | ||
49 | * Opaque handle that can be used to cancel | ||
50 | * a transmit-ready notification. | ||
51 | */ | ||
52 | struct GNUNET_CONNECTION_TransmitHandle; | ||
53 | |||
54 | /** | ||
55 | * @brief handle for a server | ||
56 | */ | ||
57 | struct GNUNET_SERVER_Handle; | ||
58 | |||
59 | /** | ||
60 | * @brief opaque handle for a client of the server | ||
61 | */ | ||
62 | struct GNUNET_SERVER_Client; | ||
63 | |||
64 | /** | ||
65 | * @brief opaque handle server returns for aborting transmission to a client. | ||
66 | */ | ||
67 | struct GNUNET_SERVER_TransmitHandle; | ||
68 | |||
69 | /** | ||
70 | * @brief handle for a network connection | ||
71 | */ | ||
72 | struct GNUNET_CONNECTION_Handle; | ||
73 | |||
74 | /** | ||
75 | * @brief handle for a network service | ||
76 | */ | ||
77 | struct LEGACY_SERVICE_Context; | ||
78 | |||
79 | |||
80 | /** | ||
81 | * Stops a service that was started with #GNUNET_SERVICE_start(). | ||
82 | * | ||
83 | * @param srv service to stop | ||
84 | */ | ||
85 | void | ||
86 | LEGACY_SERVICE_stop (struct LEGACY_SERVICE_Context *srv); | ||
87 | |||
88 | |||
89 | |||
90 | /** | ||
91 | * Function called to notify a client about the connection begin ready | ||
92 | * to queue more data. @a buf will be NULL and @a size zero if the | ||
93 | * connection was closed for writing in the meantime. | ||
94 | * | ||
95 | * @param cls closure | ||
96 | * @param size number of bytes available in @a buf | ||
97 | * @param buf where the callee should write the message | ||
98 | * @return number of bytes written to @a buf | ||
99 | */ | ||
100 | typedef size_t | ||
101 | (*GNUNET_CONNECTION_TransmitReadyNotify) (void *cls, | ||
102 | size_t size, | ||
103 | void *buf); | ||
104 | |||
105 | /** | ||
106 | * Credentials for UNIX domain sockets. | ||
107 | */ | ||
108 | struct GNUNET_CONNECTION_Credentials | ||
109 | { | ||
110 | /** | ||
111 | * UID of the other end of the connection. | ||
112 | */ | ||
113 | uid_t uid; | ||
114 | |||
115 | /** | ||
116 | * GID of the other end of the connection. | ||
117 | */ | ||
118 | gid_t gid; | ||
119 | }; | ||
120 | |||
121 | |||
122 | /** | ||
123 | * Functions with this signature are called whenever a client | ||
124 | * is disconnected on the network level. | ||
125 | * | ||
126 | * @param cls closure | ||
127 | * @param client identification of the client; NULL | ||
128 | * for the last call when the server is destroyed | ||
129 | */ | ||
130 | typedef void | ||
131 | (*GNUNET_SERVER_DisconnectCallback) (void *cls, | ||
132 | struct GNUNET_SERVER_Client *client); | ||
133 | |||
134 | |||
135 | /** | ||
136 | * Functions with this signature are called whenever a client | ||
137 | * is connected on the network level. | ||
138 | * | ||
139 | * @param cls closure | ||
140 | * @param client identification of the client | ||
141 | */ | ||
142 | typedef void | ||
143 | (*GNUNET_SERVER_ConnectCallback) (void *cls, | ||
144 | struct GNUNET_SERVER_Client *client); | ||
145 | |||
146 | |||
147 | |||
148 | |||
149 | /** | ||
150 | * Function to call for access control checks. | ||
151 | * | ||
152 | * @param cls closure | ||
153 | * @param ucred credentials, if available, otherwise NULL | ||
154 | * @param addr address | ||
155 | * @param addrlen length of address | ||
156 | * @return GNUNET_YES to allow, GNUNET_NO to deny, GNUNET_SYSERR | ||
157 | * for unknown address family (will be denied). | ||
158 | */ | ||
159 | typedef int | ||
160 | (*GNUNET_CONNECTION_AccessCheck) (void *cls, | ||
161 | const struct | ||
162 | GNUNET_CONNECTION_Credentials * | ||
163 | ucred, | ||
164 | const struct sockaddr * addr, | ||
165 | socklen_t addrlen); | ||
166 | |||
167 | /** | ||
168 | * Callback function for data received from the network. Note that | ||
169 | * both "available" and "err" would be 0 if the read simply timed out. | ||
170 | * | ||
171 | * @param cls closure | ||
172 | * @param buf pointer to received data | ||
173 | * @param available number of bytes availabe in "buf", | ||
174 | * possibly 0 (on errors) | ||
175 | * @param addr address of the sender | ||
176 | * @param addrlen size of addr | ||
177 | * @param errCode value of errno (on errors receiving) | ||
178 | */ | ||
179 | typedef void | ||
180 | (*GNUNET_CONNECTION_Receiver) (void *cls, const void *buf, | ||
181 | size_t available, | ||
182 | const struct sockaddr * addr, | ||
183 | socklen_t addrlen, int errCode); | ||
184 | |||
185 | |||
186 | |||
187 | /** | ||
188 | * Close the connection and free associated resources. There must | ||
189 | * not be any pending requests for reading or writing to the | ||
190 | * connection at this time. | ||
191 | * | ||
192 | * @param connection connection to destroy | ||
193 | */ | ||
194 | void | ||
195 | GNUNET_CONNECTION_destroy (struct GNUNET_CONNECTION_Handle *connection); | ||
196 | |||
197 | |||
198 | /** | ||
199 | * Signature of a function to create a custom tokenizer. | ||
200 | * | ||
201 | * @param cls closure from #GNUNET_SERVER_set_callbacks | ||
202 | * @param client handle to client the tokenzier will be used for | ||
203 | * @return handle to custom tokenizer ('mst') | ||
204 | */ | ||
205 | typedef void* | ||
206 | (*GNUNET_SERVER_MstCreateCallback) (void *cls, | ||
207 | struct GNUNET_SERVER_Client *client); | ||
208 | |||
209 | |||
210 | /** | ||
211 | * Signature of a function to destroy a custom tokenizer. | ||
212 | * | ||
213 | * @param cls closure from #GNUNET_SERVER_set_callbacks | ||
214 | * @param mst custom tokenizer handle | ||
215 | */ | ||
216 | typedef void | ||
217 | (*GNUNET_SERVER_MstDestroyCallback) (void *cls, | ||
218 | void *mst); | ||
219 | |||
220 | /** | ||
221 | * Signature of a function to receive data for a custom tokenizer. | ||
222 | * | ||
223 | * @param cls closure from #GNUNET_SERVER_set_callbacks | ||
224 | * @param mst custom tokenizer handle | ||
225 | * @param client_identity ID of client for which this is a buffer, | ||
226 | * can be NULL (will be passed back to 'cb') | ||
227 | * @param buf input data to add | ||
228 | * @param size number of bytes in @a buf | ||
229 | * @param purge should any excess bytes in the buffer be discarded | ||
230 | * (i.e. for packet-based services like UDP) | ||
231 | * @param one_shot only call callback once, keep rest of message in buffer | ||
232 | * @return #GNUNET_OK if we are done processing (need more data) | ||
233 | * #GNUNET_NO if one_shot was set and we have another message ready | ||
234 | * #GNUNET_SYSERR if the data stream is corrupt | ||
235 | */ | ||
236 | typedef int | ||
237 | (*GNUNET_SERVER_MstReceiveCallback) (void *cls, void *mst, | ||
238 | struct GNUNET_SERVER_Client *client, | ||
239 | const char *buf, | ||
240 | size_t size, | ||
241 | int purge, | ||
242 | int one_shot); | ||
243 | /** | ||
244 | * Functions with this signature are called whenever a message is | ||
245 | * received. | ||
246 | * | ||
247 | * @param cls closure | ||
248 | * @param client identification of the client | ||
249 | * @param message the actual message | ||
250 | */ | ||
251 | typedef void | ||
252 | (*GNUNET_SERVER_MessageCallback) (void *cls, | ||
253 | struct GNUNET_SERVER_Client *client, | ||
254 | const struct GNUNET_MessageHeader *message); | ||
255 | |||
256 | /** | ||
257 | * Message handler. Each struct specifies how to handle on particular | ||
258 | * type of message received. | ||
259 | */ | ||
260 | struct GNUNET_SERVER_MessageHandler | ||
261 | { | ||
262 | /** | ||
263 | * Function to call for messages of "type". | ||
264 | */ | ||
265 | GNUNET_SERVER_MessageCallback callback; | ||
266 | |||
267 | /** | ||
268 | * Closure argument for @e callback. | ||
269 | */ | ||
270 | void *callback_cls; | ||
271 | |||
272 | /** | ||
273 | * Type of the message this handler covers. | ||
274 | */ | ||
275 | uint16_t type; | ||
276 | |||
277 | /** | ||
278 | * Expected size of messages of this type. Use 0 for | ||
279 | * variable-size. If non-zero, messages of the given | ||
280 | * type will be discarded (and the connection closed) | ||
281 | * if they do not have the right size. | ||
282 | */ | ||
283 | uint16_t expected_size; | ||
284 | |||
285 | }; | ||
286 | |||
287 | |||
288 | /** | ||
289 | * Options for the service (bitmask). | ||
290 | */ | ||
291 | enum LEGACY_SERVICE_Options | ||
292 | { | ||
293 | /** | ||
294 | * Use defaults. Terminates all client connections and the listen | ||
295 | * sockets immediately upon receiving the shutdown signal. | ||
296 | */ | ||
297 | LEGACY_SERVICE_OPTION_NONE = 0, | ||
298 | |||
299 | /** | ||
300 | * Do not trigger server shutdown on signal at all; instead, allow | ||
301 | * for the user to terminate the server explicitly when needed | ||
302 | * by calling #LEGACY_SERVICE_shutdown(). | ||
303 | */ | ||
304 | LEGACY_SERVICE_OPTION_MANUAL_SHUTDOWN = 1, | ||
305 | |||
306 | /** | ||
307 | * Trigger a SOFT server shutdown on signals, allowing active | ||
308 | * non-monitor clients to complete their transactions. | ||
309 | */ | ||
310 | LEGACY_SERVICE_OPTION_SOFT_SHUTDOWN = 2 | ||
311 | }; | ||
312 | |||
313 | |||
314 | |||
315 | /** | ||
316 | * Ask the server to disconnect from the given client. This is the | ||
317 | * same as passing #GNUNET_SYSERR to #GNUNET_SERVER_receive_done, | ||
318 | * except that it allows dropping of a client even when not handling a | ||
319 | * message from that client. | ||
320 | * | ||
321 | * @param client the client to disconnect from | ||
322 | */ | ||
323 | void | ||
324 | GNUNET_SERVER_client_disconnect (struct GNUNET_SERVER_Client *client); | ||
325 | |||
326 | /** | ||
327 | * Return user context associated with the given client. | ||
328 | * Note: you should probably use the macro (call without the underscore). | ||
329 | * | ||
330 | * @param client client to query | ||
331 | * @param size number of bytes in user context struct (for verification only) | ||
332 | * @return pointer to user context | ||
333 | */ | ||
334 | void * | ||
335 | GNUNET_SERVER_client_get_user_context_ (struct GNUNET_SERVER_Client *client, | ||
336 | size_t size); | ||
337 | |||
338 | |||
339 | /** | ||
340 | * Functions with this signature are called whenever a | ||
341 | * complete message is received by the tokenizer. | ||
342 | * | ||
343 | * Do not call #GNUNET_SERVER_mst_destroy from within | ||
344 | * the scope of this callback. | ||
345 | * | ||
346 | * @param cls closure | ||
347 | * @param client identification of the client | ||
348 | * @param message the actual message | ||
349 | * @return #GNUNET_OK on success, #GNUNET_SYSERR to stop further processing | ||
350 | */ | ||
351 | typedef int | ||
352 | (*GNUNET_SERVER_MessageTokenizerCallback) (void *cls, | ||
353 | void *client, | ||
354 | const struct GNUNET_MessageHeader *message); | ||
355 | |||
356 | |||
357 | /** | ||
358 | * Create a message stream tokenizer. | ||
359 | * | ||
360 | * @param cb function to call on completed messages | ||
361 | * @param cb_cls closure for @a cb | ||
362 | * @return handle to tokenizer | ||
363 | */ | ||
364 | struct GNUNET_SERVER_MessageStreamTokenizer * | ||
365 | GNUNET_SERVER_mst_create (GNUNET_SERVER_MessageTokenizerCallback cb, | ||
366 | void *cb_cls); | ||
367 | |||
368 | /** | ||
369 | * Add incoming data to the receive buffer and call the | ||
370 | * callback for all complete messages. | ||
371 | * | ||
372 | * @param mst tokenizer to use | ||
373 | * @param client_identity ID of client for which this is a buffer, | ||
374 | * can be NULL (will be passed back to 'cb') | ||
375 | * @param buf input data to add | ||
376 | * @param size number of bytes in @a buf | ||
377 | * @param purge should any excess bytes in the buffer be discarded | ||
378 | * (i.e. for packet-based services like UDP) | ||
379 | * @param one_shot only call callback once, keep rest of message in buffer | ||
380 | * @return #GNUNET_OK if we are done processing (need more data) | ||
381 | * #GNUNET_NO if one_shot was set and we have another message ready | ||
382 | * #GNUNET_SYSERR if the data stream is corrupt | ||
383 | */ | ||
384 | int | ||
385 | GNUNET_SERVER_mst_receive (struct GNUNET_SERVER_MessageStreamTokenizer *mst, | ||
386 | void *client_identity, | ||
387 | const char *buf, size_t size, | ||
388 | int purge, int one_shot); | ||
389 | |||
390 | |||
391 | |||
392 | /** | ||
393 | * Destroys a tokenizer. | ||
394 | * | ||
395 | * @param mst tokenizer to destroy | ||
396 | */ | ||
397 | void | ||
398 | GNUNET_SERVER_mst_destroy (struct GNUNET_SERVER_MessageStreamTokenizer *mst); | ||
399 | |||
400 | |||
401 | /** | ||
402 | * Set user context to be associated with the given client. | ||
403 | * Note: you should probably use the macro (call without the underscore). | ||
404 | * | ||
405 | * @param client client to query | ||
406 | * @param ptr pointer to user context | ||
407 | * @param size number of bytes in user context struct (for verification only) | ||
408 | */ | ||
409 | void | ||
410 | GNUNET_SERVER_client_set_user_context_ (struct GNUNET_SERVER_Client *client, | ||
411 | void *ptr, | ||
412 | size_t size); | ||
413 | /** | ||
414 | * Return user context associated with the given client. | ||
415 | * | ||
416 | * @param client client to query | ||
417 | * @param type expected return type (i.e. 'struct Foo') | ||
418 | * @return pointer to user context of type 'type *'. | ||
419 | */ | ||
420 | #define GNUNET_SERVER_client_get_user_context(client,type) \ | ||
421 | (type *) GNUNET_SERVER_client_get_user_context_ (client, sizeof (type)) | ||
422 | |||
423 | /** | ||
424 | * Set user context to be associated with the given client. | ||
425 | * | ||
426 | * @param client client to query | ||
427 | * @param value pointer to user context | ||
428 | */ | ||
429 | #define GNUNET_SERVER_client_set_user_context(client,value) \ | ||
430 | GNUNET_SERVER_client_set_user_context_ (client, value, sizeof (*value)) | ||
431 | |||
432 | |||
433 | |||
434 | /** | ||
435 | * Notify us when the server has enough space to transmit | ||
436 | * a message of the given size to the given client. | ||
437 | * | ||
438 | * @param client client to transmit message to | ||
439 | * @param size requested amount of buffer space | ||
440 | * @param timeout after how long should we give up (and call | ||
441 | * notify with buf NULL and size 0)? | ||
442 | * @param callback function to call when space is available | ||
443 | * @param callback_cls closure for @a callback | ||
444 | * @return non-NULL if the notify callback was queued; can be used | ||
445 | * to cancel the request using | ||
446 | * #GNUNET_SERVER_notify_transmit_ready_cancel. | ||
447 | * NULL if we are already going to notify someone else (busy) | ||
448 | */ | ||
449 | struct GNUNET_SERVER_TransmitHandle * | ||
450 | GNUNET_SERVER_notify_transmit_ready (struct GNUNET_SERVER_Client *client, | ||
451 | size_t size, | ||
452 | struct GNUNET_TIME_Relative timeout, | ||
453 | GNUNET_CONNECTION_TransmitReadyNotify callback, | ||
454 | void *callback_cls); | ||
455 | |||
456 | /** | ||
457 | * Abort transmission request. | ||
458 | * | ||
459 | * @param th request to abort | ||
460 | */ | ||
461 | void | ||
462 | GNUNET_SERVER_notify_transmit_ready_cancel (struct GNUNET_SERVER_TransmitHandle *th); | ||
463 | |||
464 | |||
465 | |||
466 | |||
467 | /** | ||
468 | * Notify the server that the given client handle should | ||
469 | * be kept (keeps the connection up if possible, increments | ||
470 | * the internal reference counter). | ||
471 | * | ||
472 | * @param client the client to keep | ||
473 | */ | ||
474 | void | ||
475 | GNUNET_SERVER_client_keep (struct GNUNET_SERVER_Client *client); | ||
476 | |||
477 | |||
478 | /** | ||
479 | * Notify the server that the given client handle is no | ||
480 | * longer required. Decrements the reference counter. If | ||
481 | * that counter reaches zero an inactive connection maybe | ||
482 | * closed. | ||
483 | * | ||
484 | * @param client the client to drop | ||
485 | */ | ||
486 | void | ||
487 | GNUNET_SERVER_client_drop (struct GNUNET_SERVER_Client *client); | ||
488 | |||
489 | |||
490 | /** | ||
491 | * Function called by the service's run | ||
492 | * method to run service-specific setup code. | ||
493 | * | ||
494 | * @param cls closure | ||
495 | * @param server the initialized server | ||
496 | * @param cfg configuration to use | ||
497 | */ | ||
498 | typedef void | ||
499 | (*LEGACY_SERVICE_Main) (void *cls, | ||
500 | struct GNUNET_SERVER_Handle *server, | ||
501 | const struct GNUNET_CONFIGURATION_Handle *cfg); | ||
502 | |||
503 | |||
504 | |||
505 | /** | ||
506 | * Suspend accepting connections from the listen socket temporarily. | ||
507 | * Resume activity using #GNUNET_SERVER_resume. | ||
508 | * | ||
509 | * @param server server to stop accepting connections. | ||
510 | */ | ||
511 | void | ||
512 | GNUNET_SERVER_suspend (struct GNUNET_SERVER_Handle *server); | ||
513 | |||
514 | /** | ||
515 | * Notify us when the server has enough space to transmit | ||
516 | * a message of the given size to the given client. | ||
517 | * | ||
518 | * @param client client to transmit message to | ||
519 | * @param size requested amount of buffer space | ||
520 | * @param timeout after how long should we give up (and call | ||
521 | * notify with buf NULL and size 0)? | ||
522 | * @param callback function to call when space is available | ||
523 | * @param callback_cls closure for @a callback | ||
524 | * @return non-NULL if the notify callback was queued; can be used | ||
525 | * to cancel the request using | ||
526 | * #GNUNET_SERVER_notify_transmit_ready_cancel. | ||
527 | * NULL if we are already going to notify someone else (busy) | ||
528 | */ | ||
529 | struct GNUNET_SERVER_TransmitHandle * | ||
530 | GNUNET_SERVER_notify_transmit_ready (struct GNUNET_SERVER_Client *client, | ||
531 | size_t size, | ||
532 | struct GNUNET_TIME_Relative timeout, | ||
533 | GNUNET_CONNECTION_TransmitReadyNotify callback, | ||
534 | void *callback_cls); | ||
535 | |||
536 | |||
537 | /** | ||
538 | * Add a TCP socket-based connection to the set of handles managed by | ||
539 | * this server. Use this function for outgoing (P2P) connections that | ||
540 | * we initiated (and where this server should process incoming | ||
541 | * messages). | ||
542 | * | ||
543 | * @param server the server to use | ||
544 | * @param connection the connection to manage (client must | ||
545 | * stop using this connection from now on) | ||
546 | * @return the client handle | ||
547 | */ | ||
548 | struct GNUNET_SERVER_Client * | ||
549 | GNUNET_SERVER_connect_socket (struct GNUNET_SERVER_Handle *server, | ||
550 | struct GNUNET_CONNECTION_Handle *connection); | ||
551 | |||
552 | |||
553 | /** | ||
554 | * Resume accepting connections from the listen socket. | ||
555 | * | ||
556 | * @param server server to resume accepting connections. | ||
557 | */ | ||
558 | void | ||
559 | GNUNET_SERVER_resume (struct GNUNET_SERVER_Handle *server); | ||
560 | |||
561 | /** | ||
562 | * Free resources held by this server. | ||
563 | * | ||
564 | * @param server server to destroy | ||
565 | */ | ||
566 | void | ||
567 | GNUNET_SERVER_destroy (struct GNUNET_SERVER_Handle *server); | ||
568 | |||
569 | |||
570 | |||
571 | |||
572 | #include "tcp_connection_legacy.c" | ||
573 | #include "tcp_server_mst_legacy.c" | ||
574 | #include "tcp_server_legacy.c" | ||
575 | #include "tcp_service_legacy.c" | ||
576 | |||
577 | GNUNET_NETWORK_STRUCT_BEGIN | ||
578 | |||
579 | /** | ||
580 | * Initial handshake message for a session. | ||
581 | */ | ||
582 | struct WelcomeMessage | ||
583 | { | ||
584 | /** | ||
585 | * Type is #GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME. | ||
586 | */ | ||
587 | struct GNUNET_MessageHeader header; | ||
588 | |||
589 | /** | ||
590 | * Identity of the node connecting (TCP client) | ||
591 | */ | ||
592 | struct GNUNET_PeerIdentity clientIdentity; | ||
593 | |||
594 | }; | ||
595 | |||
596 | /** | ||
597 | * Basically a WELCOME message, but with the purpose | ||
598 | * of giving the waiting peer a client handle to use | ||
599 | */ | ||
600 | struct TCP_NAT_ProbeMessage | ||
601 | { | ||
602 | /** | ||
603 | * Type is #GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE. | ||
604 | */ | ||
605 | struct GNUNET_MessageHeader header; | ||
606 | |||
607 | /** | ||
608 | * Identity of the sender of the message. | ||
609 | */ | ||
610 | struct GNUNET_PeerIdentity clientIdentity; | ||
611 | |||
612 | }; | ||
613 | GNUNET_NETWORK_STRUCT_END | ||
614 | |||
615 | /** | ||
616 | * Context for sending a NAT probe via TCP. | ||
617 | */ | ||
618 | struct TCPProbeContext | ||
619 | { | ||
620 | |||
621 | /** | ||
622 | * Active probes are kept in a DLL. | ||
623 | */ | ||
624 | struct TCPProbeContext *next; | ||
625 | |||
626 | /** | ||
627 | * Active probes are kept in a DLL. | ||
628 | */ | ||
629 | struct TCPProbeContext *prev; | ||
630 | |||
631 | /** | ||
632 | * Probe connection. | ||
633 | */ | ||
634 | struct GNUNET_CONNECTION_Handle *sock; | ||
635 | |||
636 | /** | ||
637 | * Message to be sent. | ||
638 | */ | ||
639 | struct TCP_NAT_ProbeMessage message; | ||
640 | |||
641 | /** | ||
642 | * Handle to the transmission. | ||
643 | */ | ||
644 | struct GNUNET_CONNECTION_TransmitHandle *transmit_handle; | ||
645 | |||
646 | /** | ||
647 | * Transport plugin handle. | ||
648 | */ | ||
649 | struct Plugin *plugin; | ||
650 | }; | ||
651 | |||
652 | /** | ||
653 | * Bits in the `options` field of TCP addresses. | ||
654 | */ | ||
655 | enum TcpAddressOptions | ||
656 | { | ||
657 | |||
658 | /** | ||
659 | * No bits set. | ||
660 | */ | ||
661 | TCP_OPTIONS_NONE = 0, | ||
662 | |||
663 | /** | ||
664 | * See #HTTP_OPTIONS_VERIFY_CERTIFICATE. | ||
665 | */ | ||
666 | TCP_OPTIONS_RESERVED = 1, | ||
667 | |||
668 | /** | ||
669 | * Enable TCP Stealth-style port knocking. | ||
670 | */ | ||
671 | TCP_OPTIONS_TCP_STEALTH = 2 | ||
672 | }; | ||
673 | |||
674 | GNUNET_NETWORK_STRUCT_BEGIN | ||
675 | |||
676 | /** | ||
677 | * Network format for IPv4 addresses. | ||
678 | */ | ||
679 | struct IPv4TcpAddress | ||
680 | { | ||
681 | /** | ||
682 | * Optional options and flags for this address, | ||
683 | * see `enum TcpAddressOptions` | ||
684 | */ | ||
685 | uint32_t options GNUNET_PACKED; | ||
686 | |||
687 | /** | ||
688 | * IPv4 address, in network byte order. | ||
689 | */ | ||
690 | uint32_t ipv4_addr GNUNET_PACKED; | ||
691 | |||
692 | /** | ||
693 | * Port number, in network byte order. | ||
694 | */ | ||
695 | uint16_t t4_port GNUNET_PACKED; | ||
696 | |||
697 | }; | ||
698 | |||
699 | /** | ||
700 | * Network format for IPv6 addresses. | ||
701 | */ | ||
702 | struct IPv6TcpAddress | ||
703 | { | ||
704 | /** | ||
705 | * Optional flags for this address | ||
706 | * see `enum TcpAddressOptions` | ||
707 | */ | ||
708 | uint32_t options GNUNET_PACKED; | ||
709 | |||
710 | /** | ||
711 | * IPv6 address. | ||
712 | */ | ||
713 | struct in6_addr ipv6_addr GNUNET_PACKED; | ||
714 | |||
715 | /** | ||
716 | * Port number, in network byte order. | ||
717 | */ | ||
718 | uint16_t t6_port GNUNET_PACKED; | ||
719 | |||
720 | }; | ||
721 | GNUNET_NETWORK_STRUCT_END | ||
722 | |||
723 | /** | ||
724 | * Encapsulation of all of the state of the plugin. | ||
725 | */ | ||
726 | struct Plugin; | ||
727 | |||
728 | /** | ||
729 | * Information kept for each message that is yet to | ||
730 | * be transmitted. | ||
731 | */ | ||
732 | struct PendingMessage | ||
733 | { | ||
734 | |||
735 | /** | ||
736 | * This is a doubly-linked list. | ||
737 | */ | ||
738 | struct PendingMessage *next; | ||
739 | |||
740 | /** | ||
741 | * This is a doubly-linked list. | ||
742 | */ | ||
743 | struct PendingMessage *prev; | ||
744 | |||
745 | /** | ||
746 | * The pending message | ||
747 | */ | ||
748 | const char *msg; | ||
749 | |||
750 | /** | ||
751 | * Continuation function to call once the message | ||
752 | * has been sent. Can be NULL if there is no | ||
753 | * continuation to call. | ||
754 | */ | ||
755 | GNUNET_TRANSPORT_TransmitContinuation transmit_cont; | ||
756 | |||
757 | /** | ||
758 | * Closure for @e transmit_cont. | ||
759 | */ | ||
760 | void *transmit_cont_cls; | ||
761 | |||
762 | /** | ||
763 | * Timeout value for the pending message. | ||
764 | */ | ||
765 | struct GNUNET_TIME_Absolute timeout; | ||
766 | |||
767 | /** | ||
768 | * So that the gnunet-service-transport can group messages together, | ||
769 | * these pending messages need to accept a message buffer and size | ||
770 | * instead of just a `struct GNUNET_MessageHeader`. | ||
771 | */ | ||
772 | size_t message_size; | ||
773 | |||
774 | }; | ||
775 | |||
776 | /** | ||
777 | * Session handle for TCP connections. | ||
778 | */ | ||
779 | struct GNUNET_ATS_Session | ||
780 | { | ||
781 | /** | ||
782 | * To whom are we talking to (set to our identity | ||
783 | * if we are still waiting for the welcome message) | ||
784 | */ | ||
785 | struct GNUNET_PeerIdentity target; | ||
786 | |||
787 | /** | ||
788 | * Pointer to the global plugin struct. | ||
789 | */ | ||
790 | struct Plugin *plugin; | ||
791 | |||
792 | /** | ||
793 | * The client (used to identify this connection) | ||
794 | */ | ||
795 | struct GNUNET_SERVER_Client *client; | ||
796 | |||
797 | /** | ||
798 | * Task cleaning up a NAT client connection establishment attempt; | ||
799 | */ | ||
800 | struct GNUNET_SCHEDULER_Task *nat_connection_timeout; | ||
801 | |||
802 | /** | ||
803 | * Messages currently pending for transmission | ||
804 | * to this peer, if any. | ||
805 | */ | ||
806 | struct PendingMessage *pending_messages_head; | ||
807 | |||
808 | /** | ||
809 | * Messages currently pending for transmission | ||
810 | * to this peer, if any. | ||
811 | */ | ||
812 | struct PendingMessage *pending_messages_tail; | ||
813 | |||
814 | /** | ||
815 | * Handle for pending transmission request. | ||
816 | */ | ||
817 | struct GNUNET_SERVER_TransmitHandle *transmit_handle; | ||
818 | |||
819 | /** | ||
820 | * Address of the other peer. | ||
821 | */ | ||
822 | struct GNUNET_HELLO_Address *address; | ||
823 | |||
824 | /** | ||
825 | * ID of task used to delay receiving more to throttle sender. | ||
826 | */ | ||
827 | struct GNUNET_SCHEDULER_Task *receive_delay_task; | ||
828 | |||
829 | /** | ||
830 | * Session timeout task | ||
831 | */ | ||
832 | struct GNUNET_SCHEDULER_Task *timeout_task; | ||
833 | |||
834 | /** | ||
835 | * When will this session time out? | ||
836 | */ | ||
837 | struct GNUNET_TIME_Absolute timeout; | ||
838 | |||
839 | /** | ||
840 | * When will we continue to read from the socket? | ||
841 | * (used to enforce inbound quota). | ||
842 | */ | ||
843 | struct GNUNET_TIME_Absolute receive_delay; | ||
844 | |||
845 | /** | ||
846 | * Last activity on this connection. Used to select preferred | ||
847 | * connection. | ||
848 | */ | ||
849 | struct GNUNET_TIME_Absolute last_activity; | ||
850 | |||
851 | /** | ||
852 | * Number of bytes waiting for transmission to this peer. | ||
853 | */ | ||
854 | unsigned long long bytes_in_queue; | ||
855 | |||
856 | /** | ||
857 | * Number of messages waiting for transmission to this peer. | ||
858 | */ | ||
859 | unsigned int msgs_in_queue; | ||
860 | |||
861 | /** | ||
862 | * Network type of the address. | ||
863 | */ | ||
864 | enum GNUNET_NetworkType scope; | ||
865 | |||
866 | /** | ||
867 | * Are we still expecting the welcome message? (#GNUNET_YES/#GNUNET_NO) | ||
868 | */ | ||
869 | int expecting_welcome; | ||
870 | |||
871 | /** | ||
872 | * Was this session created using NAT traversal? | ||
873 | */ | ||
874 | int is_nat; | ||
875 | |||
876 | }; | ||
877 | |||
878 | |||
879 | /** | ||
880 | * Context for address to string conversion, closure | ||
881 | * for #append_port(). | ||
882 | */ | ||
883 | struct PrettyPrinterContext | ||
884 | { | ||
885 | /** | ||
886 | * DLL | ||
887 | */ | ||
888 | struct PrettyPrinterContext *next; | ||
889 | |||
890 | /** | ||
891 | * DLL | ||
892 | */ | ||
893 | struct PrettyPrinterContext *prev; | ||
894 | |||
895 | /** | ||
896 | * Our plugin. | ||
897 | */ | ||
898 | struct Plugin *plugin; | ||
899 | |||
900 | /** | ||
901 | * Timeout task | ||
902 | */ | ||
903 | struct GNUNET_SCHEDULER_Task *timeout_task; | ||
904 | |||
905 | /** | ||
906 | * Resolver handle | ||
907 | */ | ||
908 | struct GNUNET_RESOLVER_RequestHandle *resolver_handle; | ||
909 | |||
910 | /** | ||
911 | * Function to call with the result. | ||
912 | */ | ||
913 | GNUNET_TRANSPORT_AddressStringCallback asc; | ||
914 | |||
915 | /** | ||
916 | * Clsoure for @e asc. | ||
917 | */ | ||
918 | void *asc_cls; | ||
919 | |||
920 | /** | ||
921 | * IPv6 address | ||
922 | */ | ||
923 | int ipv6; | ||
924 | |||
925 | /** | ||
926 | * Options | ||
927 | */ | ||
928 | uint32_t options; | ||
929 | |||
930 | /** | ||
931 | * Port to add after the IP address. | ||
932 | */ | ||
933 | uint16_t port; | ||
934 | }; | ||
935 | |||
936 | |||
937 | /** | ||
938 | * Encapsulation of all of the state of the plugin. | ||
939 | */ | ||
940 | struct Plugin | ||
941 | { | ||
942 | /** | ||
943 | * Our environment. | ||
944 | */ | ||
945 | struct GNUNET_TRANSPORT_PluginEnvironment *env; | ||
946 | |||
947 | /** | ||
948 | * The listen socket. | ||
949 | */ | ||
950 | struct GNUNET_CONNECTION_Handle *lsock; | ||
951 | |||
952 | /** | ||
953 | * Our handle to the NAT module. | ||
954 | */ | ||
955 | struct GNUNET_NAT_Handle *nat; | ||
956 | |||
957 | /** | ||
958 | * Map from peer identities to sessions for the given peer. | ||
959 | */ | ||
960 | struct GNUNET_CONTAINER_MultiPeerMap *sessionmap; | ||
961 | |||
962 | /** | ||
963 | * Handle to the network service. | ||
964 | */ | ||
965 | struct LEGACY_SERVICE_Context *service; | ||
966 | |||
967 | /** | ||
968 | * Handle to the server for this service. | ||
969 | */ | ||
970 | struct GNUNET_SERVER_Handle *server; | ||
971 | |||
972 | /** | ||
973 | * Copy of the handler array where the closures are | ||
974 | * set to this struct's instance. | ||
975 | */ | ||
976 | struct GNUNET_SERVER_MessageHandler *handlers; | ||
977 | |||
978 | /** | ||
979 | * Map of peers we have tried to contact behind a NAT | ||
980 | */ | ||
981 | struct GNUNET_CONTAINER_MultiPeerMap *nat_wait_conns; | ||
982 | |||
983 | /** | ||
984 | * List of active TCP probes. | ||
985 | */ | ||
986 | struct TCPProbeContext *probe_head; | ||
987 | |||
988 | /** | ||
989 | * List of active TCP probes. | ||
990 | */ | ||
991 | struct TCPProbeContext *probe_tail; | ||
992 | |||
993 | /** | ||
994 | * Function to call about session status changes. | ||
995 | */ | ||
996 | GNUNET_TRANSPORT_SessionInfoCallback sic; | ||
997 | |||
998 | /** | ||
999 | * Closure for @e sic. | ||
1000 | */ | ||
1001 | void *sic_cls; | ||
1002 | |||
1003 | /** | ||
1004 | * ID of task used to update our addresses when one expires. | ||
1005 | */ | ||
1006 | struct GNUNET_SCHEDULER_Task *address_update_task; | ||
1007 | |||
1008 | /** | ||
1009 | * Running pretty printers: head | ||
1010 | */ | ||
1011 | struct PrettyPrinterContext *ppc_dll_head; | ||
1012 | |||
1013 | /** | ||
1014 | * Running pretty printers: tail | ||
1015 | */ | ||
1016 | struct PrettyPrinterContext *ppc_dll_tail; | ||
1017 | |||
1018 | /** | ||
1019 | * Welcome message used by this peer. | ||
1020 | */ | ||
1021 | struct WelcomeMessage my_welcome; | ||
1022 | |||
1023 | /** | ||
1024 | * How many more TCP sessions are we allowed to open right now? | ||
1025 | */ | ||
1026 | unsigned long long max_connections; | ||
1027 | |||
1028 | /** | ||
1029 | * How many more TCP sessions do we have right now? | ||
1030 | */ | ||
1031 | unsigned long long cur_connections; | ||
1032 | |||
1033 | /** | ||
1034 | * Address options | ||
1035 | */ | ||
1036 | uint32_t myoptions; | ||
1037 | |||
1038 | /** | ||
1039 | * Port that we are actually listening on. | ||
1040 | */ | ||
1041 | uint16_t open_port; | ||
1042 | |||
1043 | /** | ||
1044 | * Port that the user said we would have visible to the | ||
1045 | * rest of the world. | ||
1046 | */ | ||
1047 | uint16_t adv_port; | ||
1048 | |||
1049 | }; | ||
1050 | |||
1051 | |||
1052 | /** | ||
1053 | * Get the list of addresses that a server for the given service | ||
1054 | * should bind to. | ||
1055 | * | ||
1056 | * @param service_name name of the service | ||
1057 | * @param cfg configuration (which specifies the addresses) | ||
1058 | * @param addrs set (call by reference) to an array of pointers to the | ||
1059 | * addresses the server should bind to and listen on; the | ||
1060 | * array will be NULL-terminated (on success) | ||
1061 | * @param addr_lens set (call by reference) to an array of the lengths | ||
1062 | * of the respective `struct sockaddr` struct in the @a addrs | ||
1063 | * array (on success) | ||
1064 | * @return number of addresses found on success, | ||
1065 | * #GNUNET_SYSERR if the configuration | ||
1066 | * did not specify reasonable finding information or | ||
1067 | * if it specified a hostname that could not be resolved; | ||
1068 | * #GNUNET_NO if the number of addresses configured is | ||
1069 | * zero (in this case, `*addrs` and `*addr_lens` will be | ||
1070 | * set to NULL). | ||
1071 | */ | ||
1072 | static int | ||
1073 | get_server_addresses (const char *service_name, | ||
1074 | const struct GNUNET_CONFIGURATION_Handle *cfg, | ||
1075 | struct sockaddr ***addrs, | ||
1076 | socklen_t ** addr_lens) | ||
1077 | { | ||
1078 | int disablev6; | ||
1079 | struct GNUNET_NETWORK_Handle *desc; | ||
1080 | unsigned long long port; | ||
1081 | char *unixpath; | ||
1082 | struct addrinfo hints; | ||
1083 | struct addrinfo *res; | ||
1084 | struct addrinfo *pos; | ||
1085 | struct addrinfo *next; | ||
1086 | unsigned int i; | ||
1087 | int resi; | ||
1088 | int ret; | ||
1089 | int abstract; | ||
1090 | struct sockaddr **saddrs; | ||
1091 | socklen_t *saddrlens; | ||
1092 | char *hostname; | ||
1093 | |||
1094 | *addrs = NULL; | ||
1095 | *addr_lens = NULL; | ||
1096 | desc = NULL; | ||
1097 | if (GNUNET_CONFIGURATION_have_value (cfg, service_name, "DISABLEV6")) | ||
1098 | { | ||
1099 | if (GNUNET_SYSERR == | ||
1100 | (disablev6 = | ||
1101 | GNUNET_CONFIGURATION_get_value_yesno (cfg, service_name, "DISABLEV6"))) | ||
1102 | return GNUNET_SYSERR; | ||
1103 | } | ||
1104 | else | ||
1105 | disablev6 = GNUNET_NO; | ||
1106 | |||
1107 | if (! disablev6) | ||
1108 | { | ||
1109 | /* probe IPv6 support */ | ||
1110 | desc = GNUNET_NETWORK_socket_create (PF_INET6, SOCK_STREAM, 0); | ||
1111 | if (NULL == desc) | ||
1112 | { | ||
1113 | if ((ENOBUFS == errno) || (ENOMEM == errno) || (ENFILE == errno) || | ||
1114 | (EACCES == errno)) | ||
1115 | { | ||
1116 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket"); | ||
1117 | return GNUNET_SYSERR; | ||
1118 | } | ||
1119 | LOG (GNUNET_ERROR_TYPE_INFO, | ||
1120 | _("Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"), | ||
1121 | service_name, STRERROR (errno)); | ||
1122 | disablev6 = GNUNET_YES; | ||
1123 | } | ||
1124 | else | ||
1125 | { | ||
1126 | GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (desc)); | ||
1127 | desc = NULL; | ||
1128 | } | ||
1129 | } | ||
1130 | |||
1131 | port = 0; | ||
1132 | if (GNUNET_CONFIGURATION_have_value (cfg, service_name, "PORT")) | ||
1133 | { | ||
1134 | if (GNUNET_OK != | ||
1135 | GNUNET_CONFIGURATION_get_value_number (cfg, service_name, | ||
1136 | "PORT", &port)) | ||
1137 | { | ||
1138 | LOG (GNUNET_ERROR_TYPE_ERROR, | ||
1139 | _("Require valid port number for service `%s' in configuration!\n"), | ||
1140 | service_name); | ||
1141 | } | ||
1142 | if (port > 65535) | ||
1143 | { | ||
1144 | LOG (GNUNET_ERROR_TYPE_ERROR, | ||
1145 | _("Require valid port number for service `%s' in configuration!\n"), | ||
1146 | service_name); | ||
1147 | return GNUNET_SYSERR; | ||
1148 | } | ||
1149 | } | ||
1150 | |||
1151 | if (GNUNET_CONFIGURATION_have_value (cfg, service_name, "BINDTO")) | ||
1152 | { | ||
1153 | GNUNET_break (GNUNET_OK == | ||
1154 | GNUNET_CONFIGURATION_get_value_string (cfg, service_name, | ||
1155 | "BINDTO", &hostname)); | ||
1156 | } | ||
1157 | else | ||
1158 | hostname = NULL; | ||
1159 | |||
1160 | unixpath = NULL; | ||
1161 | abstract = GNUNET_NO; | ||
1162 | #ifdef AF_UNIX | ||
1163 | if ((GNUNET_YES == | ||
1164 | GNUNET_CONFIGURATION_have_value (cfg, service_name, "UNIXPATH")) && | ||
1165 | (GNUNET_OK == | ||
1166 | GNUNET_CONFIGURATION_get_value_filename (cfg, service_name, "UNIXPATH", | ||
1167 | &unixpath)) && | ||
1168 | (0 < strlen (unixpath))) | ||
1169 | { | ||
1170 | /* probe UNIX support */ | ||
1171 | struct sockaddr_un s_un; | ||
1172 | |||
1173 | if (strlen (unixpath) >= sizeof (s_un.sun_path)) | ||
1174 | { | ||
1175 | LOG (GNUNET_ERROR_TYPE_WARNING, | ||
1176 | _("UNIXPATH `%s' too long, maximum length is %llu\n"), unixpath, | ||
1177 | (unsigned long long) sizeof (s_un.sun_path)); | ||
1178 | unixpath = GNUNET_NETWORK_shorten_unixpath (unixpath); | ||
1179 | LOG (GNUNET_ERROR_TYPE_INFO, | ||
1180 | _("Using `%s' instead\n"), | ||
1181 | unixpath); | ||
1182 | } | ||
1183 | #ifdef LINUX | ||
1184 | abstract = GNUNET_CONFIGURATION_get_value_yesno (cfg, | ||
1185 | "TESTING", | ||
1186 | "USE_ABSTRACT_SOCKETS"); | ||
1187 | if (GNUNET_SYSERR == abstract) | ||
1188 | abstract = GNUNET_NO; | ||
1189 | #endif | ||
1190 | if ((GNUNET_YES != abstract) | ||
1191 | && (GNUNET_OK != | ||
1192 | GNUNET_DISK_directory_create_for_file (unixpath))) | ||
1193 | GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, | ||
1194 | "mkdir", | ||
1195 | unixpath); | ||
1196 | } | ||
1197 | if (NULL != unixpath) | ||
1198 | { | ||
1199 | desc = GNUNET_NETWORK_socket_create (AF_UNIX, SOCK_STREAM, 0); | ||
1200 | if (NULL == desc) | ||
1201 | { | ||
1202 | if ((ENOBUFS == errno) || (ENOMEM == errno) || (ENFILE == errno) || | ||
1203 | (EACCES == errno)) | ||
1204 | { | ||
1205 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket"); | ||
1206 | GNUNET_free_non_null (hostname); | ||
1207 | GNUNET_free (unixpath); | ||
1208 | return GNUNET_SYSERR; | ||
1209 | } | ||
1210 | LOG (GNUNET_ERROR_TYPE_INFO, | ||
1211 | _("Disabling UNIX domain socket support for service `%s', failed to create UNIX domain socket: %s\n"), | ||
1212 | service_name, | ||
1213 | STRERROR (errno)); | ||
1214 | GNUNET_free (unixpath); | ||
1215 | unixpath = NULL; | ||
1216 | } | ||
1217 | else | ||
1218 | { | ||
1219 | GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (desc)); | ||
1220 | desc = NULL; | ||
1221 | } | ||
1222 | } | ||
1223 | #endif | ||
1224 | |||
1225 | if ((0 == port) && (NULL == unixpath)) | ||
1226 | { | ||
1227 | LOG (GNUNET_ERROR_TYPE_ERROR, | ||
1228 | _("Have neither PORT nor UNIXPATH for service `%s', but one is required\n"), | ||
1229 | service_name); | ||
1230 | GNUNET_free_non_null (hostname); | ||
1231 | return GNUNET_SYSERR; | ||
1232 | } | ||
1233 | if (0 == port) | ||
1234 | { | ||
1235 | saddrs = GNUNET_malloc (2 * sizeof (struct sockaddr *)); | ||
1236 | saddrlens = GNUNET_malloc (2 * sizeof (socklen_t)); | ||
1237 | add_unixpath (saddrs, saddrlens, unixpath, abstract); | ||
1238 | GNUNET_free_non_null (unixpath); | ||
1239 | GNUNET_free_non_null (hostname); | ||
1240 | *addrs = saddrs; | ||
1241 | *addr_lens = saddrlens; | ||
1242 | return 1; | ||
1243 | } | ||
1244 | |||
1245 | if (NULL != hostname) | ||
1246 | { | ||
1247 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
1248 | "Resolving `%s' since that is where `%s' will bind to.\n", | ||
1249 | hostname, | ||
1250 | service_name); | ||
1251 | memset (&hints, 0, sizeof (struct addrinfo)); | ||
1252 | if (disablev6) | ||
1253 | hints.ai_family = AF_INET; | ||
1254 | hints.ai_protocol = IPPROTO_TCP; | ||
1255 | if ((0 != (ret = getaddrinfo (hostname, NULL, &hints, &res))) || | ||
1256 | (NULL == res)) | ||
1257 | { | ||
1258 | LOG (GNUNET_ERROR_TYPE_ERROR, | ||
1259 | _("Failed to resolve `%s': %s\n"), | ||
1260 | hostname, | ||
1261 | gai_strerror (ret)); | ||
1262 | GNUNET_free (hostname); | ||
1263 | GNUNET_free_non_null (unixpath); | ||
1264 | return GNUNET_SYSERR; | ||
1265 | } | ||
1266 | next = res; | ||
1267 | i = 0; | ||
1268 | while (NULL != (pos = next)) | ||
1269 | { | ||
1270 | next = pos->ai_next; | ||
1271 | if ((disablev6) && (pos->ai_family == AF_INET6)) | ||
1272 | continue; | ||
1273 | i++; | ||
1274 | } | ||
1275 | if (0 == i) | ||
1276 | { | ||
1277 | LOG (GNUNET_ERROR_TYPE_ERROR, | ||
1278 | _("Failed to find %saddress for `%s'.\n"), | ||
1279 | disablev6 ? "IPv4 " : "", | ||
1280 | hostname); | ||
1281 | freeaddrinfo (res); | ||
1282 | GNUNET_free (hostname); | ||
1283 | GNUNET_free_non_null (unixpath); | ||
1284 | return GNUNET_SYSERR; | ||
1285 | } | ||
1286 | resi = i; | ||
1287 | if (NULL != unixpath) | ||
1288 | resi++; | ||
1289 | saddrs = GNUNET_malloc ((resi + 1) * sizeof (struct sockaddr *)); | ||
1290 | saddrlens = GNUNET_malloc ((resi + 1) * sizeof (socklen_t)); | ||
1291 | i = 0; | ||
1292 | if (NULL != unixpath) | ||
1293 | { | ||
1294 | add_unixpath (saddrs, saddrlens, unixpath, abstract); | ||
1295 | i++; | ||
1296 | } | ||
1297 | next = res; | ||
1298 | while (NULL != (pos = next)) | ||
1299 | { | ||
1300 | next = pos->ai_next; | ||
1301 | if ((disablev6) && (AF_INET6 == pos->ai_family)) | ||
1302 | continue; | ||
1303 | if ((IPPROTO_TCP != pos->ai_protocol) && (0 != pos->ai_protocol)) | ||
1304 | continue; /* not TCP */ | ||
1305 | if ((SOCK_STREAM != pos->ai_socktype) && (0 != pos->ai_socktype)) | ||
1306 | continue; /* huh? */ | ||
1307 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Service `%s' will bind to `%s'\n", | ||
1308 | service_name, GNUNET_a2s (pos->ai_addr, pos->ai_addrlen)); | ||
1309 | if (AF_INET == pos->ai_family) | ||
1310 | { | ||
1311 | GNUNET_assert (sizeof (struct sockaddr_in) == pos->ai_addrlen); | ||
1312 | saddrlens[i] = pos->ai_addrlen; | ||
1313 | saddrs[i] = GNUNET_malloc (saddrlens[i]); | ||
1314 | GNUNET_memcpy (saddrs[i], pos->ai_addr, saddrlens[i]); | ||
1315 | ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port); | ||
1316 | } | ||
1317 | else | ||
1318 | { | ||
1319 | GNUNET_assert (AF_INET6 == pos->ai_family); | ||
1320 | GNUNET_assert (sizeof (struct sockaddr_in6) == pos->ai_addrlen); | ||
1321 | saddrlens[i] = pos->ai_addrlen; | ||
1322 | saddrs[i] = GNUNET_malloc (saddrlens[i]); | ||
1323 | GNUNET_memcpy (saddrs[i], pos->ai_addr, saddrlens[i]); | ||
1324 | ((struct sockaddr_in6 *) saddrs[i])->sin6_port = htons (port); | ||
1325 | } | ||
1326 | i++; | ||
1327 | } | ||
1328 | GNUNET_free (hostname); | ||
1329 | freeaddrinfo (res); | ||
1330 | resi = i; | ||
1331 | } | ||
1332 | else | ||
1333 | { | ||
1334 | /* will bind against everything, just set port */ | ||
1335 | if (disablev6) | ||
1336 | { | ||
1337 | /* V4-only */ | ||
1338 | resi = 1; | ||
1339 | if (NULL != unixpath) | ||
1340 | resi++; | ||
1341 | i = 0; | ||
1342 | saddrs = GNUNET_malloc ((resi + 1) * sizeof (struct sockaddr *)); | ||
1343 | saddrlens = GNUNET_malloc ((resi + 1) * sizeof (socklen_t)); | ||
1344 | if (NULL != unixpath) | ||
1345 | { | ||
1346 | add_unixpath (saddrs, saddrlens, unixpath, abstract); | ||
1347 | i++; | ||
1348 | } | ||
1349 | saddrlens[i] = sizeof (struct sockaddr_in); | ||
1350 | saddrs[i] = GNUNET_malloc (saddrlens[i]); | ||
1351 | #if HAVE_SOCKADDR_IN_SIN_LEN | ||
1352 | ((struct sockaddr_in *) saddrs[i])->sin_len = saddrlens[i]; | ||
1353 | #endif | ||
1354 | ((struct sockaddr_in *) saddrs[i])->sin_family = AF_INET; | ||
1355 | ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port); | ||
1356 | } | ||
1357 | else | ||
1358 | { | ||
1359 | /* dual stack */ | ||
1360 | resi = 2; | ||
1361 | if (NULL != unixpath) | ||
1362 | resi++; | ||
1363 | saddrs = GNUNET_malloc ((resi + 1) * sizeof (struct sockaddr *)); | ||
1364 | saddrlens = GNUNET_malloc ((resi + 1) * sizeof (socklen_t)); | ||
1365 | i = 0; | ||
1366 | if (NULL != unixpath) | ||
1367 | { | ||
1368 | add_unixpath (saddrs, saddrlens, unixpath, abstract); | ||
1369 | i++; | ||
1370 | } | ||
1371 | saddrlens[i] = sizeof (struct sockaddr_in6); | ||
1372 | saddrs[i] = GNUNET_malloc (saddrlens[i]); | ||
1373 | #if HAVE_SOCKADDR_IN_SIN_LEN | ||
1374 | ((struct sockaddr_in6 *) saddrs[i])->sin6_len = saddrlens[0]; | ||
1375 | #endif | ||
1376 | ((struct sockaddr_in6 *) saddrs[i])->sin6_family = AF_INET6; | ||
1377 | ((struct sockaddr_in6 *) saddrs[i])->sin6_port = htons (port); | ||
1378 | i++; | ||
1379 | saddrlens[i] = sizeof (struct sockaddr_in); | ||
1380 | saddrs[i] = GNUNET_malloc (saddrlens[i]); | ||
1381 | #if HAVE_SOCKADDR_IN_SIN_LEN | ||
1382 | ((struct sockaddr_in *) saddrs[i])->sin_len = saddrlens[1]; | ||
1383 | #endif | ||
1384 | ((struct sockaddr_in *) saddrs[i])->sin_family = AF_INET; | ||
1385 | ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port); | ||
1386 | } | ||
1387 | } | ||
1388 | GNUNET_free_non_null (unixpath); | ||
1389 | *addrs = saddrs; | ||
1390 | *addr_lens = saddrlens; | ||
1391 | return resi; | ||
1392 | } | ||
1393 | /* end ancient copy-and-paste */ | ||
1394 | |||
1395 | |||
1396 | /** | ||
1397 | * If a session monitor is attached, notify it about the new | ||
1398 | * session state. | ||
1399 | * | ||
1400 | * @param plugin our plugin | ||
1401 | * @param session session that changed state | ||
1402 | * @param state new state of the session | ||
1403 | */ | ||
1404 | static void | ||
1405 | notify_session_monitor (struct Plugin *plugin, | ||
1406 | struct GNUNET_ATS_Session *session, | ||
1407 | enum GNUNET_TRANSPORT_SessionState state) | ||
1408 | { | ||
1409 | struct GNUNET_TRANSPORT_SessionInfo info; | ||
1410 | |||
1411 | if (NULL == plugin->sic) | ||
1412 | return; | ||
1413 | memset (&info, 0, sizeof (info)); | ||
1414 | info.state = state; | ||
1415 | info.is_inbound = GNUNET_HELLO_address_check_option (session->address, | ||
1416 | GNUNET_HELLO_ADDRESS_INFO_INBOUND); | ||
1417 | info.num_msg_pending = session->msgs_in_queue; | ||
1418 | info.num_bytes_pending = session->bytes_in_queue; | ||
1419 | if (NULL != session->receive_delay_task) | ||
1420 | info.receive_delay = session->receive_delay; | ||
1421 | info.session_timeout = session->timeout; | ||
1422 | info.address = session->address; | ||
1423 | plugin->sic (plugin->sic_cls, | ||
1424 | session, | ||
1425 | &info); | ||
1426 | } | ||
1427 | |||
1428 | |||
1429 | /** | ||
1430 | * Our external IP address/port mapping has changed. | ||
1431 | * | ||
1432 | * @param cls closure, the `struct Plugin` | ||
1433 | * @param add_remove #GNUNET_YES to mean the new public IP address, #GNUNET_NO to mean | ||
1434 | * the previous (now invalid) one | ||
1435 | * @param ac address class the address belongs to | ||
1436 | * @param addr either the previous or the new public IP address | ||
1437 | * @param addrlen actual length of @a addr | ||
1438 | */ | ||
1439 | static void | ||
1440 | tcp_nat_port_map_callback (void *cls, | ||
1441 | int add_remove, | ||
1442 | enum GNUNET_NAT_AddressClass ac, | ||
1443 | const struct sockaddr *addr, | ||
1444 | socklen_t addrlen) | ||
1445 | { | ||
1446 | struct Plugin *plugin = cls; | ||
1447 | struct GNUNET_HELLO_Address *address; | ||
1448 | struct IPv4TcpAddress t4; | ||
1449 | struct IPv6TcpAddress t6; | ||
1450 | void *arg; | ||
1451 | size_t args; | ||
1452 | |||
1453 | if (GNUNET_NAT_AC_LOOPBACK == ac) | ||
1454 | return; | ||
1455 | if (GNUNET_NAT_AC_LAN == ac) | ||
1456 | return; | ||
1457 | if (GNUNET_NAT_AC_LAN_PRIVATE == ac) | ||
1458 | return; | ||
1459 | LOG (GNUNET_ERROR_TYPE_INFO, | ||
1460 | "NAT notification to %s address `%s'\n", | ||
1461 | (GNUNET_YES == add_remove) ? "add" : "remove", | ||
1462 | GNUNET_a2s (addr, addrlen)); | ||
1463 | /* convert 'addr' to our internal format */ | ||
1464 | switch (addr->sa_family) | ||
1465 | { | ||
1466 | case AF_INET: | ||
1467 | GNUNET_assert(addrlen == sizeof(struct sockaddr_in)); | ||
1468 | memset (&t4, 0, sizeof(t4)); | ||
1469 | t4.options = htonl (plugin->myoptions); | ||
1470 | t4.ipv4_addr = ((struct sockaddr_in *) addr)->sin_addr.s_addr; | ||
1471 | t4.t4_port = ((struct sockaddr_in *) addr)->sin_port; | ||
1472 | arg = &t4; | ||
1473 | args = sizeof (t4); | ||
1474 | break; | ||
1475 | case AF_INET6: | ||
1476 | GNUNET_assert(addrlen == sizeof(struct sockaddr_in6)); | ||
1477 | memset (&t6, 0, sizeof(t6)); | ||
1478 | GNUNET_memcpy (&t6.ipv6_addr, | ||
1479 | &((struct sockaddr_in6 *) addr)->sin6_addr, | ||
1480 | sizeof(struct in6_addr)); | ||
1481 | t6.options = htonl (plugin->myoptions); | ||
1482 | t6.t6_port = ((struct sockaddr_in6 *) addr)->sin6_port; | ||
1483 | arg = &t6; | ||
1484 | args = sizeof (t6); | ||
1485 | break; | ||
1486 | default: | ||
1487 | GNUNET_break(0); | ||
1488 | return; | ||
1489 | } | ||
1490 | /* modify our published address list */ | ||
1491 | GNUNET_assert ((args == sizeof (struct IPv4TcpAddress)) || | ||
1492 | (args == sizeof (struct IPv6TcpAddress))); | ||
1493 | /* TODO: use 'ac' here in the future... */ | ||
1494 | address = GNUNET_HELLO_address_allocate (plugin->env->my_identity, | ||
1495 | PLUGIN_NAME, | ||
1496 | arg, | ||
1497 | args, | ||
1498 | GNUNET_HELLO_ADDRESS_INFO_NONE); | ||
1499 | plugin->env->notify_address (plugin->env->cls, | ||
1500 | add_remove, | ||
1501 | address); | ||
1502 | GNUNET_HELLO_address_free (address); | ||
1503 | } | ||
1504 | |||
1505 | |||
1506 | /** | ||
1507 | * Function called for a quick conversion of the binary address to | ||
1508 | * a numeric address. Note that the caller must not free the | ||
1509 | * address and that the next call to this function is allowed | ||
1510 | * to override the address again. | ||
1511 | * | ||
1512 | * @param cls closure (`struct Plugin*`) | ||
1513 | * @param addr binary address | ||
1514 | * @param addrlen length of @a addr | ||
1515 | * @return string representing the same address | ||
1516 | */ | ||
1517 | static const char * | ||
1518 | tcp_plugin_address_to_string (void *cls, | ||
1519 | const void *addr, | ||
1520 | size_t addrlen) | ||
1521 | { | ||
1522 | static char rbuf[INET6_ADDRSTRLEN + 12]; | ||
1523 | char buf[INET6_ADDRSTRLEN]; | ||
1524 | const void *sb; | ||
1525 | struct in_addr a4; | ||
1526 | struct in6_addr a6; | ||
1527 | const struct IPv4TcpAddress *t4; | ||
1528 | const struct IPv6TcpAddress *t6; | ||
1529 | int af; | ||
1530 | uint16_t port; | ||
1531 | uint32_t options; | ||
1532 | |||
1533 | switch (addrlen) | ||
1534 | { | ||
1535 | case sizeof(struct IPv6TcpAddress): | ||
1536 | t6 = addr; | ||
1537 | af = AF_INET6; | ||
1538 | port = ntohs (t6->t6_port); | ||
1539 | options = ntohl (t6->options); | ||
1540 | GNUNET_memcpy (&a6, &t6->ipv6_addr, sizeof(a6)); | ||
1541 | sb = &a6; | ||
1542 | break; | ||
1543 | case sizeof(struct IPv4TcpAddress): | ||
1544 | t4 = addr; | ||
1545 | af = AF_INET; | ||
1546 | port = ntohs (t4->t4_port); | ||
1547 | options = ntohl (t4->options); | ||
1548 | GNUNET_memcpy (&a4, &t4->ipv4_addr, sizeof(a4)); | ||
1549 | sb = &a4; | ||
1550 | break; | ||
1551 | default: | ||
1552 | LOG (GNUNET_ERROR_TYPE_WARNING, | ||
1553 | _("Unexpected address length: %u bytes\n"), | ||
1554 | (unsigned int) addrlen); | ||
1555 | return NULL ; | ||
1556 | } | ||
1557 | if (NULL == inet_ntop (af, sb, buf, INET6_ADDRSTRLEN)) | ||
1558 | { | ||
1559 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, | ||
1560 | "inet_ntop"); | ||
1561 | return NULL ; | ||
1562 | } | ||
1563 | GNUNET_snprintf (rbuf, sizeof(rbuf), | ||
1564 | (af == AF_INET6) ? "%s.%u.[%s]:%u" : "%s.%u.%s:%u", | ||
1565 | PLUGIN_NAME, | ||
1566 | options, | ||
1567 | buf, | ||
1568 | port); | ||
1569 | return rbuf; | ||
1570 | } | ||
1571 | |||
1572 | |||
1573 | /** | ||
1574 | * Function called to convert a string address to | ||
1575 | * a binary address. | ||
1576 | * | ||
1577 | * @param cls closure (`struct Plugin*`) | ||
1578 | * @param addr string address | ||
1579 | * @param addrlen length of the address | ||
1580 | * @param buf location to store the buffer | ||
1581 | * @param added location to store the number of bytes in the buffer. | ||
1582 | * If the function returns #GNUNET_SYSERR, its contents are undefined. | ||
1583 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure | ||
1584 | */ | ||
1585 | static int | ||
1586 | tcp_plugin_string_to_address (void *cls, | ||
1587 | const char *addr, | ||
1588 | uint16_t addrlen, | ||
1589 | void **buf, | ||
1590 | size_t *added) | ||
1591 | { | ||
1592 | struct sockaddr_storage socket_address; | ||
1593 | char *address; | ||
1594 | char *plugin; | ||
1595 | char *optionstr; | ||
1596 | uint32_t options; | ||
1597 | |||
1598 | /* Format tcp.options.address:port */ | ||
1599 | address = NULL; | ||
1600 | plugin = NULL; | ||
1601 | optionstr = NULL; | ||
1602 | if ((NULL == addr) || (0 == addrlen)) | ||
1603 | { | ||
1604 | GNUNET_break(0); | ||
1605 | return GNUNET_SYSERR; | ||
1606 | } | ||
1607 | if ('\0' != addr[addrlen - 1]) | ||
1608 | { | ||
1609 | GNUNET_break(0); | ||
1610 | return GNUNET_SYSERR; | ||
1611 | } | ||
1612 | if (strlen (addr) != addrlen - 1) | ||
1613 | { | ||
1614 | GNUNET_break(0); | ||
1615 | return GNUNET_SYSERR; | ||
1616 | } | ||
1617 | plugin = GNUNET_strdup (addr); | ||
1618 | optionstr = strchr (plugin, '.'); | ||
1619 | if (NULL == optionstr) | ||
1620 | { | ||
1621 | GNUNET_break(0); | ||
1622 | GNUNET_free(plugin); | ||
1623 | return GNUNET_SYSERR; | ||
1624 | } | ||
1625 | optionstr[0] = '\0'; | ||
1626 | optionstr++; | ||
1627 | options = atol (optionstr); | ||
1628 | address = strchr (optionstr, '.'); | ||
1629 | if (NULL == address) | ||
1630 | { | ||
1631 | GNUNET_break(0); | ||
1632 | GNUNET_free(plugin); | ||
1633 | return GNUNET_SYSERR; | ||
1634 | } | ||
1635 | address[0] = '\0'; | ||
1636 | address++; | ||
1637 | |||
1638 | if (GNUNET_OK != | ||
1639 | GNUNET_STRINGS_to_address_ip (address, | ||
1640 | strlen (address), | ||
1641 | &socket_address)) | ||
1642 | { | ||
1643 | GNUNET_break(0); | ||
1644 | GNUNET_free(plugin); | ||
1645 | return GNUNET_SYSERR; | ||
1646 | } | ||
1647 | |||
1648 | GNUNET_free(plugin); | ||
1649 | switch (socket_address.ss_family) | ||
1650 | { | ||
1651 | case AF_INET: | ||
1652 | { | ||
1653 | struct IPv4TcpAddress *t4; | ||
1654 | struct sockaddr_in *in4 = (struct sockaddr_in *) &socket_address; | ||
1655 | t4 = GNUNET_new (struct IPv4TcpAddress); | ||
1656 | t4->options = htonl (options); | ||
1657 | t4->ipv4_addr = in4->sin_addr.s_addr; | ||
1658 | t4->t4_port = in4->sin_port; | ||
1659 | *buf = t4; | ||
1660 | *added = sizeof(struct IPv4TcpAddress); | ||
1661 | return GNUNET_OK; | ||
1662 | } | ||
1663 | case AF_INET6: | ||
1664 | { | ||
1665 | struct IPv6TcpAddress *t6; | ||
1666 | struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) &socket_address; | ||
1667 | t6 = GNUNET_new (struct IPv6TcpAddress); | ||
1668 | t6->options = htonl (options); | ||
1669 | t6->ipv6_addr = in6->sin6_addr; | ||
1670 | t6->t6_port = in6->sin6_port; | ||
1671 | *buf = t6; | ||
1672 | *added = sizeof(struct IPv6TcpAddress); | ||
1673 | return GNUNET_OK; | ||
1674 | } | ||
1675 | default: | ||
1676 | return GNUNET_SYSERR; | ||
1677 | } | ||
1678 | } | ||
1679 | |||
1680 | |||
1681 | /** | ||
1682 | * Find the session handle for the given client. | ||
1683 | * Currently uses both the hashmap and the client | ||
1684 | * context, as the client context is new and the | ||
1685 | * logic still needs to be tested. | ||
1686 | * | ||
1687 | * @param plugin the plugin | ||
1688 | * @param client which client to find the session handle for | ||
1689 | * @return NULL if no matching session exists | ||
1690 | */ | ||
1691 | static struct GNUNET_ATS_Session * | ||
1692 | lookup_session_by_client (struct Plugin *plugin, | ||
1693 | struct GNUNET_SERVER_Client *client) | ||
1694 | { | ||
1695 | return GNUNET_SERVER_client_get_user_context (client, | ||
1696 | struct GNUNET_ATS_Session); | ||
1697 | } | ||
1698 | |||
1699 | |||
1700 | /** | ||
1701 | * Functions with this signature are called whenever we need | ||
1702 | * to close a session due to a disconnect or failure to | ||
1703 | * establish a connection. | ||
1704 | * | ||
1705 | * @param cls the `struct Plugin` | ||
1706 | * @param session session to close down | ||
1707 | * @return #GNUNET_OK on success | ||
1708 | */ | ||
1709 | static int | ||
1710 | tcp_plugin_disconnect_session (void *cls, | ||
1711 | struct GNUNET_ATS_Session *session) | ||
1712 | { | ||
1713 | struct Plugin *plugin = cls; | ||
1714 | struct PendingMessage *pm; | ||
1715 | |||
1716 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
1717 | "Disconnecting session of peer `%s' address `%s'\n", | ||
1718 | GNUNET_i2s (&session->target), | ||
1719 | tcp_plugin_address_to_string (session->plugin, | ||
1720 | session->address->address, | ||
1721 | session->address->address_length)); | ||
1722 | |||
1723 | if (NULL != session->timeout_task) | ||
1724 | { | ||
1725 | GNUNET_SCHEDULER_cancel (session->timeout_task); | ||
1726 | session->timeout_task = NULL; | ||
1727 | session->timeout = GNUNET_TIME_UNIT_ZERO_ABS; | ||
1728 | } | ||
1729 | |||
1730 | if (GNUNET_YES == | ||
1731 | GNUNET_CONTAINER_multipeermap_remove (plugin->sessionmap, | ||
1732 | &session->target, | ||
1733 | session)) | ||
1734 | { | ||
1735 | GNUNET_STATISTICS_update (session->plugin->env->stats, | ||
1736 | gettext_noop ("# TCP sessions active"), | ||
1737 | -1, | ||
1738 | GNUNET_NO); | ||
1739 | } | ||
1740 | else | ||
1741 | { | ||
1742 | GNUNET_assert (GNUNET_YES == | ||
1743 | GNUNET_CONTAINER_multipeermap_remove (plugin->nat_wait_conns, | ||
1744 | &session->target, | ||
1745 | session)); | ||
1746 | } | ||
1747 | if (NULL != session->client) | ||
1748 | GNUNET_SERVER_client_set_user_context (session->client, | ||
1749 | NULL); | ||
1750 | |||
1751 | /* clean up state */ | ||
1752 | if (NULL != session->transmit_handle) | ||
1753 | { | ||
1754 | GNUNET_SERVER_notify_transmit_ready_cancel (session->transmit_handle); | ||
1755 | session->transmit_handle = NULL; | ||
1756 | } | ||
1757 | session->plugin->env->session_end (session->plugin->env->cls, | ||
1758 | session->address, | ||
1759 | session); | ||
1760 | |||
1761 | if (NULL != session->nat_connection_timeout) | ||
1762 | { | ||
1763 | GNUNET_SCHEDULER_cancel (session->nat_connection_timeout); | ||
1764 | session->nat_connection_timeout = NULL; | ||
1765 | } | ||
1766 | |||
1767 | while (NULL != (pm = session->pending_messages_head)) | ||
1768 | { | ||
1769 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
1770 | (NULL != pm->transmit_cont) | ||
1771 | ? "Could not deliver message to `%s' at %s.\n" | ||
1772 | : "Could not deliver message to `%s' at %s, notifying.\n", | ||
1773 | GNUNET_i2s (&session->target), | ||
1774 | tcp_plugin_address_to_string (session->plugin, | ||
1775 | session->address->address, | ||
1776 | session->address->address_length)); | ||
1777 | GNUNET_STATISTICS_update (session->plugin->env->stats, | ||
1778 | gettext_noop ("# bytes currently in TCP buffers"), | ||
1779 | -(int64_t) pm->message_size, GNUNET_NO); | ||
1780 | GNUNET_STATISTICS_update (session->plugin->env->stats, | ||
1781 | gettext_noop ("# bytes discarded by TCP (disconnect)"), | ||
1782 | pm->message_size, | ||
1783 | GNUNET_NO); | ||
1784 | GNUNET_CONTAINER_DLL_remove (session->pending_messages_head, | ||
1785 | session->pending_messages_tail, | ||
1786 | pm); | ||
1787 | GNUNET_assert (0 < session->msgs_in_queue); | ||
1788 | session->msgs_in_queue--; | ||
1789 | GNUNET_assert (pm->message_size <= session->bytes_in_queue); | ||
1790 | session->bytes_in_queue -= pm->message_size; | ||
1791 | if (NULL != pm->transmit_cont) | ||
1792 | pm->transmit_cont (pm->transmit_cont_cls, | ||
1793 | &session->target, | ||
1794 | GNUNET_SYSERR, | ||
1795 | pm->message_size, | ||
1796 | 0); | ||
1797 | GNUNET_free (pm); | ||
1798 | } | ||
1799 | GNUNET_assert (0 == session->msgs_in_queue); | ||
1800 | GNUNET_assert (0 == session->bytes_in_queue); | ||
1801 | notify_session_monitor (session->plugin, | ||
1802 | session, | ||
1803 | GNUNET_TRANSPORT_SS_DONE); | ||
1804 | |||
1805 | if (NULL != session->receive_delay_task) | ||
1806 | { | ||
1807 | GNUNET_SCHEDULER_cancel (session->receive_delay_task); | ||
1808 | session->receive_delay_task = NULL; | ||
1809 | } | ||
1810 | if (NULL != session->client) | ||
1811 | { | ||
1812 | GNUNET_SERVER_client_disconnect (session->client); | ||
1813 | session->client = NULL; | ||
1814 | } | ||
1815 | GNUNET_HELLO_address_free (session->address); | ||
1816 | GNUNET_assert (NULL == session->transmit_handle); | ||
1817 | GNUNET_free (session); | ||
1818 | return GNUNET_OK; | ||
1819 | } | ||
1820 | |||
1821 | |||
1822 | /** | ||
1823 | * Function that is called to get the keepalive factor. | ||
1824 | * #GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT is divided by this number to | ||
1825 | * calculate the interval between keepalive packets. | ||
1826 | * | ||
1827 | * @param cls closure with the `struct Plugin` | ||
1828 | * @return keepalive factor | ||
1829 | */ | ||
1830 | static unsigned int | ||
1831 | tcp_plugin_query_keepalive_factor (void *cls) | ||
1832 | { | ||
1833 | return 3; | ||
1834 | } | ||
1835 | |||
1836 | |||
1837 | /** | ||
1838 | * Session was idle for too long, so disconnect it | ||
1839 | * | ||
1840 | * @param cls the `struct GNUNET_ATS_Session` of the idle session | ||
1841 | */ | ||
1842 | static void | ||
1843 | session_timeout (void *cls) | ||
1844 | { | ||
1845 | struct GNUNET_ATS_Session *s = cls; | ||
1846 | struct GNUNET_TIME_Relative left; | ||
1847 | |||
1848 | s->timeout_task = NULL; | ||
1849 | left = GNUNET_TIME_absolute_get_remaining (s->timeout); | ||
1850 | if (0 != left.rel_value_us) | ||
1851 | { | ||
1852 | /* not actually our turn yet, but let's at least update | ||
1853 | the monitor, it may think we're about to die ... */ | ||
1854 | notify_session_monitor (s->plugin, | ||
1855 | s, | ||
1856 | GNUNET_TRANSPORT_SS_UPDATE); | ||
1857 | s->timeout_task = GNUNET_SCHEDULER_add_delayed (left, | ||
1858 | &session_timeout, | ||
1859 | s); | ||
1860 | return; | ||
1861 | } | ||
1862 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
1863 | "Session %p was idle for %s, disconnecting\n", | ||
1864 | s, | ||
1865 | GNUNET_STRINGS_relative_time_to_string (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, | ||
1866 | GNUNET_YES)); | ||
1867 | /* call session destroy function */ | ||
1868 | tcp_plugin_disconnect_session (s->plugin, | ||
1869 | s); | ||
1870 | } | ||
1871 | |||
1872 | |||
1873 | /** | ||
1874 | * Increment session timeout due to activity. | ||
1875 | * | ||
1876 | * @param s session to increment timeout for | ||
1877 | */ | ||
1878 | static void | ||
1879 | reschedule_session_timeout (struct GNUNET_ATS_Session *s) | ||
1880 | { | ||
1881 | GNUNET_assert (NULL != s->timeout_task); | ||
1882 | s->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT); | ||
1883 | } | ||
1884 | |||
1885 | |||
1886 | /** | ||
1887 | * Create a new session. Also queues a welcome message. | ||
1888 | * | ||
1889 | * @param plugin the plugin | ||
1890 | * @param address the address to create the session for | ||
1891 | * @param scope network scope the address is from | ||
1892 | * @param client client to use, reference counter must have already been increased | ||
1893 | * @param is_nat this a NAT session, we should wait for a client to | ||
1894 | * connect to us from an address, then assign that to | ||
1895 | * the session | ||
1896 | * @return new session object | ||
1897 | */ | ||
1898 | static struct GNUNET_ATS_Session * | ||
1899 | create_session (struct Plugin *plugin, | ||
1900 | const struct GNUNET_HELLO_Address *address, | ||
1901 | enum GNUNET_NetworkType scope, | ||
1902 | struct GNUNET_SERVER_Client *client, | ||
1903 | int is_nat) | ||
1904 | { | ||
1905 | struct GNUNET_ATS_Session *session; | ||
1906 | struct PendingMessage *pm; | ||
1907 | |||
1908 | if (GNUNET_YES != is_nat) | ||
1909 | GNUNET_assert (NULL != client); | ||
1910 | else | ||
1911 | GNUNET_assert (NULL == client); | ||
1912 | |||
1913 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
1914 | "Creating new session for peer `%s' at address %s\n", | ||
1915 | GNUNET_i2s (&address->peer), | ||
1916 | tcp_plugin_address_to_string (plugin, | ||
1917 | address->address, | ||
1918 | address->address_length)); | ||
1919 | session = GNUNET_new (struct GNUNET_ATS_Session); | ||
1920 | session->last_activity = GNUNET_TIME_absolute_get (); | ||
1921 | session->plugin = plugin; | ||
1922 | session->is_nat = is_nat; | ||
1923 | if (NULL != client) | ||
1924 | { | ||
1925 | session->client = client; | ||
1926 | GNUNET_SERVER_client_set_user_context (client, | ||
1927 | session); | ||
1928 | } | ||
1929 | session->address = GNUNET_HELLO_address_copy (address); | ||
1930 | session->target = address->peer; | ||
1931 | session->expecting_welcome = GNUNET_YES; | ||
1932 | session->scope = scope; | ||
1933 | pm = GNUNET_malloc (sizeof (struct PendingMessage) + | ||
1934 | sizeof (struct WelcomeMessage)); | ||
1935 | pm->msg = (const char *) &pm[1]; | ||
1936 | pm->message_size = sizeof(struct WelcomeMessage); | ||
1937 | GNUNET_memcpy (&pm[1], | ||
1938 | &plugin->my_welcome, | ||
1939 | sizeof(struct WelcomeMessage)); | ||
1940 | pm->timeout = GNUNET_TIME_UNIT_FOREVER_ABS; | ||
1941 | GNUNET_STATISTICS_update (plugin->env->stats, | ||
1942 | gettext_noop ("# bytes currently in TCP buffers"), | ||
1943 | pm->message_size, | ||
1944 | GNUNET_NO); | ||
1945 | GNUNET_CONTAINER_DLL_insert (session->pending_messages_head, | ||
1946 | session->pending_messages_tail, | ||
1947 | pm); | ||
1948 | session->msgs_in_queue++; | ||
1949 | session->bytes_in_queue += pm->message_size; | ||
1950 | session->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT); | ||
1951 | session->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, | ||
1952 | &session_timeout, | ||
1953 | session); | ||
1954 | notify_session_monitor (session->plugin, | ||
1955 | session, | ||
1956 | GNUNET_TRANSPORT_SS_INIT); | ||
1957 | if (GNUNET_YES != is_nat) | ||
1958 | { | ||
1959 | GNUNET_STATISTICS_update (plugin->env->stats, | ||
1960 | gettext_noop ("# TCP sessions active"), | ||
1961 | 1, | ||
1962 | GNUNET_NO); | ||
1963 | notify_session_monitor (session->plugin, | ||
1964 | session, | ||
1965 | GNUNET_TRANSPORT_SS_UP); | ||
1966 | } | ||
1967 | else | ||
1968 | { | ||
1969 | notify_session_monitor (session->plugin, | ||
1970 | session, | ||
1971 | GNUNET_TRANSPORT_SS_HANDSHAKE); | ||
1972 | } | ||
1973 | return session; | ||
1974 | } | ||
1975 | |||
1976 | |||
1977 | /** | ||
1978 | * If we have pending messages, ask the server to | ||
1979 | * transmit them (schedule the respective tasks, etc.) | ||
1980 | * | ||
1981 | * @param session for which session should we do this | ||
1982 | */ | ||
1983 | static void | ||
1984 | process_pending_messages (struct GNUNET_ATS_Session *session); | ||
1985 | |||
1986 | |||
1987 | /** | ||
1988 | * Function called to notify a client about the socket | ||
1989 | * being ready to queue more data. "buf" will be | ||
1990 | * NULL and "size" zero if the socket was closed for | ||
1991 | * writing in the meantime. | ||
1992 | * | ||
1993 | * @param cls closure | ||
1994 | * @param size number of bytes available in @a buf | ||
1995 | * @param buf where the callee should write the message | ||
1996 | * @return number of bytes written to @a buf | ||
1997 | */ | ||
1998 | static size_t | ||
1999 | do_transmit (void *cls, | ||
2000 | size_t size, | ||
2001 | void *buf) | ||
2002 | { | ||
2003 | struct GNUNET_ATS_Session *session = cls; | ||
2004 | struct GNUNET_PeerIdentity pid; | ||
2005 | struct Plugin *plugin; | ||
2006 | struct PendingMessage *pos; | ||
2007 | struct PendingMessage *hd; | ||
2008 | struct PendingMessage *tl; | ||
2009 | struct GNUNET_TIME_Absolute now; | ||
2010 | char *cbuf; | ||
2011 | size_t ret; | ||
2012 | |||
2013 | session->transmit_handle = NULL; | ||
2014 | plugin = session->plugin; | ||
2015 | if (NULL == buf) | ||
2016 | { | ||
2017 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
2018 | "Timeout trying to transmit to peer `%s', discarding message queue.\n", | ||
2019 | GNUNET_i2s (&session->target)); | ||
2020 | /* timeout; cancel all messages that have already expired */ | ||
2021 | hd = NULL; | ||
2022 | tl = NULL; | ||
2023 | ret = 0; | ||
2024 | now = GNUNET_TIME_absolute_get (); | ||
2025 | while ( (NULL != (pos = session->pending_messages_head)) && | ||
2026 | (pos->timeout.abs_value_us <= now.abs_value_us) ) | ||
2027 | { | ||
2028 | GNUNET_CONTAINER_DLL_remove (session->pending_messages_head, | ||
2029 | session->pending_messages_tail, | ||
2030 | pos); | ||
2031 | GNUNET_assert (0 < session->msgs_in_queue); | ||
2032 | session->msgs_in_queue--; | ||
2033 | GNUNET_assert (pos->message_size <= session->bytes_in_queue); | ||
2034 | session->bytes_in_queue -= pos->message_size; | ||
2035 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
2036 | "Failed to transmit %u byte message to `%s'.\n", | ||
2037 | pos->message_size, | ||
2038 | GNUNET_i2s (&session->target)); | ||
2039 | ret += pos->message_size; | ||
2040 | GNUNET_CONTAINER_DLL_insert_after (hd, | ||
2041 | tl, | ||
2042 | tl, | ||
2043 | pos); | ||
2044 | } | ||
2045 | /* do this call before callbacks (so that if callbacks destroy | ||
2046 | * session, they have a chance to cancel actions done by this | ||
2047 | * call) */ | ||
2048 | process_pending_messages (session); | ||
2049 | pid = session->target; | ||
2050 | /* no do callbacks and do not use session again since | ||
2051 | * the callbacks may abort the session */ | ||
2052 | while (NULL != (pos = hd)) | ||
2053 | { | ||
2054 | GNUNET_CONTAINER_DLL_remove (hd, | ||
2055 | tl, | ||
2056 | pos); | ||
2057 | if (NULL != pos->transmit_cont) | ||
2058 | pos->transmit_cont (pos->transmit_cont_cls, | ||
2059 | &pid, | ||
2060 | GNUNET_SYSERR, | ||
2061 | pos->message_size, | ||
2062 | 0); | ||
2063 | GNUNET_free (pos); | ||
2064 | } | ||
2065 | GNUNET_STATISTICS_update (plugin->env->stats, | ||
2066 | gettext_noop ("# bytes currently in TCP buffers"), -(int64_t) ret, | ||
2067 | GNUNET_NO); | ||
2068 | GNUNET_STATISTICS_update (plugin->env->stats, | ||
2069 | gettext_noop ("# bytes discarded by TCP (timeout)"), | ||
2070 | ret, | ||
2071 | GNUNET_NO); | ||
2072 | if (0 < ret) | ||
2073 | notify_session_monitor (session->plugin, | ||
2074 | session, | ||
2075 | GNUNET_TRANSPORT_SS_UPDATE); | ||
2076 | return 0; | ||
2077 | } | ||
2078 | /* copy all pending messages that would fit */ | ||
2079 | ret = 0; | ||
2080 | cbuf = buf; | ||
2081 | hd = NULL; | ||
2082 | tl = NULL; | ||
2083 | while (NULL != (pos = session->pending_messages_head)) | ||
2084 | { | ||
2085 | if (ret + pos->message_size > size) | ||
2086 | break; | ||
2087 | GNUNET_CONTAINER_DLL_remove (session->pending_messages_head, | ||
2088 | session->pending_messages_tail, | ||
2089 | pos); | ||
2090 | GNUNET_assert (0 < session->msgs_in_queue); | ||
2091 | session->msgs_in_queue--; | ||
2092 | GNUNET_assert (pos->message_size <= session->bytes_in_queue); | ||
2093 | session->bytes_in_queue -= pos->message_size; | ||
2094 | GNUNET_assert(size >= pos->message_size); | ||
2095 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
2096 | "Transmitting message of type %u size %u to peer %s at %s\n", | ||
2097 | ntohs (((struct GNUNET_MessageHeader *) pos->msg)->type), | ||
2098 | pos->message_size, | ||
2099 | GNUNET_i2s (&session->target), | ||
2100 | tcp_plugin_address_to_string (session->plugin, | ||
2101 | session->address->address, | ||
2102 | session->address->address_length)); | ||
2103 | /* FIXME: this GNUNET_memcpy can be up to 7% of our total runtime */ | ||
2104 | GNUNET_memcpy (cbuf, | ||
2105 | pos->msg, | ||
2106 | pos->message_size); | ||
2107 | cbuf += pos->message_size; | ||
2108 | ret += pos->message_size; | ||
2109 | size -= pos->message_size; | ||
2110 | GNUNET_CONTAINER_DLL_insert_tail (hd, | ||
2111 | tl, | ||
2112 | pos); | ||
2113 | } | ||
2114 | notify_session_monitor (session->plugin, | ||
2115 | session, | ||
2116 | GNUNET_TRANSPORT_SS_UPDATE); | ||
2117 | /* schedule 'continuation' before callbacks so that callbacks that | ||
2118 | * cancel everything don't cause us to use a session that no longer | ||
2119 | * exists... */ | ||
2120 | process_pending_messages (session); | ||
2121 | session->last_activity = GNUNET_TIME_absolute_get (); | ||
2122 | pid = session->target; | ||
2123 | /* we'll now call callbacks that may cancel the session; hence | ||
2124 | * we should not use 'session' after this point */ | ||
2125 | while (NULL != (pos = hd)) | ||
2126 | { | ||
2127 | GNUNET_CONTAINER_DLL_remove (hd, tl, pos); | ||
2128 | if (NULL != pos->transmit_cont) | ||
2129 | pos->transmit_cont (pos->transmit_cont_cls, | ||
2130 | &pid, | ||
2131 | GNUNET_OK, | ||
2132 | pos->message_size, | ||
2133 | pos->message_size); /* FIXME: include TCP overhead */ | ||
2134 | GNUNET_free (pos); | ||
2135 | } | ||
2136 | GNUNET_assert (NULL == hd); | ||
2137 | GNUNET_assert (NULL == tl); | ||
2138 | GNUNET_STATISTICS_update (plugin->env->stats, | ||
2139 | gettext_noop ("# bytes currently in TCP buffers"), | ||
2140 | - (int64_t) ret, | ||
2141 | GNUNET_NO); | ||
2142 | GNUNET_STATISTICS_update (plugin->env->stats, | ||
2143 | gettext_noop ("# bytes transmitted via TCP"), | ||
2144 | ret, | ||
2145 | GNUNET_NO); | ||
2146 | return ret; | ||
2147 | } | ||
2148 | |||
2149 | |||
2150 | /** | ||
2151 | * If we have pending messages, ask the server to | ||
2152 | * transmit them (schedule the respective tasks, etc.) | ||
2153 | * | ||
2154 | * @param session for which session should we do this | ||
2155 | */ | ||
2156 | static void | ||
2157 | process_pending_messages (struct GNUNET_ATS_Session *session) | ||
2158 | { | ||
2159 | struct PendingMessage *pm; | ||
2160 | |||
2161 | GNUNET_assert (NULL != session->client); | ||
2162 | if (NULL != session->transmit_handle) | ||
2163 | return; | ||
2164 | if (NULL == (pm = session->pending_messages_head)) | ||
2165 | return; | ||
2166 | |||
2167 | session->transmit_handle | ||
2168 | = GNUNET_SERVER_notify_transmit_ready (session->client, | ||
2169 | pm->message_size, | ||
2170 | GNUNET_TIME_absolute_get_remaining (pm->timeout), | ||
2171 | &do_transmit, | ||
2172 | session); | ||
2173 | } | ||
2174 | |||
2175 | |||
2176 | /** | ||
2177 | * Function that can be used by the transport service to transmit | ||
2178 | * a message using the plugin. Note that in the case of a | ||
2179 | * peer disconnecting, the continuation MUST be called | ||
2180 | * prior to the disconnect notification itself. This function | ||
2181 | * will be called with this peer's HELLO message to initiate | ||
2182 | * a fresh connection to another peer. | ||
2183 | * | ||
2184 | * @param cls closure | ||
2185 | * @param session which session must be used | ||
2186 | * @param msgbuf the message to transmit | ||
2187 | * @param msgbuf_size number of bytes in @a msgbuf | ||
2188 | * @param priority how important is the message (most plugins will | ||
2189 | * ignore message priority and just FIFO) | ||
2190 | * @param to how long to wait at most for the transmission (does not | ||
2191 | * require plugins to discard the message after the timeout, | ||
2192 | * just advisory for the desired delay; most plugins will ignore | ||
2193 | * this as well) | ||
2194 | * @param cont continuation to call once the message has | ||
2195 | * been transmitted (or if the transport is ready | ||
2196 | * for the next transmission call; or if the | ||
2197 | * peer disconnected...); can be NULL | ||
2198 | * @param cont_cls closure for @a cont | ||
2199 | * @return number of bytes used (on the physical network, with overheads); | ||
2200 | * -1 on hard errors (i.e. address invalid); 0 is a legal value | ||
2201 | * and does NOT mean that the message was not transmitted (DV) | ||
2202 | */ | ||
2203 | static ssize_t | ||
2204 | tcp_plugin_send (void *cls, | ||
2205 | struct GNUNET_ATS_Session *session, | ||
2206 | const char *msgbuf, | ||
2207 | size_t msgbuf_size, | ||
2208 | unsigned int priority, | ||
2209 | struct GNUNET_TIME_Relative to, | ||
2210 | GNUNET_TRANSPORT_TransmitContinuation cont, | ||
2211 | void *cont_cls) | ||
2212 | { | ||
2213 | struct Plugin * plugin = cls; | ||
2214 | struct PendingMessage *pm; | ||
2215 | |||
2216 | /* create new message entry */ | ||
2217 | pm = GNUNET_malloc (sizeof (struct PendingMessage) + msgbuf_size); | ||
2218 | pm->msg = (const char *) &pm[1]; | ||
2219 | GNUNET_memcpy (&pm[1], msgbuf, msgbuf_size); | ||
2220 | pm->message_size = msgbuf_size; | ||
2221 | pm->timeout = GNUNET_TIME_relative_to_absolute (to); | ||
2222 | pm->transmit_cont = cont; | ||
2223 | pm->transmit_cont_cls = cont_cls; | ||
2224 | |||
2225 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
2226 | "Asked to transmit %u bytes to `%s', added message to list.\n", | ||
2227 | msgbuf_size, | ||
2228 | GNUNET_i2s (&session->target)); | ||
2229 | |||
2230 | if (GNUNET_YES == | ||
2231 | GNUNET_CONTAINER_multipeermap_contains_value (plugin->sessionmap, | ||
2232 | &session->target, | ||
2233 | session)) | ||
2234 | { | ||
2235 | GNUNET_assert (NULL != session->client); | ||
2236 | GNUNET_SERVER_client_set_timeout (session->client, | ||
2237 | GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT); | ||
2238 | GNUNET_STATISTICS_update (plugin->env->stats, | ||
2239 | gettext_noop ("# bytes currently in TCP buffers"), | ||
2240 | msgbuf_size, | ||
2241 | GNUNET_NO); | ||
2242 | |||
2243 | /* append pm to pending_messages list */ | ||
2244 | GNUNET_CONTAINER_DLL_insert_tail (session->pending_messages_head, | ||
2245 | session->pending_messages_tail, | ||
2246 | pm); | ||
2247 | notify_session_monitor (session->plugin, | ||
2248 | session, | ||
2249 | GNUNET_TRANSPORT_SS_UPDATE); | ||
2250 | session->msgs_in_queue++; | ||
2251 | session->bytes_in_queue += pm->message_size; | ||
2252 | process_pending_messages (session); | ||
2253 | return msgbuf_size; | ||
2254 | } | ||
2255 | if (GNUNET_YES == | ||
2256 | GNUNET_CONTAINER_multipeermap_contains_value (plugin->nat_wait_conns, | ||
2257 | &session->target, | ||
2258 | session)) | ||
2259 | { | ||
2260 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
2261 | "This NAT WAIT session for peer `%s' is not yet ready!\n", | ||
2262 | GNUNET_i2s (&session->target)); | ||
2263 | GNUNET_STATISTICS_update (plugin->env->stats, | ||
2264 | gettext_noop ("# bytes currently in TCP buffers"), msgbuf_size, | ||
2265 | GNUNET_NO); | ||
2266 | /* append pm to pending_messages list */ | ||
2267 | GNUNET_CONTAINER_DLL_insert_tail (session->pending_messages_head, | ||
2268 | session->pending_messages_tail, | ||
2269 | pm); | ||
2270 | session->msgs_in_queue++; | ||
2271 | session->bytes_in_queue += pm->message_size; | ||
2272 | notify_session_monitor (session->plugin, | ||
2273 | session, | ||
2274 | GNUNET_TRANSPORT_SS_HANDSHAKE); | ||
2275 | return msgbuf_size; | ||
2276 | } | ||
2277 | LOG (GNUNET_ERROR_TYPE_ERROR, | ||
2278 | "Invalid session %p\n", | ||
2279 | session); | ||
2280 | if (NULL != cont) | ||
2281 | cont (cont_cls, | ||
2282 | &session->target, | ||
2283 | GNUNET_SYSERR, | ||
2284 | pm->message_size, | ||
2285 | 0); | ||
2286 | GNUNET_break (0); | ||
2287 | GNUNET_free (pm); | ||
2288 | return GNUNET_SYSERR; /* session does not exist here */ | ||
2289 | } | ||
2290 | |||
2291 | |||
2292 | /** | ||
2293 | * Closure for #session_lookup_it(). | ||
2294 | */ | ||
2295 | struct GNUNET_ATS_SessionItCtx | ||
2296 | { | ||
2297 | /** | ||
2298 | * Address we are looking for. | ||
2299 | */ | ||
2300 | const struct GNUNET_HELLO_Address *address; | ||
2301 | |||
2302 | /** | ||
2303 | * Where to store the session (if we found it). | ||
2304 | */ | ||
2305 | struct GNUNET_ATS_Session *result; | ||
2306 | |||
2307 | }; | ||
2308 | |||
2309 | |||
2310 | /** | ||
2311 | * Look for a session by address. | ||
2312 | * | ||
2313 | * @param cls the `struct GNUNET_ATS_SessionItCtx` | ||
2314 | * @param key unused | ||
2315 | * @param value a `struct GNUNET_ATS_Session` | ||
2316 | * @return #GNUNET_YES to continue looking, #GNUNET_NO if we found the session | ||
2317 | */ | ||
2318 | static int | ||
2319 | session_lookup_it (void *cls, | ||
2320 | const struct GNUNET_PeerIdentity *key, | ||
2321 | void *value) | ||
2322 | { | ||
2323 | struct GNUNET_ATS_SessionItCtx *si_ctx = cls; | ||
2324 | struct GNUNET_ATS_Session *session = value; | ||
2325 | |||
2326 | if (0 != | ||
2327 | GNUNET_HELLO_address_cmp (si_ctx->address, | ||
2328 | session->address)) | ||
2329 | return GNUNET_YES; | ||
2330 | si_ctx->result = session; | ||
2331 | return GNUNET_NO; | ||
2332 | } | ||
2333 | |||
2334 | |||
2335 | /** | ||
2336 | * Task cleaning up a NAT connection attempt after timeout | ||
2337 | * | ||
2338 | * @param cls the `struct GNUNET_ATS_Session` | ||
2339 | */ | ||
2340 | static void | ||
2341 | nat_connect_timeout (void *cls) | ||
2342 | { | ||
2343 | struct GNUNET_ATS_Session *session = cls; | ||
2344 | |||
2345 | session->nat_connection_timeout = NULL; | ||
2346 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
2347 | "NAT WAIT connection to `%4s' at `%s' could not be established, removing session\n", | ||
2348 | GNUNET_i2s (&session->target), | ||
2349 | tcp_plugin_address_to_string (session->plugin, | ||
2350 | session->address->address, | ||
2351 | session->address->address_length)); | ||
2352 | tcp_plugin_disconnect_session (session->plugin, | ||
2353 | session); | ||
2354 | } | ||
2355 | |||
2356 | |||
2357 | /** | ||
2358 | * Function that will be called whenever the transport service wants to | ||
2359 | * notify the plugin that a session is still active and in use and | ||
2360 | * therefore the session timeout for this session has to be updated | ||
2361 | * | ||
2362 | * @param cls closure | ||
2363 | * @param peer which peer was the session for | ||
2364 | * @param session which session is being updated | ||
2365 | */ | ||
2366 | static void | ||
2367 | tcp_plugin_update_session_timeout (void *cls, | ||
2368 | const struct GNUNET_PeerIdentity *peer, | ||
2369 | struct GNUNET_ATS_Session *session) | ||
2370 | { | ||
2371 | reschedule_session_timeout (session); | ||
2372 | } | ||
2373 | |||
2374 | |||
2375 | /** | ||
2376 | * Task to signal the server that we can continue | ||
2377 | * receiving from the TCP client now. | ||
2378 | * | ||
2379 | * @param cls the `struct GNUNET_ATS_Session *` | ||
2380 | */ | ||
2381 | static void | ||
2382 | delayed_done (void *cls) | ||
2383 | { | ||
2384 | struct GNUNET_ATS_Session *session = cls; | ||
2385 | |||
2386 | session->receive_delay_task = NULL; | ||
2387 | reschedule_session_timeout (session); | ||
2388 | GNUNET_SERVER_receive_done (session->client, | ||
2389 | GNUNET_OK); | ||
2390 | } | ||
2391 | |||
2392 | |||
2393 | /** | ||
2394 | * Function that will be called whenever the transport service wants to | ||
2395 | * notify the plugin that the inbound quota changed and that the plugin | ||
2396 | * should update it's delay for the next receive value | ||
2397 | * | ||
2398 | * @param cls closure | ||
2399 | * @param peer which peer was the session for | ||
2400 | * @param session which session is being updated | ||
2401 | * @param delay new delay to use for receiving | ||
2402 | */ | ||
2403 | static void | ||
2404 | tcp_plugin_update_inbound_delay (void *cls, | ||
2405 | const struct GNUNET_PeerIdentity *peer, | ||
2406 | struct GNUNET_ATS_Session *session, | ||
2407 | struct GNUNET_TIME_Relative delay) | ||
2408 | { | ||
2409 | if (NULL == session->receive_delay_task) | ||
2410 | return; | ||
2411 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
2412 | "New inbound delay %s\n", | ||
2413 | GNUNET_STRINGS_relative_time_to_string (delay, | ||
2414 | GNUNET_NO)); | ||
2415 | session->receive_delay = GNUNET_TIME_relative_to_absolute (delay); | ||
2416 | GNUNET_SCHEDULER_cancel (session->receive_delay_task); | ||
2417 | session->receive_delay_task = GNUNET_SCHEDULER_add_delayed (delay, | ||
2418 | &delayed_done, | ||
2419 | session); | ||
2420 | } | ||
2421 | |||
2422 | |||
2423 | /** | ||
2424 | * Create a new session to transmit data to the target | ||
2425 | * This session will used to send data to this peer and the plugin will | ||
2426 | * notify us by calling the env->session_end function | ||
2427 | * | ||
2428 | * @param cls closure | ||
2429 | * @param address the address to use | ||
2430 | * @return the session if the address is valid, NULL otherwise | ||
2431 | */ | ||
2432 | static struct GNUNET_ATS_Session * | ||
2433 | tcp_plugin_get_session (void *cls, | ||
2434 | const struct GNUNET_HELLO_Address *address) | ||
2435 | { | ||
2436 | struct Plugin *plugin = cls; | ||
2437 | struct GNUNET_ATS_Session *session = NULL; | ||
2438 | int af; | ||
2439 | const void *sb; | ||
2440 | size_t sbs; | ||
2441 | struct GNUNET_CONNECTION_Handle *sa; | ||
2442 | struct sockaddr_in a4; | ||
2443 | struct sockaddr_in6 a6; | ||
2444 | const struct IPv4TcpAddress *t4; | ||
2445 | const struct IPv6TcpAddress *t6; | ||
2446 | unsigned int options; | ||
2447 | enum GNUNET_NetworkType net_type; | ||
2448 | unsigned int is_natd = GNUNET_NO; | ||
2449 | size_t addrlen; | ||
2450 | #ifdef TCP_STEALTH | ||
2451 | struct GNUNET_NETWORK_Handle *s; | ||
2452 | #endif | ||
2453 | |||
2454 | addrlen = address->address_length; | ||
2455 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
2456 | "Trying to get session for `%s' address of peer `%s'\n", | ||
2457 | tcp_plugin_address_to_string (plugin, | ||
2458 | address->address, | ||
2459 | address->address_length), | ||
2460 | GNUNET_i2s (&address->peer)); | ||
2461 | |||
2462 | if (GNUNET_HELLO_address_check_option (address, | ||
2463 | GNUNET_HELLO_ADDRESS_INFO_INBOUND)) | ||
2464 | { | ||
2465 | GNUNET_break (0); | ||
2466 | return NULL; | ||
2467 | } | ||
2468 | |||
2469 | /* look for existing session */ | ||
2470 | if (GNUNET_YES == | ||
2471 | GNUNET_CONTAINER_multipeermap_contains (plugin->sessionmap, | ||
2472 | &address->peer)) | ||
2473 | { | ||
2474 | struct GNUNET_ATS_SessionItCtx si_ctx; | ||
2475 | |||
2476 | si_ctx.address = address; | ||
2477 | si_ctx.result = NULL; | ||
2478 | GNUNET_CONTAINER_multipeermap_get_multiple (plugin->sessionmap, | ||
2479 | &address->peer, | ||
2480 | &session_lookup_it, | ||
2481 | &si_ctx); | ||
2482 | if (NULL != si_ctx.result) | ||
2483 | { | ||
2484 | session = si_ctx.result; | ||
2485 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
2486 | "Found existing session for `%s' address `%s'\n", | ||
2487 | GNUNET_i2s (&address->peer), | ||
2488 | tcp_plugin_address_to_string (plugin, | ||
2489 | address->address, | ||
2490 | address->address_length)); | ||
2491 | return session; | ||
2492 | } | ||
2493 | /* This is a bit of a hack, limiting TCP to never allow more than | ||
2494 | one TCP connection to any given peer at the same time. | ||
2495 | Without this, peers sometimes disagree about which of the TCP | ||
2496 | connections they should use, causing one side to believe that | ||
2497 | they transmit successfully, while the other receives nothing. */ | ||
2498 | return NULL; /* Refuse to have more than one TCP connection per | ||
2499 | peer pair at the same time. */ | ||
2500 | } | ||
2501 | |||
2502 | if (addrlen == sizeof(struct IPv6TcpAddress)) | ||
2503 | { | ||
2504 | GNUNET_assert (NULL != address->address); /* make static analysis happy */ | ||
2505 | t6 = address->address; | ||
2506 | options = t6->options; | ||
2507 | af = AF_INET6; | ||
2508 | memset (&a6, 0, sizeof(a6)); | ||
2509 | #if HAVE_SOCKADDR_IN_SIN_LEN | ||
2510 | a6.sin6_len = sizeof (a6); | ||
2511 | #endif | ||
2512 | a6.sin6_family = AF_INET6; | ||
2513 | a6.sin6_port = t6->t6_port; | ||
2514 | if (t6->t6_port == 0) | ||
2515 | is_natd = GNUNET_YES; | ||
2516 | GNUNET_memcpy (&a6.sin6_addr, &t6->ipv6_addr, sizeof(struct in6_addr)); | ||
2517 | sb = &a6; | ||
2518 | sbs = sizeof(a6); | ||
2519 | } | ||
2520 | else if (addrlen == sizeof(struct IPv4TcpAddress)) | ||
2521 | { | ||
2522 | GNUNET_assert(NULL != address->address); /* make static analysis happy */ | ||
2523 | t4 = address->address; | ||
2524 | options = t4->options; | ||
2525 | af = AF_INET; | ||
2526 | memset (&a4, 0, sizeof(a4)); | ||
2527 | #if HAVE_SOCKADDR_IN_SIN_LEN | ||
2528 | a4.sin_len = sizeof (a4); | ||
2529 | #endif | ||
2530 | a4.sin_family = AF_INET; | ||
2531 | a4.sin_port = t4->t4_port; | ||
2532 | if (t4->t4_port == 0) | ||
2533 | is_natd = GNUNET_YES; | ||
2534 | a4.sin_addr.s_addr = t4->ipv4_addr; | ||
2535 | sb = &a4; | ||
2536 | sbs = sizeof(a4); | ||
2537 | } | ||
2538 | else | ||
2539 | { | ||
2540 | GNUNET_STATISTICS_update (plugin->env->stats, | ||
2541 | gettext_noop ("# requests to create session with invalid address"), | ||
2542 | 1, | ||
2543 | GNUNET_NO); | ||
2544 | return NULL; | ||
2545 | } | ||
2546 | |||
2547 | net_type = plugin->env->get_address_type (plugin->env->cls, | ||
2548 | sb, | ||
2549 | sbs); | ||
2550 | GNUNET_break (net_type != GNUNET_NT_UNSPECIFIED); | ||
2551 | |||
2552 | if ( (is_natd == GNUNET_YES) && | ||
2553 | (addrlen == sizeof(struct IPv6TcpAddress)) ) | ||
2554 | { | ||
2555 | /* NAT client only works with IPv4 addresses */ | ||
2556 | return NULL; | ||
2557 | } | ||
2558 | |||
2559 | if (plugin->cur_connections >= plugin->max_connections) | ||
2560 | { | ||
2561 | /* saturated */ | ||
2562 | return NULL; | ||
2563 | } | ||
2564 | |||
2565 | if ( (is_natd == GNUNET_YES) && | ||
2566 | (GNUNET_YES == | ||
2567 | GNUNET_CONTAINER_multipeermap_contains (plugin->nat_wait_conns, | ||
2568 | &address->peer))) | ||
2569 | { | ||
2570 | /* Only do one NAT punch attempt per peer identity */ | ||
2571 | return NULL; | ||
2572 | } | ||
2573 | |||
2574 | if ( (is_natd == GNUNET_YES) && | ||
2575 | (NULL != plugin->nat) && | ||
2576 | (GNUNET_NO == | ||
2577 | GNUNET_CONTAINER_multipeermap_contains (plugin->nat_wait_conns, | ||
2578 | &address->peer))) | ||
2579 | { | ||
2580 | struct sockaddr_in local_sa; | ||
2581 | |||
2582 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
2583 | "Found valid IPv4 NAT address (creating session)!\n"); | ||
2584 | session = create_session (plugin, | ||
2585 | address, | ||
2586 | net_type, | ||
2587 | NULL, | ||
2588 | GNUNET_YES); | ||
2589 | session->nat_connection_timeout = GNUNET_SCHEDULER_add_delayed (NAT_TIMEOUT, | ||
2590 | &nat_connect_timeout, | ||
2591 | session); | ||
2592 | GNUNET_assert (GNUNET_OK == | ||
2593 | GNUNET_CONTAINER_multipeermap_put (plugin->nat_wait_conns, | ||
2594 | &session->target, | ||
2595 | session, | ||
2596 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); | ||
2597 | |||
2598 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
2599 | "Created NAT WAIT connection to `%s' at `%s'\n", | ||
2600 | GNUNET_i2s (&session->target), | ||
2601 | GNUNET_a2s (sb, sbs)); | ||
2602 | memset (&local_sa, | ||
2603 | 0, | ||
2604 | sizeof (local_sa)); | ||
2605 | local_sa.sin_family = AF_INET; | ||
2606 | local_sa.sin_port = htons (plugin->open_port); | ||
2607 | /* We leave sin_address at 0, let the kernel figure it out, | ||
2608 | even if our bind() is more specific. (May want to reconsider | ||
2609 | later.) */ | ||
2610 | if (GNUNET_OK == | ||
2611 | GNUNET_NAT_request_reversal (plugin->nat, | ||
2612 | &local_sa, | ||
2613 | &a4)) | ||
2614 | return session; | ||
2615 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
2616 | "Running NAT client for `%s' at `%s' failed\n", | ||
2617 | GNUNET_i2s (&session->target), | ||
2618 | GNUNET_a2s (sb, sbs)); | ||
2619 | tcp_plugin_disconnect_session (plugin, | ||
2620 | session); | ||
2621 | return NULL; | ||
2622 | } | ||
2623 | |||
2624 | /* create new outbound session */ | ||
2625 | if (0 != (options & TCP_OPTIONS_TCP_STEALTH)) | ||
2626 | { | ||
2627 | #ifdef TCP_STEALTH | ||
2628 | s = GNUNET_NETWORK_socket_create (af, SOCK_STREAM, 0); | ||
2629 | if (NULL == s) | ||
2630 | { | ||
2631 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK, | ||
2632 | "socket"); | ||
2633 | sa = NULL; | ||
2634 | } | ||
2635 | else | ||
2636 | { | ||
2637 | if ( (GNUNET_OK != | ||
2638 | GNUNET_NETWORK_socket_setsockopt (s, | ||
2639 | IPPROTO_TCP, | ||
2640 | TCP_STEALTH, | ||
2641 | &session->target, | ||
2642 | sizeof (struct GNUNET_PeerIdentity))) || | ||
2643 | (GNUNET_OK != | ||
2644 | GNUNET_NETWORK_socket_setsockopt (s, | ||
2645 | IPPROTO_TCP, | ||
2646 | TCP_STEALTH_INTEGRITY, | ||
2647 | &plugin->my_welcome, | ||
2648 | sizeof (struct WelcomeMessage))) ) | ||
2649 | { | ||
2650 | /* TCP STEALTH not supported by kernel */ | ||
2651 | GNUNET_break (GNUNET_OK == | ||
2652 | GNUNET_NETWORK_socket_close (s)); | ||
2653 | sa = NULL; | ||
2654 | } | ||
2655 | else | ||
2656 | { | ||
2657 | sa = GNUNET_CONNECTION_connect_socket (s, sb, sbs); | ||
2658 | } | ||
2659 | } | ||
2660 | #else | ||
2661 | sa = NULL; | ||
2662 | #endif | ||
2663 | } | ||
2664 | else | ||
2665 | { | ||
2666 | sa = GNUNET_CONNECTION_create_from_sockaddr (af, sb, sbs); | ||
2667 | } | ||
2668 | if (NULL == sa) | ||
2669 | { | ||
2670 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
2671 | "Failed to create connection to `%s' at `%s'\n", | ||
2672 | GNUNET_i2s (&address->peer), | ||
2673 | GNUNET_a2s (sb, sbs)); | ||
2674 | return NULL; | ||
2675 | } | ||
2676 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
2677 | "Asked to transmit to `%s', creating fresh session using address `%s'.\n", | ||
2678 | GNUNET_i2s (&address->peer), | ||
2679 | GNUNET_a2s (sb, sbs)); | ||
2680 | |||
2681 | session = create_session (plugin, | ||
2682 | address, | ||
2683 | net_type, | ||
2684 | GNUNET_SERVER_connect_socket (plugin->server, | ||
2685 | sa), | ||
2686 | GNUNET_NO); | ||
2687 | (void) GNUNET_CONTAINER_multipeermap_put (plugin->sessionmap, | ||
2688 | &session->target, | ||
2689 | session, | ||
2690 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); | ||
2691 | /* Send TCP Welcome */ | ||
2692 | process_pending_messages (session); | ||
2693 | |||
2694 | return session; | ||
2695 | } | ||
2696 | |||
2697 | |||
2698 | /** | ||
2699 | * We have been asked to destroy all connections to a particular peer. | ||
2700 | * This function is called on each applicable session and must tear it | ||
2701 | * down. | ||
2702 | * | ||
2703 | * @param cls the `struct Plugin *` | ||
2704 | * @param key the peer which the session belongs to (unused) | ||
2705 | * @param value the `struct GNUNET_ATS_Session` | ||
2706 | * @return #GNUNET_YES (continue to iterate) | ||
2707 | */ | ||
2708 | static int | ||
2709 | session_disconnect_it (void *cls, | ||
2710 | const struct GNUNET_PeerIdentity *key, | ||
2711 | void *value) | ||
2712 | { | ||
2713 | struct Plugin *plugin = cls; | ||
2714 | struct GNUNET_ATS_Session *session = value; | ||
2715 | |||
2716 | GNUNET_STATISTICS_update (session->plugin->env->stats, | ||
2717 | gettext_noop ("# transport-service disconnect requests for TCP"), | ||
2718 | 1, | ||
2719 | GNUNET_NO); | ||
2720 | tcp_plugin_disconnect_session (plugin, | ||
2721 | session); | ||
2722 | return GNUNET_YES; | ||
2723 | } | ||
2724 | |||
2725 | |||
2726 | /** | ||
2727 | * Function that can be called to force a disconnect from the | ||
2728 | * specified neighbour. This should also cancel all previously | ||
2729 | * scheduled transmissions. Obviously the transmission may have been | ||
2730 | * partially completed already, which is OK. The plugin is supposed | ||
2731 | * to close the connection (if applicable) and no longer call the | ||
2732 | * transmit continuation(s). | ||
2733 | * | ||
2734 | * Finally, plugin MUST NOT call the services's receive function to | ||
2735 | * notify the service that the connection to the specified target was | ||
2736 | * closed after a getting this call. | ||
2737 | * | ||
2738 | * @param cls closure | ||
2739 | * @param target peer for which the last transmission is | ||
2740 | * to be cancelled | ||
2741 | */ | ||
2742 | static void | ||
2743 | tcp_plugin_disconnect (void *cls, | ||
2744 | const struct GNUNET_PeerIdentity *target) | ||
2745 | { | ||
2746 | struct Plugin *plugin = cls; | ||
2747 | |||
2748 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
2749 | "Disconnecting peer `%s'\n", | ||
2750 | GNUNET_i2s (target)); | ||
2751 | GNUNET_CONTAINER_multipeermap_get_multiple (plugin->sessionmap, | ||
2752 | target, | ||
2753 | &session_disconnect_it, | ||
2754 | plugin); | ||
2755 | GNUNET_CONTAINER_multipeermap_get_multiple (plugin->nat_wait_conns, | ||
2756 | target, | ||
2757 | &session_disconnect_it, | ||
2758 | plugin); | ||
2759 | } | ||
2760 | |||
2761 | |||
2762 | /** | ||
2763 | * We are processing an address pretty printing request and finished | ||
2764 | * the IP resolution (if applicable). Append our port and forward the | ||
2765 | * result. If called with @a hostname NULL, we are done and should | ||
2766 | * clean up the pretty printer (otherwise, there might be multiple | ||
2767 | * hostnames for the IP address and we might receive more). | ||
2768 | * | ||
2769 | * @param cls the `struct PrettyPrinterContext *` | ||
2770 | * @param hostname hostname part of the address | ||
2771 | */ | ||
2772 | static void | ||
2773 | append_port (void *cls, | ||
2774 | const char *hostname) | ||
2775 | { | ||
2776 | struct PrettyPrinterContext *ppc = cls; | ||
2777 | struct Plugin *plugin = ppc->plugin; | ||
2778 | char *ret; | ||
2779 | |||
2780 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
2781 | "append_port called with hostname `%s'\n", | ||
2782 | hostname); | ||
2783 | if (NULL == hostname) | ||
2784 | { | ||
2785 | /* Final call, done */ | ||
2786 | ppc->resolver_handle = NULL; | ||
2787 | GNUNET_CONTAINER_DLL_remove (plugin->ppc_dll_head, | ||
2788 | plugin->ppc_dll_tail, | ||
2789 | ppc); | ||
2790 | ppc->asc (ppc->asc_cls, | ||
2791 | NULL, | ||
2792 | GNUNET_OK); | ||
2793 | GNUNET_free (ppc); | ||
2794 | return; | ||
2795 | } | ||
2796 | if (GNUNET_YES == ppc->ipv6) | ||
2797 | GNUNET_asprintf (&ret, | ||
2798 | "%s.%u.[%s]:%d", | ||
2799 | PLUGIN_NAME, | ||
2800 | ppc->options, | ||
2801 | hostname, | ||
2802 | ppc->port); | ||
2803 | else | ||
2804 | GNUNET_asprintf (&ret, | ||
2805 | "%s.%u.%s:%d", | ||
2806 | PLUGIN_NAME, | ||
2807 | ppc->options, | ||
2808 | hostname, | ||
2809 | ppc->port); | ||
2810 | ppc->asc (ppc->asc_cls, | ||
2811 | ret, | ||
2812 | GNUNET_OK); | ||
2813 | GNUNET_free (ret); | ||
2814 | } | ||
2815 | |||
2816 | |||
2817 | /** | ||
2818 | * Convert the transports address to a nice, human-readable format. | ||
2819 | * | ||
2820 | * @param cls closure with the `struct Plugin` | ||
2821 | * @param type name of the transport that generated the address | ||
2822 | * @param addr one of the addresses of the host, NULL for the last address | ||
2823 | * the specific address format depends on the transport | ||
2824 | * @param addrlen length of the @a addr | ||
2825 | * @param numeric should (IP) addresses be displayed in numeric form? | ||
2826 | * @param timeout after how long should we give up? | ||
2827 | * @param asc function to call on each string | ||
2828 | * @param asc_cls closure for @a asc | ||
2829 | */ | ||
2830 | static void | ||
2831 | tcp_plugin_address_pretty_printer (void *cls, | ||
2832 | const char *type, | ||
2833 | const void *addr, | ||
2834 | size_t addrlen, | ||
2835 | int numeric, | ||
2836 | struct GNUNET_TIME_Relative timeout, | ||
2837 | GNUNET_TRANSPORT_AddressStringCallback asc, | ||
2838 | void *asc_cls) | ||
2839 | { | ||
2840 | struct Plugin *plugin = cls; | ||
2841 | struct PrettyPrinterContext *ppc; | ||
2842 | const void *sb; | ||
2843 | size_t sbs; | ||
2844 | struct sockaddr_in a4; | ||
2845 | struct sockaddr_in6 a6; | ||
2846 | const struct IPv4TcpAddress *t4; | ||
2847 | const struct IPv6TcpAddress *t6; | ||
2848 | uint16_t port; | ||
2849 | uint32_t options; | ||
2850 | |||
2851 | if (sizeof(struct IPv6TcpAddress) == addrlen) | ||
2852 | { | ||
2853 | t6 = addr; | ||
2854 | memset (&a6, 0, sizeof(a6)); | ||
2855 | a6.sin6_family = AF_INET6; | ||
2856 | a6.sin6_port = t6->t6_port; | ||
2857 | GNUNET_memcpy (&a6.sin6_addr, &t6->ipv6_addr, sizeof(struct in6_addr)); | ||
2858 | port = ntohs (t6->t6_port); | ||
2859 | options = ntohl (t6->options); | ||
2860 | sb = &a6; | ||
2861 | sbs = sizeof(a6); | ||
2862 | } | ||
2863 | else if (sizeof(struct IPv4TcpAddress) == addrlen) | ||
2864 | { | ||
2865 | t4 = addr; | ||
2866 | memset (&a4, 0, sizeof(a4)); | ||
2867 | a4.sin_family = AF_INET; | ||
2868 | a4.sin_port = t4->t4_port; | ||
2869 | a4.sin_addr.s_addr = t4->ipv4_addr; | ||
2870 | port = ntohs (t4->t4_port); | ||
2871 | options = ntohl (t4->options); | ||
2872 | sb = &a4; | ||
2873 | sbs = sizeof(a4); | ||
2874 | } | ||
2875 | else | ||
2876 | { | ||
2877 | /* invalid address */ | ||
2878 | LOG (GNUNET_ERROR_TYPE_WARNING, | ||
2879 | _("Unexpected address length: %u bytes\n"), | ||
2880 | (unsigned int) addrlen); | ||
2881 | asc (asc_cls, NULL, GNUNET_SYSERR); | ||
2882 | asc (asc_cls, NULL, GNUNET_OK); | ||
2883 | return; | ||
2884 | } | ||
2885 | ppc = GNUNET_new (struct PrettyPrinterContext); | ||
2886 | ppc->plugin = plugin; | ||
2887 | if (addrlen == sizeof(struct IPv6TcpAddress)) | ||
2888 | ppc->ipv6 = GNUNET_YES; | ||
2889 | else | ||
2890 | ppc->ipv6 = GNUNET_NO; | ||
2891 | ppc->asc = asc; | ||
2892 | ppc->asc_cls = asc_cls; | ||
2893 | ppc->port = port; | ||
2894 | ppc->options = options; | ||
2895 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
2896 | "Starting DNS reverse lookup\n"); | ||
2897 | ppc->resolver_handle = GNUNET_RESOLVER_hostname_get (sb, | ||
2898 | sbs, | ||
2899 | ! numeric, | ||
2900 | timeout, | ||
2901 | &append_port, | ||
2902 | ppc); | ||
2903 | if (NULL == ppc->resolver_handle) | ||
2904 | { | ||
2905 | GNUNET_break (0); | ||
2906 | GNUNET_free (ppc); | ||
2907 | return; | ||
2908 | } | ||
2909 | GNUNET_CONTAINER_DLL_insert (plugin->ppc_dll_head, | ||
2910 | plugin->ppc_dll_tail, | ||
2911 | ppc); | ||
2912 | } | ||
2913 | |||
2914 | |||
2915 | /** | ||
2916 | * Function that will be called to check if a binary address for this | ||
2917 | * plugin is well-formed and corresponds to an address for THIS peer | ||
2918 | * (as per our configuration). Naturally, if absolutely necessary, | ||
2919 | * plugins can be a bit conservative in their answer, but in general | ||
2920 | * plugins should make sure that the address does not redirect | ||
2921 | * traffic to a 3rd party that might try to man-in-the-middle our | ||
2922 | * traffic. | ||
2923 | * | ||
2924 | * @param cls closure, our `struct Plugin *` | ||
2925 | * @param addr pointer to the address | ||
2926 | * @param addrlen length of @a addr | ||
2927 | * @return #GNUNET_OK if this is a plausible address for this peer | ||
2928 | * and transport, #GNUNET_SYSERR if not | ||
2929 | */ | ||
2930 | static int | ||
2931 | tcp_plugin_check_address (void *cls, | ||
2932 | const void *addr, | ||
2933 | size_t addrlen) | ||
2934 | { | ||
2935 | struct Plugin *plugin = cls; | ||
2936 | const struct IPv4TcpAddress *v4; | ||
2937 | const struct IPv6TcpAddress *v6; | ||
2938 | |||
2939 | if ( (addrlen != sizeof(struct IPv4TcpAddress)) && | ||
2940 | (addrlen != sizeof(struct IPv6TcpAddress)) ) | ||
2941 | { | ||
2942 | GNUNET_break_op (0); | ||
2943 | return GNUNET_SYSERR; | ||
2944 | } | ||
2945 | |||
2946 | if (addrlen == sizeof(struct IPv4TcpAddress)) | ||
2947 | { | ||
2948 | struct sockaddr_in s4; | ||
2949 | |||
2950 | v4 = (const struct IPv4TcpAddress *) addr; | ||
2951 | if (0 != memcmp (&v4->options, | ||
2952 | &plugin->myoptions, | ||
2953 | sizeof(uint32_t))) | ||
2954 | { | ||
2955 | GNUNET_break (0); | ||
2956 | return GNUNET_SYSERR; | ||
2957 | } | ||
2958 | memset (&s4, 0, sizeof (s4)); | ||
2959 | s4.sin_family = AF_INET; | ||
2960 | #if HAVE_SOCKADDR_IN_SIN_LEN | ||
2961 | s4.sin_len = sizeof (s4); | ||
2962 | #endif | ||
2963 | s4.sin_port = v4->t4_port; | ||
2964 | s4.sin_addr.s_addr = v4->ipv4_addr; | ||
2965 | |||
2966 | if (GNUNET_OK != | ||
2967 | GNUNET_NAT_test_address (plugin->nat, | ||
2968 | &s4, | ||
2969 | sizeof (struct sockaddr_in))) | ||
2970 | return GNUNET_SYSERR; | ||
2971 | } | ||
2972 | else | ||
2973 | { | ||
2974 | struct sockaddr_in6 s6; | ||
2975 | |||
2976 | v6 = (const struct IPv6TcpAddress *) addr; | ||
2977 | if (IN6_IS_ADDR_LINKLOCAL (&v6->ipv6_addr)) | ||
2978 | { | ||
2979 | GNUNET_break_op (0); | ||
2980 | return GNUNET_SYSERR; | ||
2981 | } | ||
2982 | if (0 != memcmp (&v6->options, | ||
2983 | &plugin->myoptions, | ||
2984 | sizeof (uint32_t))) | ||
2985 | { | ||
2986 | GNUNET_break (0); | ||
2987 | return GNUNET_SYSERR; | ||
2988 | } | ||
2989 | memset (&s6, 0, sizeof (s6)); | ||
2990 | s6.sin6_family = AF_INET6; | ||
2991 | #if HAVE_SOCKADDR_IN_SIN_LEN | ||
2992 | s6.sin6_len = sizeof (s6); | ||
2993 | #endif | ||
2994 | s6.sin6_port = v6->t6_port; | ||
2995 | s6.sin6_addr = v6->ipv6_addr; | ||
2996 | |||
2997 | if (GNUNET_OK != | ||
2998 | GNUNET_NAT_test_address (plugin->nat, | ||
2999 | &s6, | ||
3000 | sizeof(struct sockaddr_in6))) | ||
3001 | return GNUNET_SYSERR; | ||
3002 | } | ||
3003 | return GNUNET_OK; | ||
3004 | } | ||
3005 | |||
3006 | |||
3007 | /** | ||
3008 | * We've received a nat probe from this peer via TCP. Finish | ||
3009 | * creating the client session and resume sending of queued | ||
3010 | * messages. | ||
3011 | * | ||
3012 | * @param cls closure | ||
3013 | * @param client identification of the client | ||
3014 | * @param message the actual message | ||
3015 | */ | ||
3016 | static void | ||
3017 | handle_tcp_nat_probe (void *cls, | ||
3018 | struct GNUNET_SERVER_Client *client, | ||
3019 | const struct GNUNET_MessageHeader *message) | ||
3020 | { | ||
3021 | struct Plugin *plugin = cls; | ||
3022 | struct GNUNET_ATS_Session *session; | ||
3023 | const struct TCP_NAT_ProbeMessage *tcp_nat_probe; | ||
3024 | size_t alen; | ||
3025 | void *vaddr; | ||
3026 | struct IPv4TcpAddress *t4; | ||
3027 | struct IPv6TcpAddress *t6; | ||
3028 | const struct sockaddr_in *s4; | ||
3029 | const struct sockaddr_in6 *s6; | ||
3030 | |||
3031 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
3032 | "Received NAT probe\n"); | ||
3033 | /* We have received a TCP NAT probe, meaning we (hopefully) initiated | ||
3034 | * a connection to this peer by running gnunet-nat-client. This peer | ||
3035 | * received the punch message and now wants us to use the new connection | ||
3036 | * as the default for that peer. Do so and then send a WELCOME message | ||
3037 | * so we can really be connected! | ||
3038 | */ | ||
3039 | if (ntohs (message->size) != sizeof(struct TCP_NAT_ProbeMessage)) | ||
3040 | { | ||
3041 | GNUNET_break_op(0); | ||
3042 | GNUNET_SERVER_receive_done (client, | ||
3043 | GNUNET_SYSERR); | ||
3044 | return; | ||
3045 | } | ||
3046 | |||
3047 | tcp_nat_probe = (const struct TCP_NAT_ProbeMessage *) message; | ||
3048 | if (0 == memcmp (&tcp_nat_probe->clientIdentity, plugin->env->my_identity, | ||
3049 | sizeof(struct GNUNET_PeerIdentity))) | ||
3050 | { | ||
3051 | /* refuse connections from ourselves */ | ||
3052 | GNUNET_SERVER_receive_done (client, | ||
3053 | GNUNET_SYSERR); | ||
3054 | return; | ||
3055 | } | ||
3056 | |||
3057 | session = GNUNET_CONTAINER_multipeermap_get (plugin->nat_wait_conns, | ||
3058 | &tcp_nat_probe->clientIdentity); | ||
3059 | if (NULL == session) | ||
3060 | { | ||
3061 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
3062 | "Did NOT find session for NAT probe!\n"); | ||
3063 | GNUNET_SERVER_receive_done (client, | ||
3064 | GNUNET_OK); | ||
3065 | return; | ||
3066 | } | ||
3067 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
3068 | "Found session for NAT probe!\n"); | ||
3069 | |||
3070 | if (NULL != session->nat_connection_timeout) | ||
3071 | { | ||
3072 | GNUNET_SCHEDULER_cancel (session->nat_connection_timeout); | ||
3073 | session->nat_connection_timeout = NULL; | ||
3074 | } | ||
3075 | |||
3076 | if (GNUNET_OK != | ||
3077 | GNUNET_SERVER_client_get_address (client, | ||
3078 | &vaddr, | ||
3079 | &alen)) | ||
3080 | { | ||
3081 | GNUNET_break(0); | ||
3082 | GNUNET_SERVER_receive_done (client, | ||
3083 | GNUNET_SYSERR); | ||
3084 | tcp_plugin_disconnect_session (plugin, | ||
3085 | session); | ||
3086 | return; | ||
3087 | } | ||
3088 | GNUNET_assert (GNUNET_YES == | ||
3089 | GNUNET_CONTAINER_multipeermap_remove (plugin->nat_wait_conns, | ||
3090 | &tcp_nat_probe->clientIdentity, | ||
3091 | session)); | ||
3092 | GNUNET_SERVER_client_set_user_context (client, | ||
3093 | session); | ||
3094 | (void) GNUNET_CONTAINER_multipeermap_put (plugin->sessionmap, | ||
3095 | &session->target, | ||
3096 | session, | ||
3097 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); | ||
3098 | session->last_activity = GNUNET_TIME_absolute_get (); | ||
3099 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
3100 | "Found address `%s' for incoming connection\n", | ||
3101 | GNUNET_a2s (vaddr, alen)); | ||
3102 | switch (((const struct sockaddr *) vaddr)->sa_family) | ||
3103 | { | ||
3104 | case AF_INET: | ||
3105 | s4 = vaddr; | ||
3106 | t4 = GNUNET_new (struct IPv4TcpAddress); | ||
3107 | t4->options = htonl (TCP_OPTIONS_NONE); | ||
3108 | t4->t4_port = s4->sin_port; | ||
3109 | t4->ipv4_addr = s4->sin_addr.s_addr; | ||
3110 | session->address = GNUNET_HELLO_address_allocate (&tcp_nat_probe->clientIdentity, | ||
3111 | PLUGIN_NAME, | ||
3112 | &t4, | ||
3113 | sizeof(struct IPv4TcpAddress), | ||
3114 | GNUNET_HELLO_ADDRESS_INFO_NONE); | ||
3115 | break; | ||
3116 | case AF_INET6: | ||
3117 | s6 = vaddr; | ||
3118 | t6 = GNUNET_new (struct IPv6TcpAddress); | ||
3119 | t6->options = htonl (TCP_OPTIONS_NONE); | ||
3120 | t6->t6_port = s6->sin6_port; | ||
3121 | GNUNET_memcpy (&t6->ipv6_addr, &s6->sin6_addr, sizeof(struct in6_addr)); | ||
3122 | session->address = GNUNET_HELLO_address_allocate (&tcp_nat_probe->clientIdentity, | ||
3123 | PLUGIN_NAME, | ||
3124 | &t6, | ||
3125 | sizeof(struct IPv6TcpAddress), | ||
3126 | GNUNET_HELLO_ADDRESS_INFO_NONE); | ||
3127 | break; | ||
3128 | default: | ||
3129 | GNUNET_break_op(0); | ||
3130 | LOG(GNUNET_ERROR_TYPE_DEBUG, | ||
3131 | "Bad address for incoming connection!\n"); | ||
3132 | GNUNET_free(vaddr); | ||
3133 | GNUNET_SERVER_receive_done (client, | ||
3134 | GNUNET_SYSERR); | ||
3135 | tcp_plugin_disconnect_session (plugin, | ||
3136 | session); | ||
3137 | return; | ||
3138 | } | ||
3139 | GNUNET_free (vaddr); | ||
3140 | GNUNET_break (NULL == session->client); | ||
3141 | session->client = client; | ||
3142 | GNUNET_STATISTICS_update (plugin->env->stats, | ||
3143 | gettext_noop ("# TCP sessions active"), | ||
3144 | 1, | ||
3145 | GNUNET_NO); | ||
3146 | process_pending_messages (session); | ||
3147 | GNUNET_SERVER_receive_done (client, | ||
3148 | GNUNET_OK); | ||
3149 | } | ||
3150 | |||
3151 | |||
3152 | /** | ||
3153 | * We've received a welcome from this peer via TCP. Possibly create a | ||
3154 | * fresh client record and send back our welcome. | ||
3155 | * | ||
3156 | * @param cls closure | ||
3157 | * @param client identification of the client | ||
3158 | * @param message the actual message | ||
3159 | */ | ||
3160 | static void | ||
3161 | handle_tcp_welcome (void *cls, | ||
3162 | struct GNUNET_SERVER_Client *client, | ||
3163 | const struct GNUNET_MessageHeader *message) | ||
3164 | { | ||
3165 | struct Plugin *plugin = cls; | ||
3166 | const struct WelcomeMessage *wm = (const struct WelcomeMessage *) message; | ||
3167 | struct GNUNET_HELLO_Address *address; | ||
3168 | struct GNUNET_ATS_Session *session; | ||
3169 | size_t alen; | ||
3170 | void *vaddr; | ||
3171 | struct IPv4TcpAddress t4; | ||
3172 | struct IPv6TcpAddress t6; | ||
3173 | const struct sockaddr_in *s4; | ||
3174 | const struct sockaddr_in6 *s6; | ||
3175 | |||
3176 | if (0 == memcmp (&wm->clientIdentity, | ||
3177 | plugin->env->my_identity, | ||
3178 | sizeof(struct GNUNET_PeerIdentity))) | ||
3179 | { | ||
3180 | /* refuse connections from ourselves */ | ||
3181 | if (GNUNET_OK == | ||
3182 | GNUNET_SERVER_client_get_address (client, | ||
3183 | &vaddr, | ||
3184 | &alen)) | ||
3185 | { | ||
3186 | LOG (GNUNET_ERROR_TYPE_INFO, | ||
3187 | "Received WELCOME message from my own identity `%s' on address `%s'\n", | ||
3188 | GNUNET_i2s (&wm->clientIdentity), | ||
3189 | GNUNET_a2s (vaddr, alen)); | ||
3190 | GNUNET_free (vaddr); | ||
3191 | } | ||
3192 | GNUNET_SERVER_receive_done (client, | ||
3193 | GNUNET_SYSERR); | ||
3194 | return; | ||
3195 | } | ||
3196 | |||
3197 | if (GNUNET_OK == | ||
3198 | GNUNET_SERVER_client_get_address (client, | ||
3199 | &vaddr, | ||
3200 | &alen)) | ||
3201 | { | ||
3202 | LOG(GNUNET_ERROR_TYPE_DEBUG, | ||
3203 | "Received WELCOME message from `%s' on address `%s'\n", | ||
3204 | GNUNET_i2s (&wm->clientIdentity), | ||
3205 | GNUNET_a2s (vaddr, alen)); | ||
3206 | GNUNET_free (vaddr); | ||
3207 | } | ||
3208 | GNUNET_STATISTICS_update (plugin->env->stats, | ||
3209 | gettext_noop ("# TCP WELCOME messages received"), | ||
3210 | 1, | ||
3211 | GNUNET_NO); | ||
3212 | session = lookup_session_by_client (plugin, | ||
3213 | client); | ||
3214 | if (NULL != session) | ||
3215 | { | ||
3216 | if (GNUNET_OK == | ||
3217 | GNUNET_SERVER_client_get_address (client, | ||
3218 | &vaddr, | ||
3219 | &alen)) | ||
3220 | { | ||
3221 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
3222 | "Found existing session %p for peer `%s'\n", | ||
3223 | session, | ||
3224 | GNUNET_a2s (vaddr, alen)); | ||
3225 | GNUNET_free (vaddr); | ||
3226 | } | ||
3227 | } | ||
3228 | else | ||
3229 | { | ||
3230 | if (GNUNET_OK == | ||
3231 | GNUNET_SERVER_client_get_address (client, &vaddr, &alen)) | ||
3232 | { | ||
3233 | if (alen == sizeof(struct sockaddr_in)) | ||
3234 | { | ||
3235 | s4 = vaddr; | ||
3236 | memset (&t4, '\0', sizeof (t4)); | ||
3237 | t4.options = htonl (TCP_OPTIONS_NONE); | ||
3238 | t4.t4_port = s4->sin_port; | ||
3239 | t4.ipv4_addr = s4->sin_addr.s_addr; | ||
3240 | address = GNUNET_HELLO_address_allocate (&wm->clientIdentity, | ||
3241 | PLUGIN_NAME, | ||
3242 | &t4, | ||
3243 | sizeof(t4), | ||
3244 | GNUNET_HELLO_ADDRESS_INFO_INBOUND); | ||
3245 | } | ||
3246 | else if (alen == sizeof(struct sockaddr_in6)) | ||
3247 | { | ||
3248 | s6 = vaddr; | ||
3249 | memset (&t6, '\0', sizeof (t6)); | ||
3250 | t6.options = htonl (TCP_OPTIONS_NONE); | ||
3251 | t6.t6_port = s6->sin6_port; | ||
3252 | GNUNET_memcpy (&t6.ipv6_addr, &s6->sin6_addr, sizeof(struct in6_addr)); | ||
3253 | address = GNUNET_HELLO_address_allocate (&wm->clientIdentity, | ||
3254 | PLUGIN_NAME, | ||
3255 | &t6, | ||
3256 | sizeof (t6), | ||
3257 | GNUNET_HELLO_ADDRESS_INFO_INBOUND); | ||
3258 | } | ||
3259 | else | ||
3260 | { | ||
3261 | GNUNET_break (0); | ||
3262 | GNUNET_free_non_null (vaddr); | ||
3263 | GNUNET_SERVER_receive_done (client, | ||
3264 | GNUNET_SYSERR); | ||
3265 | return; | ||
3266 | } | ||
3267 | session = create_session (plugin, | ||
3268 | address, | ||
3269 | plugin->env->get_address_type (plugin->env->cls, | ||
3270 | vaddr, | ||
3271 | alen), | ||
3272 | client, | ||
3273 | GNUNET_NO); | ||
3274 | GNUNET_break (GNUNET_NT_UNSPECIFIED != session->scope); | ||
3275 | GNUNET_HELLO_address_free (address); | ||
3276 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
3277 | "Creating new%s session %p for peer `%s' client %p\n", | ||
3278 | GNUNET_HELLO_address_check_option (session->address, | ||
3279 | GNUNET_HELLO_ADDRESS_INFO_INBOUND) | ||
3280 | ? " inbound" : "", | ||
3281 | session, | ||
3282 | tcp_plugin_address_to_string (plugin, | ||
3283 | session->address->address, | ||
3284 | session->address->address_length), | ||
3285 | client); | ||
3286 | GNUNET_free (vaddr); | ||
3287 | (void) GNUNET_CONTAINER_multipeermap_put (plugin->sessionmap, | ||
3288 | &session->target, | ||
3289 | session, | ||
3290 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); | ||
3291 | /* Notify transport and ATS about new session */ | ||
3292 | plugin->env->session_start (plugin->env->cls, | ||
3293 | session->address, | ||
3294 | session, | ||
3295 | session->scope); | ||
3296 | } | ||
3297 | else | ||
3298 | { | ||
3299 | LOG(GNUNET_ERROR_TYPE_DEBUG, | ||
3300 | "Did not obtain TCP socket address for incoming connection\n"); | ||
3301 | GNUNET_break(0); | ||
3302 | GNUNET_SERVER_receive_done (client, | ||
3303 | GNUNET_SYSERR); | ||
3304 | return; | ||
3305 | } | ||
3306 | } | ||
3307 | |||
3308 | if (GNUNET_YES != session->expecting_welcome) | ||
3309 | { | ||
3310 | GNUNET_break_op (0); | ||
3311 | GNUNET_SERVER_receive_done (client, | ||
3312 | GNUNET_SYSERR); | ||
3313 | return; | ||
3314 | } | ||
3315 | session->last_activity = GNUNET_TIME_absolute_get (); | ||
3316 | session->expecting_welcome = GNUNET_NO; | ||
3317 | |||
3318 | process_pending_messages (session); | ||
3319 | GNUNET_SERVER_client_set_timeout (client, | ||
3320 | GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT); | ||
3321 | GNUNET_SERVER_receive_done (client, | ||
3322 | GNUNET_OK); | ||
3323 | } | ||
3324 | |||
3325 | |||
3326 | /** | ||
3327 | * We've received data for this peer via TCP. Unbox, | ||
3328 | * compute latency and forward. | ||
3329 | * | ||
3330 | * @param cls closure | ||
3331 | * @param client identification of the client | ||
3332 | * @param message the actual message | ||
3333 | */ | ||
3334 | static void | ||
3335 | handle_tcp_data (void *cls, | ||
3336 | struct GNUNET_SERVER_Client *client, | ||
3337 | const struct GNUNET_MessageHeader *message) | ||
3338 | { | ||
3339 | struct Plugin *plugin = cls; | ||
3340 | struct GNUNET_ATS_Session *session; | ||
3341 | struct GNUNET_TIME_Relative delay; | ||
3342 | uint16_t type; | ||
3343 | |||
3344 | type = ntohs (message->type); | ||
3345 | if ( (GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME == type) || | ||
3346 | (GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE == type) ) | ||
3347 | { | ||
3348 | /* We don't want to propagate WELCOME and NAT Probe messages up! */ | ||
3349 | GNUNET_SERVER_receive_done (client, | ||
3350 | GNUNET_OK); | ||
3351 | return; | ||
3352 | } | ||
3353 | session = lookup_session_by_client (plugin, client); | ||
3354 | if (NULL == session) | ||
3355 | { | ||
3356 | /* No inbound session found */ | ||
3357 | void *vaddr = NULL; | ||
3358 | size_t alen; | ||
3359 | |||
3360 | GNUNET_assert (GNUNET_OK == | ||
3361 | GNUNET_SERVER_client_get_address (client, | ||
3362 | &vaddr, | ||
3363 | &alen)); | ||
3364 | LOG (GNUNET_ERROR_TYPE_ERROR, | ||
3365 | "Received unexpected %u bytes of type %u from `%s'\n", | ||
3366 | (unsigned int) ntohs (message->size), | ||
3367 | (unsigned int) ntohs (message->type), | ||
3368 | GNUNET_a2s (vaddr, | ||
3369 | alen)); | ||
3370 | GNUNET_break_op(0); | ||
3371 | GNUNET_SERVER_receive_done (client, | ||
3372 | GNUNET_SYSERR); | ||
3373 | GNUNET_free_non_null (vaddr); | ||
3374 | return; | ||
3375 | } | ||
3376 | if (GNUNET_YES == session->expecting_welcome) | ||
3377 | { | ||
3378 | /* Session is expecting WELCOME message */ | ||
3379 | void *vaddr = NULL; | ||
3380 | size_t alen; | ||
3381 | |||
3382 | GNUNET_SERVER_client_get_address (client, | ||
3383 | &vaddr, | ||
3384 | &alen); | ||
3385 | LOG (GNUNET_ERROR_TYPE_ERROR, | ||
3386 | "Received unexpected %u bytes of type %u from `%s'\n", | ||
3387 | (unsigned int) ntohs (message->size), | ||
3388 | (unsigned int) ntohs (message->type), | ||
3389 | GNUNET_a2s (vaddr, alen)); | ||
3390 | GNUNET_break_op(0); | ||
3391 | GNUNET_SERVER_receive_done (client, | ||
3392 | GNUNET_SYSERR); | ||
3393 | GNUNET_free_non_null (vaddr); | ||
3394 | return; | ||
3395 | } | ||
3396 | |||
3397 | session->last_activity = GNUNET_TIME_absolute_get (); | ||
3398 | { | ||
3399 | void *vaddr = NULL; | ||
3400 | size_t alen; | ||
3401 | |||
3402 | GNUNET_SERVER_client_get_address (client, | ||
3403 | &vaddr, | ||
3404 | &alen); | ||
3405 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
3406 | "Passing %u bytes of type %u from `%s' at %s to transport service.\n", | ||
3407 | (unsigned int) ntohs (message->size), | ||
3408 | (unsigned int) ntohs (message->type), | ||
3409 | GNUNET_i2s (&session->target), | ||
3410 | GNUNET_a2s (vaddr, alen)); | ||
3411 | GNUNET_free_non_null (vaddr); | ||
3412 | } | ||
3413 | |||
3414 | GNUNET_STATISTICS_update (plugin->env->stats, | ||
3415 | gettext_noop ("# bytes received via TCP"), | ||
3416 | ntohs (message->size), | ||
3417 | GNUNET_NO); | ||
3418 | |||
3419 | GNUNET_assert (GNUNET_CONTAINER_multipeermap_contains_value (plugin->sessionmap, | ||
3420 | &session->target, | ||
3421 | session)); | ||
3422 | delay = plugin->env->receive (plugin->env->cls, | ||
3423 | session->address, | ||
3424 | session, | ||
3425 | message); | ||
3426 | reschedule_session_timeout (session); | ||
3427 | if (0 == delay.rel_value_us) | ||
3428 | { | ||
3429 | GNUNET_SERVER_receive_done (client, | ||
3430 | GNUNET_OK); | ||
3431 | } | ||
3432 | else | ||
3433 | { | ||
3434 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
3435 | "Throttling receiving from `%s' for %s\n", | ||
3436 | GNUNET_i2s (&session->target), | ||
3437 | GNUNET_STRINGS_relative_time_to_string (delay, | ||
3438 | GNUNET_YES)); | ||
3439 | GNUNET_SERVER_disable_receive_done_warning (client); | ||
3440 | GNUNET_assert (NULL == session->receive_delay_task); | ||
3441 | session->receive_delay_task = GNUNET_SCHEDULER_add_delayed (delay, | ||
3442 | &delayed_done, | ||
3443 | session); | ||
3444 | } | ||
3445 | } | ||
3446 | |||
3447 | |||
3448 | /** | ||
3449 | * Function called whenever a peer is connected on the "SERVER" level. | ||
3450 | * Increments number of active connections and suspends server if we | ||
3451 | * have reached the limit. | ||
3452 | * | ||
3453 | * @param cls closure | ||
3454 | * @param client identification of the client | ||
3455 | */ | ||
3456 | static void | ||
3457 | connect_notify (void *cls, | ||
3458 | struct GNUNET_SERVER_Client *client) | ||
3459 | { | ||
3460 | struct Plugin *plugin = cls; | ||
3461 | |||
3462 | if (NULL == client) | ||
3463 | return; | ||
3464 | plugin->cur_connections++; | ||
3465 | GNUNET_STATISTICS_set (plugin->env->stats, | ||
3466 | gettext_noop ("# TCP server connections active"), | ||
3467 | plugin->cur_connections, | ||
3468 | GNUNET_NO); | ||
3469 | GNUNET_STATISTICS_update (plugin->env->stats, | ||
3470 | gettext_noop ("# TCP server connect events"), | ||
3471 | 1, | ||
3472 | GNUNET_NO); | ||
3473 | if (plugin->cur_connections != plugin->max_connections) | ||
3474 | return; | ||
3475 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | ||
3476 | _("TCP connection limit reached, suspending server\n")); | ||
3477 | GNUNET_STATISTICS_update (plugin->env->stats, | ||
3478 | gettext_noop ("# TCP service suspended"), | ||
3479 | 1, | ||
3480 | GNUNET_NO); | ||
3481 | GNUNET_SERVER_suspend (plugin->server); /* Maximum number of connections rechead */ | ||
3482 | } | ||
3483 | |||
3484 | |||
3485 | /** | ||
3486 | * Function called whenever a peer is disconnected on the "SERVER" | ||
3487 | * level. Cleans up the connection, decrements number of active | ||
3488 | * connections and if applicable resumes listening. | ||
3489 | * | ||
3490 | * @param cls closure | ||
3491 | * @param client identification of the client | ||
3492 | */ | ||
3493 | static void | ||
3494 | disconnect_notify (void *cls, | ||
3495 | struct GNUNET_SERVER_Client *client) | ||
3496 | { | ||
3497 | struct Plugin *plugin = cls; | ||
3498 | struct GNUNET_ATS_Session *session; | ||
3499 | |||
3500 | if (NULL == client) | ||
3501 | return; | ||
3502 | GNUNET_assert (plugin->cur_connections >= 1); | ||
3503 | plugin->cur_connections--; | ||
3504 | session = lookup_session_by_client (plugin, | ||
3505 | client); | ||
3506 | if (NULL == session) | ||
3507 | return; /* unknown, nothing to do */ | ||
3508 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
3509 | "Destroying session of `%s' with %s due to network-level disconnect.\n", | ||
3510 | GNUNET_i2s (&session->target), | ||
3511 | tcp_plugin_address_to_string (session->plugin, | ||
3512 | session->address->address, | ||
3513 | session->address->address_length)); | ||
3514 | |||
3515 | if (plugin->cur_connections == plugin->max_connections) | ||
3516 | { | ||
3517 | GNUNET_STATISTICS_update (session->plugin->env->stats, | ||
3518 | gettext_noop ("# TCP service resumed"), | ||
3519 | 1, | ||
3520 | GNUNET_NO); | ||
3521 | GNUNET_SERVER_resume (plugin->server); /* Resume server */ | ||
3522 | } | ||
3523 | GNUNET_STATISTICS_set (plugin->env->stats, | ||
3524 | gettext_noop ("# TCP server connections active"), | ||
3525 | plugin->cur_connections, | ||
3526 | GNUNET_NO); | ||
3527 | GNUNET_STATISTICS_update (session->plugin->env->stats, | ||
3528 | gettext_noop ("# network-level TCP disconnect events"), | ||
3529 | 1, | ||
3530 | GNUNET_NO); | ||
3531 | tcp_plugin_disconnect_session (plugin, | ||
3532 | session); | ||
3533 | } | ||
3534 | |||
3535 | |||
3536 | /** | ||
3537 | * We can now send a probe message, copy into buffer to really send. | ||
3538 | * | ||
3539 | * @param cls closure, a `struct TCPProbeContext` | ||
3540 | * @param size max size to copy | ||
3541 | * @param buf buffer to copy message to | ||
3542 | * @return number of bytes copied into @a buf | ||
3543 | */ | ||
3544 | static size_t | ||
3545 | notify_send_probe (void *cls, | ||
3546 | size_t size, | ||
3547 | void *buf) | ||
3548 | { | ||
3549 | struct TCPProbeContext *tcp_probe_ctx = cls; | ||
3550 | struct Plugin *plugin = tcp_probe_ctx->plugin; | ||
3551 | size_t ret; | ||
3552 | |||
3553 | tcp_probe_ctx->transmit_handle = NULL; | ||
3554 | GNUNET_CONTAINER_DLL_remove (plugin->probe_head, | ||
3555 | plugin->probe_tail, | ||
3556 | tcp_probe_ctx); | ||
3557 | if (NULL == buf) | ||
3558 | { | ||
3559 | GNUNET_CONNECTION_destroy (tcp_probe_ctx->sock); | ||
3560 | GNUNET_free(tcp_probe_ctx); | ||
3561 | return 0; | ||
3562 | } | ||
3563 | GNUNET_assert(size >= sizeof(tcp_probe_ctx->message)); | ||
3564 | GNUNET_memcpy (buf, | ||
3565 | &tcp_probe_ctx->message, | ||
3566 | sizeof(tcp_probe_ctx->message)); | ||
3567 | GNUNET_SERVER_connect_socket (tcp_probe_ctx->plugin->server, | ||
3568 | tcp_probe_ctx->sock); | ||
3569 | ret = sizeof(tcp_probe_ctx->message); | ||
3570 | GNUNET_free (tcp_probe_ctx); | ||
3571 | return ret; | ||
3572 | } | ||
3573 | |||
3574 | |||
3575 | /** | ||
3576 | * Function called by the NAT subsystem suggesting another peer wants | ||
3577 | * to connect to us via connection reversal. Try to connect back to the | ||
3578 | * given IP. | ||
3579 | * | ||
3580 | * @param cls closure | ||
3581 | * @param addr address to try | ||
3582 | * @param addrlen number of bytes in @a addr | ||
3583 | */ | ||
3584 | static void | ||
3585 | try_connection_reversal (void *cls, | ||
3586 | const struct sockaddr *addr, | ||
3587 | socklen_t addrlen) | ||
3588 | { | ||
3589 | struct Plugin *plugin = cls; | ||
3590 | struct GNUNET_CONNECTION_Handle *sock; | ||
3591 | struct TCPProbeContext *tcp_probe_ctx; | ||
3592 | |||
3593 | /** | ||
3594 | * We have received an ICMP response, ostensibly from a peer | ||
3595 | * that wants to connect to us! Send a message to establish a connection. | ||
3596 | */ | ||
3597 | sock = GNUNET_CONNECTION_create_from_sockaddr (AF_INET, | ||
3598 | addr, | ||
3599 | addrlen); | ||
3600 | if (NULL == sock) | ||
3601 | { | ||
3602 | /* failed for some odd reason (out of sockets?); ignore attempt */ | ||
3603 | return; | ||
3604 | } | ||
3605 | |||
3606 | tcp_probe_ctx = GNUNET_new (struct TCPProbeContext); | ||
3607 | tcp_probe_ctx->message.header.size | ||
3608 | = htons (sizeof (struct TCP_NAT_ProbeMessage)); | ||
3609 | tcp_probe_ctx->message.header.type | ||
3610 | = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE); | ||
3611 | tcp_probe_ctx->message.clientIdentity | ||
3612 | = *plugin->env->my_identity; | ||
3613 | tcp_probe_ctx->plugin = plugin; | ||
3614 | tcp_probe_ctx->sock = sock; | ||
3615 | GNUNET_CONTAINER_DLL_insert (plugin->probe_head, | ||
3616 | plugin->probe_tail, | ||
3617 | tcp_probe_ctx); | ||
3618 | tcp_probe_ctx->transmit_handle | ||
3619 | = GNUNET_CONNECTION_notify_transmit_ready (sock, | ||
3620 | ntohs (tcp_probe_ctx->message.header.size), | ||
3621 | GNUNET_TIME_UNIT_FOREVER_REL, | ||
3622 | ¬ify_send_probe, | ||
3623 | tcp_probe_ctx); | ||
3624 | } | ||
3625 | |||
3626 | |||
3627 | /** | ||
3628 | * Function obtain the network type for a session | ||
3629 | * | ||
3630 | * @param cls closure (`struct Plugin *`) | ||
3631 | * @param session the session | ||
3632 | * @return the network type in HBO or #GNUNET_SYSERR | ||
3633 | */ | ||
3634 | static enum GNUNET_NetworkType | ||
3635 | tcp_plugin_get_network (void *cls, | ||
3636 | struct GNUNET_ATS_Session *session) | ||
3637 | { | ||
3638 | return session->scope; | ||
3639 | } | ||
3640 | |||
3641 | |||
3642 | /** | ||
3643 | * Function obtain the network type for an address. | ||
3644 | * | ||
3645 | * @param cls closure (`struct Plugin *`) | ||
3646 | * @param address the address | ||
3647 | * @return the network type | ||
3648 | */ | ||
3649 | static enum GNUNET_NetworkType | ||
3650 | tcp_plugin_get_network_for_address (void *cls, | ||
3651 | const struct GNUNET_HELLO_Address *address) | ||
3652 | { | ||
3653 | struct Plugin *plugin = cls; | ||
3654 | size_t addrlen; | ||
3655 | struct sockaddr_in a4; | ||
3656 | struct sockaddr_in6 a6; | ||
3657 | const struct IPv4TcpAddress *t4; | ||
3658 | const struct IPv6TcpAddress *t6; | ||
3659 | const void *sb; | ||
3660 | size_t sbs; | ||
3661 | |||
3662 | addrlen = address->address_length; | ||
3663 | if (addrlen == sizeof(struct IPv6TcpAddress)) | ||
3664 | { | ||
3665 | GNUNET_assert (NULL != address->address); /* make static analysis happy */ | ||
3666 | t6 = address->address; | ||
3667 | memset (&a6, 0, sizeof(a6)); | ||
3668 | #if HAVE_SOCKADDR_IN_SIN_LEN | ||
3669 | a6.sin6_len = sizeof (a6); | ||
3670 | #endif | ||
3671 | a6.sin6_family = AF_INET6; | ||
3672 | a6.sin6_port = t6->t6_port; | ||
3673 | GNUNET_memcpy (&a6.sin6_addr, &t6->ipv6_addr, sizeof(struct in6_addr)); | ||
3674 | sb = &a6; | ||
3675 | sbs = sizeof(a6); | ||
3676 | } | ||
3677 | else if (addrlen == sizeof(struct IPv4TcpAddress)) | ||
3678 | { | ||
3679 | GNUNET_assert (NULL != address->address); /* make static analysis happy */ | ||
3680 | t4 = address->address; | ||
3681 | memset (&a4, 0, sizeof(a4)); | ||
3682 | #if HAVE_SOCKADDR_IN_SIN_LEN | ||
3683 | a4.sin_len = sizeof (a4); | ||
3684 | #endif | ||
3685 | a4.sin_family = AF_INET; | ||
3686 | a4.sin_port = t4->t4_port; | ||
3687 | a4.sin_addr.s_addr = t4->ipv4_addr; | ||
3688 | sb = &a4; | ||
3689 | sbs = sizeof(a4); | ||
3690 | } | ||
3691 | else | ||
3692 | { | ||
3693 | GNUNET_break (0); | ||
3694 | return GNUNET_NT_UNSPECIFIED; | ||
3695 | } | ||
3696 | return plugin->env->get_address_type (plugin->env->cls, | ||
3697 | sb, | ||
3698 | sbs); | ||
3699 | } | ||
3700 | |||
3701 | |||
3702 | /** | ||
3703 | * Return information about the given session to the | ||
3704 | * monitor callback. | ||
3705 | * | ||
3706 | * @param cls the `struct Plugin` with the monitor callback (`sic`) | ||
3707 | * @param peer peer we send information about | ||
3708 | * @param value our `struct GNUNET_ATS_Session` to send information about | ||
3709 | * @return #GNUNET_OK (continue to iterate) | ||
3710 | */ | ||
3711 | static int | ||
3712 | send_session_info_iter (void *cls, | ||
3713 | const struct GNUNET_PeerIdentity *peer, | ||
3714 | void *value) | ||
3715 | { | ||
3716 | struct Plugin *plugin = cls; | ||
3717 | struct GNUNET_ATS_Session *session = value; | ||
3718 | |||
3719 | notify_session_monitor (plugin, | ||
3720 | session, | ||
3721 | GNUNET_TRANSPORT_SS_INIT); | ||
3722 | /* FIXME: cannot tell if this is up or not from current | ||
3723 | session state... */ | ||
3724 | notify_session_monitor (plugin, | ||
3725 | session, | ||
3726 | GNUNET_TRANSPORT_SS_UP); | ||
3727 | return GNUNET_OK; | ||
3728 | } | ||
3729 | |||
3730 | |||
3731 | /** | ||
3732 | * Begin monitoring sessions of a plugin. There can only | ||
3733 | * be one active monitor per plugin (i.e. if there are | ||
3734 | * multiple monitors, the transport service needs to | ||
3735 | * multiplex the generated events over all of them). | ||
3736 | * | ||
3737 | * @param cls closure of the plugin | ||
3738 | * @param sic callback to invoke, NULL to disable monitor; | ||
3739 | * plugin will being by iterating over all active | ||
3740 | * sessions immediately and then enter monitor mode | ||
3741 | * @param sic_cls closure for @a sic | ||
3742 | */ | ||
3743 | static void | ||
3744 | tcp_plugin_setup_monitor (void *cls, | ||
3745 | GNUNET_TRANSPORT_SessionInfoCallback sic, | ||
3746 | void *sic_cls) | ||
3747 | { | ||
3748 | struct Plugin *plugin = cls; | ||
3749 | |||
3750 | plugin->sic = sic; | ||
3751 | plugin->sic_cls = sic_cls; | ||
3752 | if (NULL != sic) | ||
3753 | { | ||
3754 | GNUNET_CONTAINER_multipeermap_iterate (plugin->sessionmap, | ||
3755 | &send_session_info_iter, | ||
3756 | plugin); | ||
3757 | /* signal end of first iteration */ | ||
3758 | sic (sic_cls, NULL, NULL); | ||
3759 | } | ||
3760 | } | ||
3761 | |||
3762 | |||
3763 | /** | ||
3764 | * Entry point for the plugin. | ||
3765 | * | ||
3766 | * @param cls closure, the `struct GNUNET_TRANSPORT_PluginEnvironment *` | ||
3767 | * @return the `struct GNUNET_TRANSPORT_PluginFunctions *` or NULL on error | ||
3768 | */ | ||
3769 | void * | ||
3770 | libgnunet_plugin_transport_xt_init (void *cls) | ||
3771 | { | ||
3772 | static const struct GNUNET_SERVER_MessageHandler my_handlers[] = { | ||
3773 | { &handle_tcp_welcome, NULL, | ||
3774 | GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME, | ||
3775 | sizeof(struct WelcomeMessage) }, | ||
3776 | { &handle_tcp_nat_probe, NULL, | ||
3777 | GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE, | ||
3778 | sizeof(struct TCP_NAT_ProbeMessage) }, | ||
3779 | { &handle_tcp_data, NULL, | ||
3780 | GNUNET_MESSAGE_TYPE_ALL, 0 }, | ||
3781 | { NULL, NULL, 0, 0 } | ||
3782 | }; | ||
3783 | struct GNUNET_TRANSPORT_PluginEnvironment *env = cls; | ||
3784 | struct GNUNET_TRANSPORT_PluginFunctions *api; | ||
3785 | struct Plugin *plugin; | ||
3786 | struct LEGACY_SERVICE_Context *service; | ||
3787 | unsigned long long aport; | ||
3788 | unsigned long long bport; | ||
3789 | unsigned long long max_connections; | ||
3790 | unsigned int i; | ||
3791 | struct GNUNET_TIME_Relative idle_timeout; | ||
3792 | #ifdef TCP_STEALTH | ||
3793 | struct GNUNET_NETWORK_Handle *const*lsocks; | ||
3794 | #endif | ||
3795 | int ret; | ||
3796 | int ret_s; | ||
3797 | struct sockaddr **addrs; | ||
3798 | socklen_t *addrlens; | ||
3799 | |||
3800 | if (NULL == env->receive) | ||
3801 | { | ||
3802 | /* run in 'stub' mode (i.e. as part of gnunet-peerinfo), don't fully | ||
3803 | initialze the plugin or the API */ | ||
3804 | api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions); | ||
3805 | api->cls = NULL; | ||
3806 | api->address_pretty_printer = &tcp_plugin_address_pretty_printer; | ||
3807 | api->address_to_string = &tcp_plugin_address_to_string; | ||
3808 | api->string_to_address = &tcp_plugin_string_to_address; | ||
3809 | return api; | ||
3810 | } | ||
3811 | |||
3812 | GNUNET_assert (NULL != env->cfg); | ||
3813 | if (GNUNET_OK != | ||
3814 | GNUNET_CONFIGURATION_get_value_number (env->cfg, | ||
3815 | "transport-xt", | ||
3816 | "MAX_CONNECTIONS", | ||
3817 | &max_connections)) | ||
3818 | max_connections = 128; | ||
3819 | |||
3820 | aport = 0; | ||
3821 | if ((GNUNET_OK != | ||
3822 | GNUNET_CONFIGURATION_get_value_number (env->cfg, | ||
3823 | "transport-xt", | ||
3824 | "PORT", &bport)) || | ||
3825 | (bport > 65535) || | ||
3826 | ((GNUNET_OK == | ||
3827 | GNUNET_CONFIGURATION_get_value_number (env->cfg, | ||
3828 | "transport-xt", | ||
3829 | "ADVERTISED-PORT", &aport)) && | ||
3830 | (aport > 65535) )) | ||
3831 | { | ||
3832 | LOG(GNUNET_ERROR_TYPE_ERROR, | ||
3833 | _("Require valid port number for service `%s' in configuration!\n"), | ||
3834 | "transport-xt"); | ||
3835 | return NULL ; | ||
3836 | } | ||
3837 | if (0 == aport) | ||
3838 | aport = bport; | ||
3839 | if (0 == bport) | ||
3840 | aport = 0; | ||
3841 | if (0 != bport) | ||
3842 | { | ||
3843 | service = LEGACY_SERVICE_start ("transport-xt", | ||
3844 | env->cfg, | ||
3845 | LEGACY_SERVICE_OPTION_NONE); | ||
3846 | if (NULL == service) | ||
3847 | { | ||
3848 | LOG (GNUNET_ERROR_TYPE_WARNING, | ||
3849 | _("Failed to start service.\n")); | ||
3850 | return NULL; | ||
3851 | } | ||
3852 | } | ||
3853 | else | ||
3854 | service = NULL; | ||
3855 | |||
3856 | api = NULL; | ||
3857 | plugin = GNUNET_new (struct Plugin); | ||
3858 | plugin->sessionmap = GNUNET_CONTAINER_multipeermap_create (max_connections, | ||
3859 | GNUNET_YES); | ||
3860 | plugin->max_connections = max_connections; | ||
3861 | plugin->open_port = bport; | ||
3862 | plugin->adv_port = aport; | ||
3863 | plugin->env = env; | ||
3864 | plugin->my_welcome.header.size = htons (sizeof(struct WelcomeMessage)); | ||
3865 | plugin->my_welcome.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME); | ||
3866 | plugin->my_welcome.clientIdentity = *plugin->env->my_identity; | ||
3867 | |||
3868 | if ( (NULL != service) && | ||
3869 | (GNUNET_YES == | ||
3870 | GNUNET_CONFIGURATION_get_value_yesno (env->cfg, | ||
3871 | "transport-xt", | ||
3872 | "TCP_STEALTH")) ) | ||
3873 | { | ||
3874 | #ifdef TCP_STEALTH | ||
3875 | plugin->myoptions |= TCP_OPTIONS_TCP_STEALTH; | ||
3876 | lsocks = LEGACY_SERVICE_get_listen_sockets (service); | ||
3877 | if (NULL != lsocks) | ||
3878 | { | ||
3879 | uint32_t len = sizeof (struct WelcomeMessage); | ||
3880 | |||
3881 | for (i=0;NULL!=lsocks[i];i++) | ||
3882 | { | ||
3883 | if ( (GNUNET_OK != | ||
3884 | GNUNET_NETWORK_socket_setsockopt (lsocks[i], | ||
3885 | IPPROTO_TCP, | ||
3886 | TCP_STEALTH, | ||
3887 | env->my_identity, | ||
3888 | sizeof (struct GNUNET_PeerIdentity))) || | ||
3889 | (GNUNET_OK != | ||
3890 | GNUNET_NETWORK_socket_setsockopt (lsocks[i], | ||
3891 | IPPROTO_TCP, | ||
3892 | TCP_STEALTH_INTEGRITY_LEN, | ||
3893 | &len, | ||
3894 | sizeof (len))) ) | ||
3895 | { | ||
3896 | /* TCP STEALTH not supported by kernel */ | ||
3897 | GNUNET_assert (0 == i); | ||
3898 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
3899 | _("TCP_STEALTH not supported on this platform.\n")); | ||
3900 | goto die; | ||
3901 | } | ||
3902 | } | ||
3903 | } | ||
3904 | #else | ||
3905 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
3906 | _("TCP_STEALTH not supported on this platform.\n")); | ||
3907 | goto die; | ||
3908 | #endif | ||
3909 | } | ||
3910 | |||
3911 | if ( (NULL != service) && | ||
3912 | (GNUNET_SYSERR != | ||
3913 | (ret_s = | ||
3914 | get_server_addresses ("transport-xt", | ||
3915 | env->cfg, | ||
3916 | &addrs, | ||
3917 | &addrlens)))) | ||
3918 | { | ||
3919 | for (ret = ret_s-1; ret >= 0; ret--) | ||
3920 | LOG (GNUNET_ERROR_TYPE_INFO, | ||
3921 | "Binding to address `%s'\n", | ||
3922 | GNUNET_a2s (addrs[ret], addrlens[ret])); | ||
3923 | plugin->nat | ||
3924 | = GNUNET_NAT_register (env->cfg, | ||
3925 | "transport-xt", | ||
3926 | IPPROTO_TCP, | ||
3927 | (unsigned int) ret_s, | ||
3928 | (const struct sockaddr **) addrs, | ||
3929 | addrlens, | ||
3930 | &tcp_nat_port_map_callback, | ||
3931 | &try_connection_reversal, | ||
3932 | plugin); | ||
3933 | for (ret = ret_s -1; ret >= 0; ret--) | ||
3934 | GNUNET_free (addrs[ret]); | ||
3935 | GNUNET_free_non_null (addrs); | ||
3936 | GNUNET_free_non_null (addrlens); | ||
3937 | } | ||
3938 | else | ||
3939 | { | ||
3940 | plugin->nat = GNUNET_NAT_register (plugin->env->cfg, | ||
3941 | "transport-xt", | ||
3942 | IPPROTO_TCP, | ||
3943 | 0, | ||
3944 | NULL, | ||
3945 | NULL, | ||
3946 | NULL, | ||
3947 | &try_connection_reversal, | ||
3948 | plugin); | ||
3949 | } | ||
3950 | api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions); | ||
3951 | api->cls = plugin; | ||
3952 | api->send = &tcp_plugin_send; | ||
3953 | api->get_session = &tcp_plugin_get_session; | ||
3954 | api->disconnect_session = &tcp_plugin_disconnect_session; | ||
3955 | api->query_keepalive_factor = &tcp_plugin_query_keepalive_factor; | ||
3956 | api->disconnect_peer = &tcp_plugin_disconnect; | ||
3957 | api->address_pretty_printer = &tcp_plugin_address_pretty_printer; | ||
3958 | api->check_address = &tcp_plugin_check_address; | ||
3959 | api->address_to_string = &tcp_plugin_address_to_string; | ||
3960 | api->string_to_address = &tcp_plugin_string_to_address; | ||
3961 | api->get_network = &tcp_plugin_get_network; | ||
3962 | api->get_network_for_address = &tcp_plugin_get_network_for_address; | ||
3963 | api->update_session_timeout = &tcp_plugin_update_session_timeout; | ||
3964 | api->update_inbound_delay = &tcp_plugin_update_inbound_delay; | ||
3965 | api->setup_monitor = &tcp_plugin_setup_monitor; | ||
3966 | plugin->service = service; | ||
3967 | if (NULL != service) | ||
3968 | { | ||
3969 | plugin->server = LEGACY_SERVICE_get_server (service); | ||
3970 | } | ||
3971 | else | ||
3972 | { | ||
3973 | if (GNUNET_OK != | ||
3974 | GNUNET_CONFIGURATION_get_value_time (env->cfg, | ||
3975 | "transport-xt", | ||
3976 | "TIMEOUT", | ||
3977 | &idle_timeout)) | ||
3978 | { | ||
3979 | GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, | ||
3980 | "transport-xt", | ||
3981 | "TIMEOUT"); | ||
3982 | goto die; | ||
3983 | } | ||
3984 | plugin->server | ||
3985 | = GNUNET_SERVER_create_with_sockets (NULL, | ||
3986 | plugin, | ||
3987 | NULL, | ||
3988 | idle_timeout, | ||
3989 | GNUNET_YES); | ||
3990 | } | ||
3991 | plugin->handlers = GNUNET_malloc (sizeof (my_handlers)); | ||
3992 | GNUNET_memcpy (plugin->handlers, | ||
3993 | my_handlers, | ||
3994 | sizeof(my_handlers)); | ||
3995 | for (i = 0;i < sizeof(my_handlers) / sizeof(struct GNUNET_SERVER_MessageHandler);i++) | ||
3996 | plugin->handlers[i].callback_cls = plugin; | ||
3997 | |||
3998 | GNUNET_SERVER_add_handlers (plugin->server, | ||
3999 | plugin->handlers); | ||
4000 | GNUNET_SERVER_connect_notify (plugin->server, | ||
4001 | &connect_notify, | ||
4002 | plugin); | ||
4003 | GNUNET_SERVER_disconnect_notify (plugin->server, | ||
4004 | &disconnect_notify, | ||
4005 | plugin); | ||
4006 | plugin->nat_wait_conns = GNUNET_CONTAINER_multipeermap_create (16, | ||
4007 | GNUNET_YES); | ||
4008 | if (0 != bport) | ||
4009 | LOG (GNUNET_ERROR_TYPE_INFO, | ||
4010 | _("XT transport listening on port %llu\n"), | ||
4011 | bport); | ||
4012 | else | ||
4013 | LOG (GNUNET_ERROR_TYPE_INFO, | ||
4014 | _("XT transport not listening on any port (client only)\n")); | ||
4015 | if ( (aport != bport) && | ||
4016 | (0 != bport) ) | ||
4017 | LOG (GNUNET_ERROR_TYPE_INFO, | ||
4018 | _("XT transport advertises itself as being on port %llu\n"), | ||
4019 | aport); | ||
4020 | /* Initially set connections to 0 */ | ||
4021 | GNUNET_STATISTICS_set (plugin->env->stats, | ||
4022 | gettext_noop ("# XT sessions active"), | ||
4023 | 0, | ||
4024 | GNUNET_NO); | ||
4025 | return api; | ||
4026 | |||
4027 | die: | ||
4028 | if (NULL != plugin->nat) | ||
4029 | GNUNET_NAT_unregister (plugin->nat); | ||
4030 | GNUNET_CONTAINER_multipeermap_destroy (plugin->sessionmap); | ||
4031 | if (NULL != service) | ||
4032 | LEGACY_SERVICE_stop (service); | ||
4033 | GNUNET_free (plugin); | ||
4034 | GNUNET_free_non_null (api); | ||
4035 | return NULL; | ||
4036 | } | ||
4037 | |||
4038 | |||
4039 | /** | ||
4040 | * Exit point from the plugin. | ||
4041 | * | ||
4042 | * @param cls the `struct GNUNET_TRANSPORT_PluginFunctions` | ||
4043 | * @return NULL | ||
4044 | */ | ||
4045 | void * | ||
4046 | libgnunet_plugin_transport_xt_done (void *cls) | ||
4047 | { | ||
4048 | struct GNUNET_TRANSPORT_PluginFunctions *api = cls; | ||
4049 | struct Plugin *plugin = api->cls; | ||
4050 | struct TCPProbeContext *tcp_probe; | ||
4051 | struct PrettyPrinterContext *cur; | ||
4052 | struct PrettyPrinterContext *next; | ||
4053 | |||
4054 | if (NULL == plugin) | ||
4055 | { | ||
4056 | GNUNET_free(api); | ||
4057 | return NULL ; | ||
4058 | } | ||
4059 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
4060 | "Shutting down XT plugin\n"); | ||
4061 | |||
4062 | /* Removing leftover sessions */ | ||
4063 | GNUNET_CONTAINER_multipeermap_iterate (plugin->sessionmap, | ||
4064 | &session_disconnect_it, | ||
4065 | plugin); | ||
4066 | /* Removing leftover NAT sessions */ | ||
4067 | GNUNET_CONTAINER_multipeermap_iterate (plugin->nat_wait_conns, | ||
4068 | &session_disconnect_it, | ||
4069 | plugin); | ||
4070 | |||
4071 | for (cur = plugin->ppc_dll_head; NULL != cur; cur = next) | ||
4072 | { | ||
4073 | next = cur->next; | ||
4074 | GNUNET_CONTAINER_DLL_remove (plugin->ppc_dll_head, | ||
4075 | plugin->ppc_dll_tail, | ||
4076 | cur); | ||
4077 | GNUNET_RESOLVER_request_cancel (cur->resolver_handle); | ||
4078 | cur->asc (cur->asc_cls, | ||
4079 | NULL, | ||
4080 | GNUNET_OK); | ||
4081 | GNUNET_free (cur); | ||
4082 | } | ||
4083 | |||
4084 | if (NULL != plugin->service) | ||
4085 | LEGACY_SERVICE_stop (plugin->service); | ||
4086 | else | ||
4087 | GNUNET_SERVER_destroy (plugin->server); | ||
4088 | GNUNET_free (plugin->handlers); | ||
4089 | if (NULL != plugin->nat) | ||
4090 | GNUNET_NAT_unregister (plugin->nat); | ||
4091 | while (NULL != (tcp_probe = plugin->probe_head)) | ||
4092 | { | ||
4093 | GNUNET_CONTAINER_DLL_remove (plugin->probe_head, | ||
4094 | plugin->probe_tail, | ||
4095 | tcp_probe); | ||
4096 | GNUNET_CONNECTION_destroy (tcp_probe->sock); | ||
4097 | GNUNET_free (tcp_probe); | ||
4098 | } | ||
4099 | GNUNET_CONTAINER_multipeermap_destroy (plugin->nat_wait_conns); | ||
4100 | GNUNET_CONTAINER_multipeermap_destroy (plugin->sessionmap); | ||
4101 | GNUNET_break (0 == plugin->cur_connections); | ||
4102 | GNUNET_free (plugin); | ||
4103 | GNUNET_free (api); | ||
4104 | return NULL; | ||
4105 | } | ||
4106 | |||
4107 | /* end of plugin_transport_xt.c */ | ||
diff --git a/src/transport/plugin_transport_xu.c b/src/transport/plugin_transport_xu.c deleted file mode 100644 index b716c6878..000000000 --- a/src/transport/plugin_transport_xu.c +++ /dev/null | |||
@@ -1,2492 +0,0 @@ | |||
1 | /* | ||
2 | This file is part of GNUnet | ||
3 | Copyright (C) 2010-2017 GNUnet e.V. | ||
4 | |||
5 | GNUnet is free software: you can redistribute it and/or modify it | ||
6 | under the terms of the GNU Affero General Public License as published | ||
7 | by the Free Software Foundation, either version 3 of the License, | ||
8 | or (at your option) any later version. | ||
9 | |||
10 | GNUnet is distributed in the hope that it will be useful, but | ||
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
13 | Affero General Public License for more details. | ||
14 | |||
15 | You should have received a copy of the GNU Affero General Public License | ||
16 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
17 | |||
18 | SPDX-License-Identifier: AGPL3.0-or-later | ||
19 | */ | ||
20 | |||
21 | /** | ||
22 | * @file transport/plugin_transport_xu.c | ||
23 | * @brief Implementation of the XU transport protocol | ||
24 | * @author Christian Grothoff | ||
25 | * @author Nathan Evans | ||
26 | * @author Matthias Wachs | ||
27 | */ | ||
28 | #include "platform.h" | ||
29 | #include "plugin_transport_xu.h" | ||
30 | #include "gnunet_hello_lib.h" | ||
31 | #include "gnunet_util_lib.h" | ||
32 | #include "gnunet_fragmentation_lib.h" | ||
33 | #include "gnunet_nat_service.h" | ||
34 | #include "gnunet_protocols.h" | ||
35 | #include "gnunet_resolver_service.h" | ||
36 | #include "gnunet_signatures.h" | ||
37 | #include "gnunet_constants.h" | ||
38 | #include "gnunet_statistics_service.h" | ||
39 | #include "gnunet_transport_service.h" | ||
40 | #include "gnunet_transport_plugin.h" | ||
41 | #include "transport.h" | ||
42 | |||
43 | #define LOG(kind,...) GNUNET_log_from (kind, "transport-xu", __VA_ARGS__) | ||
44 | |||
45 | /** | ||
46 | * After how much inactivity should a XU session time out? | ||
47 | */ | ||
48 | #define XU_SESSION_TIME_OUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60) | ||
49 | |||
50 | |||
51 | /** | ||
52 | * XU Message-Packet header (after defragmentation). | ||
53 | */ | ||
54 | struct XUMessage | ||
55 | { | ||
56 | /** | ||
57 | * Message header. | ||
58 | */ | ||
59 | struct GNUNET_MessageHeader header; | ||
60 | |||
61 | /** | ||
62 | * Always zero for now. | ||
63 | */ | ||
64 | uint32_t reserved; | ||
65 | |||
66 | /** | ||
67 | * What is the identity of the sender | ||
68 | */ | ||
69 | struct GNUNET_PeerIdentity sender; | ||
70 | |||
71 | }; | ||
72 | |||
73 | |||
74 | /** | ||
75 | * Closure for #append_port(). | ||
76 | */ | ||
77 | struct PrettyPrinterContext | ||
78 | { | ||
79 | /** | ||
80 | * DLL | ||
81 | */ | ||
82 | struct PrettyPrinterContext *next; | ||
83 | |||
84 | /** | ||
85 | * DLL | ||
86 | */ | ||
87 | struct PrettyPrinterContext *prev; | ||
88 | |||
89 | /** | ||
90 | * Our plugin. | ||
91 | */ | ||
92 | struct Plugin *plugin; | ||
93 | |||
94 | /** | ||
95 | * Resolver handle | ||
96 | */ | ||
97 | struct GNUNET_RESOLVER_RequestHandle *resolver_handle; | ||
98 | |||
99 | /** | ||
100 | * Function to call with the result. | ||
101 | */ | ||
102 | GNUNET_TRANSPORT_AddressStringCallback asc; | ||
103 | |||
104 | /** | ||
105 | * Clsoure for @e asc. | ||
106 | */ | ||
107 | void *asc_cls; | ||
108 | |||
109 | /** | ||
110 | * Timeout task | ||
111 | */ | ||
112 | struct GNUNET_SCHEDULER_Task *timeout_task; | ||
113 | |||
114 | /** | ||
115 | * Is this an IPv6 address? | ||
116 | */ | ||
117 | int ipv6; | ||
118 | |||
119 | /** | ||
120 | * Options | ||
121 | */ | ||
122 | uint32_t options; | ||
123 | |||
124 | /** | ||
125 | * Port to add after the IP address. | ||
126 | */ | ||
127 | uint16_t port; | ||
128 | |||
129 | }; | ||
130 | |||
131 | |||
132 | /** | ||
133 | * Session with another peer. | ||
134 | */ | ||
135 | struct GNUNET_ATS_Session | ||
136 | { | ||
137 | /** | ||
138 | * Which peer is this session for? | ||
139 | */ | ||
140 | struct GNUNET_PeerIdentity target; | ||
141 | |||
142 | /** | ||
143 | * Tokenizer for inbound messages. | ||
144 | */ | ||
145 | struct GNUNET_MessageStreamTokenizer *mst; | ||
146 | |||
147 | /** | ||
148 | * Plugin this session belongs to. | ||
149 | */ | ||
150 | struct Plugin *plugin; | ||
151 | |||
152 | /** | ||
153 | * Session timeout task | ||
154 | */ | ||
155 | struct GNUNET_SCHEDULER_Task *timeout_task; | ||
156 | |||
157 | /** | ||
158 | * When does this session time out? | ||
159 | */ | ||
160 | struct GNUNET_TIME_Absolute timeout; | ||
161 | |||
162 | /** | ||
163 | * What time did we last transmit? | ||
164 | */ | ||
165 | struct GNUNET_TIME_Absolute last_transmit_time; | ||
166 | |||
167 | /** | ||
168 | * expected delay for ACKs | ||
169 | */ | ||
170 | struct GNUNET_TIME_Relative last_expected_ack_delay; | ||
171 | |||
172 | /** | ||
173 | * desired delay between XU messages | ||
174 | */ | ||
175 | struct GNUNET_TIME_Relative last_expected_msg_delay; | ||
176 | |||
177 | /** | ||
178 | */ | ||
179 | struct GNUNET_TIME_Relative flow_delay_for_other_peer; | ||
180 | struct GNUNET_TIME_Relative flow_delay_from_other_peer; | ||
181 | |||
182 | /** | ||
183 | * Our own address. | ||
184 | */ | ||
185 | struct GNUNET_HELLO_Address *address; | ||
186 | |||
187 | /** | ||
188 | * Number of bytes waiting for transmission to this peer. | ||
189 | */ | ||
190 | unsigned long long bytes_in_queue; | ||
191 | |||
192 | /** | ||
193 | * Number of messages waiting for transmission to this peer. | ||
194 | */ | ||
195 | unsigned int msgs_in_queue; | ||
196 | |||
197 | /** | ||
198 | * Reference counter to indicate that this session is | ||
199 | * currently being used and must not be destroyed; | ||
200 | * setting @e in_destroy will destroy it as soon as | ||
201 | * possible. | ||
202 | */ | ||
203 | unsigned int rc; | ||
204 | |||
205 | /** | ||
206 | * Network type of the address. | ||
207 | */ | ||
208 | enum GNUNET_NetworkType scope; | ||
209 | |||
210 | /** | ||
211 | * Is this session about to be destroyed (sometimes we cannot | ||
212 | * destroy a session immediately as below us on the stack | ||
213 | * there might be code that still uses it; in this case, | ||
214 | * @e rc is non-zero). | ||
215 | */ | ||
216 | int in_destroy; | ||
217 | }; | ||
218 | |||
219 | |||
220 | |||
221 | /** | ||
222 | * If a session monitor is attached, notify it about the new | ||
223 | * session state. | ||
224 | * | ||
225 | * @param plugin our plugin | ||
226 | * @param session session that changed state | ||
227 | * @param state new state of the session | ||
228 | */ | ||
229 | static void | ||
230 | notify_session_monitor (struct Plugin *plugin, | ||
231 | struct GNUNET_ATS_Session *session, | ||
232 | enum GNUNET_TRANSPORT_SessionState state) | ||
233 | { | ||
234 | struct GNUNET_TRANSPORT_SessionInfo info; | ||
235 | |||
236 | if (NULL == plugin->sic) | ||
237 | return; | ||
238 | if (GNUNET_YES == session->in_destroy) | ||
239 | return; /* already destroyed, just RC>0 left-over actions */ | ||
240 | memset (&info, | ||
241 | 0, | ||
242 | sizeof (info)); | ||
243 | info.state = state; | ||
244 | info.is_inbound = GNUNET_SYSERR; /* hard to say */ | ||
245 | info.num_msg_pending = session->msgs_in_queue; | ||
246 | info.num_bytes_pending = session->bytes_in_queue; | ||
247 | /* info.receive_delay remains zero as this is not supported by XU | ||
248 | (cannot selectively not receive from 'some' peer while continuing | ||
249 | to receive from others) */ | ||
250 | info.session_timeout = session->timeout; | ||
251 | info.address = session->address; | ||
252 | plugin->sic (plugin->sic_cls, | ||
253 | session, | ||
254 | &info); | ||
255 | } | ||
256 | |||
257 | |||
258 | /** | ||
259 | * Return information about the given session to the monitor callback. | ||
260 | * | ||
261 | * @param cls the `struct Plugin` with the monitor callback (`sic`) | ||
262 | * @param peer peer we send information about | ||
263 | * @param value our `struct GNUNET_ATS_Session` to send information about | ||
264 | * @return #GNUNET_OK (continue to iterate) | ||
265 | */ | ||
266 | static int | ||
267 | send_session_info_iter (void *cls, | ||
268 | const struct GNUNET_PeerIdentity *peer, | ||
269 | void *value) | ||
270 | { | ||
271 | struct Plugin *plugin = cls; | ||
272 | struct GNUNET_ATS_Session *session = value; | ||
273 | |||
274 | (void) peer; | ||
275 | notify_session_monitor (plugin, | ||
276 | session, | ||
277 | GNUNET_TRANSPORT_SS_INIT); | ||
278 | notify_session_monitor (plugin, | ||
279 | session, | ||
280 | GNUNET_TRANSPORT_SS_UP); | ||
281 | return GNUNET_OK; | ||
282 | } | ||
283 | |||
284 | |||
285 | /** | ||
286 | * Begin monitoring sessions of a plugin. There can only | ||
287 | * be one active monitor per plugin (i.e. if there are | ||
288 | * multiple monitors, the transport service needs to | ||
289 | * multiplex the generated events over all of them). | ||
290 | * | ||
291 | * @param cls closure of the plugin | ||
292 | * @param sic callback to invoke, NULL to disable monitor; | ||
293 | * plugin will being by iterating over all active | ||
294 | * sessions immediately and then enter monitor mode | ||
295 | * @param sic_cls closure for @a sic | ||
296 | */ | ||
297 | static void | ||
298 | xu_plugin_setup_monitor (void *cls, | ||
299 | GNUNET_TRANSPORT_SessionInfoCallback sic, | ||
300 | void *sic_cls) | ||
301 | { | ||
302 | struct Plugin *plugin = cls; | ||
303 | |||
304 | plugin->sic = sic; | ||
305 | plugin->sic_cls = sic_cls; | ||
306 | if (NULL != sic) | ||
307 | { | ||
308 | GNUNET_CONTAINER_multipeermap_iterate (plugin->sessions, | ||
309 | &send_session_info_iter, | ||
310 | plugin); | ||
311 | /* signal end of first iteration */ | ||
312 | sic (sic_cls, | ||
313 | NULL, | ||
314 | NULL); | ||
315 | } | ||
316 | } | ||
317 | |||
318 | |||
319 | /* ****************** Little Helpers ****************** */ | ||
320 | |||
321 | |||
322 | /** | ||
323 | * Function to free last resources associated with a session. | ||
324 | * | ||
325 | * @param s session to free | ||
326 | */ | ||
327 | static void | ||
328 | free_session (struct GNUNET_ATS_Session *s) | ||
329 | { | ||
330 | if (NULL != s->address) | ||
331 | { | ||
332 | GNUNET_HELLO_address_free (s->address); | ||
333 | s->address = NULL; | ||
334 | } | ||
335 | if (NULL != s->mst) | ||
336 | { | ||
337 | GNUNET_MST_destroy (s->mst); | ||
338 | s->mst = NULL; | ||
339 | } | ||
340 | GNUNET_free (s); | ||
341 | } | ||
342 | |||
343 | |||
344 | /** | ||
345 | * Function that is called to get the keepalive factor. | ||
346 | * #GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT is divided by this number to | ||
347 | * calculate the interval between keepalive packets. | ||
348 | * | ||
349 | * @param cls closure with the `struct Plugin` | ||
350 | * @return keepalive factor | ||
351 | */ | ||
352 | static unsigned int | ||
353 | xu_query_keepalive_factor (void *cls) | ||
354 | { | ||
355 | (void) cls; | ||
356 | return 15; | ||
357 | } | ||
358 | |||
359 | |||
360 | /** | ||
361 | * Function obtain the network type for a session | ||
362 | * | ||
363 | * @param cls closure (`struct Plugin *`) | ||
364 | * @param session the session | ||
365 | * @return the network type | ||
366 | */ | ||
367 | static enum GNUNET_NetworkType | ||
368 | xu_plugin_get_network (void *cls, | ||
369 | struct GNUNET_ATS_Session *session) | ||
370 | { | ||
371 | (void) cls; | ||
372 | return session->scope; | ||
373 | } | ||
374 | |||
375 | |||
376 | /** | ||
377 | * Function obtain the network type for an address. | ||
378 | * | ||
379 | * @param cls closure (`struct Plugin *`) | ||
380 | * @param address the address | ||
381 | * @return the network type | ||
382 | */ | ||
383 | static enum GNUNET_NetworkType | ||
384 | xu_plugin_get_network_for_address (void *cls, | ||
385 | const struct GNUNET_HELLO_Address *address) | ||
386 | { | ||
387 | struct Plugin *plugin = cls; | ||
388 | size_t addrlen; | ||
389 | struct sockaddr_in a4; | ||
390 | struct sockaddr_in6 a6; | ||
391 | const struct IPv4XuAddress *u4; | ||
392 | const struct IPv6XuAddress *u6; | ||
393 | const void *sb; | ||
394 | size_t sbs; | ||
395 | |||
396 | addrlen = address->address_length; | ||
397 | if (addrlen == sizeof(struct IPv6XuAddress)) | ||
398 | { | ||
399 | GNUNET_assert (NULL != address->address); /* make static analysis happy */ | ||
400 | u6 = address->address; | ||
401 | memset (&a6, 0, sizeof(a6)); | ||
402 | #if HAVE_SOCKADDR_IN_SIN_LEN | ||
403 | a6.sin6_len = sizeof (a6); | ||
404 | #endif | ||
405 | a6.sin6_family = AF_INET6; | ||
406 | a6.sin6_port = u6->u6_port; | ||
407 | GNUNET_memcpy (&a6.sin6_addr, &u6->ipv6_addr, sizeof(struct in6_addr)); | ||
408 | sb = &a6; | ||
409 | sbs = sizeof(a6); | ||
410 | } | ||
411 | else if (addrlen == sizeof(struct IPv4XuAddress)) | ||
412 | { | ||
413 | GNUNET_assert (NULL != address->address); /* make static analysis happy */ | ||
414 | u4 = address->address; | ||
415 | memset (&a4, 0, sizeof(a4)); | ||
416 | #if HAVE_SOCKADDR_IN_SIN_LEN | ||
417 | a4.sin_len = sizeof (a4); | ||
418 | #endif | ||
419 | a4.sin_family = AF_INET; | ||
420 | a4.sin_port = u4->u4_port; | ||
421 | a4.sin_addr.s_addr = u4->ipv4_addr; | ||
422 | sb = &a4; | ||
423 | sbs = sizeof(a4); | ||
424 | } | ||
425 | else | ||
426 | { | ||
427 | GNUNET_break (0); | ||
428 | return GNUNET_NT_UNSPECIFIED; | ||
429 | } | ||
430 | return plugin->env->get_address_type (plugin->env->cls, | ||
431 | sb, | ||
432 | sbs); | ||
433 | } | ||
434 | |||
435 | |||
436 | /* ******************* Event loop ******************** */ | ||
437 | |||
438 | /** | ||
439 | * We have been notified that our readset has something to read. We don't | ||
440 | * know which socket needs to be read, so we have to check each one | ||
441 | * Then reschedule this function to be called again once more is available. | ||
442 | * | ||
443 | * @param cls the plugin handle | ||
444 | */ | ||
445 | static void | ||
446 | xu_plugin_select_v4 (void *cls); | ||
447 | |||
448 | |||
449 | /** | ||
450 | * We have been notified that our readset has something to read. We don't | ||
451 | * know which socket needs to be read, so we have to check each one | ||
452 | * Then reschedule this function to be called again once more is available. | ||
453 | * | ||
454 | * @param cls the plugin handle | ||
455 | */ | ||
456 | static void | ||
457 | xu_plugin_select_v6 (void *cls); | ||
458 | |||
459 | |||
460 | /** | ||
461 | * (re)schedule IPv4-select tasks for this plugin. | ||
462 | * | ||
463 | * @param plugin plugin to reschedule | ||
464 | */ | ||
465 | static void | ||
466 | schedule_select_v4 (struct Plugin *plugin) | ||
467 | { | ||
468 | if ( (GNUNET_YES != plugin->enable_ipv4) || | ||
469 | (NULL == plugin->sockv4) ) | ||
470 | return; | ||
471 | if (NULL != plugin->select_task_v4) | ||
472 | GNUNET_SCHEDULER_cancel (plugin->select_task_v4); | ||
473 | plugin->select_task_v4 | ||
474 | = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, | ||
475 | plugin->sockv4, | ||
476 | &xu_plugin_select_v4, | ||
477 | plugin); | ||
478 | } | ||
479 | |||
480 | |||
481 | /** | ||
482 | * (re)schedule IPv6-select tasks for this plugin. | ||
483 | * | ||
484 | * @param plugin plugin to reschedule | ||
485 | */ | ||
486 | static void | ||
487 | schedule_select_v6 (struct Plugin *plugin) | ||
488 | { | ||
489 | if ( (GNUNET_YES != plugin->enable_ipv6) || | ||
490 | (NULL == plugin->sockv6) ) | ||
491 | return; | ||
492 | if (NULL != plugin->select_task_v6) | ||
493 | GNUNET_SCHEDULER_cancel (plugin->select_task_v6); | ||
494 | plugin->select_task_v6 | ||
495 | = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, | ||
496 | plugin->sockv6, | ||
497 | &xu_plugin_select_v6, | ||
498 | plugin); | ||
499 | } | ||
500 | |||
501 | |||
502 | /* ******************* Address to string and back ***************** */ | ||
503 | |||
504 | |||
505 | /** | ||
506 | * Function called for a quick conversion of the binary address to | ||
507 | * a numeric address. Note that the caller must not free the | ||
508 | * address and that the next call to this function is allowed | ||
509 | * to override the address again. | ||
510 | * | ||
511 | * @param cls closure | ||
512 | * @param addr binary address (a `union XuAddress`) | ||
513 | * @param addrlen length of the @a addr | ||
514 | * @return string representing the same address | ||
515 | */ | ||
516 | const char * | ||
517 | xu_address_to_string (void *cls, | ||
518 | const void *addr, | ||
519 | size_t addrlen) | ||
520 | { | ||
521 | static char rbuf[INET6_ADDRSTRLEN + 10]; | ||
522 | char buf[INET6_ADDRSTRLEN]; | ||
523 | const void *sb; | ||
524 | struct in_addr a4; | ||
525 | struct in6_addr a6; | ||
526 | const struct IPv4XuAddress *t4; | ||
527 | const struct IPv6XuAddress *t6; | ||
528 | int af; | ||
529 | uint16_t port; | ||
530 | uint32_t options; | ||
531 | |||
532 | (void) cls; | ||
533 | if (NULL == addr) | ||
534 | { | ||
535 | GNUNET_break_op (0); | ||
536 | return NULL; | ||
537 | } | ||
538 | |||
539 | if (addrlen == sizeof(struct IPv6XuAddress)) | ||
540 | { | ||
541 | t6 = addr; | ||
542 | af = AF_INET6; | ||
543 | options = ntohl (t6->options); | ||
544 | port = ntohs (t6->u6_port); | ||
545 | a6 = t6->ipv6_addr; | ||
546 | sb = &a6; | ||
547 | } | ||
548 | else if (addrlen == sizeof(struct IPv4XuAddress)) | ||
549 | { | ||
550 | t4 = addr; | ||
551 | af = AF_INET; | ||
552 | options = ntohl (t4->options); | ||
553 | port = ntohs (t4->u4_port); | ||
554 | a4.s_addr = t4->ipv4_addr; | ||
555 | sb = &a4; | ||
556 | } | ||
557 | else | ||
558 | { | ||
559 | GNUNET_break_op (0); | ||
560 | return NULL; | ||
561 | } | ||
562 | inet_ntop (af, | ||
563 | sb, | ||
564 | buf, | ||
565 | INET6_ADDRSTRLEN); | ||
566 | GNUNET_snprintf (rbuf, | ||
567 | sizeof(rbuf), | ||
568 | (af == AF_INET6) | ||
569 | ? "%s.%u.[%s]:%u" | ||
570 | : "%s.%u.%s:%u", | ||
571 | PLUGIN_NAME, | ||
572 | options, | ||
573 | buf, | ||
574 | port); | ||
575 | return rbuf; | ||
576 | } | ||
577 | |||
578 | |||
579 | /** | ||
580 | * Function called to convert a string address to a binary address. | ||
581 | * | ||
582 | * @param cls closure (`struct Plugin *`) | ||
583 | * @param addr string address | ||
584 | * @param addrlen length of the address | ||
585 | * @param buf location to store the buffer | ||
586 | * @param added location to store the number of bytes in the buffer. | ||
587 | * If the function returns #GNUNET_SYSERR, its contents are undefined. | ||
588 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure | ||
589 | */ | ||
590 | static int | ||
591 | xu_string_to_address (void *cls, | ||
592 | const char *addr, | ||
593 | uint16_t addrlen, | ||
594 | void **buf, | ||
595 | size_t *added) | ||
596 | { | ||
597 | struct sockaddr_storage socket_address; | ||
598 | char *address; | ||
599 | char *plugin; | ||
600 | char *optionstr; | ||
601 | uint32_t options; | ||
602 | |||
603 | (void) cls; | ||
604 | /* Format tcp.options.address:port */ | ||
605 | address = NULL; | ||
606 | plugin = NULL; | ||
607 | optionstr = NULL; | ||
608 | |||
609 | if ((NULL == addr) || (0 == addrlen)) | ||
610 | { | ||
611 | GNUNET_break (0); | ||
612 | return GNUNET_SYSERR; | ||
613 | } | ||
614 | if ('\0' != addr[addrlen - 1]) | ||
615 | { | ||
616 | GNUNET_break (0); | ||
617 | return GNUNET_SYSERR; | ||
618 | } | ||
619 | if (strlen (addr) + 1 != (size_t) addrlen) | ||
620 | { | ||
621 | GNUNET_break (0); | ||
622 | return GNUNET_SYSERR; | ||
623 | } | ||
624 | plugin = GNUNET_strdup (addr); | ||
625 | optionstr = strchr (plugin, '.'); | ||
626 | if (NULL == optionstr) | ||
627 | { | ||
628 | GNUNET_break (0); | ||
629 | GNUNET_free (plugin); | ||
630 | return GNUNET_SYSERR; | ||
631 | } | ||
632 | optionstr[0] = '\0'; | ||
633 | optionstr++; | ||
634 | options = atol (optionstr); | ||
635 | address = strchr (optionstr, '.'); | ||
636 | if (NULL == address) | ||
637 | { | ||
638 | GNUNET_break (0); | ||
639 | GNUNET_free (plugin); | ||
640 | return GNUNET_SYSERR; | ||
641 | } | ||
642 | address[0] = '\0'; | ||
643 | address++; | ||
644 | |||
645 | if (GNUNET_OK != | ||
646 | GNUNET_STRINGS_to_address_ip (address, | ||
647 | strlen (address), | ||
648 | &socket_address)) | ||
649 | { | ||
650 | GNUNET_break (0); | ||
651 | GNUNET_free (plugin); | ||
652 | return GNUNET_SYSERR; | ||
653 | } | ||
654 | GNUNET_free(plugin); | ||
655 | |||
656 | switch (socket_address.ss_family) | ||
657 | { | ||
658 | case AF_INET: | ||
659 | { | ||
660 | struct IPv4XuAddress *u4; | ||
661 | const struct sockaddr_in *in4 = (const struct sockaddr_in *) &socket_address; | ||
662 | |||
663 | u4 = GNUNET_new (struct IPv4XuAddress); | ||
664 | u4->options = htonl (options); | ||
665 | u4->ipv4_addr = in4->sin_addr.s_addr; | ||
666 | u4->u4_port = in4->sin_port; | ||
667 | *buf = u4; | ||
668 | *added = sizeof (struct IPv4XuAddress); | ||
669 | return GNUNET_OK; | ||
670 | } | ||
671 | case AF_INET6: | ||
672 | { | ||
673 | struct IPv6XuAddress *u6; | ||
674 | const struct sockaddr_in6 *in6 = (const struct sockaddr_in6 *) &socket_address; | ||
675 | |||
676 | u6 = GNUNET_new (struct IPv6XuAddress); | ||
677 | u6->options = htonl (options); | ||
678 | u6->ipv6_addr = in6->sin6_addr; | ||
679 | u6->u6_port = in6->sin6_port; | ||
680 | *buf = u6; | ||
681 | *added = sizeof (struct IPv6XuAddress); | ||
682 | return GNUNET_OK; | ||
683 | } | ||
684 | default: | ||
685 | GNUNET_break (0); | ||
686 | return GNUNET_SYSERR; | ||
687 | } | ||
688 | } | ||
689 | |||
690 | |||
691 | /** | ||
692 | * Append our port and forward the result. | ||
693 | * | ||
694 | * @param cls a `struct PrettyPrinterContext *` | ||
695 | * @param hostname result from DNS resolver | ||
696 | */ | ||
697 | static void | ||
698 | append_port (void *cls, | ||
699 | const char *hostname) | ||
700 | { | ||
701 | struct PrettyPrinterContext *ppc = cls; | ||
702 | struct Plugin *plugin = ppc->plugin; | ||
703 | char *ret; | ||
704 | |||
705 | if (NULL == hostname) | ||
706 | { | ||
707 | /* Final call, done */ | ||
708 | GNUNET_CONTAINER_DLL_remove (plugin->ppc_dll_head, | ||
709 | plugin->ppc_dll_tail, | ||
710 | ppc); | ||
711 | ppc->resolver_handle = NULL; | ||
712 | ppc->asc (ppc->asc_cls, | ||
713 | NULL, | ||
714 | GNUNET_OK); | ||
715 | GNUNET_free (ppc); | ||
716 | return; | ||
717 | } | ||
718 | if (GNUNET_YES == ppc->ipv6) | ||
719 | GNUNET_asprintf (&ret, | ||
720 | "%s.%u.[%s]:%d", | ||
721 | PLUGIN_NAME, | ||
722 | ppc->options, | ||
723 | hostname, | ||
724 | ppc->port); | ||
725 | else | ||
726 | GNUNET_asprintf (&ret, | ||
727 | "%s.%u.%s:%d", | ||
728 | PLUGIN_NAME, | ||
729 | ppc->options, | ||
730 | hostname, | ||
731 | ppc->port); | ||
732 | ppc->asc (ppc->asc_cls, | ||
733 | ret, | ||
734 | GNUNET_OK); | ||
735 | GNUNET_free (ret); | ||
736 | } | ||
737 | |||
738 | |||
739 | /** | ||
740 | * Convert the transports address to a nice, human-readable format. | ||
741 | * | ||
742 | * @param cls closure with the `struct Plugin *` | ||
743 | * @param type name of the transport that generated the address | ||
744 | * @param addr one of the addresses of the host, NULL for the last address | ||
745 | * the specific address format depends on the transport; | ||
746 | * a `union XuAddress` | ||
747 | * @param addrlen length of the address | ||
748 | * @param numeric should (IP) addresses be displayed in numeric form? | ||
749 | * @param timeout after how long should we give up? | ||
750 | * @param asc function to call on each string | ||
751 | * @param asc_cls closure for @a asc | ||
752 | */ | ||
753 | static void | ||
754 | xu_plugin_address_pretty_printer (void *cls, | ||
755 | const char *type, | ||
756 | const void *addr, | ||
757 | size_t addrlen, | ||
758 | int numeric, | ||
759 | struct GNUNET_TIME_Relative timeout, | ||
760 | GNUNET_TRANSPORT_AddressStringCallback asc, | ||
761 | void *asc_cls) | ||
762 | { | ||
763 | struct Plugin *plugin = cls; | ||
764 | struct PrettyPrinterContext *ppc; | ||
765 | const struct sockaddr *sb; | ||
766 | size_t sbs; | ||
767 | struct sockaddr_in a4; | ||
768 | struct sockaddr_in6 a6; | ||
769 | const struct IPv4XuAddress *u4; | ||
770 | const struct IPv6XuAddress *u6; | ||
771 | uint16_t port; | ||
772 | uint32_t options; | ||
773 | |||
774 | (void) type; | ||
775 | if (addrlen == sizeof(struct IPv6XuAddress)) | ||
776 | { | ||
777 | u6 = addr; | ||
778 | memset (&a6, | ||
779 | 0, | ||
780 | sizeof (a6)); | ||
781 | a6.sin6_family = AF_INET6; | ||
782 | #if HAVE_SOCKADDR_IN_SIN_LEN | ||
783 | a6.sin6_len = sizeof (a6); | ||
784 | #endif | ||
785 | a6.sin6_port = u6->u6_port; | ||
786 | a6.sin6_addr = u6->ipv6_addr; | ||
787 | port = ntohs (u6->u6_port); | ||
788 | options = ntohl (u6->options); | ||
789 | sb = (const struct sockaddr *) &a6; | ||
790 | sbs = sizeof (a6); | ||
791 | } | ||
792 | else if (addrlen == sizeof (struct IPv4XuAddress)) | ||
793 | { | ||
794 | u4 = addr; | ||
795 | memset (&a4, | ||
796 | 0, | ||
797 | sizeof(a4)); | ||
798 | a4.sin_family = AF_INET; | ||
799 | #if HAVE_SOCKADDR_IN_SIN_LEN | ||
800 | a4.sin_len = sizeof (a4); | ||
801 | #endif | ||
802 | a4.sin_port = u4->u4_port; | ||
803 | a4.sin_addr.s_addr = u4->ipv4_addr; | ||
804 | port = ntohs (u4->u4_port); | ||
805 | options = ntohl (u4->options); | ||
806 | sb = (const struct sockaddr *) &a4; | ||
807 | sbs = sizeof(a4); | ||
808 | } | ||
809 | else | ||
810 | { | ||
811 | /* invalid address */ | ||
812 | GNUNET_break_op (0); | ||
813 | asc (asc_cls, | ||
814 | NULL, | ||
815 | GNUNET_SYSERR); | ||
816 | asc (asc_cls, | ||
817 | NULL, | ||
818 | GNUNET_OK); | ||
819 | return; | ||
820 | } | ||
821 | ppc = GNUNET_new (struct PrettyPrinterContext); | ||
822 | ppc->plugin = plugin; | ||
823 | ppc->asc = asc; | ||
824 | ppc->asc_cls = asc_cls; | ||
825 | ppc->port = port; | ||
826 | ppc->options = options; | ||
827 | if (addrlen == sizeof (struct IPv6XuAddress)) | ||
828 | ppc->ipv6 = GNUNET_YES; | ||
829 | else | ||
830 | ppc->ipv6 = GNUNET_NO; | ||
831 | GNUNET_CONTAINER_DLL_insert (plugin->ppc_dll_head, | ||
832 | plugin->ppc_dll_tail, | ||
833 | ppc); | ||
834 | ppc->resolver_handle | ||
835 | = GNUNET_RESOLVER_hostname_get (sb, | ||
836 | sbs, | ||
837 | ! numeric, | ||
838 | timeout, | ||
839 | &append_port, | ||
840 | ppc); | ||
841 | } | ||
842 | |||
843 | |||
844 | /** | ||
845 | * Check if the given port is plausible (must be either our listen | ||
846 | * port or our advertised port). If it is neither, we return | ||
847 | * #GNUNET_SYSERR. | ||
848 | * | ||
849 | * @param plugin global variables | ||
850 | * @param in_port port number to check | ||
851 | * @return #GNUNET_OK if port is either our open or advertised port | ||
852 | */ | ||
853 | static int | ||
854 | check_port (const struct Plugin *plugin, | ||
855 | uint16_t in_port) | ||
856 | { | ||
857 | if ( (plugin->port == in_port) || | ||
858 | (plugin->aport == in_port) ) | ||
859 | return GNUNET_OK; | ||
860 | return GNUNET_SYSERR; | ||
861 | } | ||
862 | |||
863 | |||
864 | /** | ||
865 | * Function that will be called to check if a binary address for this | ||
866 | * plugin is well-formed and corresponds to an address for THIS peer | ||
867 | * (as per our configuration). Naturally, if absolutely necessary, | ||
868 | * plugins can be a bit conservative in their answer, but in general | ||
869 | * plugins should make sure that the address does not redirect | ||
870 | * traffic to a 3rd party that might try to man-in-the-middle our | ||
871 | * traffic. | ||
872 | * | ||
873 | * @param cls closure, should be our handle to the Plugin | ||
874 | * @param addr pointer to a `union XuAddress` | ||
875 | * @param addrlen length of @a addr | ||
876 | * @return #GNUNET_OK if this is a plausible address for this peer | ||
877 | * and transport, #GNUNET_SYSERR if not | ||
878 | */ | ||
879 | static int | ||
880 | xu_plugin_check_address (void *cls, | ||
881 | const void *addr, | ||
882 | size_t addrlen) | ||
883 | { | ||
884 | struct Plugin *plugin = cls; | ||
885 | const struct IPv4XuAddress *v4; | ||
886 | const struct IPv6XuAddress *v6; | ||
887 | |||
888 | if (sizeof(struct IPv4XuAddress) == addrlen) | ||
889 | { | ||
890 | struct sockaddr_in s4; | ||
891 | |||
892 | v4 = (const struct IPv4XuAddress *) addr; | ||
893 | if (GNUNET_OK != check_port (plugin, | ||
894 | ntohs (v4->u4_port))) | ||
895 | return GNUNET_SYSERR; | ||
896 | memset (&s4, 0, sizeof (s4)); | ||
897 | s4.sin_family = AF_INET; | ||
898 | #if HAVE_SOCKADDR_IN_SIN_LEN | ||
899 | s4.sin_len = sizeof (s4); | ||
900 | #endif | ||
901 | s4.sin_port = v4->u4_port; | ||
902 | s4.sin_addr.s_addr = v4->ipv4_addr; | ||
903 | |||
904 | if (GNUNET_OK != | ||
905 | GNUNET_NAT_test_address (plugin->nat, | ||
906 | &s4, | ||
907 | sizeof (struct sockaddr_in))) | ||
908 | return GNUNET_SYSERR; | ||
909 | } | ||
910 | else if (sizeof(struct IPv6XuAddress) == addrlen) | ||
911 | { | ||
912 | struct sockaddr_in6 s6; | ||
913 | |||
914 | v6 = (const struct IPv6XuAddress *) addr; | ||
915 | if (IN6_IS_ADDR_LINKLOCAL (&v6->ipv6_addr)) | ||
916 | return GNUNET_OK; /* plausible, if unlikely... */ | ||
917 | memset (&s6, 0, sizeof (s6)); | ||
918 | s6.sin6_family = AF_INET6; | ||
919 | #if HAVE_SOCKADDR_IN_SIN_LEN | ||
920 | s6.sin6_len = sizeof (s6); | ||
921 | #endif | ||
922 | s6.sin6_port = v6->u6_port; | ||
923 | s6.sin6_addr = v6->ipv6_addr; | ||
924 | |||
925 | if (GNUNET_OK != | ||
926 | GNUNET_NAT_test_address (plugin->nat, | ||
927 | &s6, | ||
928 | sizeof(struct sockaddr_in6))) | ||
929 | return GNUNET_SYSERR; | ||
930 | } | ||
931 | else | ||
932 | { | ||
933 | GNUNET_break_op (0); | ||
934 | return GNUNET_SYSERR; | ||
935 | } | ||
936 | return GNUNET_OK; | ||
937 | } | ||
938 | |||
939 | |||
940 | /** | ||
941 | * Our external IP address/port mapping has changed. | ||
942 | * | ||
943 | * @param cls closure, the `struct Plugin` | ||
944 | * @param add_remove #GNUNET_YES to mean the new public IP address, | ||
945 | * #GNUNET_NO to mean the previous (now invalid) one | ||
946 | * @param ac address class the address belongs to | ||
947 | * @param addr either the previous or the new public IP address | ||
948 | * @param addrlen actual length of the @a addr | ||
949 | */ | ||
950 | static void | ||
951 | xu_nat_port_map_callback (void *cls, | ||
952 | int add_remove, | ||
953 | enum GNUNET_NAT_AddressClass ac, | ||
954 | const struct sockaddr *addr, | ||
955 | socklen_t addrlen) | ||
956 | { | ||
957 | struct Plugin *plugin = cls; | ||
958 | struct GNUNET_HELLO_Address *address; | ||
959 | struct IPv4XuAddress u4; | ||
960 | struct IPv6XuAddress u6; | ||
961 | void *arg; | ||
962 | size_t args; | ||
963 | |||
964 | if (GNUNET_NAT_AC_LOOPBACK == ac) | ||
965 | return; | ||
966 | if (GNUNET_NAT_AC_LAN == ac) | ||
967 | return; | ||
968 | if (GNUNET_NAT_AC_LAN_PRIVATE == ac) | ||
969 | return; | ||
970 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
971 | (GNUNET_YES == add_remove) | ||
972 | ? "NAT notification to add address `%s'\n" | ||
973 | : "NAT notification to remove address `%s'\n", | ||
974 | GNUNET_a2s (addr, | ||
975 | addrlen)); | ||
976 | /* convert 'address' to our internal format */ | ||
977 | switch (addr->sa_family) | ||
978 | { | ||
979 | case AF_INET: | ||
980 | { | ||
981 | const struct sockaddr_in *i4; | ||
982 | |||
983 | GNUNET_assert (sizeof(struct sockaddr_in) == addrlen); | ||
984 | i4 = (const struct sockaddr_in *) addr; | ||
985 | if (0 == ntohs (i4->sin_port)) | ||
986 | return; /* Port = 0 means unmapped, ignore these for XU. */ | ||
987 | memset (&u4, | ||
988 | 0, | ||
989 | sizeof(u4)); | ||
990 | u4.options = htonl (plugin->myoptions); | ||
991 | u4.ipv4_addr = i4->sin_addr.s_addr; | ||
992 | u4.u4_port = i4->sin_port; | ||
993 | arg = &u4; | ||
994 | args = sizeof (struct IPv4XuAddress); | ||
995 | break; | ||
996 | } | ||
997 | case AF_INET6: | ||
998 | { | ||
999 | const struct sockaddr_in6 *i6; | ||
1000 | |||
1001 | GNUNET_assert (sizeof(struct sockaddr_in6) == addrlen); | ||
1002 | i6 = (const struct sockaddr_in6 *) addr; | ||
1003 | if (0 == ntohs (i6->sin6_port)) | ||
1004 | return; /* Port = 0 means unmapped, ignore these for XU. */ | ||
1005 | memset (&u6, | ||
1006 | 0, | ||
1007 | sizeof(u6)); | ||
1008 | u6.options = htonl (plugin->myoptions); | ||
1009 | u6.ipv6_addr = i6->sin6_addr; | ||
1010 | u6.u6_port = i6->sin6_port; | ||
1011 | arg = &u6; | ||
1012 | args = sizeof (struct IPv6XuAddress); | ||
1013 | break; | ||
1014 | } | ||
1015 | default: | ||
1016 | GNUNET_break (0); | ||
1017 | return; | ||
1018 | } | ||
1019 | /* modify our published address list */ | ||
1020 | /* TODO: use 'ac' here in the future... */ | ||
1021 | address = GNUNET_HELLO_address_allocate (plugin->env->my_identity, | ||
1022 | PLUGIN_NAME, | ||
1023 | arg, | ||
1024 | args, | ||
1025 | GNUNET_HELLO_ADDRESS_INFO_NONE); | ||
1026 | plugin->env->notify_address (plugin->env->cls, | ||
1027 | add_remove, | ||
1028 | address); | ||
1029 | GNUNET_HELLO_address_free (address); | ||
1030 | } | ||
1031 | |||
1032 | |||
1033 | /* ********************* Finding sessions ******************* */ | ||
1034 | |||
1035 | |||
1036 | /** | ||
1037 | * Closure for #session_cmp_it(). | ||
1038 | */ | ||
1039 | struct GNUNET_ATS_SessionCompareContext | ||
1040 | { | ||
1041 | /** | ||
1042 | * Set to session matching the address. | ||
1043 | */ | ||
1044 | struct GNUNET_ATS_Session *res; | ||
1045 | |||
1046 | /** | ||
1047 | * Address we are looking for. | ||
1048 | */ | ||
1049 | const struct GNUNET_HELLO_Address *address; | ||
1050 | }; | ||
1051 | |||
1052 | |||
1053 | /** | ||
1054 | * Find a session with a matching address. | ||
1055 | * | ||
1056 | * @param cls the `struct GNUNET_ATS_SessionCompareContext *` | ||
1057 | * @param key peer identity (unused) | ||
1058 | * @param value the `struct GNUNET_ATS_Session *` | ||
1059 | * @return #GNUNET_NO if we found the session, #GNUNET_OK if not | ||
1060 | */ | ||
1061 | static int | ||
1062 | session_cmp_it (void *cls, | ||
1063 | const struct GNUNET_PeerIdentity *key, | ||
1064 | void *value) | ||
1065 | { | ||
1066 | struct GNUNET_ATS_SessionCompareContext *cctx = cls; | ||
1067 | struct GNUNET_ATS_Session *s = value; | ||
1068 | |||
1069 | (void) key; | ||
1070 | if (0 == GNUNET_HELLO_address_cmp (s->address, | ||
1071 | cctx->address)) | ||
1072 | { | ||
1073 | GNUNET_assert (GNUNET_NO == s->in_destroy); | ||
1074 | cctx->res = s; | ||
1075 | return GNUNET_NO; | ||
1076 | } | ||
1077 | return GNUNET_OK; | ||
1078 | } | ||
1079 | |||
1080 | |||
1081 | /** | ||
1082 | * Locate an existing session the transport service is using to | ||
1083 | * send data to another peer. Performs some basic sanity checks | ||
1084 | * on the address and then tries to locate a matching session. | ||
1085 | * | ||
1086 | * @param cls the plugin | ||
1087 | * @param address the address we should locate the session by | ||
1088 | * @return the session if it exists, or NULL if it is not found | ||
1089 | */ | ||
1090 | static struct GNUNET_ATS_Session * | ||
1091 | xu_plugin_lookup_session (void *cls, | ||
1092 | const struct GNUNET_HELLO_Address *address) | ||
1093 | { | ||
1094 | struct Plugin *plugin = cls; | ||
1095 | const struct IPv6XuAddress *xu_a6; | ||
1096 | const struct IPv4XuAddress *xu_a4; | ||
1097 | struct GNUNET_ATS_SessionCompareContext cctx; | ||
1098 | |||
1099 | if (NULL == address->address) | ||
1100 | { | ||
1101 | GNUNET_break (0); | ||
1102 | return NULL; | ||
1103 | } | ||
1104 | if (sizeof(struct IPv4XuAddress) == address->address_length) | ||
1105 | { | ||
1106 | if (NULL == plugin->sockv4) | ||
1107 | return NULL; | ||
1108 | xu_a4 = (const struct IPv4XuAddress *) address->address; | ||
1109 | if (0 == xu_a4->u4_port) | ||
1110 | { | ||
1111 | GNUNET_break (0); | ||
1112 | return NULL; | ||
1113 | } | ||
1114 | } | ||
1115 | else if (sizeof(struct IPv6XuAddress) == address->address_length) | ||
1116 | { | ||
1117 | if (NULL == plugin->sockv6) | ||
1118 | return NULL; | ||
1119 | xu_a6 = (const struct IPv6XuAddress *) address->address; | ||
1120 | if (0 == xu_a6->u6_port) | ||
1121 | { | ||
1122 | GNUNET_break (0); | ||
1123 | return NULL; | ||
1124 | } | ||
1125 | } | ||
1126 | else | ||
1127 | { | ||
1128 | GNUNET_break (0); | ||
1129 | return NULL; | ||
1130 | } | ||
1131 | |||
1132 | /* check if session already exists */ | ||
1133 | cctx.address = address; | ||
1134 | cctx.res = NULL; | ||
1135 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
1136 | "Looking for existing session for peer `%s' with address `%s'\n", | ||
1137 | GNUNET_i2s (&address->peer), | ||
1138 | xu_address_to_string (plugin, | ||
1139 | address->address, | ||
1140 | address->address_length)); | ||
1141 | GNUNET_CONTAINER_multipeermap_get_multiple (plugin->sessions, | ||
1142 | &address->peer, | ||
1143 | &session_cmp_it, | ||
1144 | &cctx); | ||
1145 | if (NULL == cctx.res) | ||
1146 | return NULL; | ||
1147 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
1148 | "Found existing session %p\n", | ||
1149 | cctx.res); | ||
1150 | return cctx.res; | ||
1151 | } | ||
1152 | |||
1153 | |||
1154 | /* ********************** Timeout ****************** */ | ||
1155 | |||
1156 | |||
1157 | /** | ||
1158 | * Increment session timeout due to activity. | ||
1159 | * | ||
1160 | * @param s session to reschedule timeout activity for | ||
1161 | */ | ||
1162 | static void | ||
1163 | reschedule_session_timeout (struct GNUNET_ATS_Session *s) | ||
1164 | { | ||
1165 | if (GNUNET_YES == s->in_destroy) | ||
1166 | return; | ||
1167 | GNUNET_assert (NULL != s->timeout_task); | ||
1168 | s->timeout = GNUNET_TIME_relative_to_absolute (XU_SESSION_TIME_OUT); | ||
1169 | } | ||
1170 | |||
1171 | |||
1172 | |||
1173 | /** | ||
1174 | * Function that will be called whenever the transport service wants to | ||
1175 | * notify the plugin that a session is still active and in use and | ||
1176 | * therefore the session timeout for this session has to be updated | ||
1177 | * | ||
1178 | * @param cls closure with the `struct Plugin` | ||
1179 | * @param peer which peer was the session for | ||
1180 | * @param session which session is being updated | ||
1181 | */ | ||
1182 | static void | ||
1183 | xu_plugin_update_session_timeout (void *cls, | ||
1184 | const struct GNUNET_PeerIdentity *peer, | ||
1185 | struct GNUNET_ATS_Session *session) | ||
1186 | { | ||
1187 | struct Plugin *plugin = cls; | ||
1188 | |||
1189 | if (GNUNET_YES != | ||
1190 | GNUNET_CONTAINER_multipeermap_contains_value (plugin->sessions, | ||
1191 | peer, | ||
1192 | session)) | ||
1193 | { | ||
1194 | GNUNET_break (0); | ||
1195 | return; | ||
1196 | } | ||
1197 | /* Reschedule session timeout */ | ||
1198 | reschedule_session_timeout (session); | ||
1199 | } | ||
1200 | |||
1201 | |||
1202 | /* ************************* Sending ************************ */ | ||
1203 | |||
1204 | |||
1205 | /** | ||
1206 | * We failed to transmit a message via XU. Generate | ||
1207 | * a descriptive error message. | ||
1208 | * | ||
1209 | * @param plugin our plugin | ||
1210 | * @param sa target address we were trying to reach | ||
1211 | * @param slen number of bytes in @a sa | ||
1212 | * @param error the errno value returned from the sendto() call | ||
1213 | */ | ||
1214 | static void | ||
1215 | analyze_send_error (struct Plugin *plugin, | ||
1216 | const struct sockaddr *sa, | ||
1217 | socklen_t slen, | ||
1218 | int error) | ||
1219 | { | ||
1220 | enum GNUNET_NetworkType type; | ||
1221 | |||
1222 | type = plugin->env->get_address_type (plugin->env->cls, | ||
1223 | sa, | ||
1224 | slen); | ||
1225 | if ( ( (GNUNET_NT_LAN == type) || | ||
1226 | (GNUNET_NT_WAN == type) ) && | ||
1227 | ( (ENETUNREACH == errno) || | ||
1228 | (ENETDOWN == errno) ) ) | ||
1229 | { | ||
1230 | if (slen == sizeof (struct sockaddr_in)) | ||
1231 | { | ||
1232 | /* IPv4: "Network unreachable" or "Network down" | ||
1233 | * | ||
1234 | * This indicates we do not have connectivity | ||
1235 | */ | ||
1236 | LOG (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK, | ||
1237 | _("XU could not transmit message to `%s': " | ||
1238 | "Network seems down, please check your network configuration\n"), | ||
1239 | GNUNET_a2s (sa, | ||
1240 | slen)); | ||
1241 | } | ||
1242 | if (slen == sizeof (struct sockaddr_in6)) | ||
1243 | { | ||
1244 | /* IPv6: "Network unreachable" or "Network down" | ||
1245 | * | ||
1246 | * This indicates that this system is IPv6 enabled, but does not | ||
1247 | * have a valid global IPv6 address assigned or we do not have | ||
1248 | * connectivity | ||
1249 | */ | ||
1250 | LOG (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK, | ||
1251 | _("XU could not transmit IPv6 message! " | ||
1252 | "Please check your network configuration and disable IPv6 if your " | ||
1253 | "connection does not have a global IPv6 address\n")); | ||
1254 | } | ||
1255 | } | ||
1256 | else | ||
1257 | { | ||
1258 | LOG (GNUNET_ERROR_TYPE_WARNING, | ||
1259 | "XU could not transmit message to `%s': `%s'\n", | ||
1260 | GNUNET_a2s (sa, | ||
1261 | slen), | ||
1262 | STRERROR (error)); | ||
1263 | } | ||
1264 | } | ||
1265 | |||
1266 | |||
1267 | |||
1268 | |||
1269 | /** | ||
1270 | * Function that can be used by the transport service to transmit a | ||
1271 | * message using the plugin. Note that in the case of a peer | ||
1272 | * disconnecting, the continuation MUST be called prior to the | ||
1273 | * disconnect notification itself. This function will be called with | ||
1274 | * this peer's HELLO message to initiate a fresh connection to another | ||
1275 | * peer. | ||
1276 | * | ||
1277 | * @param cls closure | ||
1278 | * @param s which session must be used | ||
1279 | * @param msgbuf the message to transmit | ||
1280 | * @param msgbuf_size number of bytes in @a msgbuf | ||
1281 | * @param priority how important is the message (most plugins will | ||
1282 | * ignore message priority and just FIFO) | ||
1283 | * @param to how long to wait at most for the transmission (does not | ||
1284 | * require plugins to discard the message after the timeout, | ||
1285 | * just advisory for the desired delay; most plugins will ignore | ||
1286 | * this as well) | ||
1287 | * @param cont continuation to call once the message has | ||
1288 | * been transmitted (or if the transport is ready | ||
1289 | * for the next transmission call; or if the | ||
1290 | * peer disconnected...); can be NULL | ||
1291 | * @param cont_cls closure for @a cont | ||
1292 | * @return number of bytes used (on the physical network, with overheads); | ||
1293 | * -1 on hard errors (i.e. address invalid); 0 is a legal value | ||
1294 | * and does NOT mean that the message was not transmitted (DV) | ||
1295 | */ | ||
1296 | static ssize_t | ||
1297 | xu_plugin_send (void *cls, | ||
1298 | struct GNUNET_ATS_Session *s, | ||
1299 | const char *msgbuf, | ||
1300 | size_t msgbuf_size, | ||
1301 | unsigned int priority, | ||
1302 | struct GNUNET_TIME_Relative to, | ||
1303 | GNUNET_TRANSPORT_TransmitContinuation cont, | ||
1304 | void *cont_cls) | ||
1305 | { | ||
1306 | struct Plugin *plugin = cls; | ||
1307 | size_t xumlen = msgbuf_size + sizeof(struct XUMessage); | ||
1308 | struct XUMessage *xu; | ||
1309 | char mbuf[xumlen] GNUNET_ALIGN; | ||
1310 | ssize_t sent; | ||
1311 | socklen_t slen; | ||
1312 | const struct sockaddr *a; | ||
1313 | const struct IPv4XuAddress *u4; | ||
1314 | struct sockaddr_in a4; | ||
1315 | const struct IPv6XuAddress *u6; | ||
1316 | struct sockaddr_in6 a6; | ||
1317 | struct GNUNET_NETWORK_Handle *sock; | ||
1318 | |||
1319 | (void) priority; | ||
1320 | (void) to; | ||
1321 | if ( (sizeof(struct IPv6XuAddress) == s->address->address_length) && | ||
1322 | (NULL == plugin->sockv6) ) | ||
1323 | return GNUNET_SYSERR; | ||
1324 | if ( (sizeof(struct IPv4XuAddress) == s->address->address_length) && | ||
1325 | (NULL == plugin->sockv4) ) | ||
1326 | return GNUNET_SYSERR; | ||
1327 | if (xumlen >= GNUNET_MAX_MESSAGE_SIZE) | ||
1328 | { | ||
1329 | GNUNET_break (0); | ||
1330 | return GNUNET_SYSERR; | ||
1331 | } | ||
1332 | if (GNUNET_YES != | ||
1333 | GNUNET_CONTAINER_multipeermap_contains_value (plugin->sessions, | ||
1334 | &s->target, | ||
1335 | s)) | ||
1336 | { | ||
1337 | GNUNET_break (0); | ||
1338 | return GNUNET_SYSERR; | ||
1339 | } | ||
1340 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
1341 | "XU transmits %u-byte message to `%s' using address `%s'\n", | ||
1342 | xumlen, | ||
1343 | GNUNET_i2s (&s->target), | ||
1344 | xu_address_to_string (plugin, | ||
1345 | s->address->address, | ||
1346 | s->address->address_length)); | ||
1347 | xu = (struct XUMessage *) mbuf; | ||
1348 | xu->header.size = htons (xumlen); | ||
1349 | xu->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_XU_MESSAGE); | ||
1350 | xu->reserved = htonl (0); | ||
1351 | xu->sender = *plugin->env->my_identity; | ||
1352 | GNUNET_memcpy (&xu[1], | ||
1353 | msgbuf, | ||
1354 | msgbuf_size); | ||
1355 | |||
1356 | if (sizeof (struct IPv4XuAddress) == s->address->address_length) | ||
1357 | { | ||
1358 | u4 = s->address->address; | ||
1359 | memset (&a4, | ||
1360 | 0, | ||
1361 | sizeof(a4)); | ||
1362 | a4.sin_family = AF_INET; | ||
1363 | #if HAVE_SOCKADDR_IN_SIN_LEN | ||
1364 | a4.sin_len = sizeof (a4); | ||
1365 | #endif | ||
1366 | a4.sin_port = u4->u4_port; | ||
1367 | a4.sin_addr.s_addr = u4->ipv4_addr; | ||
1368 | a = (const struct sockaddr *) &a4; | ||
1369 | slen = sizeof (a4); | ||
1370 | sock = plugin->sockv4; | ||
1371 | } | ||
1372 | else if (sizeof (struct IPv6XuAddress) == s->address->address_length) | ||
1373 | { | ||
1374 | u6 = s->address->address; | ||
1375 | memset (&a6, | ||
1376 | 0, | ||
1377 | sizeof(a6)); | ||
1378 | a6.sin6_family = AF_INET6; | ||
1379 | #if HAVE_SOCKADDR_IN_SIN_LEN | ||
1380 | a6.sin6_len = sizeof (a6); | ||
1381 | #endif | ||
1382 | a6.sin6_port = u6->u6_port; | ||
1383 | a6.sin6_addr = u6->ipv6_addr; | ||
1384 | a = (const struct sockaddr *) &a6; | ||
1385 | slen = sizeof (a6); | ||
1386 | sock = plugin->sockv6; | ||
1387 | } | ||
1388 | else | ||
1389 | { | ||
1390 | GNUNET_break (0); | ||
1391 | return GNUNET_SYSERR; | ||
1392 | } | ||
1393 | |||
1394 | sent = GNUNET_NETWORK_socket_sendto (sock, | ||
1395 | mbuf, | ||
1396 | xumlen, | ||
1397 | a, | ||
1398 | slen); | ||
1399 | s->last_transmit_time | ||
1400 | = GNUNET_TIME_absolute_max (GNUNET_TIME_absolute_get (), | ||
1401 | s->last_transmit_time); | ||
1402 | |||
1403 | if (GNUNET_SYSERR == sent) | ||
1404 | { | ||
1405 | /* Failure */ | ||
1406 | analyze_send_error (plugin, | ||
1407 | a, | ||
1408 | slen, | ||
1409 | errno); | ||
1410 | GNUNET_STATISTICS_update (plugin->env->stats, | ||
1411 | "# XU, total, bytes, sent, failure", | ||
1412 | sent, | ||
1413 | GNUNET_NO); | ||
1414 | GNUNET_STATISTICS_update (plugin->env->stats, | ||
1415 | "# XU, total, messages, sent, failure", | ||
1416 | 1, | ||
1417 | GNUNET_NO); | ||
1418 | return GNUNET_SYSERR; | ||
1419 | } | ||
1420 | /* Success */ | ||
1421 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
1422 | "XU transmitted %u-byte message to `%s' `%s' (%d: %s)\n", | ||
1423 | (unsigned int) (msgbuf_size), | ||
1424 | GNUNET_i2s (&s->target), | ||
1425 | GNUNET_a2s (a, | ||
1426 | slen), | ||
1427 | (int ) sent, | ||
1428 | (sent < 0) ? STRERROR (errno) : "ok"); | ||
1429 | GNUNET_STATISTICS_update (plugin->env->stats, | ||
1430 | "# XU, total, bytes, sent, success", | ||
1431 | sent, | ||
1432 | GNUNET_NO); | ||
1433 | GNUNET_STATISTICS_update (plugin->env->stats, | ||
1434 | "# XU, total, messages, sent, success", | ||
1435 | 1, | ||
1436 | GNUNET_NO); | ||
1437 | cont (cont_cls, | ||
1438 | &s->target, | ||
1439 | GNUNET_OK, | ||
1440 | msgbuf_size, | ||
1441 | xumlen); | ||
1442 | notify_session_monitor (s->plugin, | ||
1443 | s, | ||
1444 | GNUNET_TRANSPORT_SS_UPDATE); | ||
1445 | return xumlen; | ||
1446 | } | ||
1447 | |||
1448 | |||
1449 | /* ********************** Receiving ********************** */ | ||
1450 | |||
1451 | |||
1452 | /** | ||
1453 | * Functions with this signature are called whenever we need to close | ||
1454 | * a session due to a disconnect or failure to establish a connection. | ||
1455 | * | ||
1456 | * @param cls closure with the `struct Plugin` | ||
1457 | * @param s session to close down | ||
1458 | * @return #GNUNET_OK on success | ||
1459 | */ | ||
1460 | static int | ||
1461 | xu_disconnect_session (void *cls, | ||
1462 | struct GNUNET_ATS_Session *s) | ||
1463 | { | ||
1464 | struct Plugin *plugin = cls; | ||
1465 | |||
1466 | GNUNET_assert (GNUNET_YES != s->in_destroy); | ||
1467 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
1468 | "Session %p to peer `%s' at address %s ended\n", | ||
1469 | s, | ||
1470 | GNUNET_i2s (&s->target), | ||
1471 | xu_address_to_string (plugin, | ||
1472 | s->address->address, | ||
1473 | s->address->address_length)); | ||
1474 | if (NULL != s->timeout_task) | ||
1475 | { | ||
1476 | GNUNET_SCHEDULER_cancel (s->timeout_task); | ||
1477 | s->timeout_task = NULL; | ||
1478 | } | ||
1479 | GNUNET_assert (GNUNET_YES == | ||
1480 | GNUNET_CONTAINER_multipeermap_remove (plugin->sessions, | ||
1481 | &s->target, | ||
1482 | s)); | ||
1483 | s->in_destroy = GNUNET_YES; | ||
1484 | notify_session_monitor (s->plugin, | ||
1485 | s, | ||
1486 | GNUNET_TRANSPORT_SS_DONE); | ||
1487 | plugin->env->session_end (plugin->env->cls, | ||
1488 | s->address, | ||
1489 | s); | ||
1490 | GNUNET_STATISTICS_set (plugin->env->stats, | ||
1491 | "# XU sessions active", | ||
1492 | GNUNET_CONTAINER_multipeermap_size (plugin->sessions), | ||
1493 | GNUNET_NO); | ||
1494 | if (0 == s->rc) | ||
1495 | free_session (s); | ||
1496 | return GNUNET_OK; | ||
1497 | } | ||
1498 | |||
1499 | |||
1500 | /** | ||
1501 | * Message tokenizer has broken up an incomming message. Pass it on | ||
1502 | * to the service. | ||
1503 | * | ||
1504 | * @param cls the `struct GNUNET_ATS_Session *` | ||
1505 | * @param hdr the actual message | ||
1506 | * @return #GNUNET_OK (always) | ||
1507 | */ | ||
1508 | static int | ||
1509 | process_inbound_tokenized_messages (void *cls, | ||
1510 | const struct GNUNET_MessageHeader *hdr) | ||
1511 | { | ||
1512 | struct GNUNET_ATS_Session *session = cls; | ||
1513 | struct Plugin *plugin = session->plugin; | ||
1514 | |||
1515 | if (GNUNET_YES == session->in_destroy) | ||
1516 | return GNUNET_OK; | ||
1517 | reschedule_session_timeout (session); | ||
1518 | session->flow_delay_for_other_peer | ||
1519 | = plugin->env->receive (plugin->env->cls, | ||
1520 | session->address, | ||
1521 | session, | ||
1522 | hdr); | ||
1523 | return GNUNET_OK; | ||
1524 | } | ||
1525 | |||
1526 | |||
1527 | /** | ||
1528 | * Destroy a session, plugin is being unloaded. | ||
1529 | * | ||
1530 | * @param cls the `struct Plugin` | ||
1531 | * @param key hash of public key of target peer | ||
1532 | * @param value a `struct PeerSession *` to clean up | ||
1533 | * @return #GNUNET_OK (continue to iterate) | ||
1534 | */ | ||
1535 | static int | ||
1536 | disconnect_and_free_it (void *cls, | ||
1537 | const struct GNUNET_PeerIdentity *key, | ||
1538 | void *value) | ||
1539 | { | ||
1540 | struct Plugin *plugin = cls; | ||
1541 | |||
1542 | (void) key; | ||
1543 | xu_disconnect_session (plugin, | ||
1544 | value); | ||
1545 | return GNUNET_OK; | ||
1546 | } | ||
1547 | |||
1548 | |||
1549 | /** | ||
1550 | * Disconnect from a remote node. Clean up session if we have one for | ||
1551 | * this peer. | ||
1552 | * | ||
1553 | * @param cls closure for this call (should be handle to Plugin) | ||
1554 | * @param target the peeridentity of the peer to disconnect | ||
1555 | * @return #GNUNET_OK on success, #GNUNET_SYSERR if the operation failed | ||
1556 | */ | ||
1557 | static void | ||
1558 | xu_disconnect (void *cls, | ||
1559 | const struct GNUNET_PeerIdentity *target) | ||
1560 | { | ||
1561 | struct Plugin *plugin = cls; | ||
1562 | |||
1563 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
1564 | "Disconnecting from peer `%s'\n", | ||
1565 | GNUNET_i2s (target)); | ||
1566 | GNUNET_CONTAINER_multipeermap_get_multiple (plugin->sessions, | ||
1567 | target, | ||
1568 | &disconnect_and_free_it, | ||
1569 | plugin); | ||
1570 | } | ||
1571 | |||
1572 | |||
1573 | /** | ||
1574 | * Session was idle, so disconnect it. | ||
1575 | * | ||
1576 | * @param cls the `struct GNUNET_ATS_Session` to time out | ||
1577 | */ | ||
1578 | static void | ||
1579 | session_timeout (void *cls) | ||
1580 | { | ||
1581 | struct GNUNET_ATS_Session *s = cls; | ||
1582 | struct Plugin *plugin = s->plugin; | ||
1583 | struct GNUNET_TIME_Relative left; | ||
1584 | |||
1585 | s->timeout_task = NULL; | ||
1586 | left = GNUNET_TIME_absolute_get_remaining (s->timeout); | ||
1587 | if (left.rel_value_us > 0) | ||
1588 | { | ||
1589 | /* not actually our turn yet, but let's at least update | ||
1590 | the monitor, it may think we're about to die ... */ | ||
1591 | notify_session_monitor (s->plugin, | ||
1592 | s, | ||
1593 | GNUNET_TRANSPORT_SS_UPDATE); | ||
1594 | s->timeout_task = GNUNET_SCHEDULER_add_delayed (left, | ||
1595 | &session_timeout, | ||
1596 | s); | ||
1597 | return; | ||
1598 | } | ||
1599 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
1600 | "Session %p was idle for %s, disconnecting\n", | ||
1601 | s, | ||
1602 | GNUNET_STRINGS_relative_time_to_string (XU_SESSION_TIME_OUT, | ||
1603 | GNUNET_YES)); | ||
1604 | /* call session destroy function */ | ||
1605 | xu_disconnect_session (plugin, | ||
1606 | s); | ||
1607 | } | ||
1608 | |||
1609 | |||
1610 | /** | ||
1611 | * Allocate a new session for the given endpoint address. | ||
1612 | * Note that this function does not inform the service | ||
1613 | * of the new session, this is the responsibility of the | ||
1614 | * caller (if needed). | ||
1615 | * | ||
1616 | * @param cls the `struct Plugin` | ||
1617 | * @param address address of the other peer to use | ||
1618 | * @param network_type network type the address belongs to | ||
1619 | * @return NULL on error, otherwise session handle | ||
1620 | */ | ||
1621 | static struct GNUNET_ATS_Session * | ||
1622 | xu_plugin_create_session (void *cls, | ||
1623 | const struct GNUNET_HELLO_Address *address, | ||
1624 | enum GNUNET_NetworkType network_type) | ||
1625 | { | ||
1626 | struct Plugin *plugin = cls; | ||
1627 | struct GNUNET_ATS_Session *s; | ||
1628 | |||
1629 | s = GNUNET_new (struct GNUNET_ATS_Session); | ||
1630 | s->mst = GNUNET_MST_create (&process_inbound_tokenized_messages, | ||
1631 | s); | ||
1632 | s->plugin = plugin; | ||
1633 | s->address = GNUNET_HELLO_address_copy (address); | ||
1634 | s->target = address->peer; | ||
1635 | s->last_transmit_time = GNUNET_TIME_absolute_get (); | ||
1636 | s->last_expected_ack_delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, | ||
1637 | 250); | ||
1638 | s->last_expected_msg_delay = GNUNET_TIME_UNIT_MILLISECONDS; | ||
1639 | s->flow_delay_from_other_peer = GNUNET_TIME_UNIT_ZERO; | ||
1640 | s->flow_delay_for_other_peer = GNUNET_TIME_UNIT_ZERO; | ||
1641 | s->timeout = GNUNET_TIME_relative_to_absolute (XU_SESSION_TIME_OUT); | ||
1642 | s->timeout_task = GNUNET_SCHEDULER_add_delayed (XU_SESSION_TIME_OUT, | ||
1643 | &session_timeout, | ||
1644 | s); | ||
1645 | s->scope = network_type; | ||
1646 | |||
1647 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
1648 | "Creating new session %p for peer `%s' address `%s'\n", | ||
1649 | s, | ||
1650 | GNUNET_i2s (&address->peer), | ||
1651 | xu_address_to_string (plugin, | ||
1652 | address->address, | ||
1653 | address->address_length)); | ||
1654 | GNUNET_assert (GNUNET_OK == | ||
1655 | GNUNET_CONTAINER_multipeermap_put (plugin->sessions, | ||
1656 | &s->target, | ||
1657 | s, | ||
1658 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)); | ||
1659 | GNUNET_STATISTICS_set (plugin->env->stats, | ||
1660 | "# XU sessions active", | ||
1661 | GNUNET_CONTAINER_multipeermap_size (plugin->sessions), | ||
1662 | GNUNET_NO); | ||
1663 | notify_session_monitor (plugin, | ||
1664 | s, | ||
1665 | GNUNET_TRANSPORT_SS_INIT); | ||
1666 | return s; | ||
1667 | } | ||
1668 | |||
1669 | |||
1670 | /** | ||
1671 | * Creates a new outbound session the transport service will use to | ||
1672 | * send data to the peer. | ||
1673 | * | ||
1674 | * @param cls the `struct Plugin *` | ||
1675 | * @param address the address | ||
1676 | * @return the session or NULL of max connections exceeded | ||
1677 | */ | ||
1678 | static struct GNUNET_ATS_Session * | ||
1679 | xu_plugin_get_session (void *cls, | ||
1680 | const struct GNUNET_HELLO_Address *address) | ||
1681 | { | ||
1682 | struct Plugin *plugin = cls; | ||
1683 | struct GNUNET_ATS_Session *s; | ||
1684 | enum GNUNET_NetworkType network_type = GNUNET_NT_UNSPECIFIED; | ||
1685 | const struct IPv4XuAddress *xu_v4; | ||
1686 | const struct IPv6XuAddress *xu_v6; | ||
1687 | |||
1688 | if (NULL == address) | ||
1689 | { | ||
1690 | GNUNET_break (0); | ||
1691 | return NULL; | ||
1692 | } | ||
1693 | if ( (address->address_length != sizeof(struct IPv4XuAddress)) && | ||
1694 | (address->address_length != sizeof(struct IPv6XuAddress)) ) | ||
1695 | { | ||
1696 | GNUNET_break_op (0); | ||
1697 | return NULL; | ||
1698 | } | ||
1699 | if (NULL != (s = xu_plugin_lookup_session (cls, | ||
1700 | address))) | ||
1701 | return s; | ||
1702 | |||
1703 | /* need to create new session */ | ||
1704 | if (sizeof (struct IPv4XuAddress) == address->address_length) | ||
1705 | { | ||
1706 | struct sockaddr_in v4; | ||
1707 | |||
1708 | xu_v4 = (const struct IPv4XuAddress *) address->address; | ||
1709 | memset (&v4, '\0', sizeof (v4)); | ||
1710 | v4.sin_family = AF_INET; | ||
1711 | #if HAVE_SOCKADDR_IN_SIN_LEN | ||
1712 | v4.sin_len = sizeof (struct sockaddr_in); | ||
1713 | #endif | ||
1714 | v4.sin_port = xu_v4->u4_port; | ||
1715 | v4.sin_addr.s_addr = xu_v4->ipv4_addr; | ||
1716 | network_type = plugin->env->get_address_type (plugin->env->cls, | ||
1717 | (const struct sockaddr *) &v4, | ||
1718 | sizeof (v4)); | ||
1719 | } | ||
1720 | if (sizeof (struct IPv6XuAddress) == address->address_length) | ||
1721 | { | ||
1722 | struct sockaddr_in6 v6; | ||
1723 | |||
1724 | xu_v6 = (const struct IPv6XuAddress *) address->address; | ||
1725 | memset (&v6, '\0', sizeof (v6)); | ||
1726 | v6.sin6_family = AF_INET6; | ||
1727 | #if HAVE_SOCKADDR_IN_SIN_LEN | ||
1728 | v6.sin6_len = sizeof (struct sockaddr_in6); | ||
1729 | #endif | ||
1730 | v6.sin6_port = xu_v6->u6_port; | ||
1731 | v6.sin6_addr = xu_v6->ipv6_addr; | ||
1732 | network_type = plugin->env->get_address_type (plugin->env->cls, | ||
1733 | (const struct sockaddr *) &v6, | ||
1734 | sizeof (v6)); | ||
1735 | } | ||
1736 | GNUNET_break (GNUNET_NT_UNSPECIFIED != network_type); | ||
1737 | return xu_plugin_create_session (cls, | ||
1738 | address, | ||
1739 | network_type); | ||
1740 | } | ||
1741 | |||
1742 | |||
1743 | /** | ||
1744 | * We've received a XU Message. Process it (pass contents to main service). | ||
1745 | * | ||
1746 | * @param plugin plugin context | ||
1747 | * @param msg the message | ||
1748 | * @param xu_addr sender address | ||
1749 | * @param xu_addr_len number of bytes in @a xu_addr | ||
1750 | * @param network_type network type the address belongs to | ||
1751 | */ | ||
1752 | static void | ||
1753 | process_xu_message (struct Plugin *plugin, | ||
1754 | const struct XUMessage *msg, | ||
1755 | const union XuAddress *xu_addr, | ||
1756 | size_t xu_addr_len, | ||
1757 | enum GNUNET_NetworkType network_type) | ||
1758 | { | ||
1759 | struct GNUNET_ATS_Session *s; | ||
1760 | struct GNUNET_HELLO_Address *address; | ||
1761 | |||
1762 | GNUNET_break (GNUNET_NT_UNSPECIFIED != network_type); | ||
1763 | if (0 != ntohl (msg->reserved)) | ||
1764 | { | ||
1765 | GNUNET_break_op(0); | ||
1766 | return; | ||
1767 | } | ||
1768 | if (ntohs (msg->header.size) | ||
1769 | < sizeof(struct GNUNET_MessageHeader) + sizeof(struct XUMessage)) | ||
1770 | { | ||
1771 | GNUNET_break_op(0); | ||
1772 | return; | ||
1773 | } | ||
1774 | |||
1775 | address = GNUNET_HELLO_address_allocate (&msg->sender, | ||
1776 | PLUGIN_NAME, | ||
1777 | xu_addr, | ||
1778 | xu_addr_len, | ||
1779 | GNUNET_HELLO_ADDRESS_INFO_NONE); | ||
1780 | if (NULL == | ||
1781 | (s = xu_plugin_lookup_session (plugin, | ||
1782 | address))) | ||
1783 | { | ||
1784 | s = xu_plugin_create_session (plugin, | ||
1785 | address, | ||
1786 | network_type); | ||
1787 | plugin->env->session_start (plugin->env->cls, | ||
1788 | address, | ||
1789 | s, | ||
1790 | s->scope); | ||
1791 | notify_session_monitor (plugin, | ||
1792 | s, | ||
1793 | GNUNET_TRANSPORT_SS_UP); | ||
1794 | } | ||
1795 | GNUNET_free (address); | ||
1796 | |||
1797 | s->rc++; | ||
1798 | GNUNET_MST_from_buffer (s->mst, | ||
1799 | (const char *) &msg[1], | ||
1800 | ntohs (msg->header.size) - sizeof(struct XUMessage), | ||
1801 | GNUNET_YES, | ||
1802 | GNUNET_NO); | ||
1803 | s->rc--; | ||
1804 | if ( (0 == s->rc) && | ||
1805 | (GNUNET_YES == s->in_destroy) ) | ||
1806 | free_session (s); | ||
1807 | } | ||
1808 | |||
1809 | |||
1810 | /** | ||
1811 | * Read and process a message from the given socket. | ||
1812 | * | ||
1813 | * @param plugin the overall plugin | ||
1814 | * @param rsock socket to read from | ||
1815 | */ | ||
1816 | static void | ||
1817 | xu_select_read (struct Plugin *plugin, | ||
1818 | struct GNUNET_NETWORK_Handle *rsock) | ||
1819 | { | ||
1820 | socklen_t fromlen; | ||
1821 | struct sockaddr_storage addr; | ||
1822 | char buf[65536] GNUNET_ALIGN; | ||
1823 | ssize_t size; | ||
1824 | const struct GNUNET_MessageHeader *msg; | ||
1825 | struct IPv4XuAddress v4; | ||
1826 | struct IPv6XuAddress v6; | ||
1827 | const struct sockaddr *sa; | ||
1828 | const struct sockaddr_in *sa4; | ||
1829 | const struct sockaddr_in6 *sa6; | ||
1830 | const union XuAddress *int_addr; | ||
1831 | size_t int_addr_len; | ||
1832 | enum GNUNET_NetworkType network_type; | ||
1833 | |||
1834 | fromlen = sizeof (addr); | ||
1835 | memset (&addr, | ||
1836 | 0, | ||
1837 | sizeof(addr)); | ||
1838 | size = GNUNET_NETWORK_socket_recvfrom (rsock, | ||
1839 | buf, | ||
1840 | sizeof (buf), | ||
1841 | (struct sockaddr *) &addr, | ||
1842 | &fromlen); | ||
1843 | sa = (const struct sockaddr *) &addr; | ||
1844 | #if MINGW | ||
1845 | /* On SOCK_DGRAM XU sockets recvfrom might fail with a | ||
1846 | * WSAECONNRESET error to indicate that previous sendto() (yes, sendto!) | ||
1847 | * on this socket has failed. | ||
1848 | * Quote from MSDN: | ||
1849 | * WSAECONNRESET - The virtual circuit was reset by the remote side | ||
1850 | * executing a hard or abortive close. The application should close | ||
1851 | * the socket; it is no longer usable. On a XU-datagram socket this | ||
1852 | * error indicates a previous send operation resulted in an ICMP Port | ||
1853 | * Unreachable message. | ||
1854 | */ | ||
1855 | if ( (-1 == size) && | ||
1856 | (ECONNRESET == errno) ) | ||
1857 | return; | ||
1858 | #endif | ||
1859 | if (-1 == size) | ||
1860 | { | ||
1861 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
1862 | "XU failed to receive data: %s\n", | ||
1863 | STRERROR (errno)); | ||
1864 | /* Connection failure or something. Not a protocol violation. */ | ||
1865 | return; | ||
1866 | } | ||
1867 | |||
1868 | /* Check if this is a STUN packet */ | ||
1869 | if (GNUNET_NO != | ||
1870 | GNUNET_NAT_stun_handle_packet (plugin->nat, | ||
1871 | (const struct sockaddr *) &addr, | ||
1872 | fromlen, | ||
1873 | buf, | ||
1874 | size)) | ||
1875 | return; /* was STUN, do not process further */ | ||
1876 | |||
1877 | if (((size_t) size) < sizeof(struct GNUNET_MessageHeader)) | ||
1878 | { | ||
1879 | LOG (GNUNET_ERROR_TYPE_WARNING, | ||
1880 | "XU got %u bytes from %s, which is not enough for a GNUnet message header\n", | ||
1881 | (unsigned int ) size, | ||
1882 | GNUNET_a2s (sa, | ||
1883 | fromlen)); | ||
1884 | /* _MAY_ be a connection failure (got partial message) */ | ||
1885 | /* But it _MAY_ also be that the other side uses non-GNUnet protocol. */ | ||
1886 | GNUNET_break_op (0); | ||
1887 | return; | ||
1888 | } | ||
1889 | |||
1890 | msg = (const struct GNUNET_MessageHeader *) buf; | ||
1891 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
1892 | "XU received %u-byte message from `%s' type %u\n", | ||
1893 | (unsigned int) size, | ||
1894 | GNUNET_a2s (sa, | ||
1895 | fromlen), | ||
1896 | ntohs (msg->type)); | ||
1897 | if (size != ntohs (msg->size)) | ||
1898 | { | ||
1899 | LOG (GNUNET_ERROR_TYPE_WARNING, | ||
1900 | "XU malformed message (size %u) header from %s\n", | ||
1901 | (unsigned int) size, | ||
1902 | GNUNET_a2s (sa, | ||
1903 | fromlen)); | ||
1904 | GNUNET_break_op (0); | ||
1905 | return; | ||
1906 | } | ||
1907 | GNUNET_STATISTICS_update (plugin->env->stats, | ||
1908 | "# XU, total bytes received", | ||
1909 | size, | ||
1910 | GNUNET_NO); | ||
1911 | network_type = plugin->env->get_address_type (plugin->env->cls, | ||
1912 | sa, | ||
1913 | fromlen); | ||
1914 | switch (sa->sa_family) | ||
1915 | { | ||
1916 | case AF_INET: | ||
1917 | sa4 = (const struct sockaddr_in *) &addr; | ||
1918 | v4.options = 0; | ||
1919 | v4.ipv4_addr = sa4->sin_addr.s_addr; | ||
1920 | v4.u4_port = sa4->sin_port; | ||
1921 | int_addr = (union XuAddress *) &v4; | ||
1922 | int_addr_len = sizeof (v4); | ||
1923 | break; | ||
1924 | case AF_INET6: | ||
1925 | sa6 = (const struct sockaddr_in6 *) &addr; | ||
1926 | v6.options = 0; | ||
1927 | v6.ipv6_addr = sa6->sin6_addr; | ||
1928 | v6.u6_port = sa6->sin6_port; | ||
1929 | int_addr = (union XuAddress *) &v6; | ||
1930 | int_addr_len = sizeof (v6); | ||
1931 | break; | ||
1932 | default: | ||
1933 | GNUNET_break (0); | ||
1934 | return; | ||
1935 | } | ||
1936 | |||
1937 | switch (ntohs (msg->type)) | ||
1938 | { | ||
1939 | case GNUNET_MESSAGE_TYPE_TRANSPORT_XU_MESSAGE: | ||
1940 | if (ntohs (msg->size) < sizeof(struct XUMessage)) | ||
1941 | { | ||
1942 | GNUNET_break_op(0); | ||
1943 | return; | ||
1944 | } | ||
1945 | process_xu_message (plugin, | ||
1946 | (const struct XUMessage *) msg, | ||
1947 | int_addr, | ||
1948 | int_addr_len, | ||
1949 | network_type); | ||
1950 | return; | ||
1951 | default: | ||
1952 | GNUNET_break_op(0); | ||
1953 | return; | ||
1954 | } | ||
1955 | } | ||
1956 | |||
1957 | |||
1958 | /* ***************** Event loop (part 2) *************** */ | ||
1959 | |||
1960 | |||
1961 | /** | ||
1962 | * We have been notified that our readset has something to read. We don't | ||
1963 | * know which socket needs to be read, so we have to check each one | ||
1964 | * Then reschedule this function to be called again once more is available. | ||
1965 | * | ||
1966 | * @param cls the plugin handle | ||
1967 | */ | ||
1968 | static void | ||
1969 | xu_plugin_select_v4 (void *cls) | ||
1970 | { | ||
1971 | struct Plugin *plugin = cls; | ||
1972 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
1973 | |||
1974 | plugin->select_task_v4 = NULL; | ||
1975 | if (NULL == plugin->sockv4) | ||
1976 | return; | ||
1977 | tc = GNUNET_SCHEDULER_get_task_context (); | ||
1978 | if ( (0 != (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) && | ||
1979 | (GNUNET_NETWORK_fdset_isset (tc->read_ready, | ||
1980 | plugin->sockv4)) ) | ||
1981 | xu_select_read (plugin, | ||
1982 | plugin->sockv4); | ||
1983 | schedule_select_v4 (plugin); | ||
1984 | } | ||
1985 | |||
1986 | |||
1987 | /** | ||
1988 | * We have been notified that our readset has something to read. We don't | ||
1989 | * know which socket needs to be read, so we have to check each one | ||
1990 | * Then reschedule this function to be called again once more is available. | ||
1991 | * | ||
1992 | * @param cls the plugin handle | ||
1993 | */ | ||
1994 | static void | ||
1995 | xu_plugin_select_v6 (void *cls) | ||
1996 | { | ||
1997 | struct Plugin *plugin = cls; | ||
1998 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
1999 | |||
2000 | plugin->select_task_v6 = NULL; | ||
2001 | if (NULL == plugin->sockv6) | ||
2002 | return; | ||
2003 | tc = GNUNET_SCHEDULER_get_task_context (); | ||
2004 | if ( (0 != (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) && | ||
2005 | (GNUNET_NETWORK_fdset_isset (tc->read_ready, | ||
2006 | plugin->sockv6)) ) | ||
2007 | xu_select_read (plugin, | ||
2008 | plugin->sockv6); | ||
2009 | schedule_select_v6 (plugin); | ||
2010 | } | ||
2011 | |||
2012 | |||
2013 | /* ******************* Initialization *************** */ | ||
2014 | |||
2015 | |||
2016 | /** | ||
2017 | * Setup the XU sockets (for IPv4 and IPv6) for the plugin. | ||
2018 | * | ||
2019 | * @param plugin the plugin to initialize | ||
2020 | * @param bind_v6 IPv6 address to bind to (can be NULL, for 'any') | ||
2021 | * @param bind_v4 IPv4 address to bind to (can be NULL, for 'any') | ||
2022 | * @return number of sockets that were successfully bound | ||
2023 | */ | ||
2024 | static unsigned int | ||
2025 | setup_sockets (struct Plugin *plugin, | ||
2026 | const struct sockaddr_in6 *bind_v6, | ||
2027 | const struct sockaddr_in *bind_v4) | ||
2028 | { | ||
2029 | int tries; | ||
2030 | unsigned int sockets_created = 0; | ||
2031 | struct sockaddr_in6 server_addrv6; | ||
2032 | struct sockaddr_in server_addrv4; | ||
2033 | const struct sockaddr *server_addr; | ||
2034 | const struct sockaddr *addrs[2]; | ||
2035 | socklen_t addrlens[2]; | ||
2036 | socklen_t addrlen; | ||
2037 | int eno; | ||
2038 | |||
2039 | /* Create IPv6 socket */ | ||
2040 | eno = EINVAL; | ||
2041 | if (GNUNET_YES == plugin->enable_ipv6) | ||
2042 | { | ||
2043 | plugin->sockv6 = GNUNET_NETWORK_socket_create (PF_INET6, | ||
2044 | SOCK_DGRAM, | ||
2045 | 0); | ||
2046 | if (NULL == plugin->sockv6) | ||
2047 | { | ||
2048 | LOG (GNUNET_ERROR_TYPE_INFO, | ||
2049 | _("Disabling IPv6 since it is not supported on this system!\n")); | ||
2050 | plugin->enable_ipv6 = GNUNET_NO; | ||
2051 | } | ||
2052 | else | ||
2053 | { | ||
2054 | memset (&server_addrv6, | ||
2055 | 0, | ||
2056 | sizeof(struct sockaddr_in6)); | ||
2057 | #if HAVE_SOCKADDR_IN_SIN_LEN | ||
2058 | server_addrv6.sin6_len = sizeof (struct sockaddr_in6); | ||
2059 | #endif | ||
2060 | server_addrv6.sin6_family = AF_INET6; | ||
2061 | if (NULL != bind_v6) | ||
2062 | server_addrv6.sin6_addr = bind_v6->sin6_addr; | ||
2063 | else | ||
2064 | server_addrv6.sin6_addr = in6addr_any; | ||
2065 | |||
2066 | if (0 == plugin->port) /* autodetect */ | ||
2067 | server_addrv6.sin6_port | ||
2068 | = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, | ||
2069 | 33537) | ||
2070 | + 32000); | ||
2071 | else | ||
2072 | server_addrv6.sin6_port = htons (plugin->port); | ||
2073 | addrlen = sizeof (struct sockaddr_in6); | ||
2074 | server_addr = (const struct sockaddr *) &server_addrv6; | ||
2075 | |||
2076 | tries = 0; | ||
2077 | while (tries < 10) | ||
2078 | { | ||
2079 | LOG(GNUNET_ERROR_TYPE_DEBUG, | ||
2080 | "Binding to IPv6 `%s'\n", | ||
2081 | GNUNET_a2s (server_addr, | ||
2082 | addrlen)); | ||
2083 | /* binding */ | ||
2084 | if (GNUNET_OK == | ||
2085 | GNUNET_NETWORK_socket_bind (plugin->sockv6, | ||
2086 | server_addr, | ||
2087 | addrlen)) | ||
2088 | break; | ||
2089 | eno = errno; | ||
2090 | if (0 != plugin->port) | ||
2091 | { | ||
2092 | tries = 10; /* fail immediately */ | ||
2093 | break; /* bind failed on specific port */ | ||
2094 | } | ||
2095 | /* autodetect */ | ||
2096 | server_addrv6.sin6_port | ||
2097 | = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, | ||
2098 | 33537) | ||
2099 | + 32000); | ||
2100 | tries++; | ||
2101 | } | ||
2102 | if (tries >= 10) | ||
2103 | { | ||
2104 | GNUNET_NETWORK_socket_close (plugin->sockv6); | ||
2105 | plugin->enable_ipv6 = GNUNET_NO; | ||
2106 | plugin->sockv6 = NULL; | ||
2107 | } | ||
2108 | else | ||
2109 | { | ||
2110 | plugin->port = ntohs (server_addrv6.sin6_port); | ||
2111 | } | ||
2112 | if (NULL != plugin->sockv6) | ||
2113 | { | ||
2114 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
2115 | "IPv6 XU socket created listinging at %s\n", | ||
2116 | GNUNET_a2s (server_addr, | ||
2117 | addrlen)); | ||
2118 | addrs[sockets_created] = server_addr; | ||
2119 | addrlens[sockets_created] = addrlen; | ||
2120 | sockets_created++; | ||
2121 | } | ||
2122 | else | ||
2123 | { | ||
2124 | LOG (GNUNET_ERROR_TYPE_WARNING, | ||
2125 | _("Failed to bind XU socket to %s: %s\n"), | ||
2126 | GNUNET_a2s (server_addr, | ||
2127 | addrlen), | ||
2128 | STRERROR (eno)); | ||
2129 | } | ||
2130 | } | ||
2131 | } | ||
2132 | |||
2133 | /* Create IPv4 socket */ | ||
2134 | eno = EINVAL; | ||
2135 | plugin->sockv4 = GNUNET_NETWORK_socket_create (PF_INET, | ||
2136 | SOCK_DGRAM, | ||
2137 | 0); | ||
2138 | if (NULL == plugin->sockv4) | ||
2139 | { | ||
2140 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, | ||
2141 | "socket"); | ||
2142 | LOG (GNUNET_ERROR_TYPE_INFO, | ||
2143 | _("Disabling IPv4 since it is not supported on this system!\n")); | ||
2144 | plugin->enable_ipv4 = GNUNET_NO; | ||
2145 | } | ||
2146 | else | ||
2147 | { | ||
2148 | memset (&server_addrv4, | ||
2149 | 0, | ||
2150 | sizeof(struct sockaddr_in)); | ||
2151 | #if HAVE_SOCKADDR_IN_SIN_LEN | ||
2152 | server_addrv4.sin_len = sizeof (struct sockaddr_in); | ||
2153 | #endif | ||
2154 | server_addrv4.sin_family = AF_INET; | ||
2155 | if (NULL != bind_v4) | ||
2156 | server_addrv4.sin_addr = bind_v4->sin_addr; | ||
2157 | else | ||
2158 | server_addrv4.sin_addr.s_addr = INADDR_ANY; | ||
2159 | |||
2160 | if (0 == plugin->port) | ||
2161 | /* autodetect */ | ||
2162 | server_addrv4.sin_port | ||
2163 | = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, | ||
2164 | 33537) | ||
2165 | + 32000); | ||
2166 | else | ||
2167 | server_addrv4.sin_port = htons (plugin->port); | ||
2168 | |||
2169 | addrlen = sizeof (struct sockaddr_in); | ||
2170 | server_addr = (const struct sockaddr *) &server_addrv4; | ||
2171 | |||
2172 | tries = 0; | ||
2173 | while (tries < 10) | ||
2174 | { | ||
2175 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
2176 | "Binding to IPv4 `%s'\n", | ||
2177 | GNUNET_a2s (server_addr, | ||
2178 | addrlen)); | ||
2179 | |||
2180 | /* binding */ | ||
2181 | if (GNUNET_OK == | ||
2182 | GNUNET_NETWORK_socket_bind (plugin->sockv4, | ||
2183 | server_addr, | ||
2184 | addrlen)) | ||
2185 | break; | ||
2186 | eno = errno; | ||
2187 | if (0 != plugin->port) | ||
2188 | { | ||
2189 | tries = 10; /* fail */ | ||
2190 | break; /* bind failed on specific port */ | ||
2191 | } | ||
2192 | |||
2193 | /* autodetect */ | ||
2194 | server_addrv4.sin_port | ||
2195 | = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, | ||
2196 | 33537) | ||
2197 | + 32000); | ||
2198 | tries++; | ||
2199 | } | ||
2200 | if (tries >= 10) | ||
2201 | { | ||
2202 | GNUNET_NETWORK_socket_close (plugin->sockv4); | ||
2203 | plugin->enable_ipv4 = GNUNET_NO; | ||
2204 | plugin->sockv4 = NULL; | ||
2205 | } | ||
2206 | else | ||
2207 | { | ||
2208 | plugin->port = ntohs (server_addrv4.sin_port); | ||
2209 | } | ||
2210 | |||
2211 | if (NULL != plugin->sockv4) | ||
2212 | { | ||
2213 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
2214 | "IPv4 socket created on port %s\n", | ||
2215 | GNUNET_a2s (server_addr, | ||
2216 | addrlen)); | ||
2217 | addrs[sockets_created] = server_addr; | ||
2218 | addrlens[sockets_created] = addrlen; | ||
2219 | sockets_created++; | ||
2220 | } | ||
2221 | else | ||
2222 | { | ||
2223 | LOG (GNUNET_ERROR_TYPE_ERROR, | ||
2224 | _("Failed to bind XU socket to %s: %s\n"), | ||
2225 | GNUNET_a2s (server_addr, | ||
2226 | addrlen), | ||
2227 | STRERROR (eno)); | ||
2228 | } | ||
2229 | } | ||
2230 | |||
2231 | if (0 == sockets_created) | ||
2232 | { | ||
2233 | LOG (GNUNET_ERROR_TYPE_WARNING, | ||
2234 | _("Failed to open XU sockets\n")); | ||
2235 | return 0; /* No sockets created, return */ | ||
2236 | } | ||
2237 | schedule_select_v4 (plugin); | ||
2238 | schedule_select_v6 (plugin); | ||
2239 | plugin->nat = GNUNET_NAT_register (plugin->env->cfg, | ||
2240 | "transport-xu", | ||
2241 | IPPROTO_UDP, | ||
2242 | sockets_created, | ||
2243 | addrs, | ||
2244 | addrlens, | ||
2245 | &xu_nat_port_map_callback, | ||
2246 | NULL, | ||
2247 | plugin); | ||
2248 | return sockets_created; | ||
2249 | } | ||
2250 | |||
2251 | |||
2252 | /** | ||
2253 | * The exported method. Makes the core api available via a global and | ||
2254 | * returns the xu transport API. | ||
2255 | * | ||
2256 | * @param cls our `struct GNUNET_TRANSPORT_PluginEnvironment` | ||
2257 | * @return our `struct GNUNET_TRANSPORT_PluginFunctions` | ||
2258 | */ | ||
2259 | void * | ||
2260 | libgnunet_plugin_transport_xu_init (void *cls) | ||
2261 | { | ||
2262 | struct GNUNET_TRANSPORT_PluginEnvironment *env = cls; | ||
2263 | struct GNUNET_TRANSPORT_PluginFunctions *api; | ||
2264 | struct Plugin *p; | ||
2265 | unsigned long long port; | ||
2266 | unsigned long long aport; | ||
2267 | int enable_v6; | ||
2268 | char *bind4_address; | ||
2269 | char *bind6_address; | ||
2270 | struct sockaddr_in server_addrv4; | ||
2271 | struct sockaddr_in6 server_addrv6; | ||
2272 | unsigned int res; | ||
2273 | int have_bind4; | ||
2274 | int have_bind6; | ||
2275 | |||
2276 | if (NULL == env->receive) | ||
2277 | { | ||
2278 | /* run in 'stub' mode (i.e. as part of gnunet-peerinfo), don't fully | ||
2279 | initialze the plugin or the API */ | ||
2280 | api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions); | ||
2281 | api->cls = NULL; | ||
2282 | api->address_pretty_printer = &xu_plugin_address_pretty_printer; | ||
2283 | api->address_to_string = &xu_address_to_string; | ||
2284 | api->string_to_address = &xu_string_to_address; | ||
2285 | return api; | ||
2286 | } | ||
2287 | |||
2288 | /* Get port number: port == 0 : autodetect a port, | ||
2289 | * > 0 : use this port, not given : 2086 default */ | ||
2290 | if (GNUNET_OK != | ||
2291 | GNUNET_CONFIGURATION_get_value_number (env->cfg, | ||
2292 | "transport-xu", | ||
2293 | "PORT", | ||
2294 | &port)) | ||
2295 | port = 2086; | ||
2296 | if (port > 65535) | ||
2297 | { | ||
2298 | GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, | ||
2299 | "transport-xu", | ||
2300 | "PORT", | ||
2301 | _("must be in [0,65535]")); | ||
2302 | return NULL; | ||
2303 | } | ||
2304 | if (GNUNET_OK != | ||
2305 | GNUNET_CONFIGURATION_get_value_number (env->cfg, | ||
2306 | "transport-xu", | ||
2307 | "ADVERTISED_PORT", | ||
2308 | &aport)) | ||
2309 | aport = port; | ||
2310 | if (aport > 65535) | ||
2311 | { | ||
2312 | GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, | ||
2313 | "transport-xu", | ||
2314 | "ADVERTISED_PORT", | ||
2315 | _("must be in [0,65535]")); | ||
2316 | return NULL; | ||
2317 | } | ||
2318 | |||
2319 | if (GNUNET_YES == | ||
2320 | GNUNET_CONFIGURATION_get_value_yesno (env->cfg, | ||
2321 | "nat", | ||
2322 | "DISABLEV6")) | ||
2323 | enable_v6 = GNUNET_NO; | ||
2324 | else | ||
2325 | enable_v6 = GNUNET_YES; | ||
2326 | |||
2327 | have_bind4 = GNUNET_NO; | ||
2328 | memset (&server_addrv4, | ||
2329 | 0, | ||
2330 | sizeof (server_addrv4)); | ||
2331 | if (GNUNET_YES == | ||
2332 | GNUNET_CONFIGURATION_get_value_string (env->cfg, | ||
2333 | "transport-xu", | ||
2334 | "BINDTO", | ||
2335 | &bind4_address)) | ||
2336 | { | ||
2337 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
2338 | "Binding XU plugin to specific address: `%s'\n", | ||
2339 | bind4_address); | ||
2340 | if (1 != inet_pton (AF_INET, | ||
2341 | bind4_address, | ||
2342 | &server_addrv4.sin_addr)) | ||
2343 | { | ||
2344 | GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, | ||
2345 | "transport-xu", | ||
2346 | "BINDTO", | ||
2347 | _("must be valid IPv4 address")); | ||
2348 | GNUNET_free (bind4_address); | ||
2349 | return NULL; | ||
2350 | } | ||
2351 | have_bind4 = GNUNET_YES; | ||
2352 | } | ||
2353 | GNUNET_free_non_null (bind4_address); | ||
2354 | have_bind6 = GNUNET_NO; | ||
2355 | memset (&server_addrv6, | ||
2356 | 0, | ||
2357 | sizeof (server_addrv6)); | ||
2358 | if (GNUNET_YES == | ||
2359 | GNUNET_CONFIGURATION_get_value_string (env->cfg, | ||
2360 | "transport-xu", | ||
2361 | "BINDTO6", | ||
2362 | &bind6_address)) | ||
2363 | { | ||
2364 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
2365 | "Binding xu plugin to specific address: `%s'\n", | ||
2366 | bind6_address); | ||
2367 | if (1 != inet_pton (AF_INET6, | ||
2368 | bind6_address, | ||
2369 | &server_addrv6.sin6_addr)) | ||
2370 | { | ||
2371 | GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, | ||
2372 | "transport-xu", | ||
2373 | "BINDTO6", | ||
2374 | _("must be valid IPv6 address")); | ||
2375 | GNUNET_free (bind6_address); | ||
2376 | return NULL; | ||
2377 | } | ||
2378 | have_bind6 = GNUNET_YES; | ||
2379 | } | ||
2380 | GNUNET_free_non_null (bind6_address); | ||
2381 | |||
2382 | p = GNUNET_new (struct Plugin); | ||
2383 | p->port = port; | ||
2384 | p->aport = aport; | ||
2385 | p->enable_ipv6 = enable_v6; | ||
2386 | p->enable_ipv4 = GNUNET_YES; /* default */ | ||
2387 | p->env = env; | ||
2388 | p->sessions = GNUNET_CONTAINER_multipeermap_create (16, | ||
2389 | GNUNET_NO); | ||
2390 | res = setup_sockets (p, | ||
2391 | (GNUNET_YES == have_bind6) ? &server_addrv6 : NULL, | ||
2392 | (GNUNET_YES == have_bind4) ? &server_addrv4 : NULL); | ||
2393 | if ( (0 == res) || | ||
2394 | ( (NULL == p->sockv4) && | ||
2395 | (NULL == p->sockv6) ) ) | ||
2396 | { | ||
2397 | LOG (GNUNET_ERROR_TYPE_ERROR, | ||
2398 | _("Failed to create XU network sockets\n")); | ||
2399 | GNUNET_CONTAINER_multipeermap_destroy (p->sessions); | ||
2400 | if (NULL != p->nat) | ||
2401 | GNUNET_NAT_unregister (p->nat); | ||
2402 | GNUNET_free (p); | ||
2403 | return NULL; | ||
2404 | } | ||
2405 | |||
2406 | api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions); | ||
2407 | api->cls = p; | ||
2408 | api->disconnect_session = &xu_disconnect_session; | ||
2409 | api->query_keepalive_factor = &xu_query_keepalive_factor; | ||
2410 | api->disconnect_peer = &xu_disconnect; | ||
2411 | api->address_pretty_printer = &xu_plugin_address_pretty_printer; | ||
2412 | api->address_to_string = &xu_address_to_string; | ||
2413 | api->string_to_address = &xu_string_to_address; | ||
2414 | api->check_address = &xu_plugin_check_address; | ||
2415 | api->get_session = &xu_plugin_get_session; | ||
2416 | api->send = &xu_plugin_send; | ||
2417 | api->get_network = &xu_plugin_get_network; | ||
2418 | api->get_network_for_address = &xu_plugin_get_network_for_address; | ||
2419 | api->update_session_timeout = &xu_plugin_update_session_timeout; | ||
2420 | api->setup_monitor = &xu_plugin_setup_monitor; | ||
2421 | return api; | ||
2422 | } | ||
2423 | |||
2424 | |||
2425 | /** | ||
2426 | * The exported method. Makes the core api available via a global and | ||
2427 | * returns the xu transport API. | ||
2428 | * | ||
2429 | * @param cls our `struct GNUNET_TRANSPORT_PluginEnvironment` | ||
2430 | * @return NULL | ||
2431 | */ | ||
2432 | void * | ||
2433 | libgnunet_plugin_transport_xu_done (void *cls) | ||
2434 | { | ||
2435 | struct GNUNET_TRANSPORT_PluginFunctions *api = cls; | ||
2436 | struct Plugin *plugin = api->cls; | ||
2437 | struct PrettyPrinterContext *cur; | ||
2438 | |||
2439 | if (NULL == plugin) | ||
2440 | { | ||
2441 | GNUNET_free (api); | ||
2442 | return NULL; | ||
2443 | } | ||
2444 | if (NULL != plugin->select_task_v4) | ||
2445 | { | ||
2446 | GNUNET_SCHEDULER_cancel (plugin->select_task_v4); | ||
2447 | plugin->select_task_v4 = NULL; | ||
2448 | } | ||
2449 | if (NULL != plugin->select_task_v6) | ||
2450 | { | ||
2451 | GNUNET_SCHEDULER_cancel (plugin->select_task_v6); | ||
2452 | plugin->select_task_v6 = NULL; | ||
2453 | } | ||
2454 | if (NULL != plugin->sockv4) | ||
2455 | { | ||
2456 | GNUNET_break (GNUNET_OK == | ||
2457 | GNUNET_NETWORK_socket_close (plugin->sockv4)); | ||
2458 | plugin->sockv4 = NULL; | ||
2459 | } | ||
2460 | if (NULL != plugin->sockv6) | ||
2461 | { | ||
2462 | GNUNET_break (GNUNET_OK == | ||
2463 | GNUNET_NETWORK_socket_close (plugin->sockv6)); | ||
2464 | plugin->sockv6 = NULL; | ||
2465 | } | ||
2466 | if (NULL != plugin->nat) | ||
2467 | { | ||
2468 | GNUNET_NAT_unregister (plugin->nat); | ||
2469 | plugin->nat = NULL; | ||
2470 | } | ||
2471 | GNUNET_CONTAINER_multipeermap_destroy (plugin->sessions); | ||
2472 | |||
2473 | while (NULL != (cur = plugin->ppc_dll_head)) | ||
2474 | { | ||
2475 | GNUNET_break (0); | ||
2476 | GNUNET_CONTAINER_DLL_remove (plugin->ppc_dll_head, | ||
2477 | plugin->ppc_dll_tail, | ||
2478 | cur); | ||
2479 | GNUNET_RESOLVER_request_cancel (cur->resolver_handle); | ||
2480 | if (NULL != cur->timeout_task) | ||
2481 | { | ||
2482 | GNUNET_SCHEDULER_cancel (cur->timeout_task); | ||
2483 | cur->timeout_task = NULL; | ||
2484 | } | ||
2485 | GNUNET_free (cur); | ||
2486 | } | ||
2487 | GNUNET_free (plugin); | ||
2488 | GNUNET_free (api); | ||
2489 | return NULL; | ||
2490 | } | ||
2491 | |||
2492 | /* end of plugin_transport_xu.c */ | ||
diff --git a/src/transport/plugin_transport_xu.h b/src/transport/plugin_transport_xu.h deleted file mode 100644 index dd3dcd738..000000000 --- a/src/transport/plugin_transport_xu.h +++ /dev/null | |||
@@ -1,273 +0,0 @@ | |||
1 | /* | ||
2 | This file is part of GNUnet | ||
3 | Copyright (C) 2010-2014 GNUnet e.V. | ||
4 | |||
5 | GNUnet is free software: you can redistribute it and/or modify it | ||
6 | under the terms of the GNU Affero General Public License as published | ||
7 | by the Free Software Foundation, either version 3 of the License, | ||
8 | or (at your option) any later version. | ||
9 | |||
10 | GNUnet is distributed in the hope that it will be useful, but | ||
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
13 | Affero General Public License for more details. | ||
14 | |||
15 | You should have received a copy of the GNU Affero General Public License | ||
16 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
17 | |||
18 | SPDX-License-Identifier: AGPL3.0-or-later | ||
19 | */ | ||
20 | |||
21 | /** | ||
22 | * @file transport/plugin_transport_xu.h | ||
23 | * @brief Implementation of the XU transport protocol | ||
24 | * @author Christian Grothoff | ||
25 | * @author Nathan Evans | ||
26 | * @author Matthias Wachs | ||
27 | */ | ||
28 | #ifndef PLUGIN_TRANSPORT_XU_H | ||
29 | #define PLUGIN_TRANSPORT_XU_H | ||
30 | |||
31 | #include "platform.h" | ||
32 | #include "gnunet_hello_lib.h" | ||
33 | #include "gnunet_util_lib.h" | ||
34 | #include "gnunet_fragmentation_lib.h" | ||
35 | #include "gnunet_protocols.h" | ||
36 | #include "gnunet_resolver_service.h" | ||
37 | #include "gnunet_signatures.h" | ||
38 | #include "gnunet_constants.h" | ||
39 | #include "gnunet_statistics_service.h" | ||
40 | #include "gnunet_transport_service.h" | ||
41 | #include "gnunet_transport_plugin.h" | ||
42 | #include "transport.h" | ||
43 | |||
44 | #define LOG(kind,...) GNUNET_log_from (kind, "transport-xu", __VA_ARGS__) | ||
45 | |||
46 | #define PLUGIN_NAME "xu" | ||
47 | |||
48 | #define DEBUG_XU GNUNET_NO | ||
49 | |||
50 | #define DEBUG_XU_BROADCASTING GNUNET_NO | ||
51 | |||
52 | /** | ||
53 | * MTU for fragmentation subsystem. Should be conservative since | ||
54 | * all communicating peers MUST work with this MTU. | ||
55 | */ | ||
56 | #define XU_MTU 1400 | ||
57 | |||
58 | |||
59 | GNUNET_NETWORK_STRUCT_BEGIN | ||
60 | /** | ||
61 | * Network format for IPv4 addresses. | ||
62 | */ | ||
63 | struct IPv4XuAddress | ||
64 | { | ||
65 | /** | ||
66 | * Optional options and flags for this address | ||
67 | */ | ||
68 | uint32_t options GNUNET_PACKED; | ||
69 | |||
70 | /** | ||
71 | * IPv4 address, in network byte order. | ||
72 | */ | ||
73 | uint32_t ipv4_addr GNUNET_PACKED; | ||
74 | |||
75 | /** | ||
76 | * Port number, in network byte order. | ||
77 | */ | ||
78 | uint16_t u4_port GNUNET_PACKED; | ||
79 | }; | ||
80 | |||
81 | |||
82 | /** | ||
83 | * Network format for IPv6 addresses. | ||
84 | */ | ||
85 | struct IPv6XuAddress | ||
86 | { | ||
87 | /** | ||
88 | * Optional options and flags for this address | ||
89 | */ | ||
90 | uint32_t options GNUNET_PACKED; | ||
91 | |||
92 | /** | ||
93 | * IPv6 address. | ||
94 | */ | ||
95 | struct in6_addr ipv6_addr GNUNET_PACKED; | ||
96 | |||
97 | /** | ||
98 | * Port number, in network byte order. | ||
99 | */ | ||
100 | uint16_t u6_port GNUNET_PACKED; | ||
101 | }; | ||
102 | GNUNET_NETWORK_STRUCT_END | ||
103 | |||
104 | /** | ||
105 | * Either an IPv4 or IPv6 XU address. Note that without a "length", | ||
106 | * one cannot tell which one of the two types this address represents. | ||
107 | */ | ||
108 | union XuAddress | ||
109 | { | ||
110 | /** | ||
111 | * IPv4 case. | ||
112 | */ | ||
113 | struct IPv4XuAddress v4; | ||
114 | |||
115 | /** | ||
116 | * IPv6 case. | ||
117 | */ | ||
118 | struct IPv6XuAddress v6; | ||
119 | }; | ||
120 | |||
121 | |||
122 | /** | ||
123 | * Information we track for each message in the queue. | ||
124 | */ | ||
125 | struct XU_MessageWrapper; | ||
126 | |||
127 | |||
128 | /** | ||
129 | * Closure for #append_port(). | ||
130 | */ | ||
131 | struct PrettyPrinterContext; | ||
132 | |||
133 | |||
134 | /** | ||
135 | * Encapsulation of all of the state of the plugin. | ||
136 | */ | ||
137 | struct Plugin | ||
138 | { | ||
139 | |||
140 | /** | ||
141 | * Our environment. | ||
142 | */ | ||
143 | struct GNUNET_TRANSPORT_PluginEnvironment *env; | ||
144 | |||
145 | /** | ||
146 | * Session of peers with whom we are currently connected, | ||
147 | * map of peer identity to `struct GNUNET_ATS_Session *`. | ||
148 | */ | ||
149 | struct GNUNET_CONTAINER_MultiPeerMap *sessions; | ||
150 | |||
151 | /** | ||
152 | * ID of select task for IPv4 | ||
153 | */ | ||
154 | struct GNUNET_SCHEDULER_Task *select_task_v4; | ||
155 | |||
156 | /** | ||
157 | * ID of select task for IPv6 | ||
158 | */ | ||
159 | struct GNUNET_SCHEDULER_Task *select_task_v6; | ||
160 | |||
161 | /** | ||
162 | * Address we were told to bind to exclusively (IPv4). | ||
163 | */ | ||
164 | char *bind4_address; | ||
165 | |||
166 | /** | ||
167 | * Address we were told to bind to exclusively (IPv6). | ||
168 | */ | ||
169 | char *bind6_address; | ||
170 | |||
171 | /** | ||
172 | * Handle to NAT traversal support. | ||
173 | */ | ||
174 | struct GNUNET_NAT_Handle *nat; | ||
175 | |||
176 | /** | ||
177 | * Handle to NAT traversal support. | ||
178 | */ | ||
179 | struct GNUNET_NAT_STUN_Handle *stun; | ||
180 | |||
181 | /** | ||
182 | * The read socket for IPv4 | ||
183 | */ | ||
184 | struct GNUNET_NETWORK_Handle *sockv4; | ||
185 | |||
186 | /** | ||
187 | * The read socket for IPv6 | ||
188 | */ | ||
189 | struct GNUNET_NETWORK_Handle *sockv6; | ||
190 | |||
191 | /** | ||
192 | * Running pretty printers: head | ||
193 | */ | ||
194 | struct PrettyPrinterContext *ppc_dll_head; | ||
195 | |||
196 | /** | ||
197 | * Running pretty printers: tail | ||
198 | */ | ||
199 | struct PrettyPrinterContext *ppc_dll_tail; | ||
200 | |||
201 | /** | ||
202 | * Function to call about session status changes. | ||
203 | */ | ||
204 | GNUNET_TRANSPORT_SessionInfoCallback sic; | ||
205 | |||
206 | /** | ||
207 | * Closure for @e sic. | ||
208 | */ | ||
209 | void *sic_cls; | ||
210 | |||
211 | /** | ||
212 | * IPv6 multicast address | ||
213 | */ | ||
214 | struct sockaddr_in6 ipv6_multicast_address; | ||
215 | |||
216 | /** | ||
217 | * Broadcast interval | ||
218 | */ | ||
219 | struct GNUNET_TIME_Relative broadcast_interval; | ||
220 | |||
221 | /** | ||
222 | * Bytes currently in buffer | ||
223 | */ | ||
224 | int64_t bytes_in_buffer; | ||
225 | |||
226 | /** | ||
227 | * Address options | ||
228 | */ | ||
229 | uint32_t myoptions; | ||
230 | |||
231 | /** | ||
232 | * Is IPv6 enabled: #GNUNET_YES or #GNUNET_NO | ||
233 | */ | ||
234 | int enable_ipv6; | ||
235 | |||
236 | /** | ||
237 | * Is IPv4 enabled: #GNUNET_YES or #GNUNET_NO | ||
238 | */ | ||
239 | int enable_ipv4; | ||
240 | |||
241 | /** | ||
242 | * Port we listen on. | ||
243 | */ | ||
244 | uint16_t port; | ||
245 | |||
246 | /** | ||
247 | * Port we advertise on. | ||
248 | */ | ||
249 | uint16_t aport; | ||
250 | |||
251 | }; | ||
252 | |||
253 | |||
254 | /** | ||
255 | * Function called for a quick conversion of the binary address to | ||
256 | * a numeric address. Note that the caller must not free the | ||
257 | * address and that the next call to this function is allowed | ||
258 | * to override the address again. | ||
259 | * | ||
260 | * @param cls closure | ||
261 | * @param addr binary address (a `union XuAddress`) | ||
262 | * @param addrlen length of the @a addr | ||
263 | * @return string representing the same address | ||
264 | */ | ||
265 | const char * | ||
266 | xu_address_to_string (void *cls, | ||
267 | const void *addr, | ||
268 | size_t addrlen); | ||
269 | |||
270 | |||
271 | /*#ifndef PLUGIN_TRANSPORT_XU_H*/ | ||
272 | #endif | ||
273 | /* end of plugin_transport_xu.h */ | ||
diff --git a/src/transport/transport.h b/src/transport/transport.h index c0e02c3d9..b231ea8ae 100644 --- a/src/transport/transport.h +++ b/src/transport/transport.h | |||
@@ -1107,6 +1107,38 @@ struct GNUNET_TRANSPORT_AddressToVerify | |||
1107 | }; | 1107 | }; |
1108 | 1108 | ||
1109 | 1109 | ||
1110 | /** | ||
1111 | * Application client to TRANSPORT service: we would like to have | ||
1112 | * address suggestions for this peer. | ||
1113 | */ | ||
1114 | struct ExpressPreferenceMessage | ||
1115 | { | ||
1116 | /** | ||
1117 | * Type is #GNUNET_MESSAGE_TYPE_TRANSPORT_SUGGEST or | ||
1118 | * #GNUNET_MESSAGE_TYPE_TRANSPORT_SUGGEST_CANCEL to stop | ||
1119 | * suggestions. | ||
1120 | */ | ||
1121 | struct GNUNET_MessageHeader header; | ||
1122 | |||
1123 | /** | ||
1124 | * What type of performance preference does the client have? | ||
1125 | * A `enum GNUNET_MQ_PreferenceKind` in NBO. | ||
1126 | */ | ||
1127 | uint32_t pk GNUNET_PACKED; | ||
1128 | |||
1129 | /** | ||
1130 | * Peer to get address suggestions for. | ||
1131 | */ | ||
1132 | struct GNUNET_PeerIdentity peer; | ||
1133 | |||
1134 | /** | ||
1135 | * How much bandwidth in bytes/second does the application expect? | ||
1136 | */ | ||
1137 | struct GNUNET_BANDWIDTH_Value32NBO bw; | ||
1138 | |||
1139 | }; | ||
1140 | |||
1141 | |||
1110 | #endif | 1142 | #endif |
1111 | 1143 | ||
1112 | GNUNET_NETWORK_STRUCT_END | 1144 | GNUNET_NETWORK_STRUCT_END |
diff --git a/src/transport/transport_api2_application.c b/src/transport/transport_api2_application.c new file mode 100644 index 000000000..325438e11 --- /dev/null +++ b/src/transport/transport_api2_application.c | |||
@@ -0,0 +1,366 @@ | |||
1 | /* | ||
2 | This file is part of GNUnet. | ||
3 | Copyright (C) 2010--2019 GNUnet e.V. | ||
4 | |||
5 | GNUnet is free software: you can redistribute it and/or modify it | ||
6 | under the terms of the GNU Affero General Public License as published | ||
7 | by the Free Software Foundation, either version 3 of the License, | ||
8 | or (at your option) any later version. | ||
9 | |||
10 | GNUnet is distributed in the hope that it will be useful, but | ||
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
13 | Affero General Public License for more details. | ||
14 | |||
15 | You should have received a copy of the GNU Affero General Public License | ||
16 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
17 | |||
18 | SPDX-License-Identifier: AGPL3.0-or-later | ||
19 | */ | ||
20 | /** | ||
21 | * @file transport/transport_api2_application.c | ||
22 | * @brief enable clients to ask TRANSPORT about establishing connections to peers | ||
23 | * @author Christian Grothoff | ||
24 | * @author Matthias Wachs | ||
25 | */ | ||
26 | #include "platform.h" | ||
27 | #include "gnunet_transport_application_service.h" | ||
28 | #include "gnunet_transport_core_service.h" | ||
29 | #include "transport.h" | ||
30 | |||
31 | |||
32 | #define LOG(kind,...) GNUNET_log_from(kind, "transport-application-api", __VA_ARGS__) | ||
33 | |||
34 | |||
35 | /** | ||
36 | * Handle for TRANSPORT address suggestion requests. | ||
37 | */ | ||
38 | struct GNUNET_TRANSPORT_ApplicationSuggestHandle | ||
39 | { | ||
40 | /** | ||
41 | * ID of the peer for which address suggestion was requested. | ||
42 | */ | ||
43 | struct GNUNET_PeerIdentity id; | ||
44 | |||
45 | /** | ||
46 | * Connecitivity handle this suggestion handle belongs to. | ||
47 | */ | ||
48 | struct GNUNET_TRANSPORT_ApplicationHandle *ch; | ||
49 | |||
50 | /** | ||
51 | * What preference is being expressed? | ||
52 | */ | ||
53 | enum GNUNET_MQ_PreferenceKind pk; | ||
54 | |||
55 | /** | ||
56 | * How much bandwidth does the client expect? | ||
57 | */ | ||
58 | struct GNUNET_BANDWIDTH_Value32NBO bw; | ||
59 | }; | ||
60 | |||
61 | |||
62 | /** | ||
63 | * Handle to the TRANSPORT subsystem for application management. | ||
64 | */ | ||
65 | struct GNUNET_TRANSPORT_ApplicationHandle | ||
66 | { | ||
67 | |||
68 | /** | ||
69 | * Our configuration. | ||
70 | */ | ||
71 | const struct GNUNET_CONFIGURATION_Handle *cfg; | ||
72 | |||
73 | /** | ||
74 | * Map with the identities of all the peers for which we would | ||
75 | * like to have address suggestions. The key is the PID, the | ||
76 | * value is currently the `struct GNUNET_TRANSPORT_ApplicationSuggestHandle` | ||
77 | */ | ||
78 | struct GNUNET_CONTAINER_MultiPeerMap *sug_requests; | ||
79 | |||
80 | /** | ||
81 | * Message queue for sending requests to the TRANSPORT service. | ||
82 | */ | ||
83 | struct GNUNET_MQ_Handle *mq; | ||
84 | |||
85 | /** | ||
86 | * Task to trigger reconnect. | ||
87 | */ | ||
88 | struct GNUNET_SCHEDULER_Task *task; | ||
89 | |||
90 | /** | ||
91 | * Reconnect backoff delay. | ||
92 | */ | ||
93 | struct GNUNET_TIME_Relative backoff; | ||
94 | }; | ||
95 | |||
96 | |||
97 | /** | ||
98 | * Re-establish the connection to the TRANSPORT service. | ||
99 | * | ||
100 | * @param ch handle to use to re-connect. | ||
101 | */ | ||
102 | static void | ||
103 | reconnect (struct GNUNET_TRANSPORT_ApplicationHandle *ch); | ||
104 | |||
105 | |||
106 | /** | ||
107 | * Re-establish the connection to the TRANSPORT service. | ||
108 | * | ||
109 | * @param cls handle to use to re-connect. | ||
110 | */ | ||
111 | static void | ||
112 | reconnect_task (void *cls) | ||
113 | { | ||
114 | struct GNUNET_TRANSPORT_ApplicationHandle *ch = cls; | ||
115 | |||
116 | ch->task = NULL; | ||
117 | reconnect (ch); | ||
118 | } | ||
119 | |||
120 | |||
121 | /** | ||
122 | * Disconnect from TRANSPORT and then reconnect. | ||
123 | * | ||
124 | * @param ch our handle | ||
125 | */ | ||
126 | static void | ||
127 | force_reconnect (struct GNUNET_TRANSPORT_ApplicationHandle *ch) | ||
128 | { | ||
129 | if (NULL != ch->mq) | ||
130 | { | ||
131 | GNUNET_MQ_destroy (ch->mq); | ||
132 | ch->mq = NULL; | ||
133 | } | ||
134 | ch->backoff = GNUNET_TIME_STD_BACKOFF (ch->backoff); | ||
135 | ch->task = GNUNET_SCHEDULER_add_delayed (ch->backoff, | ||
136 | &reconnect_task, | ||
137 | ch); | ||
138 | } | ||
139 | |||
140 | |||
141 | /** | ||
142 | * We encountered an error handling the MQ to the | ||
143 | * TRANSPORT service. Reconnect. | ||
144 | * | ||
145 | * @param cls the `struct GNUNET_TRANSPORT_ApplicationHandle` | ||
146 | * @param error details about the error | ||
147 | */ | ||
148 | static void | ||
149 | error_handler (void *cls, | ||
150 | enum GNUNET_MQ_Error error) | ||
151 | { | ||
152 | struct GNUNET_TRANSPORT_ApplicationHandle *ch = cls; | ||
153 | |||
154 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
155 | "TRANSPORT connection died (code %d), reconnecting\n", | ||
156 | (int) error); | ||
157 | force_reconnect (ch); | ||
158 | } | ||
159 | |||
160 | |||
161 | /** | ||
162 | * Transmit request for an address suggestion. | ||
163 | * | ||
164 | * @param cls the `struct GNUNET_TRANSPORT_ApplicationHandle` | ||
165 | * @param peer peer to ask for an address suggestion for | ||
166 | * @param value the `struct GNUNET_TRANSPORT_SuggestHandle` | ||
167 | * @return #GNUNET_OK (continue to iterate), #GNUNET_SYSERR on | ||
168 | * failure (message queue no longer exists) | ||
169 | */ | ||
170 | static int | ||
171 | transmit_suggestion (void *cls, | ||
172 | const struct GNUNET_PeerIdentity *peer, | ||
173 | void *value) | ||
174 | { | ||
175 | struct GNUNET_TRANSPORT_ApplicationHandle *ch = cls; | ||
176 | struct GNUNET_TRANSPORT_ApplicationSuggestHandle *sh = value; | ||
177 | struct GNUNET_MQ_Envelope *ev; | ||
178 | struct ExpressPreferenceMessage *m; | ||
179 | |||
180 | if (NULL == ch->mq) | ||
181 | return GNUNET_SYSERR; | ||
182 | ev = GNUNET_MQ_msg (m, | ||
183 | GNUNET_MESSAGE_TYPE_TRANSPORT_SUGGEST); | ||
184 | m->pk = htonl ((uint32_t) sh->pk); | ||
185 | m->bw = sh->bw; | ||
186 | m->peer = *peer; | ||
187 | GNUNET_MQ_send (ch->mq, ev); | ||
188 | return GNUNET_OK; | ||
189 | } | ||
190 | |||
191 | |||
192 | /** | ||
193 | * Re-establish the connection to the TRANSPORT service. | ||
194 | * | ||
195 | * @param ch handle to use to re-connect. | ||
196 | */ | ||
197 | static void | ||
198 | reconnect (struct GNUNET_TRANSPORT_ApplicationHandle *ch) | ||
199 | { | ||
200 | static const struct GNUNET_MQ_MessageHandler handlers[] = { | ||
201 | { NULL, 0, 0 } | ||
202 | }; | ||
203 | |||
204 | GNUNET_assert (NULL == ch->mq); | ||
205 | ch->mq = GNUNET_CLIENT_connect (ch->cfg, | ||
206 | "transport", | ||
207 | handlers, | ||
208 | &error_handler, | ||
209 | ch); | ||
210 | if (NULL == ch->mq) | ||
211 | { | ||
212 | force_reconnect (ch); | ||
213 | return; | ||
214 | } | ||
215 | GNUNET_CONTAINER_multipeermap_iterate (ch->sug_requests, | ||
216 | &transmit_suggestion, | ||
217 | ch); | ||
218 | } | ||
219 | |||
220 | |||
221 | /** | ||
222 | * Initialize the TRANSPORT application suggestion client handle. | ||
223 | * | ||
224 | * @param cfg configuration to use | ||
225 | * @return transport application handle, NULL on error | ||
226 | */ | ||
227 | struct GNUNET_TRANSPORT_ApplicationHandle * | ||
228 | GNUNET_TRANSPORT_application_init (const struct GNUNET_CONFIGURATION_Handle *cfg) | ||
229 | { | ||
230 | struct GNUNET_TRANSPORT_ApplicationHandle *ch; | ||
231 | |||
232 | ch = GNUNET_new (struct GNUNET_TRANSPORT_ApplicationHandle); | ||
233 | ch->cfg = cfg; | ||
234 | ch->sug_requests = GNUNET_CONTAINER_multipeermap_create (32, | ||
235 | GNUNET_YES); | ||
236 | reconnect (ch); | ||
237 | return ch; | ||
238 | } | ||
239 | |||
240 | |||
241 | /** | ||
242 | * Function called to free all `struct GNUNET_TRANSPORT_ApplicationSuggestHandle`s | ||
243 | * in the map. | ||
244 | * | ||
245 | * @param cls NULL | ||
246 | * @param key the key | ||
247 | * @param value the value to free | ||
248 | * @return #GNUNET_OK (continue to iterate) | ||
249 | */ | ||
250 | static int | ||
251 | free_sug_handle (void *cls, | ||
252 | const struct GNUNET_PeerIdentity *key, | ||
253 | void *value) | ||
254 | { | ||
255 | struct GNUNET_TRANSPORT_ApplicationSuggestHandle *cur = value; | ||
256 | |||
257 | GNUNET_free (cur); | ||
258 | return GNUNET_OK; | ||
259 | } | ||
260 | |||
261 | |||
262 | /** | ||
263 | * Client is done with TRANSPORT application management, release resources. | ||
264 | * | ||
265 | * @param ch handle to release | ||
266 | */ | ||
267 | void | ||
268 | GNUNET_TRANSPORT_application_done (struct GNUNET_TRANSPORT_ApplicationHandle *ch) | ||
269 | { | ||
270 | if (NULL != ch->mq) | ||
271 | { | ||
272 | GNUNET_MQ_destroy (ch->mq); | ||
273 | ch->mq = NULL; | ||
274 | } | ||
275 | if (NULL != ch->task) | ||
276 | { | ||
277 | GNUNET_SCHEDULER_cancel (ch->task); | ||
278 | ch->task = NULL; | ||
279 | } | ||
280 | GNUNET_CONTAINER_multipeermap_iterate (ch->sug_requests, | ||
281 | &free_sug_handle, | ||
282 | NULL); | ||
283 | GNUNET_CONTAINER_multipeermap_destroy (ch->sug_requests); | ||
284 | GNUNET_free (ch); | ||
285 | } | ||
286 | |||
287 | |||
288 | /** | ||
289 | * We would like to receive address suggestions for a peer. TRANSPORT will | ||
290 | * respond with a call to the continuation immediately containing an address or | ||
291 | * no address if none is available. TRANSPORT can suggest more addresses until we call | ||
292 | * #GNUNET_TRANSPORT_application_suggest_cancel(). | ||
293 | * | ||
294 | * @param ch handle | ||
295 | * @param peer identity of the peer we need an address for | ||
296 | * @param pk what kind of application will the application require (can be | ||
297 | * #GNUNET_MQ_PREFERENCE_NONE, we will still try to connect) | ||
298 | * @param bw desired bandwith, can be zero (we will still try to connect) | ||
299 | * @return suggest handle, NULL if a request is already pending | ||
300 | */ | ||
301 | struct GNUNET_TRANSPORT_ApplicationSuggestHandle * | ||
302 | GNUNET_TRANSPORT_application_suggest (struct GNUNET_TRANSPORT_ApplicationHandle *ch, | ||
303 | const struct GNUNET_PeerIdentity *peer, | ||
304 | enum GNUNET_MQ_PreferenceKind pk, | ||
305 | struct GNUNET_BANDWIDTH_Value32NBO bw) | ||
306 | { | ||
307 | struct GNUNET_TRANSPORT_ApplicationSuggestHandle *s; | ||
308 | |||
309 | s = GNUNET_new (struct GNUNET_TRANSPORT_ApplicationSuggestHandle); | ||
310 | s->ch = ch; | ||
311 | s->id = *peer; | ||
312 | s->pk = pk; | ||
313 | s->bw = bw; | ||
314 | (void) GNUNET_CONTAINER_multipeermap_put (ch->sug_requests, | ||
315 | &s->id, | ||
316 | s, | ||
317 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); | ||
318 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
319 | "Requesting TRANSPORT to suggest address for `%s'\n", | ||
320 | GNUNET_i2s (peer)); | ||
321 | if (NULL == ch->mq) | ||
322 | return s; | ||
323 | GNUNET_assert (GNUNET_OK == | ||
324 | transmit_suggestion (ch, | ||
325 | &s->id, | ||
326 | s)); | ||
327 | return s; | ||
328 | } | ||
329 | |||
330 | |||
331 | /** | ||
332 | * We no longer care about being connected to a peer. | ||
333 | * | ||
334 | * @param sh handle to stop | ||
335 | */ | ||
336 | void | ||
337 | GNUNET_TRANSPORT_application_suggest_cancel (struct GNUNET_TRANSPORT_ApplicationSuggestHandle *sh) | ||
338 | { | ||
339 | struct GNUNET_TRANSPORT_ApplicationHandle *ch = sh->ch; | ||
340 | struct GNUNET_MQ_Envelope *ev; | ||
341 | struct ExpressPreferenceMessage *m; | ||
342 | |||
343 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
344 | "Telling TRANSPORT we no longer care for an address for `%s'\n", | ||
345 | GNUNET_i2s (&sh->id)); | ||
346 | GNUNET_assert (GNUNET_OK == | ||
347 | GNUNET_CONTAINER_multipeermap_remove (ch->sug_requests, | ||
348 | &sh->id, | ||
349 | sh)); | ||
350 | if (NULL == ch->mq) | ||
351 | { | ||
352 | GNUNET_free (sh); | ||
353 | return; | ||
354 | } | ||
355 | ev = GNUNET_MQ_msg (m, | ||
356 | GNUNET_MESSAGE_TYPE_TRANSPORT_SUGGEST_CANCEL); | ||
357 | m->pk = htonl ((uint32_t) sh->pk); | ||
358 | m->bw = sh->bw; | ||
359 | m->peer = sh->id; | ||
360 | GNUNET_MQ_send (ch->mq, | ||
361 | ev); | ||
362 | GNUNET_free (sh); | ||
363 | } | ||
364 | |||
365 | |||
366 | /* end of transport_api2_application.c */ | ||
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 89d0462c5..0e799b553 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am | |||
@@ -280,13 +280,12 @@ gnunet_uri_LDADD = \ | |||
280 | 280 | ||
281 | 281 | ||
282 | gnunet_qr_SOURCES = \ | 282 | gnunet_qr_SOURCES = \ |
283 | gnunet-qr.c \ | 283 | gnunet-qr.c |
284 | gnunet-qr-utils.h | ||
285 | gnunet_qr_LDADD = \ | 284 | gnunet_qr_LDADD = \ |
286 | libgnunetutil.la \ | 285 | libgnunetutil.la \ |
287 | $(GN_LIBINTL) | 286 | $(GN_LIBINTL) |
288 | gnunet_qr_LDFLAGS= $(libzbar_LIBS) | 287 | gnunet_qr_LDFLAGS= \ |
289 | gnunet_qr_CFLAGS = $(libzbar_CFLAGS) -DBINDIR=\"@bindir@/\" | 288 | -lzbar |
290 | 289 | ||
291 | plugin_LTLIBRARIES = \ | 290 | plugin_LTLIBRARIES = \ |
292 | libgnunet_plugin_test.la | 291 | libgnunet_plugin_test.la |