gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r6287 - GNUnet/src/applications/chat


From: gnunet
Subject: [GNUnet-SVN] r6287 - GNUnet/src/applications/chat
Date: Wed, 13 Feb 2008 14:37:43 -0700 (MST)

Author: nevans
Date: 2008-02-13 14:37:43 -0700 (Wed, 13 Feb 2008)
New Revision: 6287

Modified:
   GNUnet/src/applications/chat/chat.c
   GNUnet/src/applications/chat/clientapi.c
   GNUnet/src/applications/chat/gnunet-chat.c
Log:
indented

Modified: GNUnet/src/applications/chat/chat.c
===================================================================
--- GNUnet/src/applications/chat/chat.c 2008-02-13 21:34:43 UTC (rev 6286)
+++ GNUnet/src/applications/chat/chat.c 2008-02-13 21:37:43 UTC (rev 6287)
@@ -80,18 +80,18 @@
 
 static int
 csHandleChatMSG (struct GNUNET_ClientHandle *client,
-               const GNUNET_MessageHeader * message)
+                 const GNUNET_MessageHeader * message)
 {
   int i;
   int j;
   CS_chat_MESSAGE *cmsg;
 
   GNUNET_HashCode hc;
-  
+
   char *nick;
   char *message_content;
   char *room_name;
-  
+
   int header_size;
   unsigned long nick_len;
   unsigned long msg_len;
@@ -99,37 +99,38 @@
 
   cmsg = (CS_chat_MESSAGE *) message;
 
-   if (ntohs (cmsg->header.size) < sizeof (CS_chat_MESSAGE))
+  if (ntohs (cmsg->header.size) < sizeof (CS_chat_MESSAGE))
     {
       GNUNET_GE_LOG (ectx,
                      GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
                      _("Message received from client is invalid\n"));
-      return GNUNET_SYSERR;    /* invalid message */
- 
+      return GNUNET_SYSERR;     /* invalid message */
+
     }
-  
 
-  header_size = ntohs(cmsg->header.size);
-  nick_len = ntohl(cmsg->nick_len);
-  msg_len = ntohl(cmsg->msg_len);
-  room_name_len = ntohl(cmsg->room_name_len);
-  
-  nick = GNUNET_malloc(nick_len + 1);
-  message_content = GNUNET_malloc(msg_len + 1);
-  room_name = GNUNET_malloc(room_name_len + 1);
-    
-  memcpy(nick,&cmsg->nick[0],nick_len);
-  memcpy(message_content,&cmsg->nick[nick_len],msg_len);
-  memcpy(room_name,&cmsg->nick[nick_len+msg_len],room_name_len);  
-       
-       nick[nick_len] = '\0';
+
+  header_size = ntohs (cmsg->header.size);
+  nick_len = ntohl (cmsg->nick_len);
+  msg_len = ntohl (cmsg->msg_len);
+  room_name_len = ntohl (cmsg->room_name_len);
+
+  nick = GNUNET_malloc (nick_len + 1);
+  message_content = GNUNET_malloc (msg_len + 1);
+  room_name = GNUNET_malloc (room_name_len + 1);
+
+  memcpy (nick, &cmsg->nick[0], nick_len);
+  memcpy (message_content, &cmsg->nick[nick_len], msg_len);
+  memcpy (room_name, &cmsg->nick[nick_len + msg_len], room_name_len);
+
+  nick[nick_len] = '\0';
   message_content[msg_len] = '\0';
   room_name[room_name_len] = '\0';
-  
+
   GNUNET_GE_LOG (ectx,
                  GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
-                 "Received chat message from client.\n Message is %s\n from 
%s\n intended for room %s\n",message_content,nick,room_name);
-    
+                 "Received chat message from client.\n Message is %s\n from 
%s\n intended for room %s\n",
+                 message_content, nick, room_name);
+
   GNUNET_hash (cmsg, header_size, &hc);
   /* check if we have seen this message already */
 
@@ -146,10 +147,10 @@
       broadcastToConnected (message, 5, 1);
       cmsg->header.type = htons (GNUNET_CS_PROTO_CHAT_MSG);
       for (j = 0; j < clientCount; j++)
-        coreAPI->cs_send_to_client (clients[j], &cmsg->header,GNUNET_YES);
+        coreAPI->cs_send_to_client (clients[j], &cmsg->header, GNUNET_YES);
       /*pmsg->nick[CHAT_NICK_LENGTH - 1] = '\0';
-      pmsg->message[CHAT_MSG_LENGTH - 1] = '\0';*/
-      
+         pmsg->message[CHAT_MSG_LENGTH - 1] = '\0'; */
+
       /*
          GNUNET_GE_LOG(ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | 
GNUNET_GE_USER,
          " CHAT: received new message from %s: %s\n",
@@ -170,16 +171,16 @@
   const CS_chat_JOIN_MESSAGE *cmsg;
   P2P_chat_MESSAGE *pmsg;
   GNUNET_HashCode hc;
-  
+
   char *nick;
   GNUNET_RSA_PublicKey *client_key;
   char *room_name;
-  
+
   int header_size;
   unsigned long nick_len;
   unsigned long pubkey_len;
   unsigned long room_name_len;
-  
+
   pmsg = (P2P_chat_MESSAGE *) message;
   cmsg = (CS_chat_JOIN_MESSAGE *) message;
 
@@ -187,28 +188,32 @@
     {
       GNUNET_GE_LOG (ectx,
                      GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
-                     _("Room join from client is invalid! Size is: %d, should 
be at least %d\n"),ntohs(cmsg->header.size),sizeof(CS_chat_JOIN_MESSAGE));
-      return GNUNET_SYSERR;  /* invalid message */
- 
+                     _
+                     ("Room join from client is invalid! Size is: %d, should 
be at least %d\n"),
+                     ntohs (cmsg->header.size),
+                     sizeof (CS_chat_JOIN_MESSAGE));
+      return GNUNET_SYSERR;     /* invalid message */
+
     }
