[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33831 - gnunet/src/cadet
From: |
gnunet |
Subject: |
[GNUnet-SVN] r33831 - gnunet/src/cadet |
Date: |
Tue, 24 Jun 2014 16:44:16 +0200 |
Author: bartpolot
Date: 2014-06-24 16:44:15 +0200 (Tue, 24 Jun 2014)
New Revision: 33831
Modified:
gnunet/src/cadet/gnunet-service-cadet_connection.c
gnunet/src/cadet/gnunet-service-cadet_tunnel.c
Log:
- check return values from GCC_send_prebuilt_message
Modified: gnunet/src/cadet/gnunet-service-cadet_connection.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_connection.c 2014-06-24 13:23:06 UTC
(rev 33830)
+++ gnunet/src/cadet/gnunet-service-cadet_connection.c 2014-06-24 14:44:15 UTC
(rev 33831)
@@ -538,10 +538,10 @@
msg.ack = htonl (ack);
msg.cid = c->id;
- prev_fc->ack_msg = GCC_send_prebuilt_message (&msg.header,
- GNUNET_MESSAGE_TYPE_CADET_ACK,
- ack, c, !fwd, GNUNET_YES,
+ prev_fc->ack_msg = GCC_send_prebuilt_message (&msg.header, 0, ack, c,
+ !fwd, GNUNET_YES,
&ack_sent, prev_fc);
+ GNUNET_assert (NULL != prev_fc->ack_msg);
}
@@ -840,9 +840,8 @@
msg.cid = c->id;
msg.peer1 = *id1;
msg.peer2 = *id2;
- GCC_send_prebuilt_message (&msg.header,
- GNUNET_MESSAGE_TYPE_CADET_CONNECTION_BROKEN, 0,
- c, fwd, GNUNET_YES, NULL, NULL);
+ GNUNET_assert (NULL == GCC_send_prebuilt_message (&msg.header, 0, 0, c, fwd,
+ GNUNET_YES, NULL, NULL));
}
@@ -1234,11 +1233,9 @@
msg.pid = htonl (fc->last_pid_sent);
LOG (GNUNET_ERROR_TYPE_DEBUG, " *** last pid sent: %u!\n",
fc->last_pid_sent);
fc->poll_msg =
- GCC_send_prebuilt_message (&msg.header,
- GNUNET_MESSAGE_TYPE_CADET_POLL,
- fc->last_pid_sent,
- c, fc == &c->fwd_fc, GNUNET_YES,
- &poll_sent, fc);
+ GCC_send_prebuilt_message (&msg.header, 0, fc->last_pid_sent, c,
+ fc == &c->fwd_fc, GNUNET_YES, &poll_sent, fc);
+ GNUNET_assert (NULL != fc->poll_msg);
}
@@ -1640,10 +1637,9 @@
LOG (GNUNET_ERROR_TYPE_DEBUG, " Retransmitting.\n");
GCP_add_path (dest_peer, path_duplicate (path), GNUNET_NO);
GCP_add_path_to_origin (orig_peer, path_duplicate (path), GNUNET_NO);
- GCC_send_prebuilt_message (message,
- GNUNET_MESSAGE_TYPE_CADET_CONNECTION_CREATE, 0,
- c, GNUNET_YES, GNUNET_YES,
- NULL, NULL);
+ GNUNET_assert (NULL == GCC_send_prebuilt_message (message, 0, 0, c,
+ GNUNET_YES, GNUNET_YES,
+ NULL, NULL));
}
path_destroy (path);
return GNUNET_OK;
@@ -1771,9 +1767,8 @@
}
LOG (GNUNET_ERROR_TYPE_DEBUG, " not for us, retransmitting...\n");
- GCC_send_prebuilt_message (message,
- GNUNET_MESSAGE_TYPE_CADET_CONNECTION_ACK, 0,
- c, fwd, GNUNET_YES, NULL, NULL);
+ GNUNET_assert (NULL == GCC_send_prebuilt_message (message, 0, 0, c, fwd,
+ GNUNET_YES, NULL, NULL));
return GNUNET_OK;
}
@@ -1833,9 +1828,8 @@
}
else
{
- GCC_send_prebuilt_message (message,
- GNUNET_MESSAGE_TYPE_CADET_CONNECTION_BROKEN, 0,
- c, fwd, GNUNET_YES, NULL, NULL);
+ GNUNET_assert (NULL == GCC_send_prebuilt_message (message, 0, 0, c, fwd,
+ GNUNET_YES, NULL, NULL));
c->destroy = GNUNET_YES;
connection_cancel_queues (c, !fwd);
}
@@ -1884,9 +1878,8 @@
return GNUNET_OK;
}
if (GNUNET_NO == GCC_is_terminal (c, fwd))
- GCC_send_prebuilt_message (message,
- GNUNET_MESSAGE_TYPE_CADET_CONNECTION_DESTROY, 0,
- c, fwd, GNUNET_YES, NULL, NULL);
+ GNUNET_assert (NULL == GCC_send_prebuilt_message (message, 0, 0, c, fwd,
+ GNUNET_YES, NULL, NULL));
else if (0 == c->pending_messages)
{
LOG (GNUNET_ERROR_TYPE_DEBUG, " directly destroying connection!\n");
@@ -2030,9 +2023,8 @@
}
GNUNET_STATISTICS_update (stats, "# messages forwarded", 1, GNUNET_NO);
- GCC_send_prebuilt_message (&msg->header,
- GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED, 0,
- c, fwd, GNUNET_NO, NULL, NULL);
+ GNUNET_assert (NULL == GCC_send_prebuilt_message (&msg->header, 0, 0, c, fwd,
+ GNUNET_NO, NULL, NULL));
return GNUNET_OK;
}
@@ -2131,8 +2123,8 @@
/* Message not for us: forward to next hop */
LOG (GNUNET_ERROR_TYPE_DEBUG, " not for us, retransmitting...\n");
GNUNET_STATISTICS_update (stats, "# messages forwarded", 1, GNUNET_NO);
- GCC_send_prebuilt_message (&msg->header, GNUNET_MESSAGE_TYPE_CADET_KX, 0,
- c, fwd, GNUNET_NO, NULL, NULL);
+ GNUNET_assert (NULL == GCC_send_prebuilt_message (&msg->header, 0, 0, c, fwd,
+ GNUNET_NO, NULL, NULL));
return GNUNET_OK;
}
@@ -3084,20 +3076,20 @@
return;
msg.header.size = htons (sizeof (msg));
- msg.header.type = htons (GNUNET_MESSAGE_TYPE_CADET_CONNECTION_DESTROY);;
+ msg.header.type = htons (GNUNET_MESSAGE_TYPE_CADET_CONNECTION_DESTROY);
msg.cid = c->id;
LOG (GNUNET_ERROR_TYPE_DEBUG,
" sending connection destroy for connection %s\n",
GCC_2s (c));
if (GNUNET_NO == GCC_is_terminal (c, GNUNET_YES))
- GCC_send_prebuilt_message (&msg.header,
- GNUNET_MESSAGE_TYPE_CADET_CONNECTION_DESTROY, 0,
- c, GNUNET_YES, GNUNET_YES, NULL, NULL);
+ GNUNET_assert (NULL == GCC_send_prebuilt_message (&msg.header, 0, 0, c,
+ GNUNET_YES, GNUNET_YES,
+ NULL, NULL));
if (GNUNET_NO == GCC_is_terminal (c, GNUNET_NO))
- GCC_send_prebuilt_message (&msg.header,
- GNUNET_MESSAGE_TYPE_CADET_CONNECTION_DESTROY, 0,
- c, GNUNET_NO, GNUNET_YES, NULL, NULL);
+ GNUNET_assert (NULL == GCC_send_prebuilt_message (&msg.header, 0, 0, c,
+ GNUNET_NO, GNUNET_YES,
+ NULL, NULL));
c->destroy = GNUNET_YES;
c->state = CADET_CONNECTION_DESTROYED;
}
Modified: gnunet/src/cadet/gnunet-service-cadet_tunnel.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_tunnel.c 2014-06-24 13:23:06 UTC
(rev 33830)
+++ gnunet/src/cadet/gnunet-service-cadet_tunnel.c 2014-06-24 14:44:15 UTC
(rev 33831)
@@ -1107,9 +1107,8 @@
if (NULL == cont)
{
- GNUNET_break (NULL ==
- GCC_send_prebuilt_message (&msg->header, type, mid,
- c, fwd, force, NULL, NULL));
+ GNUNET_break (NULL == GCC_send_prebuilt_message (&msg->header, type, mid,
c,
+ fwd, force, NULL, NULL));
return NULL;
}
if (NULL == existing_q)
@@ -1123,6 +1122,7 @@
}
tq->cq = GCC_send_prebuilt_message (&msg->header, type, mid, c, fwd, force,
&tun_message_sent, tq);
+ GNUNET_assert (NULL != tq->cq);
tq->cont = cont;
tq->cont_cls = cont_cls;
@@ -1248,8 +1248,9 @@
fwd = GCC_is_origin (t->connection_head->c, GNUNET_YES);
/* TODO save handle and cancel in case of a unneeded retransmission */
- GCC_send_prebuilt_message (&msg->header, GNUNET_MESSAGE_TYPE_CADET_KX,
- message->type, c, fwd, GNUNET_YES, NULL, NULL);
+ GNUNET_assert (NULL == GCC_send_prebuilt_message (&msg->header, type, 0, c,
+ fwd, GNUNET_YES,
+ NULL, NULL));
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33831 - gnunet/src/cadet,
gnunet <=