Changeset 4684

Timestamp:

02/22/07 18:02:28 (1 year ago)

Author:

morris

Message:

Match wired's p7 support

Files:

• wire/branches/p7/wire/client.c (modified) (12 diffs)
• wire/branches/p7/wire/client.h (modified) (2 diffs)
• wire/branches/p7/wire/commands.c (modified) (3 diffs)
• wire/branches/p7/wire/main.c (modified) (1 diff)

wire/branches/p7/wire/client.c

@@ -42 +42 @@
-#include "windows.h"
-
+typedef void                                            wr_message_func_t(wi_p7_message_t *);
+
+
-static wi_integer_t                                     wr_runloop_server_callback(wi_socket_t *);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
@@ -87 +62 @@
-wi_string_t                                                     *wr_nick;
-wi_string_t                                                     *wr_status;
-string
+data
-wi_string_t                                                     *wr_login;
-wi_string_t                                                     *wr_password;
@@ -93 +68 @@
-wi_string_t                                                     *wr_icon_path;
-wi_string_t                                                     *wr_timestamp_format;
+
+wi_socket_t                                                     *wr_socket;
+wi_p7_socket_t                                          *wr_p7_socket;
+wi_address_t                                            *wr_address;
+
+uint64_t                                                        wr_received_bytes;
+uint64_t                                                        wr_transferred_bytes;
+
+wi_integer_t                                            wr_news_count;
+wi_integer_t                                            wr_news_limit;
+
+wi_time_interval_t                                      wr_ping_time;
+
+wi_boolean_t                                            wr_connected;
+wi_boolean_t                                            wr_logged_in;
+
+static wi_socket_context_t                      *wr_socket_context;
+
+static wi_hash_t                                        *wr_message_handlers;
+
+static wi_p7_spec_t                                     *wr_p7_spec;
+
+static wi_p7_uint32_t                           wr_transaction;
-
-static const char                                       wr_default_icon[] =
@@ -139 +137 @@
-        "Vy/xW31D+jfvNtPdS+ASBQAAAABJRU5ErkJggg==";
-
-static wi_socket_context_t                      *wr_socket_context;
-
-static wi_p7_spec_t                                     *wr_p7_spec;
-
-wi_socket_t                                                     *wr_socket;
-wi_p7_socket_t                                          *wr_p7_socket;
-wi_address_t                                            *wr_address;
-
-uint64_t                                                        wr_received_bytes;
-uint64_t                                                        wr_transferred_bytes;
-
-wi_integer_t                                            wr_news_count;
-wi_integer_t                                            wr_news_limit;
-
-wi_time_interval_t                                      wr_ping_time;
-
-wi_boolean_t                                            wr_connected;
-wi_boolean_t                                            wr_logged_in;
-
-
-void wr_client_init(void) {
-
-
+
+
+
+
+
+
+
-        wr_socket_context = wi_socket_context_init(wi_socket_context_alloc());
-        
-//      if(!wi_socket_context_set_ssl_type(wr_socket_context, WI_SOCKET_SSL_CLIENT))
-//              wi_log_err(WI_STR("Could not set SSL context: %m"));
-        
-        options = WI_STRING_ENCODING_IGNORE | WI_STRING_ENCODING_TRANSLITERATE;
-        
-        wr_client_string_encoding = wi_string_encoding_init_with_charset(wi_string_encoding_alloc(),
-
-
-
+
-        wr_server_string_encoding = wi_string_encoding_init_with_charset(wi_string_encoding_alloc(),
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        
-        wr_p7_spec = wi_p7_spec_init_with_file(wi_p7_spec_alloc(), WI_STR("wired.xml"));
@@ -235 +219 @@
-                p7_socket = wi_autorelease(wi_p7_socket_init_with_socket(wi_p7_socket_alloc(), socket, wr_p7_spec));
-                
-_256
-_256
+256_SHA1
+256_SHA1
-                        wr_printf_prefix(WI_STR("Could not connect to %@: %m"), ip);
-
@@ -245 +229 @@
-                
-                if(cipher) {
-@/%u bits
-name
-bits
+u-bit %@
+bits
+name
-                } else {
-                        wr_printf_prefix(WI_STR("Connected, logging in..."));
@@ -264 +248 @@
-                
-                {
-i_p7_message_with_name(WI_STR("wired.info"), wr_p7_socket
-i_p7
+r_message_with_name(WI_STR("wired.client_info")
+r
-                        
-i_p7_socket_write_message(wr_p7_socket, 0.0, 
+r_send_message(
-                }
-                
@@ -314 +298 @@
-
-static wi_integer_t wr_runloop_server_callback(wi_socket_t *socket) {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        } else {
-
-
+
-
-                wr_disconnect();
-        }
-        
-message
+0
-}
-
@@ -335 +323 @@
-#pragma mark -
-
-
+/*
-        wi_array_t              *arguments;
-        wi_string_t             *string;
@@ -458 +446 @@
-}
-
-
+
-
-wi_boolean_t wr_send_command(wi_string_t *fmt, ...) {
@@ -506 +494 @@
-#pragma mark -
-
+wi_p7_message_t * wr_message_with_name(wi_string_t *name) {
+        return wi_p7_message_with_name(name, wr_p7_socket);
+}
+
+
+
+void wr_message_set_string_for_name(wi_p7_message_t *message, wi_string_t *string, wi_string_t *name) {
+        wi_string_t             *converted_string;
+        
+        converted_string = wi_string_by_converting_encoding(string, wr_client_string_encoding, wr_server_string_encoding);
+        
+        wi_p7_message_set_string_for_name(message, converted_string, name);
+}
+
+
+
+wi_string_t * wr_message_string_for_name(wi_p7_message_t *message, wi_string_t *name) {
+        wi_string_t             *string;
+        
+        string = wi_p7_message_string_for_name(message, name);
+        
+        if(!string)
+                return NULL;
+        
+        wi_string_convert_encoding(string, wr_server_string_encoding, wr_client_string_encoding);
+
+        return string;
+}
+
+
+
+#pragma mark -
+
+wi_boolean_t wr_send_message(wi_p7_message_t *message) {
+        wi_integer_t    result;
+        
+        wi_p7_message_set_uint32_for_name(message, wr_transaction++, WI_STR("wired.transaction"));
+        
+        result = wi_p7_socket_write_message(wr_p7_socket, 15.0, message);
+        
+        if(result <= 0)
+                wr_printf_prefix(WI_STR("Could not write to server: %m"));
+        
+        return (result > 0);
+}
+
+
+
+#pragma mark -
+
+static void wr_message_login_reply(wi_p7_message_t *reply) {
+        wi_p7_message_t         *message;
+
+        wr_wprintf_prefix(wr_console_window, WI_STR("Logged in, welcome to %@"), wr_server->name);
+        
+        message = wr_message_with_name(WI_STR("wired.set_nick"));
+        wr_message_set_string_for_name(message, wr_nick, WI_STR("wired.user.nick"));
+        wr_send_message(message);
+        
+        if(wr_status) {
+                message = wr_message_with_name(WI_STR("wired.set_status"));
+                wr_message_set_string_for_name(message, wr_status, WI_STR("wired.user.status"));
+                wr_send_message(message);
+        }
+        
+        if(wr_icon) {
+                message = wr_message_with_name(WI_STR("wired.set_icon"));
+                wi_p7_message_set_data_for_name(message, wr_icon, WI_STR("wired.user.icon"));
+                wr_send_message(message);
+        }
+}
+
+
+
+static void wr_message_ping_reply(wi_p7_message_t *reply) {
+}
+
+
+
+static void wr_message_server_info(wi_p7_message_t *message) {
+        wi_p7_message_t         *reply;
+
+        wr_server = wr_server_init(wr_server_alloc());
+        wr_server->name = wi_retain(wi_p7_message_string_for_name(message, WI_STR("wired.server_info.name")));
+        wr_server->description = wi_retain(wi_p7_message_string_for_name(message, WI_STR("wired.server_info.description")));
+        wr_server->startdate = wi_retain(wi_p7_message_string_for_name(message, WI_STR("wired.server_info.launch")));
+//      wr_server->files = wi_string_uint32(WI_ARRAY(arguments, 4));
+//      wr_server->size = wi_string_uint64(WI_ARRAY(arguments, 5));
+
+        wr_draw_divider();
+
+        if(!wr_logged_in) {
+                reply = wr_message_with_name(WI_STR("wired.login"));
+                wr_message_set_string_for_name(reply, wr_login, WI_STR("wired.user.login"));
+                wr_message_set_string_for_name(reply, wi_string_sha1(wr_password), WI_STR("wired.login.password"));
+                wr_send_message(reply);
+        }
+}
+
+
+
+#pragma mark -
+/*
-static void wr_msg_200(wi_array_t *arguments) {
-        double          protocol;
@@ -1212 +1303 @@
-                wr_print_files();
-}
+*/

wire/branches/p7/wire/client.h

@@ -55 +55 @@
-void                                                                    wr_disconnect(void);
-
+wi_p7_message_t *                                               wr_message_with_name(wi_string_t *);
+void                                                                    wr_message_set_string_for_name(wi_p7_message_t *, wi_string_t *, wi_string_t *);
+wi_string_t *                                                   wr_message_string_for_name(wi_p7_message_t *, wi_string_t *);
+
+wi_boolean_t                                                    wr_send_message(wi_p7_message_t *);
+
-wi_boolean_t                                                    wr_send_command(wi_string_t *, ...);
-wi_boolean_t                                                    wr_send_command_on_socket(wi_socket_t *, wi_string_t *, ...);
@@ -69 +75 @@
-extern wi_string_t                                              *wr_nick;
-extern wi_string_t                                              *wr_status;
-string
+data
-extern wi_string_t                                              *wr_login;
-extern wi_string_t                                              *wr_password;

wire/branches/p7/wire/commands.c

@@ -783 +783 @@
-
-static void wr_cmd_icon(wi_array_t *arguments) {
-
+
+
-
-        path = wi_string_by_normalizing_path(WI_ARRAY(arguments, 0));
-string = wi_string_init_with_contents_of_file(wi_string
-
-string
+data = wi_data_init_with_contents_of_file(wi_data
+
+data
-                wi_release(wr_icon_path);
-                wr_icon_path = wi_retain(path);
-                
-                wi_release(wr_icon);
-wi_retain(wi_string_base64(string))
+data
-                
-                if(wr_connected)
-                        wr_send_command(WI_STR("ICON %u%c%#@"), 0, WR_FIELD_SEPARATOR, wr_icon);
-
-                wi_release(string);
-        } else {
-                wr_printf_prefix(WI_STR("icon: %@: %m"), path);
@@ -1156 +1155 @@
-
-static void wr_cmd_nick(wi_array_t *arguments) {
-
+
+
-        
-        nick = WI_ARRAY(arguments, 0);
@@ -1166 +1166 @@
-                wr_draw_divider();
-                
-
-
+
+
+
+
+
-        }
-}

wire/branches/p7/wire/main.c

@@ -342 +342 @@
-                        
-                        if(interval - ping_interval > 60.0) {
-
-
-
-
-
-
+
-                                
-                                ping_interval = interval;