Changeset 4428
- Timestamp:
- 01/25/07 15:58:09 (1 year ago)
- Files:
-
- trackerd/trunk/trackerd/clients.h (modified) (1 diff)
- trackerd/trunk/trackerd/commands.c (modified) (8 diffs)
- trackerd/trunk/trackerd/servers.c (modified) (2 diffs)
- trackerd/trunk/trackerd/settings.h (modified) (2 diffs)
- trackerd/trunk/trackerd/tracker.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trackerd/trunk/trackerd/clients.h
r4407 r4428 54 54 55 55 char *buffer; 56 unsigned int buffer_size;57 unsigned int buffer_offset;56 wi_uinteger_t buffer_size; 57 wi_uinteger_t buffer_offset; 58 58 59 59 double connect_time; trackerd/trunk/trackerd/commands.c
r4407 r4428 48 48 49 49 /* minimum number of arguments required */ 50 unsigned int args;50 wi_uinteger_t args; 51 51 52 52 void (*action)(wi_array_t *); … … 56 56 57 57 static void wt_parse_command(wi_string_t *); 58 static unsigned intwt_command_index(wi_string_t *);58 static wi_uinteger_t wt_command_index(wi_string_t *); 59 59 60 60 static void wt_cmd_categories(wi_array_t *); … … 80 80 81 81 void wt_control_thread(wi_runtime_instance_t *argument) { 82 wi_pool_t *pool;83 wt_client_t *client = (wt_client_t *) argument;84 wi_string_t *string;85 unsigned int i = 0;86 int state;82 wi_pool_t *pool; 83 wt_client_t *client = (wt_client_t *) argument; 84 wi_string_t *string; 85 wi_socket_state_t state; 86 wi_uinteger_t i = 0; 87 87 88 88 pool = wi_pool_init(wi_pool_alloc()); … … 97 97 do { 98 98 state = wi_socket_wait(client->socket, 0.1); 99 } while(state == 0&& client->state <= WT_CLIENT_STATE_SAID_HELLO);99 } while(state == WI_SOCKET_TIMEOUT && client->state <= WT_CLIENT_STATE_SAID_HELLO); 100 100 101 101 if(client->state > WT_CLIENT_STATE_SAID_HELLO) { … … 104 104 } 105 105 106 if(state < 0) {106 if(state == WI_SOCKET_ERROR) { 107 107 if(wi_error_code() == EINTR) { 108 108 /* got a signal */ … … 149 149 wi_string_t *command; 150 150 wi_array_t *arguments; 151 unsigned int index;151 wi_uinteger_t index; 152 152 153 153 wi_parse_wired_command(buffer, &command, &arguments); … … 175 175 176 176 177 static unsigned int wt_command_index(wi_string_t *command) {177 static wi_uinteger_t wt_command_index(wi_string_t *command) { 178 178 const char *cstring; 179 unsigned int i, min, max;179 wi_uinteger_t i, min, max; 180 180 int cmp; 181 181 … … 286 286 wi_string_t *hostname; 287 287 wt_server_t *server; 288 unsigned int bandwidth;289 288 wi_boolean_t failed = false, passed; 289 uint32_t bandwidth; 290 290 291 291 url = wi_autorelease(wi_url_init_with_string(wi_url_alloc(), WI_ARRAY(arguments, 1))); trackerd/trunk/trackerd/servers.c
r4407 r4428 130 130 char magic[5]; 131 131 wi_time_interval_t interval, update; 132 unsigned int version,count = 0;132 wi_uinteger_t count = 0; 133 133 wi_boolean_t loaded = false; 134 uint32_t version; 134 135 135 136 wi_lock_lock(wt_servers_lock); … … 172 173 173 174 loaded = true; 175 count++; 174 176 } 175 177 } trackerd/trunk/trackerd/settings.h
r4407 r4428 41 41 wi_string_t *description; 42 42 wi_array_t *address; 43 unsigned int port;43 wi_uinteger_t port; 44 44 45 45 uid_t user; … … 50 50 wi_time_interval_t minupdatetime; 51 51 wi_time_interval_t maxupdatetime; 52 unsigned int minbandwidth;53 unsigned int maxbandwidth;52 wi_uinteger_t minbandwidth; 53 wi_uinteger_t maxbandwidth; 54 54 wi_boolean_t lookup; 55 55 wi_boolean_t reverselookup; trackerd/trunk/trackerd/tracker.c
r4407 r4428 209 209 wi_string_t *ip; 210 210 wt_client_t *client; 211 unsigned int i = 0;211 wi_uinteger_t i = 0; 212 212 213 213 pool = wi_pool_init(wi_pool_alloc()); … … 266 266 wt_server_t *server; 267 267 char buffer[WI_SOCKET_BUFFER_SIZE]; 268 unsigned int i = 0;269 intbytes;268 wi_uinteger_t i = 0; 269 wi_integer_t bytes; 270 270 271 271 pool = wi_pool_init(wi_pool_alloc()); … … 353 353 #pragma mark - 354 354 355 void wt_reply(u nsigned int n, wi_string_t *fmt, ...) {355 void wt_reply(uint32_t n, wi_string_t *fmt, ...) { 356 356 wt_client_t *client = wt_client(); 357 357 wi_string_t *string;