-   
-  header_size = ntohs(cmsg->header.size);
-  nick_len = ntohl(cmsg->nick_len);
-  pubkey_len = ntohl(cmsg->pubkey_len);
-  room_name_len = ntohl(cmsg->room_name_len);
-  
-  nick = GNUNET_malloc(nick_len + 1);
-  client_key = GNUNET_malloc(sizeof(GNUNET_RSA_PublicKey));
-  room_name = GNUNET_malloc(room_name_len + 1);
-    
-  memcpy(nick,&cmsg->nick[0],nick_len);
-  memcpy(client_key,&cmsg->nick[nick_len],pubkey_len);
-  memcpy(room_name,&cmsg->nick[nick_len + pubkey_len],room_name_len);
-  
+
+  header_size = ntohs (cmsg->header.size);
+  nick_len = ntohl (cmsg->nick_len);
+  pubkey_len = ntohl (cmsg->pubkey_len);
+  room_name_len = ntohl (cmsg->room_name_len);
+
+  nick = GNUNET_malloc (nick_len + 1);
+  client_key = GNUNET_malloc (sizeof (GNUNET_RSA_PublicKey));
+  room_name = GNUNET_malloc (room_name_len + 1);
+
+  memcpy (nick, &cmsg->nick[0], nick_len);
+  memcpy (client_key, &cmsg->nick[nick_len], pubkey_len);
+  memcpy (room_name, &cmsg->nick[nick_len + pubkey_len], room_name_len);
+
   GNUNET_GE_LOG (ectx,
                  GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
-                 "Received join chat room message from client.\n From %s\n for 
room %s\n",nick,room_name);
-    
+                 "Received join chat room message from client.\n From %s\n for 
room %s\n",
+                 nick, room_name);
+
   nick[nick_len] = '\0';
   room_name[room_name_len] = '\0';
   GNUNET_hash (cmsg, header_size, &hc);
@@ -221,7 +226,7 @@
     if (clients[i] == client)
       j = i;
     else
-      coreAPI->cs_send_to_client (clients[i], message,GNUNET_YES);
+      coreAPI->cs_send_to_client (clients[i], message, GNUNET_YES);
   if (j == -1)
     {
       if (clientCount == MAX_CLIENTS)
@@ -230,7 +235,7 @@
                        _("Maximum number of chat clients reached.\n"));
       else
         {
-          GNUNET_array_grow (clients, clientCount, clientCount + 1);   
+          GNUNET_array_grow (clients, clientCount, clientCount + 1);
           clients[clientCount] = client;
           ++clientCount;
           GNUNET_GE_LOG (ectx,
@@ -241,9 +246,9 @@
     }
   /* forward to all other nodes in the network */
   /*pmsg->header.type = htons (GNUNET_P2P_PROTO_CHAT_MSG);
-  broadcastToConnected (&pmsg->header, 5, 1);*/
+     broadcastToConnected (&pmsg->header, 5, 1); */
   GNUNET_mutex_unlock (chatMutex);
-  fprintf(stderr,"End of handleChatRequest\n");
+  fprintf (stderr, "End of handleChatRequest\n");
   return GNUNET_OK;
 }
 
