diff options
Diffstat (limited to '')
-rw-r--r-- | src/api.c | 108 |
1 files changed, 68 insertions, 40 deletions
@@ -12,6 +12,8 @@ #include <time.h> #include <stdarg.h> #include <printf.h> +#include <pthread.h> +#include <stdatomic.h> #define DC_API_PREFIX "https://discord.com/api/v8/" /* this can be a format string, DO NOT use format characters inside */ #define DC_LOGIN_FORMAT "{\"login\":\"%s\",\"password\":\"%s\",\"undelete\":false,\"captcha_key\":null,\"login_source\":null,\"gift_code_sku_id\":null}" #define DC_USER_AGENT "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.131 Safari/537.36" @@ -20,11 +22,37 @@ #define DC_API(curl, body, endpoint, ...) dc_api(curl, body, 0##__VA_OPT__(1), endpoint __VA_OPT__(,) __VA_ARGS__) #define cJSON_GetObjectItem2(root, name1, name2) (cJSON_GetObjectItem(root, name1) ? cJSON_GetObjectItem(cJSON_GetObjectItem(root, name1), name2) : NULL) #define DC_TIMESTAMP_FORMAT "%Y-%m-%dT%H:%M:%S.XXXXXX%z" +/* + struct members comment information: + - noui: the ui thread must not use the member (for example curl pointers are noui) + - noapi: the api thread must not use the member + - nofree: the (string) pointer is of a static string, do not attempt to free it (for example function, file, message in dc_error) + - yesfree: the (string) pointer is of a dynamically-allocated string, free it before losing pointer to the struct (most strings) + - nouiw: ui must not write + - noapiw: api must not write + guidelines: + - when threading, you must use mutexes to prevent accessing structs (and their pointers because of realloc!) (optionaly with timeouts that are optionaly reported with DC_CLIENT_ERROR) + - error reporting function shall not report an error to itself when mutex lock times out for obvious reasons + - _sizeofs shall represent the size of arrays in atomic types and when appending to the array shall be incremented **after** the element is appended, so reading threads may function normally + - keep arrays as arrays of pointers, not direct structs, as that allows reading an array when appending is in progress by another thread + - threading and races 101: when popping arrays, always lock in a non-shared way, same obviously applies for sorting, but not necessarily for appending (when only a shared lock is needed) + mutexes: + - mutexes for child members are kept in the struct with the object that is being modified. if realloc is used on strings or those child objects (pointers change), the whole struct must be locked. + - when reading arrays of pointers, you shared lock it, you also shared lock it when appending + - when writing, lock the memory in a non shared way, take note of the pointer in case of realloc + struct pointed to from multiple sections (a great example is a channel) + - when a channel is created, DO NOT destroy it - never free channels if you don't free messages, never free guilds if you don't free channels. that's because channels in guilds are backpointed to parent guilds and messages are backpointed to channels, realloc would lead to a segfault. + - use posixes pthread_rwlock_init(3POSIX) mutexes to allow reading and appending to arrays and other types + TODO: make it work. + - i changed arrays from type arrays to type pointer arrays, so code that allocates must be reimplemented, also struct free functions and -> instead of . in array elements + - make mutex locks in api (and ui thread) + - make the ui thread +*/ struct dc_error { size_t line; - const char * function /* this is a static string, so it is not copied, do not free it */; - char * file /* this is a static string, so it is not copied, do not free it */; - char * message /* this is copied, caller can free it if it was dynamically created by it, it must be freed before destroying struct */; + const char * function; /* nofree */ + char * file; /* nofree */ + char * message; /* yesfree */ time_t time; short unsigned int reported /* 0: error was not yet shown to the user, 1: error was already shown to the user */; }; @@ -37,13 +65,14 @@ int dc_error_free(struct dc_error * e) { free(e); }; struct dc_message { - char * username; + char * username; /* yesfree */ int discriminator; - char * content; + char * content; /* yesfree */ time_t time; - struct dc_channel * channel; + struct dc_channel * channel; /* nofree */ unsigned short int tts; - unsigned long long int id; + unsigned long long int id; /* nouiw */ + unsigned short int status; /* noapiw - 0 if it was not yet printed on the display, 1 if it was */ }; int dc_message_free (struct dc_message * m) { free(m->username); m->username = NULL; @@ -62,13 +91,12 @@ int dc_message_compare (const void * a, const void * b) { return c->time > d->time ? -1 : c->time < d->time ? 1 : 0; } struct dc_channel { - char * name; - char * topic; - unsigned long long int id; - struct dc_guild * guild; - struct dc_message * messages; - size_t messages_sizeof; - unsigned short int sent /* describes status, was message already sent (1) or is it to-be sent (0)? */; + char * name; /* yesfree, nouiw */ + char * topic; /* yesfree, nouiw */ + unsigned long long int id; /* nouiw */ + struct dc_guild * guild; /* nofree, nouiw */ + struct dc_message ** messages; /* yesfree, nouiw */ + _Atomic(size_t) messages_sizeof; /* nouiw */ }; int dc_channel_free (struct dc_channel * ch) { free(ch->name); ch->name = NULL; @@ -76,39 +104,39 @@ int dc_channel_free (struct dc_channel * ch) { ch->guild = NULL; ch->id = 0; for (int i = 0; i < ch->messages_sizeof; i++) - dc_message_free(&ch->messages[i]); + dc_message_free(ch->messages[i]); ch->messages_sizeof = 0; free(ch); } struct dc_guild { - char * name; - unsigned long long id; - size_t channels_sizeof; - struct dc_channel * channels; + char * name; /* nouiw, yesfree */ + unsigned long long id; /* nouiw */ + _Atomic(size_t) channels_sizeof; /* nouiw */ + struct dc_channel ** channels; /* yesfree, nouiw */ }; int dc_guild_free (struct dc_guild * g) { free(g->name); g->name = NULL; g->id = 0; for (int i = 0; i < g->channels_sizeof; i++) - dc_channel_free(&g->channels[i]); + dc_channel_free(g->channels[i]); g->channels_sizeof = 0; free(g); } struct dc_client { - CURL * curl; - struct curl_slist * curl_headers; - char * authorization; - char * email; /* email and password are copied, even though they are sometimes static ENV vars - they are not always! */ - char * password; - char * username; - int discriminator; - struct dc_guild * guilds; - size_t guilds_sizeof; - struct dc_channel * joinedchannel; - struct dc_error * errors; - size_t errors_sizeof; - struct dc_message * sent_messages; - size_t sent_messages_sizeof; + CURL * curl; /* noui */ + struct curl_slist * curl_headers; /* noui */ + char * authorization; /* noui */ + char * email; /* yesfree, noapiw */ + char * password; /* yesfree, noapiw */ + char * username; /* yesfree, nouiw */ + int discriminator; /* nouiw */ + struct dc_guild ** guilds; /* yesfree, nouiw */ + _Atomic(size_t) guilds_sizeof; /* nouiw */ + struct dc_channel * joinedchannel; /* nofree, nouiw */ + struct dc_error ** errors; /* yesfree */ + _Atomic(size_t) errors_sizeof; + struct dc_message ** sent_messages; /* yesfree - ui appends, api pops and moves to messages */ + _Atomic(size_t) sent_messages_sizeof; }; int dc_client_free (struct dc_client * c) { curl_easy_cleanup(c->curl); @@ -120,13 +148,13 @@ int dc_client_free (struct dc_client * c) { c->discriminator = -1; c->joinedchannel = NULL; for (int i = 0; i < c->guilds_sizeof; i++) - dc_guild_free(&c->guilds[i]); + dc_guild_free(c->guilds[i]); c->guilds_sizeof = 0; for (int i = 0; i < c->errors_sizeof; i++) - dc_error_free(&c->errors[i]); + dc_error_free(c->errors[i]); c->errors_sizeof = 0; for (int i = 0; i < c->sent_messages_sizeof; c++) - dc_message_free(&c->sent_messages[i]); + dc_message_free(c->sent_messages[i]); c->sent_messages_sizeof = 0; free(c); } @@ -502,7 +530,7 @@ int dc_fetch_messages (struct dc_client * c, struct dc_channel * ch) { DC_CLIENT_ERROR(c, "!ch || !ch->id"); return -3; } - cJSON * json = DC_API(c->curl, NULL, DC_API_PREFIX "channels/%llu/messages?limit=100", ch->id); + cJSON * json = DC_API(c->curl, NULL, DC_API_PREFIX "channels/%llu/messages?limit=100&_=", ch->id, rand()); if (!json) { const char *error_ptr = cJSON_GetErrorPtr(); if (!error_ptr) { @@ -566,9 +594,9 @@ int dc_fetch_messages (struct dc_client * c, struct dc_channel * ch) { } struct dc_api_thread_control { unsigned short int power; /* 1 if the thread should run, set it to 0 for the thread to return at the end of the loop */ - struct dc_client * clients; /* "array" of clients the thread should manage, ONLY ONE dc_api_thread PER PROCESS! */ + struct dc_client ** clients; /* "array" of pointers to clients the thread should manage, ONLY ONE dc_api_thread PER PROCESS! */ size_t dc_clients_sizeof; }; int dc_api_thread (struct dc_api_thread_control * t) { /* updates messages and sends messages when they are in the outbox */ - return -1; + return 1; } /* the thread shall use mutexes when doing things with shared memory - client structs */ |