Changeset 4739

Timestamp:

05/10/07 18:17:13 (2 years ago)

Author:

morris

Message:

Encapsulate client data fully, use accessors everywhere

Files:

• wired/trunk/wired/accounts.c (modified) (6 diffs)
• wired/trunk/wired/chats.c (modified) (4 diffs)
• wired/trunk/wired/clients.c (modified) (10 diffs)
• wired/trunk/wired/clients.h (modified) (2 diffs)
• wired/trunk/wired/commands.c (modified) (81 diffs)
• wired/trunk/wired/files.c (modified) (12 diffs)
• wired/trunk/wired/news.c (modified) (1 diff)
• wired/trunk/wired/server.c (modified) (3 diffs)
• wired/trunk/wired/transfers.c (modified) (24 diffs)

wired/trunk/wired/accounts.c

@@ -438 +438 @@
-wi_boolean_t wd_accounts_check_privileges(wd_account_t *account) {
-        wd_client_t             *client = wd_client();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        return false;
-        }
@@ -562 +565 @@
-        wi_enumerator_t         *enumerator;
-        wd_client_t                     *client;
+        wd_account_t            *account;
-
-        wi_hash_rdlock(wd_clients);
@@ -568 +572 @@
-        
-        while((client = wi_enumerator_next_data(enumerator))) {
-
+
+
+
-                        _wd_accounts_reload_client(client);
-        }
@@ -580 +586 @@
-        wi_enumerator_t         *enumerator;
-        wd_client_t                     *client;
+        wd_account_t            *account;
-
-        wi_hash_rdlock(wd_clients);
@@ -586 +593 @@
-        
-        while((client = wi_enumerator_next_data(enumerator))) {
-
+
+
+
-                        _wd_accounts_reload_client(client);
-        }
@@ -596 +605 @@
-
-static void _wd_accounts_reload_client(wd_client_t *client) {
-
-
-
-
+
+
+
+
+
-        
-        if(!account)
-                return;
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                wd_client_broadcast_status(client);
-
+        _wd_accounts_sreply_privileges(client);
+}
+
+
+
+static void _wd_accounts_sreply_privileges(wd_client_t *client) {
+        wd_account_t    *account;
+        
+        account = wd_client_account(client);
+        
-        wd_client_lock_socket(client);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        wd_client_unlock_socket(client);
-}
-
-
-
-static void _wd_accounts_sreply_privileges(wd_client_t *client) {
-        wd_sreply(client->socket, 602, WI_STR("%d%c%d%c%d%c%d%c%d%c%d%c%d%c%d%c%d%c%d%c%d%c%d%c%d%c%d%c%d%c%d%c%d%c%d%c%u%c%u%c%u%c%u%c%d"),
-                          client->account->get_user_info,                       WD_FIELD_SEPARATOR,
-                          client->account->broadcast,                           WD_FIELD_SEPARATOR,
-                          client->account->post_news,                           WD_FIELD_SEPARATOR,
-                          client->account->clear_news,                          WD_FIELD_SEPARATOR,
-                          client->account->download,                            WD_FIELD_SEPARATOR,
-                          client->account->upload,                                      WD_FIELD_SEPARATOR,
-                          client->account->upload_anywhere,                     WD_FIELD_SEPARATOR,
-                          client->account->create_folders,                      WD_FIELD_SEPARATOR,
-                          client->account->alter_files,                         WD_FIELD_SEPARATOR,
-                          client->account->delete_files,                        WD_FIELD_SEPARATOR,
-                          client->account->view_dropboxes,                      WD_FIELD_SEPARATOR,
-                          client->account->create_accounts,                     WD_FIELD_SEPARATOR,
-                          client->account->edit_accounts,                       WD_FIELD_SEPARATOR,
-                          client->account->delete_accounts,                     WD_FIELD_SEPARATOR,
-                          client->account->elevate_privileges,          WD_FIELD_SEPARATOR,
-                          client->account->kick_users,                          WD_FIELD_SEPARATOR,
-                          client->account->ban_users,                           WD_FIELD_SEPARATOR,
-                          client->account->cannot_be_kicked,            WD_FIELD_SEPARATOR,
-                          client->account->download_speed,                      WD_FIELD_SEPARATOR,
-                          client->account->upload_speed,                        WD_FIELD_SEPARATOR,
-                          client->account->download_limit,                      WD_FIELD_SEPARATOR,
-                          client->account->upload_limit,                        WD_FIELD_SEPARATOR,
-                          client->account->set_topic);
-}
-

