[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r6640 - GNUnet/src/applications/chat
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r6640 - GNUnet/src/applications/chat |
|
Date: |
Fri, 28 Mar 2008 13:48:04 -0600 (MDT) |
Author: nevans
Date: 2008-03-28 13:48:04 -0600 (Fri, 28 Mar 2008)
New Revision: 6640
Modified:
GNUnet/src/applications/chat/chat.c
GNUnet/src/applications/chat/chattest.c
GNUnet/src/applications/chat/clientapi.c
GNUnet/src/applications/chat/gnunet-chat.c
Log:
Modified: GNUnet/src/applications/chat/chat.c
===================================================================
--- GNUnet/src/applications/chat/chat.c 2008-03-28 19:47:04 UTC (rev 6639)
+++ GNUnet/src/applications/chat/chat.c 2008-03-28 19:48:04 UTC (rev 6640)
@@ -55,7 +55,7 @@
/* Thread that tells clients about chat room members
*/
-static void
+static void
update_client_members (void *cls)
{
struct GNUNET_CS_chat_client *pos;
@@ -63,41 +63,41 @@
CS_chat_ROOM_MEMBER_MESSAGE *message;
int message_size;
- fprintf (stderr, "Checking room members\n");
- GNUNET_mutex_lock (chatMutex);
- pos = client_list_head;
- while (pos != NULL)
+ fprintf (stderr, "Checking room members\n");
+ GNUNET_mutex_lock (chatMutex);
+ pos = client_list_head;
+ while (pos != NULL)
+ {
+ compare_pos = client_list_head;
+ while (compare_pos != NULL)
{
- compare_pos = client_list_head;
- while (compare_pos != NULL)
+ if (memcmp
+ (&pos->room_name_hash, &compare_pos->room_name_hash,
+ sizeof (GNUNET_HashCode)) == 0)
{
- if (memcmp
- (&pos->room_name_hash, &compare_pos->room_name_hash,
- sizeof (GNUNET_HashCode)) == 0)
- {
- /*Send nick to this client, so it knows who is in the same
room! (Including itself...) */
- fprintf (stderr, "Found matching member %s length is %d\n",
- compare_pos->nick, strlen (compare_pos->nick));
+ /*Send nick to this client, so it knows who is in the same room!
(Including itself...) */
+ fprintf (stderr, "Found matching member %s length is %d\n",
+ compare_pos->nick, strlen (compare_pos->nick));
- message_size =
- sizeof (CS_chat_ROOM_MEMBER_MESSAGE) +
- strlen (compare_pos->nick);
- message = GNUNET_malloc (message_size);
- message->header.size = htons (message_size);
- message->header.type =
- htons (GNUNET_CS_PROTO_CHAT_ROOM_MEMBER_MESSAGE);
- message->nick_len = htons (strlen (compare_pos->nick));
- memcpy (&message->nick[0], compare_pos->nick,
- strlen (compare_pos->nick));
+ message_size =
+ sizeof (CS_chat_ROOM_MEMBER_MESSAGE) +
+ strlen (compare_pos->nick);
+ message = GNUNET_malloc (message_size);
+ message->header.size = htons (message_size);
+ message->header.type =
+ htons (GNUNET_CS_PROTO_CHAT_ROOM_MEMBER_MESSAGE);
+ message->nick_len = htons (strlen (compare_pos->nick));
+ memcpy (&message->nick[0], compare_pos->nick,
+ strlen (compare_pos->nick));
- coreAPI->cs_send_message (pos->client, &message->header,
- GNUNET_YES);
- }
- compare_pos = compare_pos->next;
+ coreAPI->cs_send_message (pos->client, &message->header,
+ GNUNET_YES);
}
- pos = pos->next;
+ compare_pos = compare_pos->next;
}
- GNUNET_mutex_unlock (chatMutex);
+ pos = pos->next;
+ }
+ GNUNET_mutex_unlock (chatMutex);
}
@@ -220,15 +220,14 @@
header_size = ntohs (cmsg->header.size);
nick_len = ntohs (cmsg->nick_len);
- room_name_len =
- header_size - sizeof (CS_chat_JOIN_MESSAGE) - nick_len;
+ room_name_len = header_size - sizeof (CS_chat_JOIN_MESSAGE) - nick_len;
fprintf (stderr,
"JOIN_MESSAGE size : %d\nheader_size : %d\nnick_len :
%d\nroom_name_len : %d\n",
- sizeof (CS_chat_JOIN_MESSAGE), header_size, nick_len,
room_name_len);
+ sizeof (CS_chat_JOIN_MESSAGE), header_size, nick_len,
+ room_name_len);
fprintf (stderr, "According to my addition, header_size should be %d\n",
- nick_len + room_name_len +
- sizeof (CS_chat_JOIN_MESSAGE));
+ nick_len + room_name_len + sizeof (CS_chat_JOIN_MESSAGE));
if (header_size < (nick_len + room_name_len))
{
GNUNET_GE_BREAK (NULL, 0);
@@ -296,7 +295,7 @@
GNUNET_mutex_unlock (chatMutex);
fprintf (stderr, "End of handleChatJoinRequest\n");
- update_client_members(NULL);
+ update_client_members (NULL);
return GNUNET_OK;
}
Modified: GNUnet/src/applications/chat/chattest.c
===================================================================
--- GNUnet/src/applications/chat/chattest.c 2008-03-28 19:47:04 UTC (rev
6639)
+++ GNUnet/src/applications/chat/chattest.c 2008-03-28 19:48:04 UTC (rev
6640)
@@ -50,8 +50,8 @@
{
struct GNUNET_TESTING_DaemonContext *peers;
int ret;
- struct GNUNET_CHAT_Room * r1;
- struct GNUNET_CHAT_Room * r2;
+ struct GNUNET_CHAT_Room *r1;
+ struct GNUNET_CHAT_Room *r2;
ret = 0;
cfg = GNUNET_GC_create ();
@@ -63,8 +63,7 @@
#if START_PEERS
peers = GNUNET_TESTING_start_daemons ("",
"chat stats",
- "/tmp/gnunet-chat-test",
- 2087, 10, 1);
+ "/tmp/gnunet-chat-test", 2087, 10, 1);
if (peers == NULL)
{
fprintf (stderr, "Failed to start the gnunetd daemon!\n");
@@ -72,9 +71,9 @@
return -1;
}
#endif
- r1 = GNUNET_CHAT_join_room(...);
+ r1 = GNUNET_CHAT_join_room (...);
- GNUNET_CHAT_leave_room(r1);
+ GNUNET_CHAT_leave_room (r1);
GNUNET_shutdown_wait_for ();
Modified: GNUnet/src/applications/chat/clientapi.c
===================================================================
--- GNUnet/src/applications/chat/clientapi.c 2008-03-28 19:47:04 UTC (rev
6639)
+++ GNUnet/src/applications/chat/clientapi.c 2008-03-28 19:48:04 UTC (rev
6640)
@@ -90,77 +90,81 @@
disconnected = GNUNET_YES;
continue;
}
- switch (ntohs(reply->type)) {
- case GNUNET_CS_PROTO_CHAT_ROOM_MEMBER_MESSAGE:
- case GNUNET_CS_PROTO_CHAT_ROOM_MEMBER_LEAVE_MESSAGE:
+ switch (ntohs (reply->type))
{
- size = ntohs (reply->size);
- received_room_member_msg = (CS_chat_ROOM_MEMBER_MESSAGE *) reply;
- nick_len = ntohs (received_room_member_msg->nick_len);
+ case GNUNET_CS_PROTO_CHAT_ROOM_MEMBER_MESSAGE:
+ case GNUNET_CS_PROTO_CHAT_ROOM_MEMBER_LEAVE_MESSAGE:
+ {
+ size = ntohs (reply->size);
+ received_room_member_msg = (CS_chat_ROOM_MEMBER_MESSAGE *) reply;
+ nick_len = ntohs (received_room_member_msg->nick_len);
- if (size - sizeof(GNUNET_MessageHeader) < nick_len)
- {
- GNUNET_GE_BREAK (NULL, 0);
- GNUNET_client_connection_close_temporarily (room->sock);
- disconnected = GNUNET_YES;
- continue;
- }
- nick = GNUNET_malloc (nick_len + 1);
- memcpy (nick, &received_room_member_msg->nick[0], nick_len);
- nick[nick_len] = '\0';
+ if (size - sizeof (GNUNET_MessageHeader) < nick_len)
+ {
+ GNUNET_GE_BREAK (NULL, 0);
+ GNUNET_client_connection_close_temporarily (room->sock);
+ disconnected = GNUNET_YES;
+ continue;
+ }
+ nick = GNUNET_malloc (nick_len + 1);
+ memcpy (nick, &received_room_member_msg->nick[0], nick_len);
+ nick[nick_len] = '\0';
- if (GNUNET_OK !=
- room->member_list_callback (room->member_list_callback_cls,
- nick, ntohs(reply->type) ==
GNUNET_CS_PROTO_CHAT_ROOM_MEMBER_MESSAGE,
- GNUNET_get_time ()))
- {
- GNUNET_GE_BREAK (NULL, 0);
- GNUNET_client_connection_close_temporarily (room->sock);
- disconnected = GNUNET_YES;
- continue;
- }
+ if (GNUNET_OK !=
+ room->member_list_callback (room->member_list_callback_cls,
+ nick,
+ ntohs (reply->type) ==
+
GNUNET_CS_PROTO_CHAT_ROOM_MEMBER_MESSAGE,
+ GNUNET_get_time ()))
+ {
+ GNUNET_GE_BREAK (NULL, 0);
+ GNUNET_client_connection_close_temporarily (room->sock);
+ disconnected = GNUNET_YES;
+ continue;
+ }
+ }
+ GNUNET_free (nick);
+ break;
+ case GNUNET_CS_PROTO_CHAT_MSG:
+ {
+ size = ntohs (reply->size);
+ received_msg = (CS_chat_MESSAGE *) reply;
+ nick_len = ntohs (received_msg->nick_len);
+ msg_len = ntohs (received_msg->msg_len);
+ /* NO NEED TO SEND ROOM! */
+ room_name_len =
+ size - nick_len - msg_len - sizeof (CS_chat_MESSAGE);
+ if (size - sizeof (GNUNET_MessageHeader) <
+ (nick_len + msg_len + room_name_len))
+ {
+ GNUNET_GE_BREAK (NULL, 0);
+ GNUNET_client_connection_close_temporarily (room->sock);
+ disconnected = GNUNET_YES;
+ continue;
+ }
+ nick = GNUNET_malloc (nick_len + 1);
+ memcpy (nick, &received_msg->nick[0], nick_len);
+ nick[nick_len] = '\0';
+ message_content = GNUNET_malloc (msg_len + 1);
+ memcpy (message_content, &received_msg->nick[nick_len], msg_len);
+ message_content[msg_len] = '\0';
+ if (GNUNET_OK !=
+ room->callback (room->callback_cls, room, nick,
+ message_content, GNUNET_get_time (), 0))
+ {
+ GNUNET_GE_BREAK (NULL, 0);
+ GNUNET_client_connection_close_temporarily (room->sock);
+ disconnected = GNUNET_YES;
+ continue;
+ }
+ GNUNET_free (message_content);
+ }
+ GNUNET_free (nick);
+ break;
+ default:
+ GNUNET_GE_BREAK (NULL, 0);
+ break;
}
- GNUNET_free (nick);
- break;
- case GNUNET_CS_PROTO_CHAT_MSG:
- {
- size = ntohs (reply->size);
- received_msg = (CS_chat_MESSAGE *) reply;
- nick_len = ntohs (received_msg->nick_len);
- msg_len = ntohs (received_msg->msg_len);
- /* NO NEED TO SEND ROOM! */
- room_name_len =
- size - nick_len - msg_len - sizeof (CS_chat_MESSAGE);
- if (size - sizeof(GNUNET_MessageHeader) < (nick_len + msg_len +
room_name_len))
- {
- GNUNET_GE_BREAK (NULL, 0);
- GNUNET_client_connection_close_temporarily (room->sock);
- disconnected = GNUNET_YES;
- continue;
- }
- nick = GNUNET_malloc (nick_len + 1);
- memcpy (nick, &received_msg->nick[0], nick_len);
- nick[nick_len] = '\0';
- message_content = GNUNET_malloc (msg_len + 1);
- memcpy (message_content, &received_msg->nick[nick_len], msg_len);
- message_content[msg_len] = '\0';
- if (GNUNET_OK !=
- room->callback (room->callback_cls, room, nick, message_content,
- GNUNET_get_time (), 0))
- {
- GNUNET_GE_BREAK (NULL, 0);
- GNUNET_client_connection_close_temporarily (room->sock);
- disconnected = GNUNET_YES;
- continue;
- }
- GNUNET_free (message_content);
- }
- GNUNET_free (nick);
- break;
- default:
- GNUNET_GE_BREAK(NULL, 0);
- break;
- }
}
return NULL;
}
@@ -220,13 +224,12 @@
join_msg->header.size = htons (size_of_join);
join_msg->header.type = htons (GNUNET_CS_PROTO_CHAT_JOIN_MSG);
join_msg->nick_len = htons (strlen (nickname));
- memcpy(&join_msg->pkey,me,sizeof(GNUNET_RSA_PublicKey));
+ memcpy (&join_msg->pkey, me, sizeof (GNUNET_RSA_PublicKey));
//join_msg->pubkey_len = htons (sizeof (GNUNET_RSA_PublicKey));
memcpy (&join_msg->nick[0], nickname, strlen (nickname));
//memcpy (&join_msg->nick[strlen (nickname)], me,
// sizeof (GNUNET_RSA_PublicKey));
- memcpy (&join_msg->nick[strlen (nickname)],
- room_name, strlen (room_name));
+ memcpy (&join_msg->nick[strlen (nickname)], room_name, strlen (room_name));
if (GNUNET_SYSERR ==
GNUNET_client_connection_write (sock, &join_msg->header))
{
@@ -273,15 +276,16 @@
GNUNET_hash (chat_room->room_name, strlen (chat_room->room_name),
&hash_of_room_name);
size_of_join =
- sizeof (CS_chat_JOIN_MESSAGE) + strlen (chat_room->nickname) + strlen
(chat_room->room_name);
+ sizeof (CS_chat_JOIN_MESSAGE) + strlen (chat_room->nickname) +
+ strlen (chat_room->room_name);
join_msg = GNUNET_malloc (size_of_join);
join_msg->nick_len = htons (strlen (chat_room->nickname));
-
memcpy(&join_msg->pkey,chat_room->my_public_key,sizeof(GNUNET_RSA_PublicKey));
+ memcpy (&join_msg->pkey, chat_room->my_public_key,
+ sizeof (GNUNET_RSA_PublicKey));
#if FIXED
- char * nick = (char*) &join_msg[1];
- memcpy (nick, chat_room->nickname,
- strlen (chat_room->nickname));
+ char *nick = (char *) &join_msg[1];
+ memcpy (nick, chat_room->nickname, strlen (chat_room->nickname));
#endif
memcpy (&join_msg->nick[0], chat_room->nickname,
Modified: GNUnet/src/applications/chat/gnunet-chat.c
===================================================================
--- GNUnet/src/applications/chat/gnunet-chat.c 2008-03-28 19:47:04 UTC (rev
6639)
+++ GNUnet/src/applications/chat/gnunet-chat.c 2008-03-28 19:48:04 UTC (rev
6640)
@@ -92,10 +92,9 @@
member_list_callback (void *cls, const char *senderNick,
int is_joining, GNUNET_CronTime timestamp)
{
- fprintf (stdout, is_joining
- ? _("`%s' entered the room\n")
- : _("`%s' left the room\n"),
- senderNick);
+ fprintf (stdout, is_joining
+ ? _("`%s' entered the room\n")
+ : _("`%s' left the room\n"), senderNick);
return GNUNET_OK;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r6640 - GNUnet/src/applications/chat,
gnunet <=