[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r35425 - gnunet/src/core
From: |
gnunet |
Subject: |
[GNUnet-SVN] r35425 - gnunet/src/core |
Date: |
Mon, 23 Mar 2015 17:48:18 +0100 |
Author: grothoff
Date: 2015-03-23 17:48:18 +0100 (Mon, 23 Mar 2015)
New Revision: 35425
Modified:
gnunet/src/core/gnunet-service-core_neighbours.c
gnunet/src/core/gnunet-service-core_sessions.c
gnunet/src/core/test_core_api.c
gnunet/src/core/test_core_defaults.conf
Log:
-fix misc core issues
Modified: gnunet/src/core/gnunet-service-core_neighbours.c
===================================================================
--- gnunet/src/core/gnunet-service-core_neighbours.c 2015-03-23 16:07:42 UTC
(rev 35424)
+++ gnunet/src/core/gnunet-service-core_neighbours.c 2015-03-23 16:48:18 UTC
(rev 35425)
@@ -529,7 +529,6 @@
}
-
/**
* Check if the given neighbour has excess bandwidth available.
*
Modified: gnunet/src/core/gnunet-service-core_sessions.c
===================================================================
--- gnunet/src/core/gnunet-service-core_sessions.c 2015-03-23 16:07:42 UTC
(rev 35424)
+++ gnunet/src/core/gnunet-service-core_sessions.c 2015-03-23 16:48:18 UTC
(rev 35425)
@@ -498,7 +498,8 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received client transmission request. queueing\n");
GNUNET_CONTAINER_DLL_insert (session->active_client_request_head,
- session->active_client_request_tail, car);
+ session->active_client_request_tail,
+ car);
try_transmission (session);
}
@@ -646,9 +647,13 @@
min_deadline = GNUNET_TIME_UNIT_FOREVER_ABS;
/* if the peer has excess bandwidth, background traffic is allowed,
otherwise not */
- if (MAX_ENCRYPTED_MESSAGE_QUEUE_SIZE >=
- GSC_NEIGHBOURS_check_excess_bandwidth (&session->peer))
+ if (MAX_ENCRYPTED_MESSAGE_QUEUE_SIZE <=
+ GSC_NEIGHBOURS_get_queue_size (&session->peer))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Transmission queue already very long, waiting...\n");
return; /* queue already too long */
+ }
excess = GSC_NEIGHBOURS_check_excess_bandwidth (&session->peer);
if (GNUNET_YES == excess)
maxp = GNUNET_CORE_PRIO_BACKGROUND;
Modified: gnunet/src/core/test_core_api.c
===================================================================
--- gnunet/src/core/test_core_api.c 2015-03-23 16:07:42 UTC (rev 35424)
+++ gnunet/src/core/test_core_api.c 2015-03-23 16:48:18 UTC (rev 35425)
@@ -58,7 +58,8 @@
static void
-process_hello (void *cls, const struct GNUNET_MessageHeader *message)
+process_hello (void *cls,
+ const struct GNUNET_MessageHeader *message)
{
struct PeerContext *p = cls;
@@ -73,7 +74,8 @@
static void
-terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+terminate_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
GNUNET_assert (ok == 6);
GNUNET_CORE_disconnect (p1.ch);
@@ -98,10 +100,12 @@
static void
-terminate_task_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+terminate_task_error (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "ENDING ANGRILY %u\n", ok);
+ "ENDING ANGRILY %u\n",
+ ok);
GNUNET_break (0);
if (NULL != p1.ch)
{
@@ -143,7 +147,7 @@
GNUNET_assert (ok == 4);
OKPP;
GNUNET_assert (p == &p1);
- GNUNET_assert (buf != NULL);
+ GNUNET_assert (NULL != buf);
m = (struct GNUNET_MessageHeader *) buf;
m->type = htons (MTYPE);
m->size = htons (sizeof (struct GNUNET_MessageHeader));
@@ -152,7 +156,8 @@
static void
-connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer)
+connect_notify (void *cls,
+ const struct GNUNET_PeerIdentity *peer)
{
struct PeerContext *pc = cls;
@@ -224,12 +229,13 @@
}
-
static int
-process_mtype (void *cls, const struct GNUNET_PeerIdentity *peer,
+process_mtype (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving message from `%4s'.\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Receiving message from `%4s'.\n",
GNUNET_i2s (peer));
GNUNET_assert (ok == 5);
OKPP;
@@ -246,7 +252,8 @@
static void
-connect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+connect_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
{
@@ -254,7 +261,8 @@
return;
}
con_task =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &connect_task,
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+ &connect_task,
NULL);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Asking transport (1) to connect to peer `%4s'\n",
@@ -269,7 +277,8 @@
{
struct PeerContext *p = cls;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Core connection to `%4s'
established\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Core connection to `%4s' established\n",
GNUNET_i2s (my_identity));
p->id = *my_identity;
if (cls == &p1)
@@ -293,7 +302,8 @@
static void
-setup_peer (struct PeerContext *p, const char *cfgname)
+setup_peer (struct PeerContext *p,
+ const char *cfgname)
{
char *binary;
@@ -314,7 +324,9 @@
static void
-run (void *cls, char *const *args, const char *cfgfile,
+run (void *cls,
+ char *const *args,
+ const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
GNUNET_assert (ok == 1);
@@ -326,9 +338,13 @@
(GNUNET_TIME_UNIT_SECONDS, 300),
&terminate_task_error, NULL);
p1.ch =
- GNUNET_CORE_connect (p1.cfg, &p1, &init_notify, &connect_notify,
- &disconnect_notify, &inbound_notify, GNUNET_YES,
- &outbound_notify, GNUNET_YES, handlers);
+ GNUNET_CORE_connect (p1.cfg, &p1,
+ &init_notify,
+ &connect_notify,
+ &disconnect_notify,
+ &inbound_notify, GNUNET_YES,
+ &outbound_notify, GNUNET_YES,
+ handlers);
}
Modified: gnunet/src/core/test_core_defaults.conf
===================================================================
--- gnunet/src/core/test_core_defaults.conf 2015-03-23 16:07:42 UTC (rev
35424)
+++ gnunet/src/core/test_core_defaults.conf 2015-03-23 16:48:18 UTC (rev
35425)
@@ -1,4 +1,5 @@
@INLINE@ ../../contrib/no_forcestart.conf
address@hidden@ ../../contrib/no_autostart_above_core.conf
[PATHS]
GNUNET_TEST_HOME = /tmp/test-gnunet-core/
@@ -24,4 +25,3 @@
[peerinfo]
NO_IO = YES
-
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r35425 - gnunet/src/core,
gnunet <=