[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r13678 - gnunet/src/core
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r13678 - gnunet/src/core |
|
Date: |
Sun, 14 Nov 2010 14:37:10 +0100 |
Author: grothoff
Date: 2010-11-14 14:37:09 +0100 (Sun, 14 Nov 2010)
New Revision: 13678
Modified:
gnunet/src/core/test_core_api.c
gnunet/src/core/test_core_api_reliability.c
gnunet/src/core/test_core_api_start_only.c
Log:
fix
Modified: gnunet/src/core/test_core_api.c
===================================================================
--- gnunet/src/core/test_core_api.c 2010-11-14 13:31:59 UTC (rev 13677)
+++ gnunet/src/core/test_core_api.c 2010-11-14 13:37:09 UTC (rev 13678)
@@ -34,7 +34,7 @@
#include "gnunet_scheduler_lib.h"
#include "gnunet_transport_service.h"
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
#define START_ARM GNUNET_YES
Modified: gnunet/src/core/test_core_api_reliability.c
===================================================================
--- gnunet/src/core/test_core_api_reliability.c 2010-11-14 13:31:59 UTC (rev
13677)
+++ gnunet/src/core/test_core_api_reliability.c 2010-11-14 13:37:09 UTC (rev
13678)
@@ -65,6 +65,9 @@
static struct GNUNET_TIME_Absolute start_time;
+static GNUNET_SCHEDULER_TaskIdentifier err_task;
+
+
struct PeerContext
{
struct GNUNET_CONFIGURATION_Handle *cfg;
@@ -84,6 +87,9 @@
static int ok;
+static int32_t tr_n;
+
+
#if VERBOSE
#define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok,
__FILE__, __LINE__); } while (0)
#else
@@ -145,17 +151,99 @@
}
+static size_t
+transmit_ready (void *cls, size_t size, void *buf)
+{
+ char *cbuf = buf;
+ struct TestMessage hdr;
+ unsigned int s;
+ unsigned int ret;
+
+ GNUNET_assert (size <= GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE);
+ if (buf == NULL)
+ {
+ if (p1.ch != NULL)
+ GNUNET_break (NULL !=
+ GNUNET_CORE_notify_transmit_ready (p1.ch,
+ 0,
+ FAST_TIMEOUT,
+ &p2.id,
+ get_size(tr_n),
+ &transmit_ready, &p1));
+ return 0;
+ }
+ GNUNET_assert (tr_n < TOTAL_MSGS);
+ ret = 0;
+ s = get_size (tr_n);
+ GNUNET_assert (size >= s);
+ GNUNET_assert (buf != NULL);
+ cbuf = buf;
+ do
+ {
+#if VERBOSE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending message %u of size %u at offset %u\n",
+ tr_n,
+ s,
+ ret);
+#endif
+ hdr.header.size = htons (s);
+ hdr.header.type = htons (MTYPE);
+ hdr.num = htonl (tr_n);
+ memcpy (&cbuf[ret], &hdr, sizeof (struct TestMessage));
+ ret += sizeof (struct TestMessage);
+ memset (&cbuf[ret], tr_n, s - sizeof (struct TestMessage));
+ ret += s - sizeof (struct TestMessage);
+ tr_n++;
+ s = get_size (tr_n);
+ if (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16))
+ break; /* sometimes pack buffer full, sometimes not */
+ }
+ while (size - ret >= s);
+ GNUNET_SCHEDULER_cancel (err_task);
+ err_task =
+ GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+ &terminate_task_error,
+ NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Returning total message block of size %u\n",
+ ret);
+ total_bytes += ret;
+ return ret;
+}
+
+
+
static void
connect_notify (void *cls,
const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_TRANSPORT_ATS_Information *atsi)
{
struct PeerContext *pc = cls;
+
GNUNET_assert (pc->connect_status == 0);
pc->connect_status = 1;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Encrypted connection established to peer `%4s'\n",
- GNUNET_i2s (peer));
+ if (pc == &p1)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Encrypted connection established to peer `%4s'\n",
+ GNUNET_i2s (peer));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Asking core (1) for transmission to peer `%4s'\n",
+ GNUNET_i2s (&p2.id));
+ err_task =
+ GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+ &terminate_task_error,
+ NULL);
+ start_time = GNUNET_TIME_absolute_get ();
+ GNUNET_break (NULL !=
+ GNUNET_CORE_notify_transmit_ready (p1.ch,
+ 0,
+ TIMEOUT,
+ &p2.id,
+ get_size (0),
+ &transmit_ready, &p1));
+ }
}
@@ -199,15 +287,9 @@
}
-static GNUNET_SCHEDULER_TaskIdentifier err_task;
-
-
static size_t
transmit_ready (void *cls, size_t size, void *buf);
-static int tr_n;
-
-
static int
process_mtype (void *cls,
const struct GNUNET_PeerIdentity *peer,
@@ -279,69 +361,7 @@
};
-static size_t
-transmit_ready (void *cls, size_t size, void *buf)
-{
- char *cbuf = buf;
- struct TestMessage hdr;
- unsigned int s;
- unsigned int ret;
- GNUNET_assert (size <= GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE);
- if (buf == NULL)
- {
- if (p1.ch != NULL)
- GNUNET_break (NULL !=
- GNUNET_CORE_notify_transmit_ready (p1.ch,
- 0,
- FAST_TIMEOUT,
- &p2.id,
- get_size(tr_n),
- &transmit_ready, &p1));
- return 0;
- }
- GNUNET_assert (tr_n < TOTAL_MSGS);
- ret = 0;
- s = get_size (tr_n);
- GNUNET_assert (size >= s);
- GNUNET_assert (buf != NULL);
- cbuf = buf;
- do
- {
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending message %u of size %u at offset %u\n",
- tr_n,
- s,
- ret);
-#endif
- hdr.header.size = htons (s);
- hdr.header.type = htons (MTYPE);
- hdr.num = htonl (tr_n);
- memcpy (&cbuf[ret], &hdr, sizeof (struct TestMessage));
- ret += sizeof (struct TestMessage);
- memset (&cbuf[ret], tr_n, s - sizeof (struct TestMessage));
- ret += s - sizeof (struct TestMessage);
- tr_n++;
- s = get_size (tr_n);
- if (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16))
- break; /* sometimes pack buffer full, sometimes not */
- }
- while (size - ret >= s);
- GNUNET_SCHEDULER_cancel (err_task);
- err_task =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT,
- &terminate_task_error,
- NULL);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Returning total message block of size %u\n",
- ret);
- total_bytes += ret;
- return ret;
-}
-
-
-
static void
init_notify (void *cls,
struct GNUNET_CORE_Handle *server,
@@ -377,20 +397,12 @@
OKPP;
GNUNET_assert (cls == &p2);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Asking core (1) for transmission to peer `%4s'\n",
+ "Asking core (1) to connect to peer `%4s'\n",
GNUNET_i2s (&p2.id));
- err_task =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT,
- &terminate_task_error,
- NULL);
- start_time = GNUNET_TIME_absolute_get ();
- GNUNET_break (NULL !=
- GNUNET_CORE_notify_transmit_ready (p1.ch,
- 0,
- TIMEOUT,
- &p2.id,
- get_size (0),
- &transmit_ready, &p1));
+ GNUNET_CORE_peer_request_connect (p1.ch,
+ GNUNET_TIME_UNIT_SECONDS,
+ &p2.id,
+ NULL, NULL);
}
}
Modified: gnunet/src/core/test_core_api_start_only.c
===================================================================
--- gnunet/src/core/test_core_api_start_only.c 2010-11-14 13:31:59 UTC (rev
13677)
+++ gnunet/src/core/test_core_api_start_only.c 2010-11-14 13:37:09 UTC (rev
13678)
@@ -31,7 +31,7 @@
#include "gnunet_program_lib.h"
#include "gnunet_scheduler_lib.h"
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
#define START_ARM GNUNET_YES
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r13678 - gnunet/src/core,
gnunet <=