Changeset 4402

Timestamp:

10/03/06 10:02:26 (2 years ago)

Author:

morris

Message:

Update for libwired

Files:

• wired/trunk/wired/accounts.c (modified) (4 diffs)
• wired/trunk/wired/chats.c (modified) (13 diffs)
• wired/trunk/wired/chats.h (modified) (1 diff)
• wired/trunk/wired/clients.c (modified) (9 diffs)
• wired/trunk/wired/clients.h (modified) (2 diffs)
• wired/trunk/wired/commands.c (modified) (19 diffs)
• wired/trunk/wired/news.c (modified) (1 diff)
• wired/trunk/wired/server.c (modified) (6 diffs)
• wired/trunk/wired/server.h (modified) (1 diff)
• wired/trunk/wired/trackers.c (modified) (19 diffs)
• wired/trunk/wired/transfers.c (modified) (14 diffs)
• wired/trunk/wired/transfers.h (modified) (1 diff)

wired/trunk/wired/accounts.c

@@ -595 +595 @@
-
-void wd_accounts_reload_users(void) {
-list_node_t         *node
+enumerator_t                *enumerator
-        wd_client_t                     *client;
-
-
-
+
+
+
+
+
+
-                _wd_accounts_reload_client(client);
-
+
+
-}
-
@@ -647 +651 @@
-
-static void _wd_accounts_reload_user(wi_string_t *name) {
-list_node_t         *node
+enumerator_t                *enumerator
-        wd_client_t                     *client;
-
-
-
+
+
+
+
+
-                if(wi_is_equal(client->account->name, name))
-                        _wd_accounts_reload_client(client);
-        }
-
+
+
-}
-
@@ -661 +669 @@
-
-static void _wd_accounts_reload_group(wi_string_t *name) {
-list_node_t         *node
+enumerator_t                *enumerator
-        wd_client_t                     *client;
-
-
-
+
+
+
+
+
-                if(wi_is_equal(client->account->group, name))
-                        _wd_accounts_reload_client(client);
-        }
-
+
+
-}
-
@@ -693 +705 @@
-        wi_lock_unlock(client->flag_lock);
-        
-
-
+
-                wd_client_broadcast_status(client);
-                wd_broadcast_unlock();
-        }
-
-        wd_client_lock_socket(client);

wired/trunk/wired/chats.c

