Changeset 4694

Timestamp:

02/23/07 14:04:15 (2 years ago)

Author:

morris

Message:

More p7 tests

Files:

• wired/branches/p7/Makefile.in (modified) (1 diff)
• wired/branches/p7/run/wired.xml (modified) (6 diffs)
• wired/branches/p7/wired/chats.c (modified) (4 diffs)
• wired/branches/p7/wired/chats.h (modified) (1 diff)
• wired/branches/p7/wired/clients.c (modified) (1 diff)
• wired/branches/p7/wired/clients.h (modified) (2 diffs)
• wired/branches/p7/wired/commands.c (modified) (15 diffs)
• wired/branches/p7/wired/messages.c (modified) (10 diffs)

wired/branches/p7/Makefile.in

@@ -17 +17 @@
-
-DISTFILES               = INSTALL LICENSE NEWS README Makefile Makefile.in \
-t
+
-                                  configure.in install-sh libwired man run wired
-SUBDIRS                 = libwired

wired/branches/p7/run/wired.xml

@@ -9 +9 @@
-                <p7:field name="wired.error.code" type="uint32" id="1001" />
-
-.
-.
-.
-.
+_
+_
+_
+_
-                <p7:field name="wired.info.arch" type="string" id="1006" />
-server_
-server_
-server_info.launch
-server_
-server_
+
+
+info.start_time
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        </p7:fields>
-
@@ -44 +57 @@
-                <p7:message name="wired.client_info" id="1003">
-                        <p7:parameter field="wired.transaction" />
-.
-.
-.
-.
+_
+_
+_
+_
-                        <p7:parameter field="wired.info.arch" use="required" />
-                </p7:message>
@@ -53 +66 @@
-                <p7:message name="wired.server_info" id="1004">
-                        <p7:parameter field="wired.transaction" />
-.
-.
-.
-.
+_
+_
+_
+_
-                        <p7:parameter field="wired.info.arch" use="required" />
-server_
-server_
-server_info.launch
-server_
-server_
+
+
+info.start_time
+
+
-                </p7:message>
-
@@ -68 +81 @@
-                        <p7:parameter field="wired.transaction" />
-                        <p7:parameter field="wired.user.login" use="required" />
-user
+login
-                </p7:message>
-
@@ -89 +102 @@
-                        <p7:parameter field="wired.transaction" />
-                        <p7:parameter field="wired.user.icon" use="required" />
+                </p7:message>
+
+                <p7:message name="wired.join_chat" id="1010">
+                        <p7:parameter field="wired.transaction" />
+                        <p7:parameter field="wired.chat.id" use="required" />
+                </p7:message>
+
+                <p7:message name="wired.user_list" id="1011">
+                        <p7:parameter field="wired.transaction" />
+                        <p7:parameter field="wired.chat.id" use="required" />
+                        <p7:parameter field="wired.user.id" use="required" />
+                        <p7:parameter field="wired.user.admin" use="required" />
+                        <p7:parameter field="wired.user.idle" use="required" />
+                        <p7:parameter field="wired.user.nick" use="required" />
+                        <p7:parameter field="wired.user.status" use="required" />
+                        <p7:parameter field="wired.user.icon" use="required" />
+                </p7:message>
+
+                <p7:message name="wired.user_list.done" id="1012">
+                        <p7:parameter field="wired.transaction" />
+                        <p7:parameter field="wired.chat.id" use="required" />
+                </p7:message>
+
+                <p7:message name="wired.get_user_info" id="1013">
+                        <p7:parameter field="wired.transaction" />
+                        <p7:parameter field="wired.user.id" use="required" />
+                </p7:message>
+
+                <p7:message name="wired.user_info" id="1014">
+                        <p7:parameter field="wired.transaction" />
+                        <p7:parameter field="wired.user.id" use="required" />
+                        <p7:parameter field="wired.user.admin" use="required" />
+                        <p7:parameter field="wired.user.idle" use="required" />
+                        <p7:parameter field="wired.user.nick" use="required" />
+                        <p7:parameter field="wired.user.status" use="required" />
+                        <p7:parameter field="wired.user.icon" use="required" />
+                        <p7:parameter field="wired.user.ip" use="required" />
+                        <p7:parameter field="wired.user.host" use="required" />
+                        <p7:parameter field="wired.user.cipher_name" use="required" />
+                        <p7:parameter field="wired.user.cipher_bits" use="required" />
+                        <p7:parameter field="wired.info.application_name" use="required" />
+                        <p7:parameter field="wired.info.application_version" use="required" />
+                        <p7:parameter field="wired.info.os_name" use="required" />
+                        <p7:parameter field="wired.info.os_version" use="required" />
+                        <p7:parameter field="wired.info.arch" use="required" />
+                </p7:message>
+
+                <p7:message name="wired.dummy" id="2000">
+                        <p7:parameter field="wired.transaction" />
+                        <p7:parameter field="wired.dummy.string" use="required" />
-                </p7:message>
-        </p7:messages>
@@ -113 +176 @@
-                
-                <p7:transaction message="wired.set_icon" originator="client" use="required" />
+                
+                <p7:transaction message="wired.join_chat" originator="client" use="required">
+                        <p7:or>
+                                <p7:and>
+                                        <p7:reply message="wired.user_list" count="+" use="required" />
+                                        <p7:reply message="wired.user_list.done" count="1" use="required" />
+                                </p7:and>
+                                <p7:reply message="wired.error" count="1" use="required" />
+                        </p7:or>
+                </p7:transaction>
+                
+                <p7:transaction message="wired.get_user_info" originator="client" use="required">
+                        <p7:or>
+                                <p7:reply message="wired.user_info" count="1" use="required" />
+                                <p7:reply message="wired.error" count="1" use="required" />
+                        </p7:or>
+                </p7:transaction>
+
+                <p7:transaction message="wired.dummy" originator="client" use="required" />
-        </p7:transactions>
-</p7:protocol>

