aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-10-26 07:13:55 +0000
committerChristian Grothoff <christian@grothoff.org>2011-10-26 07:13:55 +0000
commit69e51a4440604a7b75189f602bbea8f0f5ec2008 (patch)
treea0abe4b98fd97f0d5726ed773bc58c93e52d2a08 /src
parent913f88d980ef4fcc4153336042387a17ad8e428b (diff)
downloadgnunet-69e51a4440604a7b75189f602bbea8f0f5ec2008.tar.gz
gnunet-69e51a4440604a7b75189f602bbea8f0f5ec2008.zip
fix
Diffstat (limited to 'src')
-rw-r--r--src/chat/gnunet-service-chat.c24
1 files changed, 18 insertions, 6 deletions
diff --git a/src/chat/gnunet-service-chat.c b/src/chat/gnunet-service-chat.c
index a70017759..a3637e454 100644
--- a/src/chat/gnunet-service-chat.c
+++ b/src/chat/gnunet-service-chat.c
@@ -981,6 +981,7 @@ handle_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client)
981 * @param other the other peer involved 981 * @param other the other peer involved
982 * @param message the actual message 982 * @param message the actual message
983 * @param atsi performance information 983 * @param atsi performance information
984 * @param atsi_count number of entries in atsi
984 * @return GNUNET_OK to keep the connection open, 985 * @return GNUNET_OK to keep the connection open,
985 * GNUNET_SYSERR to close it (signal serious error) 986 * GNUNET_SYSERR to close it (signal serious error)
986 */ 987 */
@@ -989,7 +990,8 @@ handle_p2p_join_notification (void *cls,
989 const struct GNUNET_PeerIdentity *other, 990 const struct GNUNET_PeerIdentity *other,
990 const struct GNUNET_MessageHeader *message, 991 const struct GNUNET_MessageHeader *message,
991 const struct GNUNET_ATS_Information 992 const struct GNUNET_ATS_Information
992 *atsi) 993 *atsi,
994 unsigned int atsi_count)
993{ 995{
994 const struct P2PJoinNotificationMessage *p2p_jnmsg; 996 const struct P2PJoinNotificationMessage *p2p_jnmsg;
995 char *room_name; 997 char *room_name;
@@ -1097,6 +1099,7 @@ handle_p2p_join_notification (void *cls,
1097 * @param other the other peer involved 1099 * @param other the other peer involved
1098 * @param message the actual message 1100 * @param message the actual message
1099 * @param atsi performance information 1101 * @param atsi performance information
1102 * @param atsi_count number of entries in atsi
1100 * @return GNUNET_OK to keep the connection open, 1103 * @return GNUNET_OK to keep the connection open,
1101 * GNUNET_SYSERR to close it (signal serious error) 1104 * GNUNET_SYSERR to close it (signal serious error)
1102 */ 1105 */
@@ -1105,7 +1108,8 @@ handle_p2p_leave_notification (void *cls,
1105 const struct GNUNET_PeerIdentity *other, 1108 const struct GNUNET_PeerIdentity *other,
1106 const struct GNUNET_MessageHeader *message, 1109 const struct GNUNET_MessageHeader *message,
1107 const struct GNUNET_ATS_Information 1110 const struct GNUNET_ATS_Information
1108 *atsi) 1111 *atsi,
1112 unsigned int atsi_count)
1109{ 1113{
1110 const struct P2PLeaveNotificationMessage *p2p_lnmsg; 1114 const struct P2PLeaveNotificationMessage *p2p_lnmsg;
1111 GNUNET_HashCode id; 1115 GNUNET_HashCode id;
@@ -1178,6 +1182,7 @@ handle_p2p_leave_notification (void *cls,
1178 * @param other the other peer involved 1182 * @param other the other peer involved
1179 * @param message the actual message 1183 * @param message the actual message
1180 * @param atsi performance information 1184 * @param atsi performance information
1185 * @param atsi_count number of entries in atsi
1181 * @return GNUNET_OK to keep the connection open, 1186 * @return GNUNET_OK to keep the connection open,
1182 * GNUNET_SYSERR to close it (signal serious error) 1187 * GNUNET_SYSERR to close it (signal serious error)
1183 */ 1188 */
@@ -1186,7 +1191,8 @@ handle_p2p_message_notification (void *cls,
1186 const struct GNUNET_PeerIdentity *other, 1191 const struct GNUNET_PeerIdentity *other,
1187 const struct GNUNET_MessageHeader *message, 1192 const struct GNUNET_MessageHeader *message,
1188 const struct GNUNET_ATS_Information 1193 const struct GNUNET_ATS_Information
1189 *atsi) 1194 *atsi,
1195 unsigned int atsi_count)
1190{ 1196{
1191 const struct P2PReceiveNotificationMessage *p2p_rnmsg; 1197 const struct P2PReceiveNotificationMessage *p2p_rnmsg;
1192 struct P2PReceiveNotificationMessage *my_p2p_rnmsg; 1198 struct P2PReceiveNotificationMessage *my_p2p_rnmsg;
@@ -1329,13 +1335,15 @@ handle_p2p_message_notification (void *cls,
1329 * @param other the other peer involved 1335 * @param other the other peer involved
1330 * @param message the actual message 1336 * @param message the actual message
1331 * @param atsi performance information 1337 * @param atsi performance information
1338 * @param atsi_count number of entries in atsi
1332 * @return GNUNET_OK to keep the connection open, 1339 * @return GNUNET_OK to keep the connection open,
1333 * GNUNET_SYSERR to close it (signal serious error) 1340 * GNUNET_SYSERR to close it (signal serious error)
1334 */ 1341 */
1335static int 1342static int
1336handle_p2p_sync_request (void *cls, const struct GNUNET_PeerIdentity *other, 1343handle_p2p_sync_request (void *cls, const struct GNUNET_PeerIdentity *other,
1337 const struct GNUNET_MessageHeader *message, 1344 const struct GNUNET_MessageHeader *message,
1338 const struct GNUNET_ATS_Information *atsi) 1345 const struct GNUNET_ATS_Information *atsi,
1346 unsigned int atsi_count)
1339{ 1347{
1340 struct ChatClient *entry; 1348 struct ChatClient *entry;
1341 struct GNUNET_CORE_TransmitHandle *th; 1349 struct GNUNET_CORE_TransmitHandle *th;
@@ -1370,6 +1378,7 @@ handle_p2p_sync_request (void *cls, const struct GNUNET_PeerIdentity *other,
1370 * @param other the other peer involved 1378 * @param other the other peer involved
1371 * @param message the actual message 1379 * @param message the actual message
1372 * @param atsi performance information 1380 * @param atsi performance information
1381 * @param atsi_count number of entries in atsi
1373 * @return GNUNET_OK to keep the connection open, 1382 * @return GNUNET_OK to keep the connection open,
1374 * GNUNET_SYSERR to close it (signal serious error) 1383 * GNUNET_SYSERR to close it (signal serious error)
1375 */ 1384 */
@@ -1378,7 +1387,8 @@ handle_p2p_confirmation_receipt (void *cls,
1378 const struct GNUNET_PeerIdentity *other, 1387 const struct GNUNET_PeerIdentity *other,
1379 const struct GNUNET_MessageHeader *message, 1388 const struct GNUNET_MessageHeader *message,
1380 const struct GNUNET_ATS_Information 1389 const struct GNUNET_ATS_Information
1381 *atsi) 1390 *atsi,
1391 unsigned int atsi_count)
1382{ 1392{
1383 const struct P2PConfirmationReceiptMessage *p2p_crmsg; 1393 const struct P2PConfirmationReceiptMessage *p2p_crmsg;
1384 struct P2PConfirmationReceiptMessage *my_p2p_crmsg; 1394 struct P2PConfirmationReceiptMessage *my_p2p_crmsg;
@@ -1515,10 +1525,12 @@ transmit_sync_request_to_peer (void *cls, size_t size, void *buf)
1515 * @param cls closure 1525 * @param cls closure
1516 * @param peer peer identity this notification is about 1526 * @param peer peer identity this notification is about
1517 * @param atsi performance data 1527 * @param atsi performance data
1528 * @param atsi_count number of entries in atsi
1518 */ 1529 */
1519static void 1530static void
1520peer_connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer, 1531peer_connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer,
1521 const struct GNUNET_ATS_Information *atsi) 1532 const struct GNUNET_ATS_Information *atsi,
1533 unsigned int atsi_count)
1522{ 1534{
1523 struct ConnectedPeer *cp; 1535 struct ConnectedPeer *cp;
1524 struct GNUNET_CORE_TransmitHandle *th; 1536 struct GNUNET_CORE_TransmitHandle *th;