diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2013-03-21 14:43:47 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2013-03-21 14:43:47 +0000 |
commit | 75c121f5ae37d3c7ccd95f4449aea33ccb4200f0 (patch) | |
tree | 3fb440657f99a826cc4f963db55e28cb426ed9d8 /src/chat | |
parent | eb2371484330014aaef9b0bfac1f1ae191bc2460 (diff) | |
download | gnunet-75c121f5ae37d3c7ccd95f4449aea33ccb4200f0.tar.gz gnunet-75c121f5ae37d3c7ccd95f4449aea33ccb4200f0.zip |
change to core pai
Diffstat (limited to 'src/chat')
-rw-r--r-- | src/chat/gnunet-service-chat.c | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/src/chat/gnunet-service-chat.c b/src/chat/gnunet-service-chat.c index ec988e8fd..e01143cf7 100644 --- a/src/chat/gnunet-service-chat.c +++ b/src/chat/gnunet-service-chat.c | |||
@@ -979,17 +979,14 @@ handle_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client) | |||
979 | * @param cls closure, always NULL | 979 | * @param cls closure, always NULL |
980 | * @param other the other peer involved | 980 | * @param other the other peer involved |
981 | * @param message the actual message | 981 | * @param message the actual message |
982 | * @param atsi performance information | 982 | |
983 | * @param atsi_count number of entries in atsi | ||
984 | * @return GNUNET_OK to keep the connection open, | 983 | * @return GNUNET_OK to keep the connection open, |
985 | * GNUNET_SYSERR to close it (signal serious error) | 984 | * GNUNET_SYSERR to close it (signal serious error) |
986 | */ | 985 | */ |
987 | static int | 986 | static int |
988 | handle_p2p_join_notification (void *cls, | 987 | handle_p2p_join_notification (void *cls, |
989 | const struct GNUNET_PeerIdentity *other, | 988 | const struct GNUNET_PeerIdentity *other, |
990 | const struct GNUNET_MessageHeader *message, | 989 | const struct GNUNET_MessageHeader *message) |
991 | const struct GNUNET_ATS_Information *atsi, | ||
992 | unsigned int atsi_count) | ||
993 | { | 990 | { |
994 | const struct P2PJoinNotificationMessage *p2p_jnmsg; | 991 | const struct P2PJoinNotificationMessage *p2p_jnmsg; |
995 | char *room_name; | 992 | char *room_name; |
@@ -1096,17 +1093,13 @@ handle_p2p_join_notification (void *cls, | |||
1096 | * @param cls closure, always NULL | 1093 | * @param cls closure, always NULL |
1097 | * @param other the other peer involved | 1094 | * @param other the other peer involved |
1098 | * @param message the actual message | 1095 | * @param message the actual message |
1099 | * @param atsi performance information | ||
1100 | * @param atsi_count number of entries in atsi | ||
1101 | * @return GNUNET_OK to keep the connection open, | 1096 | * @return GNUNET_OK to keep the connection open, |
1102 | * GNUNET_SYSERR to close it (signal serious error) | 1097 | * GNUNET_SYSERR to close it (signal serious error) |
1103 | */ | 1098 | */ |
1104 | static int | 1099 | static int |
1105 | handle_p2p_leave_notification (void *cls, | 1100 | handle_p2p_leave_notification (void *cls, |
1106 | const struct GNUNET_PeerIdentity *other, | 1101 | const struct GNUNET_PeerIdentity *other, |
1107 | const struct GNUNET_MessageHeader *message, | 1102 | const struct GNUNET_MessageHeader *message) |
1108 | const struct GNUNET_ATS_Information *atsi, | ||
1109 | unsigned int atsi_count) | ||
1110 | { | 1103 | { |
1111 | const struct P2PLeaveNotificationMessage *p2p_lnmsg; | 1104 | const struct P2PLeaveNotificationMessage *p2p_lnmsg; |
1112 | struct GNUNET_HashCode id; | 1105 | struct GNUNET_HashCode id; |
@@ -1178,17 +1171,13 @@ handle_p2p_leave_notification (void *cls, | |||
1178 | * @param cls closure, always NULL | 1171 | * @param cls closure, always NULL |
1179 | * @param other the other peer involved | 1172 | * @param other the other peer involved |
1180 | * @param message the actual message | 1173 | * @param message the actual message |
1181 | * @param atsi performance information | ||
1182 | * @param atsi_count number of entries in atsi | ||
1183 | * @return GNUNET_OK to keep the connection open, | 1174 | * @return GNUNET_OK to keep the connection open, |
1184 | * GNUNET_SYSERR to close it (signal serious error) | 1175 | * GNUNET_SYSERR to close it (signal serious error) |
1185 | */ | 1176 | */ |
1186 | static int | 1177 | static int |
1187 | handle_p2p_message_notification (void *cls, | 1178 | handle_p2p_message_notification (void *cls, |
1188 | const struct GNUNET_PeerIdentity *other, | 1179 | const struct GNUNET_PeerIdentity *other, |
1189 | const struct GNUNET_MessageHeader *message, | 1180 | const struct GNUNET_MessageHeader *message) |
1190 | const struct GNUNET_ATS_Information *atsi, | ||
1191 | unsigned int atsi_count) | ||
1192 | { | 1181 | { |
1193 | const struct P2PReceiveNotificationMessage *p2p_rnmsg; | 1182 | const struct P2PReceiveNotificationMessage *p2p_rnmsg; |
1194 | struct P2PReceiveNotificationMessage *my_p2p_rnmsg; | 1183 | struct P2PReceiveNotificationMessage *my_p2p_rnmsg; |
@@ -1330,16 +1319,12 @@ handle_p2p_message_notification (void *cls, | |||
1330 | * @param cls closure, always NULL | 1319 | * @param cls closure, always NULL |
1331 | * @param other the other peer involved | 1320 | * @param other the other peer involved |
1332 | * @param message the actual message | 1321 | * @param message the actual message |
1333 | * @param atsi performance information | ||
1334 | * @param atsi_count number of entries in atsi | ||
1335 | * @return GNUNET_OK to keep the connection open, | 1322 | * @return GNUNET_OK to keep the connection open, |
1336 | * GNUNET_SYSERR to close it (signal serious error) | 1323 | * GNUNET_SYSERR to close it (signal serious error) |
1337 | */ | 1324 | */ |
1338 | static int | 1325 | static int |
1339 | handle_p2p_sync_request (void *cls, const struct GNUNET_PeerIdentity *other, | 1326 | handle_p2p_sync_request (void *cls, const struct GNUNET_PeerIdentity *other, |
1340 | const struct GNUNET_MessageHeader *message, | 1327 | const struct GNUNET_MessageHeader *message) |
1341 | const struct GNUNET_ATS_Information *atsi, | ||
1342 | unsigned int atsi_count) | ||
1343 | { | 1328 | { |
1344 | struct ChatClient *entry; | 1329 | struct ChatClient *entry; |
1345 | struct GNUNET_CORE_TransmitHandle *th; | 1330 | struct GNUNET_CORE_TransmitHandle *th; |
@@ -1381,9 +1366,7 @@ handle_p2p_sync_request (void *cls, const struct GNUNET_PeerIdentity *other, | |||
1381 | static int | 1366 | static int |
1382 | handle_p2p_confirmation_receipt (void *cls, | 1367 | handle_p2p_confirmation_receipt (void *cls, |
1383 | const struct GNUNET_PeerIdentity *other, | 1368 | const struct GNUNET_PeerIdentity *other, |
1384 | const struct GNUNET_MessageHeader *message, | 1369 | const struct GNUNET_MessageHeader *message) |
1385 | const struct GNUNET_ATS_Information *atsi, | ||
1386 | unsigned int atsi_count) | ||
1387 | { | 1370 | { |
1388 | const struct P2PConfirmationReceiptMessage *p2p_crmsg; | 1371 | const struct P2PConfirmationReceiptMessage *p2p_crmsg; |
1389 | struct P2PConfirmationReceiptMessage *my_p2p_crmsg; | 1372 | struct P2PConfirmationReceiptMessage *my_p2p_crmsg; |
@@ -1519,13 +1502,9 @@ transmit_sync_request_to_peer (void *cls, size_t size, void *buf) | |||
1519 | * | 1502 | * |
1520 | * @param cls closure | 1503 | * @param cls closure |
1521 | * @param peer peer identity this notification is about | 1504 | * @param peer peer identity this notification is about |
1522 | * @param atsi performance data | ||
1523 | * @param atsi_count number of entries in atsi | ||
1524 | */ | 1505 | */ |
1525 | static void | 1506 | static void |
1526 | peer_connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer, | 1507 | peer_connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer) |
1527 | const struct GNUNET_ATS_Information *atsi, | ||
1528 | unsigned int atsi_count) | ||
1529 | { | 1508 | { |
1530 | struct ConnectedPeer *cp; | 1509 | struct ConnectedPeer *cp; |
1531 | struct GNUNET_CORE_TransmitHandle *th; | 1510 | struct GNUNET_CORE_TransmitHandle *th; |