diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-02-08 11:46:36 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-02-08 11:46:36 +0000 |
commit | 6115a1150c65bd4a33ed61c6e96594c4a73d86ac (patch) | |
tree | f2bb2a57f540a3799cd112b5235f1c4222fd283e /src | |
parent | cd0a6e382eafd7fd241a00a10527333d73985fca (diff) | |
download | gnunet-6115a1150c65bd4a33ed61c6e96594c4a73d86ac.tar.gz gnunet-6115a1150c65bd4a33ed61c6e96594c4a73d86ac.zip |
more dead and duplicate code elimination
Diffstat (limited to 'src')
-rw-r--r-- | src/ats-tests/ats-testing.c | 15 | ||||
-rw-r--r-- | src/ats/ats_api_scanner.c | 11 | ||||
-rw-r--r-- | src/ats/gnunet-service-ats_normalization.c | 2 | ||||
-rw-r--r-- | src/ats/plugin_ats_mlp.c | 42 | ||||
-rw-r--r-- | src/include/gnunet_ats_service.h | 96 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport.c | 2 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport_clients.c | 3 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport_neighbours.c | 77 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport_neighbours.h | 27 |
9 files changed, 14 insertions, 261 deletions
diff --git a/src/ats-tests/ats-testing.c b/src/ats-tests/ats-testing.c index c90cbf3c7..a566a242c 100644 --- a/src/ats-tests/ats-testing.c +++ b/src/ats-tests/ats-testing.c | |||
@@ -613,21 +613,6 @@ ats_performance_info_cb (void *cls, | |||
613 | p->ats_distance = ntohl (ats[c_a].value); | 613 | p->ats_distance = ntohl (ats[c_a].value); |
614 | GNUNET_break (0); | 614 | GNUNET_break (0); |
615 | break; | 615 | break; |
616 | case GNUNET_ATS_COST_WAN: | ||
617 | if (p->ats_cost_wan != ntohl (ats[c_a].value)) | ||
618 | log = GNUNET_YES; | ||
619 | p->ats_cost_wan = ntohl (ats[c_a].value); | ||
620 | break; | ||
621 | case GNUNET_ATS_COST_LAN: | ||
622 | if (p->ats_cost_lan != ntohl (ats[c_a].value)) | ||
623 | log = GNUNET_YES; | ||
624 | p->ats_cost_lan = ntohl (ats[c_a].value); | ||
625 | break; | ||
626 | case GNUNET_ATS_COST_WLAN: | ||
627 | if (p->ats_cost_wlan != ntohl (ats[c_a].value)) | ||
628 | log = GNUNET_YES; | ||
629 | p->ats_cost_wlan = ntohl (ats[c_a].value); | ||
630 | break; | ||
631 | default: | 616 | default: |
632 | break; | 617 | break; |
633 | } | 618 | } |
diff --git a/src/ats/ats_api_scanner.c b/src/ats/ats_api_scanner.c index ddc755a04..ce1c90567 100644 --- a/src/ats/ats_api_scanner.c +++ b/src/ats/ats_api_scanner.c | |||
@@ -78,23 +78,14 @@ GNUNET_ATS_print_property_type (enum GNUNET_ATS_Property type) | |||
78 | return "UTILIZATION_UP"; | 78 | return "UTILIZATION_UP"; |
79 | case GNUNET_ATS_UTILIZATION_IN: | 79 | case GNUNET_ATS_UTILIZATION_IN: |
80 | return "UTILIZATION_DOWN"; | 80 | return "UTILIZATION_DOWN"; |
81 | case GNUNET_ATS_UTILIZATION_PAYLOAD_OUT: | ||
82 | return "UTILIZATION_PAYLOAD_UP"; | ||
83 | case GNUNET_ATS_UTILIZATION_PAYLOAD_IN: | ||
84 | return "UTILIZATION_PAYLOAD_DOWN"; | ||
85 | case GNUNET_ATS_NETWORK_TYPE: | 81 | case GNUNET_ATS_NETWORK_TYPE: |
86 | return "NETWORK_TYPE"; | 82 | return "NETWORK_TYPE"; |
87 | case GNUNET_ATS_QUALITY_NET_DELAY: | 83 | case GNUNET_ATS_QUALITY_NET_DELAY: |
88 | return "DELAY"; | 84 | return "DELAY"; |
89 | case GNUNET_ATS_QUALITY_NET_DISTANCE: | 85 | case GNUNET_ATS_QUALITY_NET_DISTANCE: |
90 | return "DISTANCE"; | 86 | return "DISTANCE"; |
91 | case GNUNET_ATS_COST_WAN: | ||
92 | return "COST_WAN"; | ||
93 | case GNUNET_ATS_COST_LAN: | ||
94 | return "COST_LAN"; | ||
95 | case GNUNET_ATS_COST_WLAN: | ||
96 | return "COST_WLAN"; | ||
97 | default: | 87 | default: |
88 | GNUNET_break (0); | ||
98 | return NULL; | 89 | return NULL; |
99 | } | 90 | } |
100 | } | 91 | } |
diff --git a/src/ats/gnunet-service-ats_normalization.c b/src/ats/gnunet-service-ats_normalization.c index 0d0b63e9d..23b7b0cb7 100644 --- a/src/ats/gnunet-service-ats_normalization.c +++ b/src/ats/gnunet-service-ats_normalization.c | |||
@@ -324,7 +324,7 @@ property_normalize (struct Property *p, | |||
324 | /* Normalize the values of this property */ | 324 | /* Normalize the values of this property */ |
325 | if (GNUNET_NO == limits_changed) | 325 | if (GNUNET_NO == limits_changed) |
326 | { | 326 | { |
327 | /* normalize just this address */ | 327 | /* normalize just this address */ |
328 | normalize_address (p, | 328 | normalize_address (p, |
329 | &address->peer, | 329 | &address->peer, |
330 | address); | 330 | address); |
diff --git a/src/ats/plugin_ats_mlp.c b/src/ats/plugin_ats_mlp.c index fbaed1eaa..89be5ae7d 100644 --- a/src/ats/plugin_ats_mlp.c +++ b/src/ats/plugin_ats_mlp.c | |||
@@ -597,45 +597,6 @@ mlp_delete_problem (struct GAS_MLP_Handle *mlp) | |||
597 | 597 | ||
598 | 598 | ||
599 | /** | 599 | /** |
600 | * Translate ATS properties to text | ||
601 | * Just intended for debugging | ||
602 | * | ||
603 | * @param ats_index the ATS index | ||
604 | * @return string with result | ||
605 | */ | ||
606 | static const char * | ||
607 | mlp_ats_to_string (int ats_index) | ||
608 | { | ||
609 | switch (ats_index) { | ||
610 | case GNUNET_ATS_ARRAY_TERMINATOR: | ||
611 | return "GNUNET_ATS_ARRAY_TERMINATOR"; | ||
612 | case GNUNET_ATS_UTILIZATION_OUT: | ||
613 | return "GNUNET_ATS_UTILIZATION_OUT"; | ||
614 | case GNUNET_ATS_UTILIZATION_IN: | ||
615 | return "GNUNET_ATS_UTILIZATION_IN"; | ||
616 | case GNUNET_ATS_UTILIZATION_PAYLOAD_OUT: | ||
617 | return "GNUNET_ATS_UTILIZATION_PAYLOAD_OUT"; | ||
618 | case GNUNET_ATS_UTILIZATION_PAYLOAD_IN: | ||
619 | return "GNUNET_ATS_UTILIZATION_PAYLOAD_IN"; | ||
620 | case GNUNET_ATS_COST_LAN: | ||
621 | return "GNUNET_ATS_COST_LAN"; | ||
622 | case GNUNET_ATS_COST_WAN: | ||
623 | return "GNUNET_ATS_COST_LAN"; | ||
624 | case GNUNET_ATS_COST_WLAN: | ||
625 | return "GNUNET_ATS_COST_WLAN"; | ||
626 | case GNUNET_ATS_NETWORK_TYPE: | ||
627 | return "GNUNET_ATS_NETWORK_TYPE"; | ||
628 | case GNUNET_ATS_QUALITY_NET_DELAY: | ||
629 | return "GNUNET_ATS_QUALITY_NET_DELAY"; | ||
630 | case GNUNET_ATS_QUALITY_NET_DISTANCE: | ||
631 | return "GNUNET_ATS_QUALITY_NET_DISTANCE"; | ||
632 | default: | ||
633 | GNUNET_break (0); | ||
634 | return "unknown"; | ||
635 | } | ||
636 | } | ||
637 | |||
638 | /** | ||
639 | * Translate glpk status error codes to text | 600 | * Translate glpk status error codes to text |
640 | * @param retcode return code | 601 | * @param retcode return code |
641 | * @return string with result | 602 | * @return string with result |
@@ -1217,7 +1178,8 @@ mlp_create_problem_add_invariant_rows (struct GAS_MLP_Handle *mlp, struct MLP_Pr | |||
1217 | { | 1178 | { |
1218 | for (c = 0; c < mlp->pv.m_q; c++) | 1179 | for (c = 0; c < mlp->pv.m_q; c++) |
1219 | { | 1180 | { |
1220 | GNUNET_asprintf(&name, "c7_q%i_%s", c, mlp_ats_to_string(mlp->pv.q[c])); | 1181 | GNUNET_asprintf (&name, "c7_q%i_%s", c, |
1182 | GNUNET_ATS_print_property_type (mlp->pv.q[c])); | ||
1221 | p->r_q[c] = mlp_create_problem_create_constraint (p, name, GLP_FX, 0.0, 0.0); | 1183 | p->r_q[c] = mlp_create_problem_create_constraint (p, name, GLP_FX, 0.0, 0.0); |
1222 | GNUNET_free (name); | 1184 | GNUNET_free (name); |
1223 | mlp_create_problem_set_value (p, p->r_q[c], p->c_q[c], -1, __LINE__); | 1185 | mlp_create_problem_set_value (p, p->r_q[c], p->c_q[c], -1, __LINE__); |
diff --git a/src/include/gnunet_ats_service.h b/src/include/gnunet_ats_service.h index 188f9091b..0bfaeb65d 100644 --- a/src/include/gnunet_ats_service.h +++ b/src/include/gnunet_ats_service.h | |||
@@ -98,11 +98,6 @@ enum GNUNET_ATS_Network_Type | |||
98 | */ | 98 | */ |
99 | #define GNUNET_ATS_MaxBandwidthString "unlimited" | 99 | #define GNUNET_ATS_MaxBandwidthString "unlimited" |
100 | 100 | ||
101 | /** | ||
102 | * Number of property types supported by ATS | ||
103 | */ | ||
104 | #define GNUNET_ATS_PropertyCount 11 | ||
105 | |||
106 | 101 | ||
107 | /** | 102 | /** |
108 | * Enum defining all known property types for ATS Enum values are used | 103 | * Enum defining all known property types for ATS Enum values are used |
@@ -129,7 +124,7 @@ enum GNUNET_ATS_Property | |||
129 | * | 124 | * |
130 | * Unit: [bytes/second] | 125 | * Unit: [bytes/second] |
131 | */ | 126 | */ |
132 | GNUNET_ATS_UTILIZATION_OUT, | 127 | GNUNET_ATS_UTILIZATION_OUT = 1, |
133 | 128 | ||
134 | /** | 129 | /** |
135 | * Actual traffic on this connection from the other peer to this peer. | 130 | * Actual traffic on this connection from the other peer to this peer. |
@@ -137,29 +132,13 @@ enum GNUNET_ATS_Property | |||
137 | * | 132 | * |
138 | * Unit: [bytes/second] | 133 | * Unit: [bytes/second] |
139 | */ | 134 | */ |
140 | GNUNET_ATS_UTILIZATION_IN, | 135 | GNUNET_ATS_UTILIZATION_IN = 2, |
141 | |||
142 | /** | ||
143 | * Actual traffic on this connection from this peer to the other peer. | ||
144 | * Only payload from layers > transport | ||
145 | * | ||
146 | * Unit: [bytes/second] | ||
147 | */ | ||
148 | GNUNET_ATS_UTILIZATION_PAYLOAD_OUT, | ||
149 | |||
150 | /** | ||
151 | * Actual traffic on this connection from the other peer to this peer. | ||
152 | * Only payload from layers > transport | ||
153 | * | ||
154 | * Unit: [bytes/second] | ||
155 | */ | ||
156 | GNUNET_ATS_UTILIZATION_PAYLOAD_IN, | ||
157 | 136 | ||
158 | /** | 137 | /** |
159 | * Is this address located in WAN, LAN or a loopback address | 138 | * Is this address located in WAN, LAN or a loopback address |
160 | * Value is element of GNUNET_ATS_Network_Type | 139 | * Value is element of GNUNET_ATS_Network_Type |
161 | */ | 140 | */ |
162 | GNUNET_ATS_NETWORK_TYPE, | 141 | GNUNET_ATS_NETWORK_TYPE = 3, |
163 | 142 | ||
164 | /** | 143 | /** |
165 | * Delay | 144 | * Delay |
@@ -173,77 +152,20 @@ enum GNUNET_ATS_Property | |||
173 | * WLAN : 2 | 152 | * WLAN : 2 |
174 | * Dialup: 500 | 153 | * Dialup: 500 |
175 | */ | 154 | */ |
176 | GNUNET_ATS_QUALITY_NET_DELAY, | 155 | GNUNET_ATS_QUALITY_NET_DELAY = 4, |
177 | 156 | ||
178 | /** | 157 | /** |
179 | * Distance on network layer (required for distance-vector routing). | 158 | * Distance on network layer (required for distance-vector routing). |
180 | * | 159 | * |
181 | * Unit: [DV-hops] | 160 | * Unit: [DV-hops] |
182 | */ | 161 | */ |
183 | GNUNET_ATS_QUALITY_NET_DISTANCE, | 162 | GNUNET_ATS_QUALITY_NET_DISTANCE = 5 |
184 | |||
185 | /** | ||
186 | * Network overhead on WAN (Wide-Area Network) | ||
187 | * | ||
188 | * How many bytes are sent on the WAN when 1 kilobyte (1024 bytes) | ||
189 | * of application data is transmitted? | ||
190 | * A factor used with connect cost, bandwidth cost and energy cost | ||
191 | * to describe the overhead produced by the transport protocol | ||
192 | * | ||
193 | * Unit: [bytes/kb] | ||
194 | * | ||
195 | * Interpretation: less is better | ||
196 | * | ||
197 | * Examples: | ||
198 | * | ||
199 | * TCP/IPv4 over Ethernet: 1024 + 38 + 20 + 20 = 1102 [bytes/kb] | ||
200 | * TCP/IPv6 over Ethernet: 1024 + 38 + 20 + 40 = 1122 [bytes/kb] | ||
201 | * UDP/IPv4 over Ethernet: 1024 + 38 + 20 + 8 = 1090 [bytes/kb] | ||
202 | * UDP/IPv6 over Ethernet: 1024 + 38 + 40 + 8 = 1110 [bytes/kb] | ||
203 | */ | ||
204 | GNUNET_ATS_COST_WAN, | ||
205 | 163 | ||
206 | /** | 164 | /** |
207 | * Network overhead on LAN (Local-Area Network) | 165 | * Number of property types supported by ATS |
208 | * | 166 | */ |
209 | * How many bytes are sent on the LAN when 1 kilobyte (1024 bytes) | 167 | #define GNUNET_ATS_PropertyCount 6 |
210 | * of application data is transmitted? | ||
211 | * A factor used with connect cost, bandwidth cost and energy cost | ||
212 | * to describe the overhead produced by the transport protocol | ||
213 | * | ||
214 | * Unit: [bytes/kb] | ||
215 | * | ||
216 | * Interpretation: less is better | ||
217 | * | ||
218 | * Examples: | ||
219 | * | ||
220 | * TCP/IPv4 over Ethernet: 1024 + 38 + 20 + 20 = 1102 [bytes/kb] | ||
221 | * TCP/IPv6 over Ethernet: 1024 + 38 + 20 + 40 = 1122 [bytes/kb] | ||
222 | * UDP/IPv4 over Ethernet: 1024 + 38 + 20 + 8 = 1090 [bytes/kb] | ||
223 | * UDP/IPv6 over Ethernet: 1024 + 38 + 40 + 8 = 1110 [bytes/kb] | ||
224 | */ | ||
225 | GNUNET_ATS_COST_LAN, | ||
226 | 168 | ||
227 | /** | ||
228 | * Network overhead on WLAN (Wireless Local Area Network) | ||
229 | * | ||
230 | * How many bytes are sent on the LAN when 1 kilobyte (1024 bytes) | ||
231 | * of application data is transmitted? | ||
232 | * A factor used with connect cost, bandwidth cost and energy cost | ||
233 | * to describe the overhead produced by the transport protocol | ||
234 | * | ||
235 | * Unit: [bytes/kb] | ||
236 | * | ||
237 | * Interpretation: less is better | ||
238 | * | ||
239 | * Examples: | ||
240 | * | ||
241 | * TCP/IPv4 over Ethernet: 1024 + 38 + 20 + 20 = 1102 [bytes/kb] | ||
242 | * TCP/IPv6 over Ethernet: 1024 + 38 + 20 + 40 = 1122 [bytes/kb] | ||
243 | * UDP/IPv4 over Ethernet: 1024 + 38 + 20 + 8 = 1090 [bytes/kb] | ||
244 | * UDP/IPv6 over Ethernet: 1024 + 38 + 40 + 8 = 1110 [bytes/kb] | ||
245 | */ | ||
246 | GNUNET_ATS_COST_WLAN | ||
247 | 169 | ||
248 | }; | 170 | }; |
249 | 171 | ||
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index 3746f0597..336925f4f 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c | |||
@@ -576,8 +576,6 @@ GST_receive_callback (void *cls, | |||
576 | gettext_noop ("# bytes payload received"), | 576 | gettext_noop ("# bytes payload received"), |
577 | ntohs (message->size), | 577 | ntohs (message->size), |
578 | GNUNET_NO); | 578 | GNUNET_NO); |
579 | GST_neighbours_notify_payload_recv (address, | ||
580 | message); | ||
581 | ret = process_payload (address, | 579 | ret = process_payload (address, |
582 | session, | 580 | session, |
583 | message); | 581 | message); |
diff --git a/src/transport/gnunet-service-transport_clients.c b/src/transport/gnunet-service-transport_clients.c index 0aef9f97e..8e0b3fe68 100644 --- a/src/transport/gnunet-service-transport_clients.c +++ b/src/transport/gnunet-service-transport_clients.c | |||
@@ -700,9 +700,6 @@ handle_send_transmit_continuation (void *cls, | |||
700 | struct SendTransmitContinuationContext *stcc = cls; | 700 | struct SendTransmitContinuationContext *stcc = cls; |
701 | struct SendOkMessage send_ok_msg; | 701 | struct SendOkMessage send_ok_msg; |
702 | 702 | ||
703 | if (GNUNET_OK == success) | ||
704 | GST_neighbours_notify_payload_sent (&stcc->target, | ||
705 | bytes_payload); | ||
706 | send_ok_msg.header.size = htons (sizeof (send_ok_msg)); | 703 | send_ok_msg.header.size = htons (sizeof (send_ok_msg)); |
707 | send_ok_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK); | 704 | send_ok_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK); |
708 | send_ok_msg.bytes_msg = htonl (bytes_payload); | 705 | send_ok_msg.bytes_msg = htonl (bytes_payload); |
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index 750e1a793..15bb0bdab 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c | |||
@@ -415,16 +415,6 @@ struct NeighbourMapEntry | |||
415 | /** | 415 | /** |
416 | * Tracking utilization of outbound bandwidth | 416 | * Tracking utilization of outbound bandwidth |
417 | */ | 417 | */ |
418 | uint32_t util_payload_bytes_sent; | ||
419 | |||
420 | /** | ||
421 | * Tracking utilization of inbound bandwidth | ||
422 | */ | ||
423 | uint32_t util_payload_bytes_recv; | ||
424 | |||
425 | /** | ||
426 | * Tracking utilization of outbound bandwidth | ||
427 | */ | ||
428 | uint32_t util_total_bytes_sent; | 418 | uint32_t util_total_bytes_sent; |
429 | 419 | ||
430 | /** | 420 | /** |
@@ -2840,8 +2830,6 @@ send_utilization_data (void *cls, | |||
2840 | { | 2830 | { |
2841 | struct NeighbourMapEntry *n = value; | 2831 | struct NeighbourMapEntry *n = value; |
2842 | struct GNUNET_ATS_Information atsi[4]; | 2832 | struct GNUNET_ATS_Information atsi[4]; |
2843 | uint32_t bps_pl_in; | ||
2844 | uint32_t bps_pl_out; | ||
2845 | uint32_t bps_in; | 2833 | uint32_t bps_in; |
2846 | uint32_t bps_out; | 2834 | uint32_t bps_out; |
2847 | struct GNUNET_TIME_Relative delta; | 2835 | struct GNUNET_TIME_Relative delta; |
@@ -2850,19 +2838,6 @@ send_utilization_data (void *cls, | |||
2850 | return GNUNET_OK; | 2838 | return GNUNET_OK; |
2851 | delta = GNUNET_TIME_absolute_get_difference (n->last_util_transmission, | 2839 | delta = GNUNET_TIME_absolute_get_difference (n->last_util_transmission, |
2852 | GNUNET_TIME_absolute_get ()); | 2840 | GNUNET_TIME_absolute_get ()); |
2853 | |||
2854 | bps_pl_in = 0; | ||
2855 | |||
2856 | if ((0 != n->util_payload_bytes_recv) && (0 != delta.rel_value_us)) | ||
2857 | bps_pl_in = (1000LL * 1000LL * n->util_payload_bytes_recv) / (delta.rel_value_us); | ||
2858 | bps_pl_out = 0; | ||
2859 | if ((0 != n->util_payload_bytes_sent) && (0 != delta.rel_value_us)) | ||
2860 | bps_pl_out = (1000LL * 1000LL * n->util_payload_bytes_sent) / delta.rel_value_us; | ||
2861 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
2862 | "`%s' payload: received %u Bytes/s, sent %u Bytes/s\n", | ||
2863 | GNUNET_i2s (key), | ||
2864 | bps_pl_in, | ||
2865 | bps_pl_out); | ||
2866 | bps_in = 0; | 2841 | bps_in = 0; |
2867 | if ((0 != n->util_total_bytes_recv) && (0 != delta.rel_value_us)) | 2842 | if ((0 != n->util_total_bytes_recv) && (0 != delta.rel_value_us)) |
2868 | bps_in = (1000LL * 1000LL * n->util_total_bytes_recv) / (delta.rel_value_us); | 2843 | bps_in = (1000LL * 1000LL * n->util_total_bytes_recv) / (delta.rel_value_us); |
@@ -2880,17 +2855,9 @@ send_utilization_data (void *cls, | |||
2880 | atsi[0].value = htonl (bps_out); | 2855 | atsi[0].value = htonl (bps_out); |
2881 | atsi[1].type = htonl (GNUNET_ATS_UTILIZATION_IN); | 2856 | atsi[1].type = htonl (GNUNET_ATS_UTILIZATION_IN); |
2882 | atsi[1].value = htonl (bps_in); | 2857 | atsi[1].value = htonl (bps_in); |
2883 | |||
2884 | atsi[2].type = htonl (GNUNET_ATS_UTILIZATION_PAYLOAD_OUT); | ||
2885 | atsi[2].value = htonl (bps_pl_out); | ||
2886 | atsi[3].type = htonl (GNUNET_ATS_UTILIZATION_PAYLOAD_IN); | ||
2887 | atsi[3].value = htonl (bps_pl_in); | ||
2888 | |||
2889 | GST_ats_update_metrics (n->primary_address.address, | 2858 | GST_ats_update_metrics (n->primary_address.address, |
2890 | n->primary_address.session, | 2859 | n->primary_address.session, |
2891 | atsi, 4); | 2860 | atsi, 2); |
2892 | n->util_payload_bytes_recv = 0; | ||
2893 | n->util_payload_bytes_sent = 0; | ||
2894 | n->util_total_bytes_recv = 0; | 2861 | n->util_total_bytes_recv = 0; |
2895 | n->util_total_bytes_sent = 0; | 2862 | n->util_total_bytes_sent = 0; |
2896 | n->last_util_transmission = GNUNET_TIME_absolute_get (); | 2863 | n->last_util_transmission = GNUNET_TIME_absolute_get (); |
@@ -2941,27 +2908,6 @@ GST_neighbours_notify_data_recv (const struct GNUNET_HELLO_Address *address, | |||
2941 | 2908 | ||
2942 | 2909 | ||
2943 | /** | 2910 | /** |
2944 | * Track information about payload (useful data) we received from the | ||
2945 | * given address (used to notify ATS about our utilization of | ||
2946 | * allocated resources). | ||
2947 | * | ||
2948 | * @param address the address we got data from | ||
2949 | * @param message the message we received (really only the size is used) | ||
2950 | */ | ||
2951 | void | ||
2952 | GST_neighbours_notify_payload_recv (const struct GNUNET_HELLO_Address *address, | ||
2953 | const struct GNUNET_MessageHeader *message) | ||
2954 | { | ||
2955 | struct NeighbourMapEntry *n; | ||
2956 | |||
2957 | n = lookup_neighbour (&address->peer); | ||
2958 | if (NULL == n) | ||
2959 | return; | ||
2960 | n->util_payload_bytes_recv += ntohs (message->size); | ||
2961 | } | ||
2962 | |||
2963 | |||
2964 | /** | ||
2965 | * Track information about data we transmitted using the given @a | 2911 | * Track information about data we transmitted using the given @a |
2966 | * address and @a session (used to notify ATS about our utilization of | 2912 | * address and @a session (used to notify ATS about our utilization of |
2967 | * allocated resources). | 2913 | * allocated resources). |
@@ -2987,27 +2933,6 @@ GST_neighbours_notify_data_sent (const struct GNUNET_HELLO_Address *address, | |||
2987 | 2933 | ||
2988 | 2934 | ||
2989 | /** | 2935 | /** |
2990 | * Track information about payload (useful data) we transmitted using the | ||
2991 | * given address (used to notify ATS about our utilization of | ||
2992 | * allocated resources). | ||
2993 | * | ||
2994 | * @param address the address we transmitted data to | ||
2995 | * @param message the message we sent (really only the size is used) | ||
2996 | */ | ||
2997 | void | ||
2998 | GST_neighbours_notify_payload_sent (const struct GNUNET_PeerIdentity *peer, | ||
2999 | size_t size) | ||
3000 | { | ||
3001 | struct NeighbourMapEntry *n; | ||
3002 | |||
3003 | n = lookup_neighbour (peer); | ||
3004 | if (NULL == n) | ||
3005 | return; | ||
3006 | n->util_payload_bytes_sent += size; | ||
3007 | } | ||
3008 | |||
3009 | |||
3010 | /** | ||
3011 | * Master task run for every neighbour. Performs all of the time-related | 2936 | * Master task run for every neighbour. Performs all of the time-related |
3012 | * activities (keep alive, send next message, disconnect if idle, finish | 2937 | * activities (keep alive, send next message, disconnect if idle, finish |
3013 | * clean up after disconnect). | 2938 | * clean up after disconnect). |
diff --git a/src/transport/gnunet-service-transport_neighbours.h b/src/transport/gnunet-service-transport_neighbours.h index 637e7609b..070ee01a9 100644 --- a/src/transport/gnunet-service-transport_neighbours.h +++ b/src/transport/gnunet-service-transport_neighbours.h | |||
@@ -222,19 +222,6 @@ GST_neighbours_notify_data_recv (const struct GNUNET_HELLO_Address *address, | |||
222 | 222 | ||
223 | 223 | ||
224 | /** | 224 | /** |
225 | * Track information about payload (useful data) we received from the | ||
226 | * given address (used to notify ATS about our utilization of | ||
227 | * allocated resources). | ||
228 | * | ||
229 | * @param address the address we got data from | ||
230 | * @param message the message we received (really only the size is used) | ||
231 | */ | ||
232 | void | ||
233 | GST_neighbours_notify_payload_recv (const struct GNUNET_HELLO_Address *address, | ||
234 | const struct GNUNET_MessageHeader *message); | ||
235 | |||
236 | |||
237 | /** | ||
238 | * Track information about data we transmitted using the given @a | 225 | * Track information about data we transmitted using the given @a |
239 | * address and @a session (used to notify ATS about our utilization of | 226 | * address and @a session (used to notify ATS about our utilization of |
240 | * allocated resources). | 227 | * allocated resources). |
@@ -250,20 +237,6 @@ GST_neighbours_notify_data_sent (const struct GNUNET_HELLO_Address *address, | |||
250 | 237 | ||
251 | 238 | ||
252 | /** | 239 | /** |
253 | * Track information about payload (useful data) we transmitted using the | ||
254 | * given address (used to notify ATS about our utilization of | ||
255 | * allocated resources). | ||
256 | * | ||
257 | * @param address the address we transmitted data to | ||
258 | * @param message the message we sent (really only the size is used) | ||
259 | */ | ||
260 | void | ||
261 | GST_neighbours_notify_payload_sent (const struct GNUNET_PeerIdentity *peer, | ||
262 | size_t size); | ||
263 | |||
264 | |||
265 | |||
266 | /** | ||
267 | * For an existing neighbour record, set the active connection to | 240 | * For an existing neighbour record, set the active connection to |
268 | * use the given address. | 241 | * use the given address. |
269 | * | 242 | * |