@@ -41 +41 @@
-
-
+wd_chat_t                                                       *wd_public_chat;
+
-static wi_hash_t                                        *wd_chats;
-
@@ -55 +57 @@
-
-void wd_init_chats(void) {
-        wd_chat_t               *chat;
-
-        wd_chat_runtime_id = wi_runtime_register_class(&wd_chat_runtime_class);
-
-        wd_chats = wi_hash_init(wi_hash_alloc());
-
-
-
-
+
+
-}
-
@@ -97 +96 @@
-        
-        wi_hash_rdlock(wd_chats);
-hash_data_for_key(wd_chats, wi_number_with_int32(chat->cid
+autorelease(wi_retain(wi_hash_data_for_key(wd_chats, wi_number_with_int32(cid))
-        wi_hash_unlock(wd_chats);
-        
@@ -117 +116 @@
-                chat = wi_hash_data_for_key(wd_chats, key);
-                
+                wi_array_wrlock(chat->clients);
-                wi_array_remove_data(chat->clients, client);
+                wi_array_unlock(chat->clients);
-
-                if(chat->cid != WD_PUBLIC_CID && wi_array_count(chat->clients) == 0)
@@ -212 +213 @@
-
-        if(chat) {
-hash_rdlock(wd_cha
+array_rdlock(chat->clien
-                
-                enumerator = wi_array_data_enumerator(chat->clients);
@@ -224 +225 @@
-                }
-                        
-hash_unlock(wd_cha
+array_unlock(chat->clien
-        }
-
@@ -233 +234 @@
-
-void wd_chat_add_client(wd_chat_t *chat, wd_client_t *client) {
-
-
+
-                                 chat->cid,                     WD_FIELD_SEPARATOR,
-                                 client->uid,           WD_FIELD_SEPARATOR,
@@ -246 +246 @@
-                                 client->status,        WD_FIELD_SEPARATOR,
-                                 client->image);
-
-
-
+
+
-        wi_array_add_data(chat->clients, client);
-hash_unlock(wd_cha
+array_unlock(chat->clien
-
-        if(chat->topic.topic)
@@ -259 +258 @@
-
-void wd_chat_remove_client(wd_chat_t *chat, wd_client_t *client) {
-hash_wrlock(wd_cha
+array_wrlock(chat->clien
-        wi_array_remove_data(chat->clients, client);
-
-
+
+
+
+
-                wi_hash_remove_data_for_key(wd_chats, wi_number_with_int32(chat->cid));
-
-wi_hash_unlock(wd_chats);
+
+}
-}
-
@@ -274 +275 @@
-        wd_client_t             *client;
-        
-wd_cha
+chat->clien
-        
-        enumerator = wi_array_data_enumerator(chat->clients);
@@ -295 +296 @@
-        }
-        
-wd_cha
+chat->clien
-
-        wd_reply(311, WI_STR("%u"), chat->cid);
@@ -346 +347 @@
-        string = wi_date_iso8601_string(chat->topic.date);
-        
-->cid
+
-                                 chat->cid,                             WD_FIELD_SEPARATOR,
-                                 chat->topic.nick,              WD_FIELD_SEPARATOR,
@@ -354 +355 @@
-                                 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/trunk/wired/chats.h

@@ -83 +83 @@
-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 *);
-
-
+extern wd_chat_t                                                *wd_public_chat;
+
-#endif /* WD_CHATS_H */

wired/trunk/wired/clients.c

@@ -56 +56 @@
-static wi_timer_t                                               *wd_clients_timer;
-
-list
+hash
-
-static wi_runtime_id_t                                  wd_client_runtime_id = WI_RUNTIME_ID_NULL;
@@ -72 +72 @@
-        wd_client_runtime_id = wi_runtime_register_class(&wd_client_runtime_class);
-
-list_init(wi_list
+hash_init(wi_hash
-
-        wd_clients_timer = wi_timer_init_with_function(wi_timer_alloc(),
@@ -89 +89 @@
-
-static void wd_update_clients(wi_timer_t *timer) {
-list_node_t         *node
+enumerator_t                *enumerator
-        wd_client_t                     *client;
-        wi_time_interval_t      interval;
-
-
+
+
+
-                interval = wi_time_interval();
-
-wd_broadcast_lock(
-wi_list_rdlock(wd_clients);
-WI_LIST_FOREACH(wd_clients, node, client
+enumerator = wi_hash_data_enumerator(wd_clients
+
+while((client = wi_enumerator_next_data(enumerator))
-                        if(client->idle || client->state != WD_CLIENT_STATE_LOGGED_IN)
-                                continue;
@@ -108 +110 @@
-                        }
-                }
-                wi_list_unlock(wd_clients);
-                wd_broadcast_unlock();
-        }
+                
+        wi_hash_unlock(wd_clients);
-}
-
@@ -118 +120 @@
-        wi_log_debug(WI_STR("Clients:"));
-        wi_log_debug(WI_STR("%@"), wd_clients);
+}
+
+
+
+#pragma mark -
+
+void wd_clients_add_client(wd_client_t *client) {
+        wi_hash_wrlock(wd_clients);
+        wi_hash_set_data_for_key(wd_clients, client, wi_number_with_int32(client->uid));
+        wi_hash_unlock(wd_clients);
+}
+
+
+
+void wd_clients_remove_client(wd_client_t *client) {
+        wd_chats_remove_client(client);
+        wd_transfers_remove_client(client);
+        
+        wi_hash_wrlock(wd_clients);
+        wi_hash_remove_data_for_key(wd_clients, wi_number_with_int32(client->uid));
+        wi_hash_unlock(wd_clients);
+}
+
+
+
+void wd_clients_remove_all_clients(void) {
+        wi_enumerator_t         *enumerator;
+        wd_client_t                     *client;
+
+        wi_hash_wrlock(wd_clients);
+        
+        enumerator = wi_hash_data_enumerator(wd_clients);
+        
+        while((client = wi_enumerator_next_data(enumerator))) {
+                wd_chats_remove_client(client);
+                wd_transfers_remove_client(client);
+        }
+
+        wi_hash_remove_all_data(wd_clients);
+        
+        wi_hash_unlock(wd_clients);
-}
-
@@ -199 +242 @@
-        static wd_uid_t         uid;
-
-list
+hash
-                uid = 0;
-
@@ -238 +281 @@
-
-wd_client_t * wd_client_with_uid(wd_uid_t uid) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-}
-
@@ -259 +295 @@
-
-void wd_client_broadcast_status(wd_client_t *client) {
-WD_PUBLIC_CID
+wd_public_chat
-                                 client->uid,           WD_FIELD_SEPARATOR,
-                                 client->idle,          WD_FIELD_SEPARATOR,
@@ -267 +303 @@
-                                 client->status);
-}
-
-
-
-void wd_client_broadcast_leave(wd_client_t *client, wd_cid_t cid) {
-        wd_broadcast(cid, 303, WI_STR("%u%c%u"),
-                                 cid,           WD_FIELD_SEPARATOR,
-                                 client->uid);
-}
-
-
-
-#pragma mark -
-
-void wd_clients_add_client(wd_client_t *client) {
-        wi_list_wrlock(wd_clients);
-        wi_list_append_data(wd_clients, client);
-        wi_list_unlock(wd_clients);
-}
-
-
-
-void wd_clients_remove_client(wd_client_t *client) {
-        wd_chats_remove_client(client);
-        wd_transfers_remove_client(client);
-        
-        wi_list_wrlock(wd_clients);
-        wi_list_remove_data(wd_clients, client);
-        wi_list_unlock(wd_clients);
-}
-
-
-
-void wd_clients_remove_all_clients(void) {
-        wi_list_node_t  *node;
-        wd_client_t     *client;
-
-        wi_list_wrlock(wd_clients);
-        WI_LIST_FOREACH(wd_clients, node, client) {
-                wd_chats_remove_client(client);
-                wd_transfers_remove_client(client);
-        }
-
-        wi_list_remove_all_data(wd_clients);
-        wi_list_unlock(wd_clients);
-}

wired/trunk/wired/clients.h

@@ -91 +91 @@
-void                                                                    wd_dump_clients(void);
-
+void                                                                    wd_clients_add_client(wd_client_t *);
+void                                                                    wd_clients_remove_client(wd_client_t *);
+void                                                                    wd_clients_remove_all_clients(void);
+
-wd_client_t *                                                   wd_client_alloc(void);
-wd_client_t *                                                   wd_client_init_with_socket(wd_client_t *, wi_socket_t *);
@@ -103 +107 @@
-
-void                                                                    wd_client_broadcast_status(wd_client_t *);
-void                                                                    wd_client_broadcast_leave(wd_client_t *, unsigned int);
-
-void                                                                    wd_clients_add_client(wd_client_t *);
-void                                                                    wd_clients_remove_client(wd_client_t *);
-void                                                                    wd_clients_remove_all_clients(void);
-
-
-list
+hash
-
-#endif /* WD_CLIENTS_H */

wired/trunk/wired/commands.c

@@ -283 +283 @@
-                client->state = WD_CLIENT_STATE_DISCONNECTED;
-
-
-
-
+
-        }
-
@@ -340 +338 @@
-                        client->idle = false;
-
-                        wd_broadcast_lock();
-                        wd_client_broadcast_status(client);
-                        wd_broadcast_unlock();
-                }
-        }
@@ -411 +407 @@
-        }
-
-
-
+
-                                 peer->uid,             WD_FIELD_SEPARATOR,
-                                 client->uid,   WD_FIELD_SEPARATOR,
-                                 WI_ARRAY(arguments, 1));
-        wd_broadcast_unlock();
-
-        wi_log_ll(WI_STR("%@/%@/%@ banned %@/%@/%@"),
@@ -455 +449 @@
-        }
-
-
-
+
-                                 client->uid,   WD_FIELD_SEPARATOR,
-                                 WI_ARRAY(arguments, 0));
-        wd_broadcast_unlock();
-}
-
@@ -628 +620 @@
-                return;
-
-
-
+
-                                 chat->cid,             WD_FIELD_SEPARATOR,
-                                 client->uid);
-        wd_broadcast_unlock();
-}
-
@@ -977 +967 @@
-                client->icon = icon;
-
-
-
+
-                        wd_client_broadcast_status(client);
-                        wd_broadcast_unlock();
-                }
-        }
-
@@ -990 +977 @@
-
-                if(client->state == WD_CLIENT_STATE_LOGGED_IN) {
-
-
+
-                                                 client->uid,   WD_FIELD_SEPARATOR,
-                                                 client->image);
-                        wd_broadcast_unlock();
-                }
-        }
@@ -1007 +992 @@
-static void wd_cmd_info(wi_array_t *arguments) {
-        wd_client_t                     *client = wd_client();
-list_node_t         *node
+enumerator_t                *enumerator
-        wi_string_t                     *info, *login, *idle, *downloads, *uploads;
-        wd_client_t                     *peer;
@@ -1031 +1016 @@
-        uploads         = wi_string();
-
-
-
+
+
+
+
+
-                if(transfer->client == peer && transfer->state == WD_TRANSFER_RUNNING) {
-                        if(!client->account->view_dropboxes) {
@@ -1058 +1046 @@
-                }
-        }
-
+
+
-        
-        login   = wi_date_iso8601_string(wi_date_with_time_interval(peer->login_time));
@@ -1179 +1168 @@
-        }
-
-
-
+
-                                 peer->uid,             WD_FIELD_SEPARATOR,
-                                 client->uid,   WD_FIELD_SEPARATOR,
-                                 WI_ARRAY(arguments, 1));
-        wd_broadcast_unlock();
-
-        wi_log_ll(WI_STR("%@/%@/%@ kicked %@/%@/%@"),
@@ -1217 +1204 @@
-
-        wd_chat_remove_client(chat, client);
-
-
-
-
+
-}
-
@@ -1289 +1273 @@
-        count = wi_array_count(array);
-        
-        wd_broadcast_lock();
-        for(i = 0; i < count; i++) {
-                string = WI_ARRAY(array, i);
-                
-                if(wi_string_length(string) > 0) {
-id
+hat
-                                                 cid,                   WD_FIELD_SEPARATOR,
-                                                 client->uid,   WD_FIELD_SEPARATOR,
@@ -1300 +1283 @@
-                }
-        }
-        wd_broadcast_unlock();
-}
-
@@ -1397 +1379 @@
-                client->nick = wi_retain(nick);
-
-
-
+
-                        wd_client_broadcast_status(client);
-                        wd_broadcast_unlock();
-                }
-        }
-}
@@ -1637 +1616 @@
-        count = wi_array_count(array);
-        
-        wd_broadcast_lock();
-        for(i = 0; i < count; i++) {
-                string = WI_ARRAY(array, i);
-                
-                if(wi_string_length(string) > 0) {
-id
+hat
-                                                 cid,                   WD_FIELD_SEPARATOR,
-                                                 client->uid,   WD_FIELD_SEPARATOR,
@@ -1648 +1626 @@
-                }
-        }
-        wd_broadcast_unlock();
-}
-
@@ -1709 +1686 @@
-                client->status = wi_retain(status);
-
-
-
+
-                        wd_client_broadcast_status(client);
-                        wd_broadcast_unlock();
-                }
-        }
-}
@@ -1747 +1721 @@
-        wd_chat_set_topic(chat, WI_ARRAY(arguments, 1));
-
-        wd_broadcast_lock();
-        wd_chat_broadcast_topic(chat);
-        wd_broadcast_unlock();
-}
-