wired/branches/p7/wired/chats.c

@@ -260 +260 @@
-                wi_hash_unlock(wd_chats);
-        }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        
-        wi_array_rdlock(chat->clients);
@@ -272 +277 @@
-        enumerator = wi_array_data_enumerator(chat->clients);
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                }
-        }
@@ -291 +293 @@
-        wi_array_unlock(chat->clients);
-
-
+
+
+
-}
-
@@ -348 +352 @@
-                                 chat->topic.topic);
-}
-
-
-
-void wd_chat_broadcast_leave(wd_chat_t *chat, wd_client_t *client) {
-        wd_broadcast(chat, 303, WI_STR("%u%c%u"),
-                                 chat->cid,             WD_FIELD_SEPARATOR,
-                                 client->uid);
-}

wired/branches/p7/wired/chats.h

@@ -77 +77 @@
-void                                                                    wd_chat_add_client(wd_chat_t *, wd_client_t *);
-void                                                                    wd_chat_remove_client(wd_chat_t *, wd_client_t *);
-
+, wd_client_t *
-
-void                                                                    wd_chat_set_topic(wd_chat_t *, wi_string_t *);
-void                                                                    wd_chat_reply_topic(wd_chat_t *);
-void                                                                    wd_chat_broadcast_topic(wd_chat_t *);
-void                                                                    wd_chat_broadcast_leave(wd_chat_t *, wd_client_t *);
-
-

wired/branches/p7/wired/clients.c

