[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r14044 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r14044 - gnunet/src/transport |
Date: |
Thu, 23 Dec 2010 14:03:34 +0100 |
Author: wachs
Date: 2010-12-23 14:03:34 +0100 (Thu, 23 Dec 2010)
New Revision: 14044
Modified:
gnunet/src/transport/test_quota_compliance.c
gnunet/src/transport/test_transport_api_reliability.c
Log:
changed reliability to cancel notify_transmit_ready
Modified: gnunet/src/transport/test_quota_compliance.c
===================================================================
--- gnunet/src/transport/test_quota_compliance.c 2010-12-23 12:41:08 UTC
(rev 14043)
+++ gnunet/src/transport/test_quota_compliance.c 2010-12-23 13:03:34 UTC
(rev 14044)
@@ -148,7 +148,7 @@
static GNUNET_SCHEDULER_TaskIdentifier measurement_task;
static GNUNET_SCHEDULER_TaskIdentifier measurement_counter_task;
-struct GNUNET_TRANSPORT_TransmitHandle * transmit_handle;
+static struct GNUNET_TRANSPORT_TransmitHandle * transmit_handle;
#define OKPP do { ok++; } while (0)
Modified: gnunet/src/transport/test_transport_api_reliability.c
===================================================================
--- gnunet/src/transport/test_transport_api_reliability.c 2010-12-23
12:41:08 UTC (rev 14043)
+++ gnunet/src/transport/test_transport_api_reliability.c 2010-12-23
13:03:34 UTC (rev 14044)
@@ -100,8 +100,8 @@
static int msg_sent;
static int msg_recv_expected;
static int msg_recv;
+static struct GNUNET_TRANSPORT_TransmitHandle * transmit_handle;
-
#if VERBOSE
#define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok,
__FILE__, __LINE__); } while (0)
#else
@@ -351,6 +351,11 @@
if (connected == 2)
{
+
+ if ((transmit_handle!=NULL) && (cls == NULL))
+ GNUNET_TRANSPORT_notify_transmit_ready_cancel(transmit_handle);
+ if ((transmit_handle!=NULL) && (cls == &transmit_handle))
+ transmit_handle==NULL;
GNUNET_TRANSPORT_notify_transmit_ready (p2.th,
&p1.id,
get_size (0), 0, TIMEOUT,
@@ -466,7 +471,7 @@
const struct GNUNET_MessageHeader *message)
{
struct PeerContext *me = cls;
-
+ transmit_handle = NULL;
GNUNET_TRANSPORT_get_hello_cancel (p2.th, &exchange_hello_last, me);
#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -479,12 +484,12 @@
GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *)
message, &me->id));
- GNUNET_assert(NULL != GNUNET_TRANSPORT_notify_transmit_ready (p2.th,
+ GNUNET_assert(NULL != (transmit_handle =
GNUNET_TRANSPORT_notify_transmit_ready (p2.th,
&p1.id,
sizeof (struct
GNUNET_MessageHeader), 0,
TIMEOUT,
¬ify_ready_connect,
- NULL));
+ &transmit_handle)));
/* both HELLOs exchanged, get ready to test transmission! */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r14044 - gnunet/src/transport,
gnunet <=