projects
/
oweals
/
gnunet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
656a75a
)
fix #1796
author
Christian Grothoff
<christian@grothoff.org>
Wed, 28 Sep 2011 22:51:07 +0000
(22:51 +0000)
committer
Christian Grothoff
<christian@grothoff.org>
Wed, 28 Sep 2011 22:51:07 +0000
(22:51 +0000)
src/transport/gnunet-service-transport.c
patch
|
blob
|
history
src/transport/test_transport_api_unreliability.c
patch
|
blob
|
history
src/transport/test_transport_api_unreliability_udp_peer1.conf
patch
|
blob
|
history
diff --git
a/src/transport/gnunet-service-transport.c
b/src/transport/gnunet-service-transport.c
index 537f99dcf4b62052d1039df4a0e859f0b8e20919..92f78fec5bcbd94a528fe9f08af537c01b38aaca 100644
(file)
--- a/
src/transport/gnunet-service-transport.c
+++ b/
src/transport/gnunet-service-transport.c
@@
-232,7
+232,6
@@
plugin_env_receive_callback (void *cls, const struct GNUNET_PeerIdentity *peer,
im->ats_count = htonl (0);
memcpy (&(im->peer), peer, sizeof (struct GNUNET_PeerIdentity));
memcpy (&im[1], message, ntohs (message->size));
im->ats_count = htonl (0);
memcpy (&(im->peer), peer, sizeof (struct GNUNET_PeerIdentity));
memcpy (&im[1], message, ntohs (message->size));
-
GST_clients_broadcast ((const struct GNUNET_MessageHeader *) im,
GNUNET_YES);
GST_clients_broadcast ((const struct GNUNET_MessageHeader *) im,
GNUNET_YES);
diff --git
a/src/transport/test_transport_api_unreliability.c
b/src/transport/test_transport_api_unreliability.c
index e4e78bb3e79b6e127a232a3003b825fce8f4ad36..c675e18a0b58e972a76582bd178c4fa021365f4c 100644
(file)
--- a/
src/transport/test_transport_api_unreliability.c
+++ b/
src/transport/test_transport_api_unreliability.c
@@
-396,40
+396,14
@@
notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
if (cls == p1)
{
if (cls == p1)
{
- char * sec;
- long long unsigned int l_bps;
-
- GNUNET_asprintf(&sec, "transport-%s", test_plugin);
- if (GNUNET_CONFIGURATION_have_value (p1->cfg, sec, "MAX_BPS"))
- {
- GNUNET_CONFIGURATION_get_value_number (p1->cfg, sec, "MAX_BPS",
- &l_bps);
- max_bps_p1 = l_bps;
- }
- else
- max_bps_p1 = 1024 * 1024 * 1024;
- GNUNET_free (sec);
-
+ max_bps_p1 = 1024 * 1024 * 1024;
GNUNET_TRANSPORT_set_quota (p1->th, &p2->id,
GNUNET_BANDWIDTH_value_init (max_bps_p1),
GNUNET_BANDWIDTH_value_init (max_bps_p1));
}
else if (cls == p2)
{
GNUNET_TRANSPORT_set_quota (p1->th, &p2->id,
GNUNET_BANDWIDTH_value_init (max_bps_p1),
GNUNET_BANDWIDTH_value_init (max_bps_p1));
}
else if (cls == p2)
{
- char * sec;
- long long unsigned int l_bps;
-
- GNUNET_asprintf(&sec, "transport-%s", test_plugin);
- if (GNUNET_CONFIGURATION_have_value (p2->cfg, sec, "MAX_BPS"))
- {
- GNUNET_CONFIGURATION_get_value_number (p2->cfg, sec, "MAX_BPS",
- &l_bps);
- max_bps_p2 = l_bps;
- }
- else
- max_bps_p2 = 1024 * 1024 * 1024;
- GNUNET_free (sec);
-
+ max_bps_p2 = 1024 * 1024 * 1024;
GNUNET_TRANSPORT_set_quota (p2->th, &p1->id,
GNUNET_BANDWIDTH_value_init (max_bps_p2),
GNUNET_BANDWIDTH_value_init (max_bps_p2));
GNUNET_TRANSPORT_set_quota (p2->th, &p1->id,
GNUNET_BANDWIDTH_value_init (max_bps_p2),
GNUNET_BANDWIDTH_value_init (max_bps_p2));
diff --git
a/src/transport/test_transport_api_unreliability_udp_peer1.conf
b/src/transport/test_transport_api_unreliability_udp_peer1.conf
index 6f8c44af4c50341868c0f73ce7cd5e9bf38bac5b..e36b4ce842bd123b94fc3d451951b9c0b36fcb4a 100644
(file)
--- a/
src/transport/test_transport_api_unreliability_udp_peer1.conf
+++ b/
src/transport/test_transport_api_unreliability_udp_peer1.conf
@@
-5,7
+5,7
@@
DEFAULTCONFIG = test_transport_api_udp_peer1.conf
[transport-udp]
PORT = 12040
[transport-udp]
PORT = 12040
-MAX_BPS = 500000
+MAX_BPS = 500000
0
[arm]
PORT = 12045
[arm]
PORT = 12045