@@ -284 +284 @@
-#pragma mark -
-
+void wd_client_reply_client_info(wd_client_t *peer, wd_client_t *client) {
+        wi_p7_message_t         *message;
+        wi_cipher_t                     *cipher;
+        
+        cipher = wi_p7_socket_cipher(peer->p7_socket);
+        
+        message = wi_p7_message_with_name(WI_STR("wired.user_info"), client->p7_socket);
+        wi_p7_message_set_uint32_for_name(message, client->uid, WI_STR("wired.user.id"));
+        wi_p7_message_set_bool_for_name(message, client->admin, WI_STR("wired.user.admin"));
+        wi_p7_message_set_bool_for_name(message, client->idle, WI_STR("wired.user.idle"));
+        wi_p7_message_set_string_for_name(message, client->nick, WI_STR("wired.user.nick"));
+        wi_p7_message_set_string_for_name(message, client->status, WI_STR("wired.user.status"));
+        wi_p7_message_set_data_for_name(message, client->icon, WI_STR("wired.user.icon"));
+        wi_p7_message_set_string_for_name(message, client->ip, WI_STR("wired.user.ip"));
+        wi_p7_message_set_string_for_name(message, client->host, WI_STR("wired.user.host"));
+        wi_p7_message_set_string_for_name(message, wi_cipher_name(cipher), WI_STR("wired.user.cipher_name"));
+        wi_p7_message_set_uint32_for_name(message, wi_cipher_bits(cipher), WI_STR("wired.user.cipher_bits"));
+        wi_p7_message_set_date_for_name(message, wi_date_with_time_interval(peer->login_time), WI_STR("wired.user.login_time"));
+        wi_p7_message_set_date_for_name(message, wi_date_with_time_interval(peer->idle_time), WI_STR("wired.user.idle_time"));
+        wd_reply_message(client, message);
+
+        
+        /*      wd_reply(308, WI_STR("%u%c%u%c%u%c%u%c%#@%c%#@%c%#@%c%#@%c%#@%c%#@%c%u%c%#@%c%#@%c%#@%c%#@%c%#@%c%#@"),
+                         peer->uid,                                                             WD_FIELD_SEPARATOR,
+                         peer->idle,                                                    WD_FIELD_SEPARATOR,
+                         peer->admin,                                                   WD_FIELD_SEPARATOR,
+                         peer->icon,                                                    WD_FIELD_SEPARATOR,
+                         peer->nick,                                                    WD_FIELD_SEPARATOR,
+                         peer->login,                                                   WD_FIELD_SEPARATOR,
+                         peer->ip,                                                              WD_FIELD_SEPARATOR,
+                         peer->host,                                                    WD_FIELD_SEPARATOR,
+                         peer->version,                                                 WD_FIELD_SEPARATOR,
+                         wi_socket_cipher_name(peer->socket),   WD_FIELD_SEPARATOR,
+                         wi_socket_cipher_bits(peer->socket),   WD_FIELD_SEPARATOR,
+                         login,                                                                 WD_FIELD_SEPARATOR,
+                         idle,                                                                  WD_FIELD_SEPARATOR,
+                         downloads,                                                             WD_FIELD_SEPARATOR,
+                         uploads,                                                               WD_FIELD_SEPARATOR,
+                         peer->status,                                                  WD_FIELD_SEPARATOR,
+                         peer->image);*/
+
+}
+
+
+
-void wd_client_broadcast_status(wd_client_t *client) {
-        wd_broadcast(wd_public_chat, 304, WI_STR("%u%c%u%c%u%c%u%c%#@%c%#@"),

wired/branches/p7/wired/clients.h

@@ -38 +38 @@
-
-
-
+_
-        WD_CLIENT_STATE_CONNECTED                       = 0,
-
-
+
-        WD_CLIENT_STATE_LOGGED_IN,
-        WD_CLIENT_STATE_DISCONNECTED
-};
-
+_
-
-
@@ -105 +104 @@
-wd_client_t *                                                   wd_client_with_uid(wd_uid_t);
-
+void                                                                    wd_client_reply_client_info(wd_client_t *, wd_client_t *);
-void                                                                    wd_client_broadcast_status(wd_client_t *);
-

wired/branches/p7/wired/commands.c

@@ -128 +128 @@
-   WD_CLIENT_STATE_LOGGED_IN,           0,              true,           wd_cmd_clearnews },
- { "CLIENT",
-SAID_HELLO
+LOGGED_IN
- { "COMMENT",
-   WD_CLIENT_STATE_LOGGED_IN,           2,              true,           wd_cmd_comment },
@@ -156 +156 @@
-   WD_CLIENT_STATE_CONNECTED,           0,              true,           wd_cmd_hello },
- { "ICON",
-SAID_HELLO
+CONNECTED
- { "INFO",
-   WD_CLIENT_STATE_LOGGED_IN,           1,              true,           wd_cmd_info },
@@ -180 +180 @@
-   WD_CLIENT_STATE_LOGGED_IN,           0,              true,           wd_cmd_news },
- { "NICK",
-SAID_HELLO
+CONNECTED
- { "PASS",
-GAVE_USER
+CONNECTED
- { "PING",
-   WD_CLIENT_STATE_CONNECTED,           0,              false,          wd_cmd_ping },
@@ -204 +204 @@
-   WD_CLIENT_STATE_LOGGED_IN,           1,              true,           wd_cmd_stat },
- { "STATUS",
-SAID_HELLO
+CONNECTED
- { "TOPIC",
-   WD_CLIENT_STATE_LOGGED_IN,           1,              true,           wd_cmd_topic },
@@ -210 +210 @@
-   WD_CLIENT_STATE_LOGGED_IN,           2,              true,           wd_cmd_type },
- { "USER",
-SAID_HELLO
+CONNECTED
- { "USERS",
-   WD_CLIENT_STATE_LOGGED_IN,           0,              true,           wd_cmd_users },
@@ -273 +273 @@
-                client->state = WD_CLIENT_STATE_DISCONNECTED;
-
-broadcast_leave
+remove_client
-        }
-
@@ -471 +471 @@
-        wd_client_t             *client = wd_client();
-
-SAID_HELLO
+CONNECTED
-                return;
-
@@ -918 +918 @@
-                         wd_files_unique_size);
-        
-SAID_HELLO
+CONNECTED
-}
-
@@ -1172 +1172 @@
-
-        wd_chat_remove_client(chat, client);
-        wd_chat_broadcast_leave(chat, client);
-}
-
@@ -1338 +1337 @@
-        wi_string_t             *nick;
-
- WD_CLIENT_STATE_SAID_HELLO
+= WD_CLIENT_STATE_CONNECTED
-                return;
-        
@@ -1363 +1362 @@
-        wd_chat_t               *chat;
-
-GAVE_USER
+CONNECTED
-                return;
-        
@@ -1639 +1638 @@
-        wi_string_t             *status;
-
- WD_CLIENT_STATE_SAID_HELLO
+= WD_CLIENT_STATE_CONNECTED
-                return;
-
@@ -1734 +1733 @@
-        wd_client_t             *client = wd_client();
-
-SAID_HELLO
+CONNECTED
-                return;
-
@@ -1742 +1741 @@
-                client->nick = wi_retain(client->login);
-
-GAVE_USER
+CONNECTED
-}
-
@@ -1783 +1782 @@
-                return;
-
-
-
+//
+