@@ -270,9 +275,9 @@
 {
   int ok = GNUNET_OK;
   clientCount = 0;
-  
-  lastMsgs = GNUNET_malloc(sizeof(GNUNET_HashCode) * MAX_LAST_MESSAGES);
 
+  lastMsgs = GNUNET_malloc (sizeof (GNUNET_HashCode) * MAX_LAST_MESSAGES);
+
   GNUNET_GE_ASSERT (ectx,
                     sizeof (P2P_chat_MESSAGE) == sizeof (CS_chat_MESSAGE));
   chatMutex = GNUNET_mutex_create (GNUNET_NO);
@@ -283,13 +288,14 @@
                  "chat", GNUNET_P2P_PROTO_CHAT_MSG, GNUNET_CS_PROTO_CHAT_MSG);
 
   /*if (GNUNET_SYSERR ==
-      capi->registerHandler (GNUNET_P2P_PROTO_CHAT_MSG, &handleChatMSG))
-    ok = GNUNET_SYSERR;*/
+     capi->registerHandler (GNUNET_P2P_PROTO_CHAT_MSG, &handleChatMSG))
+     ok = GNUNET_SYSERR; */
   if (GNUNET_SYSERR ==
       capi->cs_exit_handler_register (&chatClientExitHandler))
     ok = GNUNET_SYSERR;
-  if (GNUNET_SYSERR == capi->registerClientHandler 
(GNUNET_CS_PROTO_CHAT_JOIN_MSG,
-                                                    &csHandleChatRequest))
+  if (GNUNET_SYSERR ==
+      capi->registerClientHandler (GNUNET_CS_PROTO_CHAT_JOIN_MSG,
+                                   &csHandleChatRequest))
     ok = GNUNET_SYSERR;
   if (GNUNET_SYSERR == capi->registerClientHandler (GNUNET_CS_PROTO_CHAT_MSG,
                                                     &csHandleChatMSG))
@@ -308,7 +314,7 @@
 void
 done_module_chat ()
 {
-  /*coreAPI->unregisterHandler (GNUNET_P2P_PROTO_CHAT_MSG, &handleChatMSG);*/
+  /*coreAPI->unregisterHandler (GNUNET_P2P_PROTO_CHAT_MSG, &handleChatMSG); */
   coreAPI->cs_exit_handler_unregister (&chatClientExitHandler);
   coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_CHAT_MSG,
                                     &csHandleChatMSG);

Modified: GNUnet/src/applications/chat/clientapi.c
===================================================================
--- GNUnet/src/applications/chat/clientapi.c    2008-02-13 21:34:43 UTC (rev 
6286)
+++ GNUnet/src/applications/chat/clientapi.c    2008-02-13 21:37:43 UTC (rev 
6287)
@@ -44,13 +44,13 @@
   struct GNUNET_GC_Configuration *cfg;
 
   char *nickname;
-  
+
   char *room_name;
-  
+
   GNUNET_HashCode room_name_hash;
 
   const GNUNET_RSA_PublicKey *my_public_key;
-  
+
   GNUNET_HashCode my_public_key_hash;
 
   const struct GNUNET_RSA_PrivateKey *my_private_key;