wired/trunk/wired/chats.c

@@ -236 +236 @@
-
-void wd_chat_add_client(wd_chat_t *chat, wd_client_t *client) {
-        wd_client_rdlock_client(client);
-        wd_broadcast(chat, 302, WI_STR("%u%c%u%c%u%c%u%c%u%c%#@%c%#@%c%#@%c%#@%c%#@%c%#@"),
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        
-        wd_chat_wrlock(chat);
@@ -284 +282 @@
-        
-        while((client = wi_enumerator_next_data(enumerator))) {
-
-
-
+
-                        wd_reply(310, WI_STR("%u%c%u%c%u%c%u%c%u%c%#@%c%#@%c%#@%c%#@%c%#@%c%#@"),
-
-client->uid,
-client->idle
-client->admin,        
-client->icon
-client->nick
-client->login
-client->ip,
-client->host
-client->status,
-client->image
+                       
+wd_client_uid(client),        
+wd_client_is_idle(client)
+wd_client_is_admin(client),
+wd_client_icon(client)
+wd_client_nick(client)
+wd_client_login(client)
+wd_client_ip(client), 
+wd_client_host(client)
+wd_client_status(client),     
+wd_client_image(client)
-                }
-
-                wd_client_unlock_client(client);
-        }
-        
@@ -325 +319 @@
-
-        wi_release(chat->topic.nick);
-client->nick
+wd_client_nick(client)
-
-        wi_release(chat->topic.login);
-client->login
+wd_client_login(client)
-
-        wi_release(chat->topic.ip);
-client->ip
+wd_client_ip(client)
-
-        wd_chat_unlock(chat);
@@ -381 +375 @@
-        wd_broadcast(chat, 303, WI_STR("%u%c%u"),
-                                 chat->cid,             WD_FIELD_SEPARATOR,
-client->uid
-
+wd_client_uid(client)
+

wired/trunk/wired/clients.c

@@ -45 +45 @@
-#define WD_CLIENTS_TIMER_INTERVAL               60.0
-
+#define WD_CLIENT_SET_VALUE(dst, src)                                   \
+        WI_STMT_START                                                                           \
+                wi_rwlock_wrlock(client->client_lock);                  \
+                (dst) = (src);                                                                  \
+                wi_rwlock_unlock(client->client_lock);                  \
+        WI_STMT_END
+
+#define WD_CLIENT_SET_OBJECT(dst, src)                                  \
+        WI_STMT_START                                                                           \
+                wi_rwlock_wrlock(client->client_lock);                  \
+                (dst) = wi_retain((src));                                               \
+                wi_rwlock_unlock(client->client_lock);                  \
+        WI_STMT_END
+
+#define WD_CLIENT_RETURN_VALUE(src)                                             \
+        WI_STMT_START                                                                           \
+                typeof(src)             _value;                                                 \
+                                                                                                                \
+                wi_rwlock_rdlock(client->client_lock);                  \
+                _value = (src);                                                                 \
+                wi_rwlock_unlock(client->client_lock);                  \
+                                                                                                                \
+                return _value;                                                                  \
+        WI_STMT_END
+
+#define WD_CLIENT_RETURN_OBJECT(src)                                    \
+        WI_STMT_START                                                                           \
+                typeof(src)             _object;                                                \
+                                                                                                                \
+                wi_rwlock_rdlock(client->client_lock);                  \
+                _object = wi_autorelease(wi_retain((src)));             \
+                wi_rwlock_unlock(client->client_lock);                  \
+                                                                                                                \
+                return _object;                                                                 \
+        WI_STMT_END
+
+
+
+struct _wd_client {
+        wi_runtime_base_t                                       base;
+        
+        wi_rwlock_t                                                     *client_lock;
+        wi_lock_t                                                       *socket_lock;
+        
+        wi_socket_t                                                     *socket;
+        
+        wd_uid_t                                                        uid;
+        wd_client_state_t                                       state;
+        wd_icon_t                                                       icon;
+        wi_boolean_t                                            idle;
+        wi_boolean_t                                            admin;
+        
+        wd_account_t                                            *account;
+
+        wi_string_t                                                     *nick;
+        wi_string_t                                                     *login;
+        wi_string_t                                                     *ip;
+        wi_string_t                                                     *host;
+        wi_uinteger_t                                           port;
+        wi_string_t                                                     *version;
+        wi_string_t                                                     *status;
+        
+        wi_string_t                                                     *image;
+        
+        wi_time_interval_t                                      login_time;
+        wi_time_interval_t                                      idle_time;
+        
+        wi_array_t                                                      *transfers_queue;
+        wi_uinteger_t                                           downloads;
+        wi_uinteger_t                                           uploads;
+};
+
-
-static void                                                             wd_clients_update_idle(wi_timer_t *);
@@ -51 +123 @@
-static wi_string_t *                                    wd_client_description(wi_runtime_instance_t *);
-
-wd_clien
+_wd_client_nex
-
-
@@ -106 +178 @@
-                
-                while((client = wi_enumerator_next_data(enumerator))) {
-d_client_wrlock_client(client
+i_rwlock_wrlock(client->client_lock
-                        
-                        if(client->state == WD_CLIENT_STATE_LOGGED_IN &&
@@ -116 +188 @@
-                        }
-
-d_client_unlock_client(client
+i_rwlock_unlock(client->client_lock
-                }
-        }
@@ -166 +238 @@
-
-
+wd_client_t * wd_clients_client_with_uid(wd_uid_t uid) {
+        wd_client_t     *client;
+
+        wi_hash_rdlock(wd_clients);
+        client = wi_autorelease(wi_retain(wi_hash_data_for_key(wd_clients, wi_number_with_int32(uid))));
+        wi_hash_unlock(wd_clients);
+        
+        return client;
+}
+
+
+
+#pragma mark -
+
+void wd_client_set(wd_client_t *client) {
+        wi_hash_set_data_for_key(wi_thread_hash(), client, WI_STR(WD_CLIENTS_THREAD_KEY));
+}
+
+
+
+wd_client_t * wd_client(void) {
+        return wi_hash_data_for_key(wi_thread_hash(), WI_STR(WD_CLIENTS_THREAD_KEY));
+}
+
+
+
-#pragma mark -
-
@@ -177 +275 @@
-        wi_address_t    *address;
-
-wd_clien
+_wd_client_nex
-        client->socket                  = wi_retain(socket);
-        client->state                   = WD_CLIENT_STATE_CONNECTED;
@@ -187 +285 @@
-        client->host                    = wi_retain(wi_address_hostname(address));
-        
+        client->client_lock             = wi_rwlock_init(wi_rwlock_alloc());
-        client->socket_lock             = wi_lock_init(wi_lock_alloc());
-        client->client_lock             = wi_rwlock_init(wi_rwlock_alloc());
-        
-        client->transfers_queue = wi_array_init(wi_array_alloc());
@@ -235 +333 @@
-#pragma mark -
-
-wd_clien
+_wd_client_nex
-        wd_uid_t                uid;
-        
@@ -250 +348 @@
-
-        return uid;
-}
-
-
-
-#pragma mark -
-
-void wd_client_wrlock_client(wd_client_t *client) {
-        wi_rwlock_wrlock(client->client_lock);
-}
-
-
-
-void wd_client_rdlock_client(wd_client_t *client) {
-        wi_rwlock_rdlock(client->client_lock);
-}
-
-
-
-void wd_client_unlock_client(wd_client_t *client) {
-        wi_rwlock_unlock(client->client_lock);
-}
-
-
-
-
-void wd_client_lock_socket(wd_client_t *client) {
-        wi_lock_lock(client->socket_lock);
-}
-
-
-
-void wd_client_unlock_socket(wd_client_t *client) {
-        wi_lock_unlock(client->socket_lock);
-}
-
-
-
-#pragma mark -
-
-void wd_client_set(wd_client_t *client) {
-        wi_hash_set_data_for_key(wi_thread_hash(), client, WI_STR(WD_CLIENTS_THREAD_KEY));
-}
-
-
-
-wd_client_t * wd_client(void) {
-        return wi_hash_data_for_key(wi_thread_hash(), WI_STR(WD_CLIENTS_THREAD_KEY));
-}
-
-
-
-#pragma mark -
-
-wd_client_t * wd_client_with_uid(wd_uid_t uid) {
-        wd_client_t     *client;
-
-        wi_hash_rdlock(wd_clients);
-        client = wi_autorelease(wi_retain(wi_hash_data_for_key(wd_clients, wi_number_with_int32(uid))));
-        wi_hash_unlock(wd_clients);
-        
-        return client;
-}
-
@@ -326 +363 @@
-                                 client->status);
-}
+
+
+
+#pragma mark -
+
+void wd_client_lock_socket(wd_client_t *client) {
+        wi_lock_lock(client->socket_lock);
+}
+
+
+
+void wd_client_unlock_socket(wd_client_t *client) {
+        wi_lock_unlock(client->socket_lock);
+}
+
+
+
+#pragma mark -
+
+void wd_client_set_socket(wd_client_t *client, wi_socket_t *socket) {
+        wi_rwlock_wrlock(client->client_lock);
+        client->socket = wi_retain(socket);
+        wi_rwlock_unlock(client->client_lock);
+}
+
+
+
+wi_socket_t * wd_client_socket(wd_client_t *client) {
+        wi_socket_t             *socket;
+        
+        wi_rwlock_rdlock(client->client_lock);
+        socket = wi_autorelease(wi_retain(client->socket));
+        wi_rwlock_unlock(client->client_lock);
+        
+        return socket;
+}
+
+
+
+void wd_client_set_uid(wd_client_t *client, wd_uid_t uid) {
+        WD_CLIENT_SET_VALUE(client->uid, uid);
+}
+
+
+
+wd_uid_t wd_client_uid(wd_client_t *client) {
+        WD_CLIENT_RETURN_VALUE(client->uid);
+}
+
+
+
+void wd_client_set_state(wd_client_t *client, wd_client_state_t state) {
+        WD_CLIENT_SET_VALUE(client->state, state);
+}
+
+
+
+wd_client_state_t wd_client_state(wd_client_t *client) {
+        WD_CLIENT_RETURN_VALUE(client->state);
+}
+
+
+
+void wd_client_set_icon(wd_client_t *client, wd_icon_t icon) {
+        WD_CLIENT_SET_VALUE(client->icon, icon);
+}
+
+
+
+wd_icon_t wd_client_icon(wd_client_t *client) {
+        WD_CLIENT_RETURN_VALUE(client->icon);
+}
+
+
+
+void wd_client_set_idle(wd_client_t *client, wi_boolean_t idle) {
+        WD_CLIENT_SET_VALUE(client->idle, idle);
+}
+
+
+
+wi_boolean_t wd_client_is_idle(wd_client_t *client) {
+        WD_CLIENT_RETURN_VALUE(client->idle);
+}
+
+
+
+void wd_client_set_admin(wd_client_t *client, wi_boolean_t admin) {
+        WD_CLIENT_SET_VALUE(client->admin, admin);
+}
+
+
+
+wi_boolean_t wd_client_is_admin(wd_client_t *client) {
+        WD_CLIENT_RETURN_VALUE(client->admin);
+}
+
+
+
+void wd_client_set_account(wd_client_t *client, wd_account_t *account) {
+        WD_CLIENT_SET_OBJECT(client->account, account);
+}
+
+
+
+wd_account_t * wd_client_account(wd_client_t *client) {
+        WD_CLIENT_RETURN_OBJECT(client->account);
+}
+
+
+
+void wd_client_set_nick(wd_client_t *client, wi_string_t *nick) {
+        WD_CLIENT_SET_OBJECT(client->nick, nick);
+}
+
+
+
+wi_string_t * wd_client_nick(wd_client_t *client) {
+        WD_CLIENT_RETURN_OBJECT(client->nick);
+}
+
+
+
+void wd_client_set_login(wd_client_t *client, wi_string_t *login) {
+        WD_CLIENT_SET_OBJECT(client->login, login);
+}
+
+
+
+wi_string_t * wd_client_login(wd_client_t *client) {
+        WD_CLIENT_RETURN_OBJECT(client->login);
+}
+
+
+
+void wd_client_set_ip(wd_client_t *client, wi_string_t *ip) {
+        WD_CLIENT_SET_OBJECT(client->ip, ip);
+}
+
+
+
+wi_string_t * wd_client_ip(wd_client_t *client) {
+        WD_CLIENT_RETURN_OBJECT(client->ip);
+}
+
+
+
+void wd_client_set_host(wd_client_t *client, wi_string_t *host) {
+        WD_CLIENT_SET_OBJECT(client->host, host);
+}
+
+
+
+wi_string_t * wd_client_host(wd_client_t *client) {
+        WD_CLIENT_RETURN_OBJECT(client->host);
+}
+
+
+
+void wd_client_set_port(wd_client_t *client, wi_uinteger_t port) {
+        WD_CLIENT_SET_VALUE(client->port, port);
+}
+
+
+
+wi_uinteger_t wd_client_port(wd_client_t *client) {
+        WD_CLIENT_RETURN_VALUE(client->port);
+}
+
+
+
+void wd_client_set_version(wd_client_t *client, wi_string_t *version) {
+        WD_CLIENT_SET_OBJECT(client->version, version);
+}
+
+
+
+wi_string_t * wd_client_version(wd_client_t *client) {
+        WD_CLIENT_RETURN_OBJECT(client->version);
+}
+
+
+
+void wd_client_set_status(wd_client_t *client, wi_string_t *status) {
+        WD_CLIENT_SET_OBJECT(client->status, status);
+}
+
+
+
+wi_string_t * wd_client_status(wd_client_t *client) {
+        WD_CLIENT_RETURN_OBJECT(client->status);
+}
+
+
+
+void wd_client_set_image(wd_client_t *client, wi_string_t *image) {
+        WD_CLIENT_SET_OBJECT(client->image, image);
+}
+
+
+wi_string_t * wd_client_image(wd_client_t *client) {
+        WD_CLIENT_RETURN_OBJECT(client->image);
+}
+
+
+
+void wd_client_set_login_time(wd_client_t *client, wi_time_interval_t login_time) {
+        WD_CLIENT_SET_VALUE(client->login_time, login_time);
+}
+
+
+
+wi_time_interval_t wd_client_login_time(wd_client_t *client) {
+        WD_CLIENT_RETURN_VALUE(client->login_time);
+}
+
+
+
+void wd_client_set_idle_time(wd_client_t *client, wi_time_interval_t idle_time) {
+        WD_CLIENT_SET_VALUE(client->idle_time, idle_time);
+}
+
+
+
+wi_time_interval_t wd_client_idle_time(wd_client_t *client) {
+        WD_CLIENT_RETURN_VALUE(client->idle_time);
+}
+
+
+
+void wd_client_set_transfers_queue(wd_client_t *client, wi_array_t *transfers_queue) {
+        WD_CLIENT_SET_OBJECT(client->transfers_queue, transfers_queue);
+}
+
+
+
+wi_array_t * wd_client_transfers_queue(wd_client_t *client) {
+        WD_CLIENT_RETURN_OBJECT(client->transfers_queue);
+}
+
+
+
+void wd_client_increase_downloads(wd_client_t *client) {
+        WD_CLIENT_SET_VALUE(client->downloads, client->downloads + 1);
+}
+
+
+
+void wd_client_decrease_downloads(wd_client_t *client) {
+        WD_CLIENT_SET_VALUE(client->downloads, client->downloads - 1);
+}
+
+
+
+wi_uinteger_t wd_client_downloads(wd_client_t *client) {
+        WD_CLIENT_RETURN_VALUE(client->downloads);
+}
+
+
+
+void wd_client_increase_uploads(wd_client_t *client) {
+        WD_CLIENT_SET_VALUE(client->uploads, client->uploads + 1);
+}
+
+
+
+void wd_client_decrease_uploads(wd_client_t *client) {
+        WD_CLIENT_SET_VALUE(client->uploads, client->uploads - 1);
+}