wired/branches/p7/wired/messages.c

@@ -50 +50 @@
-
-static void                                                     wd_message_client_info(wd_client_t *, wi_p7_message_t *);
+static void                                                     wd_message_get_user_info(wd_client_t *, wi_p7_message_t *);
+static void                                                     wd_message_join_chat(wd_client_t *, wi_p7_message_t *);
-static void                                                     wd_message_login(wd_client_t *, wi_p7_message_t *);
-static void                                                     wd_message_ping(wd_client_t *, wi_p7_message_t *);
@@ -73 +75 @@
-
-        wi_hash_set_data_for_key(wd_message_handlers, wd_message_client_info, WI_STR("wired.client_info"));
+        wi_hash_set_data_for_key(wd_message_handlers, wd_message_get_user_info, WI_STR("wired.get_user_info"));
+        wi_hash_set_data_for_key(wd_message_handlers, wd_message_join_chat, WI_STR("wired.join_chat"));
-        wi_hash_set_data_for_key(wd_message_handlers, wd_message_login, WI_STR("wired.login"));
-        wi_hash_set_data_for_key(wd_message_handlers, wd_message_ping, WI_STR("wired.ping"));
@@ -96 +100 @@
-
-        while(client->state <= WD_CLIENT_STATE_LOGGED_IN) {
+                if(++i % 10 == 0)
+                        wi_pool_drain(pool);
+
-                do {
-                        state = wi_socket_wait(client->socket, 0.1);
@@ -132 +139 @@
-                }
-                
+                if(client->state == WD_CLIENT_STATE_CONNECTED) {
+                        if(!wi_is_equal(wi_p7_message_name(message), WI_STR("wired.client_info"))) {
+                                wi_log_warn(WI_STR("Message should be wired.client_info"));
+                                
+                                continue;
+                        }
+                }
+                else if(client->state == WD_CLIENT_STATE_GAVE_INFO) {
+                        if(!wi_is_equal(wi_p7_message_name(message), WI_STR("wired.login"))) {
+                                wi_log_warn(WI_STR("Message should be wired.login"));
+                                
+                                continue;
+                        }
+                }
+                
-                client->message = message;
-                
-                handler = wi_hash_data_for_key(wd_message_handlers, wi_p7_message_name(message));
-                
-
+ {
-                        (*handler)(client, message);
-else
+} else {
-                        wi_log_warn(WI_STR("No handler for message %@"), wi_p7_message_name(message));
-
-if(++i % 10 == 0)
-       wi_pool_drain(pool);
+
+       continue;
+}
-        }
-        
@@ -149 +171 @@
-                client->state = WD_CLIENT_STATE_DISCONNECTED;
-
-broadcast_leave
+remove_client
-        }
-
@@ -177 +199 @@
-        wi_process_t            *process;
-        
+        client->state = WD_CLIENT_STATE_GAVE_INFO;
+
-        process = wi_process();
-
-        reply = wi_p7_message_with_name(WI_STR("wired.server_info"), client->p7_socket);
-.
-.
-.
-.
+_
+_
+_
+_
-        wi_p7_message_set_string_for_name(reply, wi_process_os_arch(process), WI_STR("wired.info.arch"));
-server_
-server_
-server_info.launch
+
+
+info.start_time
-        
-        wd_reply_message(client, reply);
+}
+
+
+
+static void wd_message_get_user_info(wd_client_t *client, wi_p7_message_t *message) {
+        wd_client_t                     *peer;
+        uint32_t                        uid;
+        
+        if(!wi_p7_message_get_uint32_for_name(message, &uid, WI_STR("wired.user.id"))) {
+                wd_reply_error2(client, 2);
+                
+                return;
+        }
+        
+        peer = wd_client_with_uid(uid);
+        
+        if(!peer) {
+                wd_reply_error2(client, 6);
+                
+                return;
+        }
+        
+        wd_client_reply_client_info(peer, client);
+}
+
+
+
+static void wd_message_join_chat(wd_client_t *client, wi_p7_message_t *message) {
+        wd_chat_t                       *chat;
+        uint32_t                        cid;
+        
+        if(!wi_p7_message_get_uint32_for_name(message, &cid, WI_STR("wired.chat.id"))) {
+                wd_reply_error2(client, 2);
+                
+                return;
+        }
+
+        chat = wd_chats_chat_with_cid(cid);
+        
+        if(!chat) {
+                wd_reply_error2(client, 3);
+                
+                return;
+        }
+        
+        if(wd_chat_contains_client(chat, client)) {
+                wd_reply_error2(client, 4);
+                
+                return;
+        }
+        
+        wd_chat_add_client(chat, client);
+        wd_chat_reply_client_list(chat, client);
-}
-
@@ -231 +308 @@
-           client->nick, client->login, client->ip);
-
-        wi_lock_lock(client->flag_lock);
-        client->admin = (client->account->kick_users || client->account->ban_users);
-        client->state = WD_CLIENT_STATE_LOGGED_IN;
-        wi_lock_unlock(client->flag_lock);
-
-        wi_lock_lock(wd_status_lock);
@@ -263 +338 @@
-        icon = wi_p7_message_data_for_name(message, WI_STR("wired.user.icon"));
-
+        if(!icon) {
+                wd_reply_error2(client, 2);
+                
+                return;
+        }
+
-        if(!wi_is_equal(icon, client->icon)) {
-                wi_release(client->icon);
@@ -278 +359 @@
-
-        nick = wi_p7_message_string_for_name(message, WI_STR("wired.user.nick"));
+        
+        if(!nick) {
+                wd_reply_error2(client, 2);
+                
+                return;
+        }
-
-        if(!wi_is_equal(nick, client->nick)) {
@@ -295 +382 @@
-        status = wi_p7_message_string_for_name(message, WI_STR("wired.user.status"));
-
+        if(!status) {
+                wd_reply_error2(client, 2);
+                
+                return;
+        }
+
-        if(!wi_is_equal(status, client->status)) {
-                wi_release(client->status);