@@ -102,15 +102,15 @@
                        const char *memberInfo,
                        GNUNET_CHAT_MessageCallback callback, void *cls)
 {
-  CS_chat_JOIN_MESSAGE *join_msg;       
+  CS_chat_JOIN_MESSAGE *join_msg;
   GNUNET_MessageHeader csHdr;
-  
+
   GNUNET_HashCode hash_of_me;
   GNUNET_HashCode hash_of_room_name;
-  
+
   struct GNUNET_CHAT_Room *chat_room;
   struct GNUNET_ClientServerConnection *sock;
-  
+
   int ret;
   int size_of_join;
 
@@ -118,50 +118,55 @@
 
   csHdr.size = htons (sizeof (CS_chat_JOIN_MESSAGE));
   csHdr.type = htons (GNUNET_CS_PROTO_CHAT_JOIN_MSG);
-  
-  sock = GNUNET_client_connection_create(ectx,cfg);
-  
+
+  sock = GNUNET_client_connection_create (ectx, cfg);
+
   if (sock == NULL)
-  {
-    fprintf (stderr, _("Error establishing connection with gnunetd.\n"));
-    ret = GNUNET_SYSERR;
-  }
-  
+    {
+      fprintf (stderr, _("Error establishing connection with gnunetd.\n"));
+      ret = GNUNET_SYSERR;
+    }
+
   // connect
-  GNUNET_hash (me, sizeof(GNUNET_RSA_PublicKey), &hash_of_me);
-  GNUNET_hash (room_name,strlen(room_name),&hash_of_room_name);
-  
-  size_of_join = sizeof (CS_chat_JOIN_MESSAGE) + strlen(nickname) + 
sizeof(GNUNET_RSA_PublicKey) + strlen(room_name);
+  GNUNET_hash (me, sizeof (GNUNET_RSA_PublicKey), &hash_of_me);
+  GNUNET_hash (room_name, strlen (room_name), &hash_of_room_name);
+
+  size_of_join =
+    sizeof (CS_chat_JOIN_MESSAGE) + strlen (nickname) +
+    sizeof (GNUNET_RSA_PublicKey) + strlen (room_name);
   join_msg = GNUNET_malloc (size_of_join);
-  
-  join_msg->nick_len = htonl(strlen(nickname));
-  join_msg->pubkey_len = htonl(sizeof(GNUNET_RSA_PublicKey));
-  join_msg->room_name_len = htonl(strlen(room_name));
-  
-  
-  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) + 
sizeof(GNUNET_RSA_PublicKey)],room_name,strlen(room_name));
-  
+
+  join_msg->nick_len = htonl (strlen (nickname));
+  join_msg->pubkey_len = htonl (sizeof (GNUNET_RSA_PublicKey));
+  join_msg->room_name_len = htonl (strlen (room_name));
+
+
+  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) + sizeof (GNUNET_RSA_PublicKey)],
+          room_name, strlen (room_name));
+
   join_msg->header = csHdr;
-  join_msg->header.size = htons(size_of_join);
-  
-  if (GNUNET_SYSERR == GNUNET_client_connection_write (sock, 
&join_msg->header))
-  {
-       fprintf (stderr, _("Error writing to socket.\n"));
-    ret = GNUNET_SYSERR;
-  }
-  
-  GNUNET_free(join_msg);
+  join_msg->header.size = htons (size_of_join);
 
+  if (GNUNET_SYSERR ==
+      GNUNET_client_connection_write (sock, &join_msg->header))
+    {
+      fprintf (stderr, _("Error writing to socket.\n"));
+      ret = GNUNET_SYSERR;
+    }
+
+  GNUNET_free (join_msg);
+
   // allocate & init room struct
-  chat_room = GNUNET_malloc(sizeof(struct GNUNET_CHAT_Room));
-  chat_room->nickname = GNUNET_malloc(strlen(nickname)+1);
-  strncpy(chat_room->nickname,nickname,strlen(nickname)+1);
-  
-  chat_room->room_name = GNUNET_malloc(strlen(room_name)+1);
-  strncpy(chat_room->room_name,room_name,strlen(room_name)+1);
-  
+  chat_room = GNUNET_malloc (sizeof (struct GNUNET_CHAT_Room));
+  chat_room->nickname = GNUNET_malloc (strlen (nickname) + 1);
+  strncpy (chat_room->nickname, nickname, strlen (nickname) + 1);
+
+  chat_room->room_name = GNUNET_malloc (strlen (room_name) + 1);
+  strncpy (chat_room->room_name, room_name, strlen (room_name) + 1);
+
   chat_room->room_name_hash = hash_of_room_name;
   chat_room->my_public_key = me;
   chat_room->my_public_key_hash = hash_of_me;
@@ -170,16 +175,16 @@
   chat_room->callback_cls = cls;
   chat_room->ectx = ectx;
   chat_room->cfg = cfg;
-  chat_room->memberInfo = GNUNET_malloc(strlen(memberInfo)+1);
-  strncpy(chat_room->memberInfo,memberInfo,strlen(memberInfo)+1);
+  chat_room->memberInfo = GNUNET_malloc (strlen (memberInfo) + 1);
+  strncpy (chat_room->memberInfo, memberInfo, strlen (memberInfo) + 1);
   chat_room->sock = sock;
 
   // create pthread
 
   // return room struct
   if (ret != GNUNET_OK)