wired/trunk/wired/news.c

@@ -133 +133 @@
-        }
-        
-
-
-
+
-
-end:

wired/trunk/wired/server.c

@@ -108 +108 @@
-                        continue;
-                
-set por
+create socke
-                wi_address_set_port(address, wd_settings.port);
+                control_socket = wi_autorelease(wi_socket_init_with_address(wi_socket_alloc(), address, WI_SOCKET_TCP));
+
-                wi_address_set_port(address, wd_settings.port + 1);
-
-                /* create sockets */
-                control_socket = wi_autorelease(wi_socket_init_with_address(wi_socket_alloc(), address, WI_SOCKET_TCP));
-                transfer_socket = wi_autorelease(wi_socket_init_with_address(wi_socket_alloc(), address, WI_SOCKET_TCP));
-        
@@ -197 +196 @@
-                string = wi_date_iso8601_string(wd_start_date);
-                
-
-
+
-                                         wd_server_version_string,              WD_FIELD_SEPARATOR,
-                                         wd_protocol_version_string,    WD_FIELD_SEPARATOR,
@@ -206 +204 @@
-                                         wd_files_unique_count,                 WD_FIELD_SEPARATOR,
-                                         wd_files_unique_size);
-                wd_broadcast_unlock();
-        }
-
@@ -482 +479 @@
-
-
-
-
-
+
-        wi_enumerator_t *enumerator;
-        wd_chat_t               *chat;
-        wd_client_t             *client;
-        wi_string_t             *string;
@@ -495 +489 @@
-        va_end(ap);
-        
-chat = wd_chats_chat_with_cid(cid
+wi_array_rdlock(chat->clients
-
-        enumerator = wi_array_data_enumerator(chat->clients);
@@ -506 +500 @@
-                }
-        }
+        
+        wi_array_unlock(chat->clients);
-
-        wi_release(string);
-}
-
-
-
-void wd_broadcast_lock(void) {
-        wi_list_rdlock(wd_chats);
-}
-
-
-
-void wd_broadcast_unlock(void) {
-        wi_list_unlock(wd_chats);
-}

