[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33753 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r33753 - gnunet/src/transport |
Date: |
Sun, 22 Jun 2014 22:13:41 +0200 |
Author: grothoff
Date: 2014-06-22 22:13:41 +0200 (Sun, 22 Jun 2014)
New Revision: 33753
Modified:
gnunet/src/transport/transport_api.c
Log:
-doxygen, cleanup
Modified: gnunet/src/transport/transport_api.c
===================================================================
--- gnunet/src/transport/transport_api.c 2014-06-22 20:10:39 UTC (rev
33752)
+++ gnunet/src/transport/transport_api.c 2014-06-22 20:13:41 UTC (rev
33753)
@@ -195,20 +195,36 @@
*/
struct GNUNET_TRANSPORT_TryConnectHandle *next;
+ /**
+ *
+ */
struct GNUNET_PeerIdentity pid;
+ /**
+ *
+ */
struct GNUNET_TRANSPORT_Handle *th;
+ /**
+ *
+ */
struct GNUNET_TRANSPORT_TransmitHandle *tth;
+ /**
+ *
+ */
GNUNET_TRANSPORT_TryConnectCallback cb;
- int connect;
-
/**
* Closure for @e cb.
*/
void *cb_cls;
+
+ /**
+ *
+ */
+ int connect;
+
};
@@ -227,10 +243,19 @@
*/
struct GNUNET_TRANSPORT_OfferHelloHandle *next;
+ /**
+ *
+ */
struct GNUNET_TRANSPORT_Handle *th;
+ /**
+ *
+ */
struct GNUNET_TRANSPORT_TransmitHandle *tth;
+ /**
+ *
+ */
GNUNET_SCHEDULER_Task cont;
/**
@@ -238,6 +263,9 @@
*/
void *cls;
+ /**
+ *
+ */
struct GNUNET_MessageHeader *msg;
};
@@ -385,7 +413,6 @@
};
-
/**
* Schedule the task to send one message, either from the control
* list or the peer message queues to the service.
@@ -535,7 +562,8 @@
* @param msg message received, NULL on timeout or fatal error
*/
static void
-demultiplexer (void *cls, const struct GNUNET_MessageHeader *msg)
+demultiplexer (void *cls,
+ const struct GNUNET_MessageHeader *msg)
{
struct GNUNET_TRANSPORT_Handle *h = cls;
const struct DisconnectInfoMessage *dim;
@@ -1134,7 +1162,6 @@
}
-
/**
* Send REQUEST_CONNECT message to the service.
*
@@ -1178,6 +1205,7 @@
return sizeof (struct TransportRequestConnectMessage);
}
+
/**
* Ask the transport service to establish a connection to
* the given peer.
@@ -1196,10 +1224,10 @@
GNUNET_TRANSPORT_TryConnectCallback cb,
void *cb_cls)
{
- struct GNUNET_TRANSPORT_TryConnectHandle *tch = NULL;
+ struct GNUNET_TRANSPORT_TryConnectHandle *tch;
if (NULL == handle->client)
- return NULL;
+ return NULL;
tch = GNUNET_new (struct GNUNET_TRANSPORT_TryConnectHandle);
tch->th = handle;
tch->pid = *(target);
@@ -1209,7 +1237,9 @@
tch->tth = schedule_control_transmit (handle,
sizeof (struct
TransportRequestConnectMessage),
&send_try_connect, tch);
- GNUNET_CONTAINER_DLL_insert(handle->tc_head, handle->tc_tail, tch);
+ GNUNET_CONTAINER_DLL_insert (handle->tc_head,
+ handle->tc_tail,
+ tch);
return tch;
}
@@ -1232,6 +1262,7 @@
GNUNET_free (tch);
}
+
/**
* Ask the transport service to shutdown a connection to
* the given peer.
@@ -1240,20 +1271,20 @@
* @param target who we should try to connect to
* @param cb callback to be called when request was transmitted to transport
* service
- * @param cb_cls closure for the callback
+ * @param cb_cls closure for the callback @a cb
* @return a `struct GNUNET_TRANSPORT_TryConnectHandle` handle or
* NULL on failure (cb will not be called)
*/
struct GNUNET_TRANSPORT_TryConnectHandle *
GNUNET_TRANSPORT_try_disconnect (struct GNUNET_TRANSPORT_Handle *handle,
- const struct GNUNET_PeerIdentity *target,
- GNUNET_TRANSPORT_TryConnectCallback cb,
- void *cb_cls)
+ const struct GNUNET_PeerIdentity *target,
+ GNUNET_TRANSPORT_TryConnectCallback cb,
+ void *cb_cls)
{
- struct GNUNET_TRANSPORT_TryConnectHandle *tch = NULL;
+ struct GNUNET_TRANSPORT_TryConnectHandle *tch;
if (NULL == handle->client)
- return NULL;
+ return NULL;
tch = GNUNET_new (struct GNUNET_TRANSPORT_TryConnectHandle);
tch->th = handle;
tch->pid = *(target);
@@ -1263,7 +1294,9 @@
tch->tth = schedule_control_transmit (handle,
sizeof (struct
TransportRequestConnectMessage),
&send_try_connect, tch);
- GNUNET_CONTAINER_DLL_insert(handle->tc_head, handle->tc_tail, tch);
+ GNUNET_CONTAINER_DLL_insert (handle->tc_head,
+ handle->tc_tail,
+ tch);
return tch;
}
@@ -1278,8 +1311,8 @@
GNUNET_TRANSPORT_try_disconnect_cancel (struct
GNUNET_TRANSPORT_TryConnectHandle *tch)
{
struct GNUNET_TRANSPORT_Handle *th;
+
GNUNET_assert (GNUNET_NO == tch->connect);
-
th = tch->th;
cancel_control_transmit (th, tch->tth);
GNUNET_CONTAINER_DLL_remove (th->tc_head, th->tc_tail, tch);
@@ -1287,8 +1320,6 @@
}
-
-
/**
* Send HELLO message to the service.
*
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33753 - gnunet/src/transport,
gnunet <=