-       return NULL;
-       
+    return NULL;
+
   return chat_room;
 }
 
@@ -192,11 +197,11 @@
   // stop thread
   // join thread
   // free room struct  
-  
-  GNUNET_free(chat_room->nickname);
-  GNUNET_free(chat_room->memberInfo);
-  GNUNET_client_connection_destroy(chat_room->sock);
-  
+
+  GNUNET_free (chat_room->nickname);
+  GNUNET_free (chat_room->memberInfo);
+  GNUNET_client_connection_destroy (chat_room->sock);
+
 }
 
 /**
@@ -216,33 +221,39 @@
   int ret = GNUNET_OK;
   GNUNET_MessageHeader cs_msg_hdr;
   CS_chat_MESSAGE *msg_to_send;
-  
-  
-  
-  cs_msg_hdr.size = htons (sizeof (GNUNET_MessageHeader) + 
sizeof(CS_chat_MESSAGE) + strlen(room->nickname) + strlen(message) + 
strlen(room->room_name));
+
+
+
+  cs_msg_hdr.size =
+    htons (sizeof (GNUNET_MessageHeader) + sizeof (CS_chat_MESSAGE) +
+           strlen (room->nickname) + strlen (message) +
+           strlen (room->room_name));
   cs_msg_hdr.type = htons (GNUNET_CS_PROTO_CHAT_MSG);
-  
-  msg_to_send = GNUNET_malloc(ntohl(cs_msg_hdr.size));
-  
-  msg_to_send->nick_len = htonl(strlen(room->nickname));
-  msg_to_send->msg_len = htonl(strlen(message));
-  msg_to_send->room_name_len = htonl(strlen(room->room_name));
-  
-  memcpy(&msg_to_send->nick[0],room->nickname,strlen(room->nickname));
-  memcpy(&msg_to_send->nick[strlen(room->nickname)],message,strlen(message));
-  memcpy(&msg_to_send->nick[strlen(room->nickname) + 
strlen(message)],room->room_name,strlen(room->room_name));
 
+  msg_to_send = GNUNET_malloc (ntohl (cs_msg_hdr.size));
+
+  msg_to_send->nick_len = htonl (strlen (room->nickname));
+  msg_to_send->msg_len = htonl (strlen (message));
+  msg_to_send->room_name_len = htonl (strlen (room->room_name));
+
+  memcpy (&msg_to_send->nick[0], room->nickname, strlen (room->nickname));
+  memcpy (&msg_to_send->nick[strlen (room->nickname)], message,
+          strlen (message));
+  memcpy (&msg_to_send->nick[strlen (room->nickname) + strlen (message)],
+          room->room_name, strlen (room->room_name));
+
   /*fprintf(stderr,"sending message ---\n");
-  fprintf(stderr,"nick: 
%s\nmessage:%s\nroom:%s\n",room->nickname,message,room->room_name);*/
-  
+     fprintf(stderr,"nick: 
%s\nmessage:%s\nroom:%s\n",room->nickname,message,room->room_name); */
+
   msg_to_send->header = cs_msg_hdr;
-  
-  if (GNUNET_SYSERR == GNUNET_client_connection_write 
(room->sock,&msg_to_send->header))
-  {
-       fprintf (stderr, _("Error writing to socket.\n"));
-    ret = GNUNET_SYSERR;
-  }
 
+  if (GNUNET_SYSERR ==
+      GNUNET_client_connection_write (room->sock, &msg_to_send->header))
+    {
+      fprintf (stderr, _("Error writing to socket.\n"));
+      ret = GNUNET_SYSERR;
+    }
+
   return ret;
 }
 

Modified: GNUnet/src/applications/chat/gnunet-chat.c
===================================================================
--- GNUnet/src/applications/chat/gnunet-chat.c  2008-02-13 21:34:43 UTC (rev 
6286)
+++ GNUnet/src/applications/chat/gnunet-chat.c  2008-02-13 21:37:43 UTC (rev 
6287)
@@ -46,7 +46,7 @@
  * All gnunet-chat command line options
  */
 static struct GNUNET_CommandLineOption gnunetchatOptions[] = {
-  GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Join a chat on GNUnet.")),   
/* -h */
+  GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Join a chat on GNUnet.")),   
 /* -h */
   GNUNET_COMMAND_LINE_OPTION_HOSTNAME,  /* -H */
   GNUNET_COMMAND_LINE_OPTION_LOGGING,   /* -L */
   {'n', "nick", "NAME",
@@ -55,7 +55,7 @@
   {'r', "room", "NAME",
    gettext_noop ("set the chat room to join (requred)"),
    1, &GNUNET_getopt_configure_set_string, &room_name},
-  GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGE_VERSION),        /* -v */
+  GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGE_VERSION), /* -v */
   GNUNET_COMMAND_LINE_OPTION_VERBOSE,
   GNUNET_COMMAND_LINE_OPTION_END,
 };