wired/trunk/wired/server.h

@@ -54 +54 @@
-void                                                            wd_reply_error(void);
-void                                                            wd_sreply(wi_socket_t *, unsigned int, wi_string_t *, ...);
-
-
-
-
+
-
-

wired/trunk/wired/trackers.c

@@ -80 +80 @@
-
-
-list
+array
-
-static wi_timer_t                                               *wd_trackers_register_timer;
@@ -101 +101 @@
-        wd_tracker_runtime_id = wi_runtime_register_class(&wd_tracker_runtime_class);
-
-list_init(wi_list
+array_init(wi_array
-
-        wd_trackers_register_timer =
@@ -126 +126 @@
-        uint32_t                        port;
-        
-list
-list
+array
+array
-        
-        enumerator = wi_array_data_enumerator(wd_settings.tracker);
-        
-        while((string = wi_enumerator_next_data(enumerator))) {
-d_tracker_init(wd_tracker_alloc(
-url_init_with_string(wi_url_alloc(), string
+i_autorelease(wd_tracker_init(wd_tracker_alloc()
+autorelease(wi_url_init_with_string(wi_url_alloc(), string)
-                
-                if(!wi_url_is_valid(url)) {
@@ -139 +139 @@
-                                string);
-                        
-goto next
+continue
-                }
-
@@ -147 +147 @@
-                        wi_log_warn(WI_STR("Could not set SSL context: %m"));
-                        
-goto next
+continue
-                }
-
@@ -162 +162 @@
-                        wi_log_warn(WI_STR("Could not resolve \"%@\": %m"), tracker->host);
-                        
-goto next
+continue
-                }
-                
@@ -175 +175 @@
-                        wi_address_set_port(address, port);
-                
-
-
-
-
-
-
-
-
+
+
+
+
-}
-
@@ -259 +255 @@
-
-void wd_trackers_register(wi_boolean_t update) {
-list
+array
-                wi_release(wd_trackers_guest_account);
-                
@@ -275 +271 @@
-static void wd_trackers_register_thread(wi_runtime_instance_t *argument) {
-        wi_pool_t                       *pool;
+        wi_enumerator_t         *enumerator;
-        wi_number_t                     *number = argument;
-        wi_list_node_t          *node;
-        wd_tracker_t            *tracker;
-        wi_boolean_t            update;
@@ -283 +279 @@
-        update = wi_number_bool(number);
-        
-
-
+
+
+
+
+
-                wd_tracker_register(tracker);
-                
@@ -290 +289 @@
-                        wd_tracker_update(tracker);
-        }
-
+
+
-        
-        if(update)
@@ -307 +307 @@
-
-static void wd_trackers_update(void) {
-list_node_t         *node
+enumerator_t                *enumerator
-        wd_tracker_t            *tracker;
-        
-
-
+
+
+
+
+
-                if(tracker->active)
-                        wd_tracker_update(tracker);
-        }
-
+
+
-}
-