diff options
Diffstat (limited to 'src/chat/gnunet-service-chat.c')
-rw-r--r-- | src/chat/gnunet-service-chat.c | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/src/chat/gnunet-service-chat.c b/src/chat/gnunet-service-chat.c index a3637e454..fb127b2f0 100644 --- a/src/chat/gnunet-service-chat.c +++ b/src/chat/gnunet-service-chat.c | |||
@@ -989,9 +989,8 @@ static int | |||
989 | handle_p2p_join_notification (void *cls, | 989 | handle_p2p_join_notification (void *cls, |
990 | const struct GNUNET_PeerIdentity *other, | 990 | const struct GNUNET_PeerIdentity *other, |
991 | const struct GNUNET_MessageHeader *message, | 991 | const struct GNUNET_MessageHeader *message, |
992 | const struct GNUNET_ATS_Information | 992 | const struct GNUNET_ATS_Information *atsi, |
993 | *atsi, | 993 | unsigned int atsi_count) |
994 | unsigned int atsi_count) | ||
995 | { | 994 | { |
996 | const struct P2PJoinNotificationMessage *p2p_jnmsg; | 995 | const struct P2PJoinNotificationMessage *p2p_jnmsg; |
997 | char *room_name; | 996 | char *room_name; |
@@ -1107,9 +1106,8 @@ static int | |||
1107 | handle_p2p_leave_notification (void *cls, | 1106 | handle_p2p_leave_notification (void *cls, |
1108 | const struct GNUNET_PeerIdentity *other, | 1107 | const struct GNUNET_PeerIdentity *other, |
1109 | const struct GNUNET_MessageHeader *message, | 1108 | const struct GNUNET_MessageHeader *message, |
1110 | const struct GNUNET_ATS_Information | 1109 | const struct GNUNET_ATS_Information *atsi, |
1111 | *atsi, | 1110 | unsigned int atsi_count) |
1112 | unsigned int atsi_count) | ||
1113 | { | 1111 | { |
1114 | const struct P2PLeaveNotificationMessage *p2p_lnmsg; | 1112 | const struct P2PLeaveNotificationMessage *p2p_lnmsg; |
1115 | GNUNET_HashCode id; | 1113 | GNUNET_HashCode id; |
@@ -1190,9 +1188,8 @@ static int | |||
1190 | handle_p2p_message_notification (void *cls, | 1188 | handle_p2p_message_notification (void *cls, |
1191 | const struct GNUNET_PeerIdentity *other, | 1189 | const struct GNUNET_PeerIdentity *other, |
1192 | const struct GNUNET_MessageHeader *message, | 1190 | const struct GNUNET_MessageHeader *message, |
1193 | const struct GNUNET_ATS_Information | 1191 | const struct GNUNET_ATS_Information *atsi, |
1194 | *atsi, | 1192 | unsigned int atsi_count) |
1195 | unsigned int atsi_count) | ||
1196 | { | 1193 | { |
1197 | const struct P2PReceiveNotificationMessage *p2p_rnmsg; | 1194 | const struct P2PReceiveNotificationMessage *p2p_rnmsg; |
1198 | struct P2PReceiveNotificationMessage *my_p2p_rnmsg; | 1195 | struct P2PReceiveNotificationMessage *my_p2p_rnmsg; |
@@ -1343,7 +1340,7 @@ static int | |||
1343 | handle_p2p_sync_request (void *cls, const struct GNUNET_PeerIdentity *other, | 1340 | handle_p2p_sync_request (void *cls, const struct GNUNET_PeerIdentity *other, |
1344 | const struct GNUNET_MessageHeader *message, | 1341 | const struct GNUNET_MessageHeader *message, |
1345 | const struct GNUNET_ATS_Information *atsi, | 1342 | const struct GNUNET_ATS_Information *atsi, |
1346 | unsigned int atsi_count) | 1343 | unsigned int atsi_count) |
1347 | { | 1344 | { |
1348 | struct ChatClient *entry; | 1345 | struct ChatClient *entry; |
1349 | struct GNUNET_CORE_TransmitHandle *th; | 1346 | struct GNUNET_CORE_TransmitHandle *th; |
@@ -1386,9 +1383,8 @@ static int | |||
1386 | handle_p2p_confirmation_receipt (void *cls, | 1383 | handle_p2p_confirmation_receipt (void *cls, |
1387 | const struct GNUNET_PeerIdentity *other, | 1384 | const struct GNUNET_PeerIdentity *other, |
1388 | const struct GNUNET_MessageHeader *message, | 1385 | const struct GNUNET_MessageHeader *message, |
1389 | const struct GNUNET_ATS_Information | 1386 | const struct GNUNET_ATS_Information *atsi, |
1390 | *atsi, | 1387 | unsigned int atsi_count) |
1391 | unsigned int atsi_count) | ||
1392 | { | 1388 | { |
1393 | const struct P2PConfirmationReceiptMessage *p2p_crmsg; | 1389 | const struct P2PConfirmationReceiptMessage *p2p_crmsg; |
1394 | struct P2PConfirmationReceiptMessage *my_p2p_crmsg; | 1390 | struct P2PConfirmationReceiptMessage *my_p2p_crmsg; |
@@ -1530,7 +1526,7 @@ transmit_sync_request_to_peer (void *cls, size_t size, void *buf) | |||
1530 | static void | 1526 | static void |
1531 | peer_connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer, | 1527 | peer_connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer, |
1532 | const struct GNUNET_ATS_Information *atsi, | 1528 | const struct GNUNET_ATS_Information *atsi, |
1533 | unsigned int atsi_count) | 1529 | unsigned int atsi_count) |
1534 | { | 1530 | { |
1535 | struct ConnectedPeer *cp; | 1531 | struct ConnectedPeer *cp; |
1536 | struct GNUNET_CORE_TransmitHandle *th; | 1532 | struct GNUNET_CORE_TransmitHandle *th; |
@@ -1716,8 +1712,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
1716 | core = | 1712 | core = |
1717 | GNUNET_CORE_connect (cfg, QUEUE_SIZE, NULL, &core_init, | 1713 | GNUNET_CORE_connect (cfg, QUEUE_SIZE, NULL, &core_init, |
1718 | &peer_connect_handler, &peer_disconnect_handler, | 1714 | &peer_connect_handler, &peer_disconnect_handler, |
1719 | NULL, GNUNET_NO, NULL, GNUNET_NO, | 1715 | NULL, GNUNET_NO, NULL, GNUNET_NO, p2p_handlers); |
1720 | p2p_handlers); | ||
1721 | GNUNET_SERVER_disconnect_notify (server, &handle_client_disconnect, NULL); | 1716 | GNUNET_SERVER_disconnect_notify (server, &handle_client_disconnect, NULL); |
1722 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleanup_task, | 1717 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleanup_task, |
1723 | NULL); | 1718 | NULL); |