@@ -124,27 +124,27 @@
 main (int argc, char **argv)
 {
   struct GNUNET_CHAT_Room *room;
-  
+
   struct GNUNET_RSA_PrivateKey *my_priv;
   GNUNET_RSA_PublicKey my_pub;
-  
+
   char *message;
   int ret = GNUNET_OK;
-  
-  GNUNET_disable_entropy_gathering();
-  
-  fprintf(stderr,"Generating public/private key pair\n");
+
+  GNUNET_disable_entropy_gathering ();
+
+  fprintf (stderr, "Generating public/private key pair\n");
   my_priv = GNUNET_RSA_create_key ();
-  GNUNET_RSA_get_public_key(my_priv,&my_pub); 
-  message = GNUNET_malloc(MAX_MESSAGE_LENGTH+1);
-  
+  GNUNET_RSA_get_public_key (my_priv, &my_pub);
+  message = GNUNET_malloc (MAX_MESSAGE_LENGTH + 1);
 
+
   if (GNUNET_SYSERR == GNUNET_init (argc,
                                     argv,
                                     "gnunet-chat [OPTIONS]",
                                     &cfgFilename, gnunetchatOptions, &ectx,
                                     &cfg))
-    ret = GNUNET_SYSERR;                   /* parse error, --help, etc. */
+    ret = GNUNET_SYSERR;        /* parse error, --help, etc. */
   if (nickname == NULL)
     {
       fprintf (stderr, _("You must specify a nickname\n"));
@@ -153,34 +153,36 @@
 
   room = GNUNET_CHAT_join_room (ectx,
                                 cfg,
-                                nickname,room_name,
-                                &my_pub, my_priv, "", &receive_callback, NULL);
+                                nickname, room_name,
+                                &my_pub, my_priv, "", &receive_callback,
+                                NULL);
   if (room == NULL)
     {
       fprintf (stderr, _("Failed to join the room\n"));
       ret = GNUNET_SYSERR;
     }
   else
-  {
-       fprintf(stdout,"Room joined, type message and hit return to send.\nType 
quit when ready to quit\n");
-  }
+    {
+      fprintf (stdout,
+               "Room joined, type message and hit return to send.\nType quit 
when ready to quit\n");
+    }
 
   /* read messages from command line and send */
-  while ((ret == GNUNET_OK)&&(strcmp(message,quit)!=0))
+  while ((ret == GNUNET_OK) && (strcmp (message, quit) != 0))
     {
-        
-      bzero(message, MAX_MESSAGE_LENGTH+1);
+
+      bzero (message, MAX_MESSAGE_LENGTH + 1);
       if (NULL == fgets (message, MAX_MESSAGE_LENGTH, stdin))
         break;
-      else if (strncmp(message,quit,sizeof(quit))==0)
+      else if (strncmp (message, quit, sizeof (quit)) == 0)
         break;
       else
-      {
-       if(message[strlen(message)-1] == '\n')
-         message[strlen(message)-1] = '\0';
-      }
-      fprintf(stderr,"quit: %s message: %s\n",quit,message);
-      
+        {
+          if (message[strlen (message) - 1] == '\n')
+            message[strlen (message) - 1] = '\0';
+        }
+      fprintf (stderr, "quit: %s message: %s\n", quit, message);
+
       if (GNUNET_OK != GNUNET_CHAT_send_message (room,
                                                  message,
                                                  &confirmation_callback,
@@ -190,13 +192,13 @@
         {
           fprintf (stderr, _("Failed to send message.\n"));
         }
-        
+
     }
-    
-  
+
+
   GNUNET_CHAT_leave_room (room);
-  GNUNET_free(room);
-  GNUNET_free(message);
+  GNUNET_free (room);
+  GNUNET_free (message);
   GNUNET_fini (ectx, cfg);
   return GNUNET_OK;
 }





reply via email to

[Prev in Thread] Current Thread [Next in Thread]