diff options
Diffstat (limited to 'src/h.c')
| -rw-r--r-- | src/h.c | 270 |
1 files changed, 217 insertions, 53 deletions
@@ -40,7 +40,10 @@ enum dc_status { /* theese are flags and should be and-checked */ DC_IN_PROGRESS = 1 << 17, /* object is in parsing (by json_cb) */ DC_DESTROY_CB = 1 << 18, /* wether cb shall call api on DESTROY (used for http responses) */ DC_MAY_FREE = 1 << 19, /* whether dc_*_add() shall free passed in pointer if found one in ISA */ - DC_WS_ACTIVE = 1 << 20, /* set at API_WS so that api_o will reconnect WS if connection dropps */ + DC_WS_ACTIVE = 1 << 20, /* set at WSI_CREATE so api_o will reconnect WS if connection dropps */ + DC_NO_WRITE = 1 << 21, /* signaling dc_ws_stack not to call lws_callback_on_writeable */ + DC_SET_WS_ACTIVE = 1 << 22, /* whether _CREATE _cb shall set client->status =| DC_WS_ACTIVE */ + DC_REPLACE = 1 << 23, /* dc_add_x replace old with new on found, _free: only free members */ DC_INTERNAL = DC_FROM_LWS | DC_FROM_API, /* call originates from an internal function */ }; /* note: when checking status, first check for DC_OK, if it's set then disregard errors! */ enum dc_permissions { /* other permissions exist, but are not implemented/understood */ @@ -52,22 +55,28 @@ enum dc_permissions { /* other permissions exist, but are not implemented/unders DC_VOICE_SPEAK = 1 << 21 }; /* all enum fields here have values same as the values that the server sends */ enum dc_channel_type { /* other types exist, but are not implemented/understood */ - DC_CM = 0, /* channel messages */ - DC_DM = 1, /* direct messages */ + DC_GC = 0, /* guild channel */ + DC_DM = 1, /* direct messages channel */ DC_VOICE = 2, /* all enum fields here have values same as the values that the server sends */ DC_GROUP_DM = 3 }; +#define DC_CHANNEL_SUPPORTED(x) (x == DC_GC || x == DC_DM || x == DC_VOICE || x == DC_GROUP_DM) enum dc_ws_packet { /* op numbers of websocket packets or json objects in other words */ DC_PING = 1, - DC_NONE = 69 /* nonexisting, set pass->packet to this before lejp_construct time 4 each packet */ + DC_STRPKTOFF = 100, /* here follow string types (t) */ + DC_NONE = DC_STRPKTOFF + 0, /* unknown packet or packet type not yet defermined */ + DC_MESSAGE_CREATE = DC_STRPKTOFF + 0, +}; /* intents enum was removed - intents're for bots, clients have capabilities - are not understood */ +char * dc_ws_packet[] = { + "", + "MESSAGE_CREATE", + "" }; -enum dc_ws_intent { /* types of json blobs that the server sends us whenever available */ - DC_GUILDS = 1 << 0, /* all enum fields here have values same as the values that the serv sends */ - DC_USERS = 1 << 1, /* other types exist, but are not implemented/understood */ - DC_CMS = 1 << 9, /* channel messages */ - DC_DMS = 1 << 12, /* direct messages */ - DC_INTENTS = DC_GUILDS | DC_USERS | DC_CMS | DC_DMS /* what intents to subscribe to/are implem */ +enum dc_message_type { /* other types exist, but are not implemented/understood, same values as server */ + DC_MESSAGE = 0, + DC_REPLY = 19, }; +#define DC_MESSAGE_SUPPORTED(x) (x == DC_MESSAGE || x == DC_REPLY) enum dc_api_io_type { /* all output structs have important structs set when an output is broadcast, for example if we get a channel from server but we don't possess it's guild (by id), api will wait for the guild and hold the channel in it's cache. for messages, tags in message are also parsed and queried. roles in premissions in channels are also fetched but not users in permissions, because permissions are currently only used for checking our permissions, not others' */ /* none of the outputs transfer memory ownership. tr0 for inputs means transfer none, trp means pointer to struct owned by library is to be passed, tr1 means transfer of ownership to library */ @@ -121,7 +130,7 @@ struct dc_api_io { /* output struct does NOT contain void * data (user pointer) struct dc_lws_pass * pass; }; #define DC_API_IO_MEMB_GC(m, t) if (m && m->status & DC_IN_PROGRESS) { \ - t##_free(m); \ + t##_free(m, DC_UNSET); \ m = NULL; } #define DC_API_IO_GC(s) do { /* this is called if: json_cb will start parsing another before callback, */ \ DC_API_IO_MEMB_GC(s.message, dc_message); /* WS connection closed, meaning json_cb */ \ @@ -139,10 +148,11 @@ struct dc_api_io { /* output struct does NOT contain void * data (user pointer) if (i.role) b i.role a \ if (i.permission) b i.permission a \ } while (0) -void dc_api_io_free (struct dc_api_io * s) { +void dc_api_io_free (struct dc_api_io * s, enum dc_status t) { if (!s) return; - free(s); + if (!(t & DC_REPLACE)) + free(s); return; } void dc_api_i (struct dc_api_io); @@ -158,37 +168,167 @@ char * dc_lws_headers[] = { enum dc_json_paths { /* lws reduces the following char array to uint8_t, so we can match easier */ DC_JSON_OP, /* packet type */ DC_JSON_S, /* packet sequence number */ + DC_JSON_T, /* type of packet for op=0 */ DC_JSON_PING, /* interval */ - DC_JSON_ME, /* never useful in path parser, but startswith() checks if we're in object */ - DC_JSON_ME_USERNAME, - DC_JSON_ME_ID, + DC_JSON_ME, + DC_JSON_ME_USERNAME, /* note: _ME is client->user ONLY for first d.user object. subsequent */ + DC_JSON_ME_ID, /* packets may contain user objects as well, they are other users */ DC_JSON_ME_DISCRIMINATOR, - DC_JSON_FRIEND, /* never useful in path parser, but startswith() checks if we're in object */ - DC_JSON_DM, /* never useful in path parser, but startswith() checks if we're in object */ + DC_JSON_FRIEND, + DC_JSON_FRIEND_ID, + DC_JSON_FRIEND_USERNAME, + DC_JSON_FRIEND_DISCRIMINATOR, + DC_JSON_DM, DC_JSON_DM_TYPE, DC_JSON_DM_ID, - DC_JSON_DM_USER, /* never useful in path parser, but startswith() checks if we're in object */ + DC_JSON_DM_USER, DC_JSON_DM_USER_NAME, DC_JSON_DM_USER_ID, DC_JSON_DM_USER_DISCRIMINATOR, - DC_JSON_PATHS_LENGTH + DC_JSON_GUILD, + DC_JSON_GUILD_NAME, + DC_JSON_GUILD_ID, + DC_JSON_GUILD_CHANNEL, + DC_JSON_GUILD_CHANNEL_TYPE, + DC_JSON_GUILD_CHANNEL_NAME, + DC_JSON_GUILD_CHANNEL_ID, + DC_JSON_GUILD_CHANNEL_TOPIC, + DC_JSON_GUILD_CHANNEL_PERMISSION, + DC_JSON_GUILD_CHANNEL_PERMISSION_TYPE, + DC_JSON_GUILD_CHANNEL_PERMISSION_ID, + DC_JSON_GUILD_CHANNEL_PERMISSION_DENY, + DC_JSON_GUILD_CHANNEL_PERMISSION_ALLOW, + DC_JSON_GUILD_ROLE, + DC_JSON_GUILD_ROLE_PERMISSION, + DC_JSON_GUILD_ROLE_NAME, + DC_JSON_GUILD_ROLE_ID, + DC_JSON_MESSAGE, + DC_JSON_MESSAGE_ATTACHMENTS, + DC_JSON_MESSAGE_ID, + DC_JSON_MESSAGE_TYPE, + DC_JSON_MESSAGE_CHANNEL, /* id */ + DC_JSON_MESSAGE_CONTENT, + DC_JSON_MESSAGE_AUTHOR, + DC_JSON_MESSAGE_AUTHOR_USERNAME, + DC_JSON_MESSAGE_AUTHOR_DISCRIMINATOR, + DC_JSON_MESSAGE_AUTHOR_ID, + DC_JSON_MESSAGE_AUTHOR_ROLES, + DC_JSON_MESSAGE_REFERENCE, /* id */ + DC_JSON_MESSAGE_MENTION_CHANNEL, /* TODO: implement role and user mentions fetching */ + DC_JSON_MESSAGE_MENTION_CHANNEL_ID, + DC_JSON_MESSAGE_MENTION_CHANNEL_GUILD, /* id */ + DC_JSON_MESSAGE_MENTION_CHANNEL_NAME, + DC_JSON_MESSAGE_MENTION_CHANNEL_TYPE, + DC_JSON_MESSAGE_MENTION_USER, + DC_JSON_MESSAGE_MENTION_USER_NAME, + DC_JSON_MESSAGE_MENTION_USER_ROLE, + DC_JSON_MESSAGE_MENTION_USER_ID, + DC_JSON_MESSAGE_MENTION_USER_DISCRIMINATOR, + DC_JSON_MESSAGE_REFOBJ, /* server only sends reference object one level deep */ + DC_JSON_MESSAGE_REFOBJ_ATTACHMENTS, + DC_JSON_MESSAGE_REFOBJ_ID, + DC_JSON_MESSAGE_REFOBJ_TYPE, + DC_JSON_MESSAGE_REFOBJ_CHANNEL, /* id */ + DC_JSON_MESSAGE_REFOBJ_CONTENT, + DC_JSON_MESSAGE_REFOBJ_AUTHOR, + DC_JSON_MESSAGE_REFOBJ_AUTHOR_USERNAME, + DC_JSON_MESSAGE_REFOBJ_AUTHOR_DISCRIMINATOR, + DC_JSON_MESSAGE_REFOBJ_AUTHOR_ID, + DC_JSON_MESSAGE_REFOBJ_AUTHOR_ROLES, + DC_JSON_MESSAGE_REFOBJ_REFERENCE, /* id, this _is_ sent for second nesting level */ + DC_JSON_MESSAGE_REFOBJ_MENTION_CHANNEL, /* TODO: implement role and user mentions fetching */ + DC_JSON_MESSAGE_REFOBJ_MENTION_CHANNEL_ID, + DC_JSON_MESSAGE_REFOBJ_MENTION_CHANNEL_GUILD, /* id */ + DC_JSON_MESSAGE_REFOBJ_MENTION_CHANNEL_NAME, + DC_JSON_MESSAGE_REFOBJ_MENTION_CHANNEL_TYPE, + DC_JSON_MESSAGE_REFOBJ_MENTION_USER, + DC_JSON_MESSAGE_REFOBJ_MENTION_USER_NAME, + DC_JSON_MESSAGE_REFOBJ_MENTION_USER_ROLE, + DC_JSON_MESSAGE_REFOBJ_MENTION_USER_ID, + DC_JSON_MESSAGE_REFOBJ_MENTION_USER_DISCRIMINATOR, + DC_JSON_PATHS_LENGTH /* we have 256 max length, because that's what library supports */ }; char * dc_json_paths[] = { /* array of paths we are interested in */ "op", "s", + "t", "d.heartbeat_interval", "d.user", /* NOTE: presence updates have same format, so only set own user once */ "d.user.username", "d.user.id", "d.user.discriminator", "d.relationships[].user", + "d.relationships[].user.id", + "d.relationships[].user.username", + "d.relationships[].user.discriminator", "d.private_channels[]", "d.private_channels[].type", "d.private_channels[].id", "d.private_channels[].recipients[]", "d.private_channels[].recipients[].username", "d.private_channels[].recipients[].id", - "d.private_channels[].recipients[].discriminator" + "d.private_channels[].recipients[].discriminator", + "d.guilds[]", + "d.guilds[].name", + "d.guilds[].id", + "d.guilds[].channels[]", + "d.guilds[].channels[].type", + "d.guilds[].channels[].name", + "d.guilds[].channels[].id", + "d.guilds[].channels[].topic", + "d.guilds[].channels[].permission_overwrites", + "d.guilds[].channels[].permission_overwrites.type", + "d.guilds[].channels[].permission_overwrites.id", + "d.guilds[].channels[].permission_overwrites.deny", + "d.guilds[].channels[].permission_overwrites.allow", + "d.guilds[].roles[]", + "d.guilds[].roles[].permissions", + "d.guilds[].roles[].name", + "d.guilds[].roles[].id", + "d", + "d.attachments[]", + "d.id", + "d.type", + "d.channel_id", + "d.content", + "d.author", + "d.author.username", + "d.author.discriminator", + "d.author.id", + "d.member.roles[]", + "d.message_reference", /* this is ID */ + "d.mention_channels[]", + "d.mention_channels[].id", + "d.mention_channels[].guild_id", + "d.mention_channels[].name", + "d.mention_channels[].type", + "d.mentions[]", + "d.mentions[].username", + "d.mentions[].member.roles[]", + "d.mentions[].id", + "d.mentions[].discriminator", + "d.referenced_message", + "d.referenced_message.attachments[]", + "d.referenced_message.id", + "d.referenced_message.type", + "d.referenced_message.channel_id", + "d.referenced_message.content", + "d.referenced_message.author", + "d.referenced_message.author.username", + "d.referenced_message.author.discriminator", + "d.referenced_message.author.id", + "d.referenced_message.member.roles[]", + "d.referenced_message.message_reference", /* this is ID */ + "d.referenced_message.mention_channels[]", + "d.referenced_message.mention_channels[].id", + "d.referenced_message.mention_channels[].guild_id", + "d.referenced_message.mention_channels[].name", + "d.referenced_message.mention_channels[].type", + "d.referenced_message.mentions[]", + "d.referenced_message.mentions[].username", + "d.referenced_message.mentions[].member.roles[]", + "d.referenced_message.mentions[].id", + "d.referenced_message.mentions[].discriminator", }; struct dc_lws_pass { /* struct that is allocated for in dc_lws_cb unique per connection in void * us */ DC_STRUCT_PREFIX @@ -216,9 +356,10 @@ struct dc_payload * dc_payload_init () { struct dc_payload * s = calloc(1, sizeof(struct dc_payload)); return s; } -void dc_payload_free (struct dc_payload * s) { +void dc_payload_free (struct dc_payload * s, enum dc_status t) { free(s->body-LWS_PRE); - free(s); + if (!(t & DC_REPLACE)) + free(s); return; } #define DC_ISASQ(shortname) DC_ISA(struct dc_##shortname, shortname##s) /* in struct array of structs quick */ @@ -226,7 +367,7 @@ void dc_payload_free (struct dc_payload * s) { name = calloc(name##_sizeof, sizeof(struct type *)); } while (0) /* prep arr, NO INIT membrs */ #define DC_ISASIQ(shortname) DC_ISAS_INIT(dc_##shortname, s->shortname##s) /* ISAS init quick */ #define DC_ISAF(shortname) for (size_t i = 0; i < s->shortname##s_sizeof; i++) /* ISA free */ \ - dc_##shortname##_free(s->shortname##s[i]); \ + dc_##shortname##_free(s->shortname##s[i], DC_UNSET); \ free(s->shortname##s); /* no problem if we free past _lenght, as uninited are NULL */ struct dc_client { DC_STRUCT_PREFIX @@ -239,6 +380,7 @@ struct dc_client { unsigned long long int last_packet; /* last packet sequence number for ping */ time_t ping_interval; time_t last_ping; + time_t disconnect_time; /* set at disconnect, so that reconnection is delayed for some seconds */ DC_ISASQ(payload); /* yesfree - array of payloads we must send over ws */ DC_ISASQ(guild); /* yesfree array of pointers only - guilds of this user */ DC_ISASQ(user); /* yesfree array of pointers only - friends of this user */ @@ -250,7 +392,7 @@ struct dc_client * dc_client_init () { DC_ISASIQ(user); return s; } -void dc_client_free (struct dc_client * s) { +void dc_client_free (struct dc_client * s, enum dc_status t) { if (!s) return; free(s->authorization); @@ -259,15 +401,17 @@ void dc_client_free (struct dc_client * s) { DC_ISAF(payload); free(s->guilds); free(s->users); - free(s); + if (!(t & DC_REPLACE)) + free(s); } -void dc_ws_stack(struct dc_client * c, struct dc_payload * p) { /* we could just use pass->body and */ - DC_MR(c->payloads); /* just append to it, but the server closes if we send two objects in one */ +void dc_ws_stack(struct dc_client * c, struct dc_payload * p, enum dc_status s) { + fprintf(stderr, "dc_ws_stack: stacking for write: %.*s\n", p->length, p->body); + DC_MR(c->payloads); /* the server closes if we send two objects in one */ c->payloads[c->payloads_length++] = p; /* packet, like so: {"packet":1}{"packet":2}, so this. */ p->body = realloc(p->body, p->length+LWS_PRE+1); /* when freeing, free p->body-LWS_PRE */ memmove(p->body+LWS_PRE, p->body, p->length+1); /* body is no longer pointer we have to free */ p->body += LWS_PRE; - if (c->pass && c->pass->wsi) + if (c->pass && c->pass->wsi && !(s & DC_NO_WRITE)) lws_callback_on_writable(c->pass->wsi); return; } @@ -277,7 +421,7 @@ struct dc_guild { unsigned long long int id; /* 0 for virtual DMs guild */ struct dc_client * client; /* nofree */ struct dc_channel * channel; /* nofree - first channel */ - struct dc_role * role; /* nofree - first role. NOTE: 1. role->id == guild->id (@everyone role) */ + struct dc_role * role; /* nofree - first role. NOTE: role->id == guild->id => @everyone role */ enum dc_permissions permissions; enum dc_status status; #ifdef DC_UI_GTK @@ -290,11 +434,12 @@ struct dc_guild * dc_guild_init () { struct dc_guild * s = calloc(1, sizeof(*s)); return s; } -void dc_guild_free (struct dc_guild * s) { +void dc_guild_free (struct dc_guild * s, enum dc_status t) { if (!s) return; free(s->name); - free(s); + if (!(t & DC_REPLACE)) /* we do this because we want to keep the pointer intact sometimes and */ + free(s); /* reused; for example when replacing/updating structs */ } struct dc_channel { DC_STRUCT_PREFIX @@ -318,13 +463,14 @@ struct dc_channel * dc_channel_init () { DC_ISASIQ(user); return s; } -void dc_channel_free (struct dc_channel * s) { +void dc_channel_free (struct dc_channel * s, enum dc_status t) { if (!s) return; free(s->name); free(s->topic); free(s->users); - free(s); + if (!(t & DC_REPLACE)) + free(s); } struct dc_message { DC_STRUCT_PREFIX @@ -342,12 +488,13 @@ struct dc_message * dc_message_init () { struct dc_message * s = calloc(1, sizeof(*s)); return s; } -void dc_message_free (struct dc_message * s) { +void dc_message_free (struct dc_message * s, enum dc_status t) { if (!s) return; free(s->message); free(s->attachment); - free(s); + if (!(t & DC_REPLACE)) + free(s); } struct dc_role { DC_STRUCT_PREFIX @@ -363,11 +510,12 @@ struct dc_role * dc_role_init () { struct dc_role * s = calloc(1, sizeof(*s)); return s; } -void dc_role_free (struct dc_role * s) { +void dc_role_free (struct dc_role * s, enum dc_status t) { if (!s) return; free(s->name); - free(s); + if (!(t & DC_REPLACE)) + free(s); } struct dc_role_membership { DC_STRUCT_PREFIX @@ -380,10 +528,11 @@ struct dc_role_membership * dc_role_membership_init () { struct dc_role_membership * s = calloc(1, sizeof(*s)); return s; } -void dc_role_membership_free (struct dc_role_membership * s) { +void dc_role_membership_free (struct dc_role_membership * s, enum dc_status t) { if (!s) return; - free(s); + if (!(t & DC_REPLACE)) + free(s); } struct dc_user { DC_STRUCT_PREFIX @@ -396,11 +545,12 @@ struct dc_user * dc_user_init () { struct dc_user * s = calloc(1, sizeof(*s)); return s; } -void dc_user_free (struct dc_user * s) { +void dc_user_free (struct dc_user * s, enum dc_status t) { if (!s) return; free(s->username); - free(s); + if (!(t & DC_REPLACE)) + free(s); } struct dc_permission { /* permissions can be individual on a per-channel basis */ DC_STRUCT_PREFIX @@ -417,10 +567,11 @@ struct dc_permission * dc_permission_init () { struct dc_permission * s = calloc(1, sizeof(*s)); return s; } -void dc_permission_free (struct dc_permission * s) { +void dc_permission_free (struct dc_permission * s, enum dc_status t) { if (!s) return; - free(s); + if (!(t & DC_REPLACE)) + free(s); } struct dc_attached_function { DC_STRUCT_PREFIX @@ -434,17 +585,19 @@ struct dc_attached_function * dc_attached_function_init () { struct dc_attached_function * s = calloc(1, sizeof(*s)); return s; } -void dc_attached_function_free (struct dc_attached_function * s) { +void dc_attached_function_free (struct dc_attached_function * s, enum dc_status t) { if (!s) return; - free(s); + if (!(t & DC_REPLACE)) + free(s); } -void dc_lws_pass_free (struct dc_lws_pass * s) { +void dc_lws_pass_free (struct dc_lws_pass * s, enum dc_status t) { if (!s) return; free(s->body); DC_API_IO_GC(s->api_io); - free(s); + if (!(t & DC_REPLACE)) + free(s); } static int dc_lws_cb (struct lws *, enum lws_callback_reasons, void *, void *, size_t); static const struct lws_protocols dc_lws_protocols[] = { @@ -483,8 +636,8 @@ enum dc_status dc_handle_ping (struct dc_api_io io, void * userdata) { /* tries } fprintf(stderr, "dc_handle_ping: handling ping for client %d\n", i); struct dc_payload * payload = calloc(1, sizeof(struct dc_payload)); - payload->length = smprintf(&payload->body, DC_WS_PING_FORMAT, client->last_packet); - dc_ws_stack(client, payload); /* send a payload */ + payload->length = asprintf(&payload->body, DC_WS_PING_FORMAT, client->last_packet); + dc_ws_stack(client, payload, DC_UNSET); /* send a payload */ } return DC_OK; } @@ -522,7 +675,7 @@ struct dc_program * dc_program_init () { dc_api_i(io); return s; } -void dc_program_free (struct dc_program * s) { +void dc_program_free (struct dc_program * s, enum dc_status t) { if (!s) return; DC_ISAF(client); @@ -536,7 +689,8 @@ void dc_program_free (struct dc_program * s) { DC_ISAF(attached_function); DC_ISAF(api_io); lws_context_destroy(s->lws_context); /* closes all connections and destroys all wsis */ - free(s); + if (!(t & DC_REPLACE)) + free(s); } void dc_api_stack (struct dc_api_io); #define DC_FIND_X(x) struct dc_##x * dc_find_##x(struct dc_##x ** p, size_t l, unsigned long long int id) { \ @@ -561,8 +715,17 @@ void dc_api_stack (struct dc_api_io); #define DC_ADD_X(x) struct dc_##x * dc_add_##x (struct dc_##x *** p, size_t * so, size_t * l, struct dc_##x * u, enum dc_status s) { \ struct dc_##x * us; \ if ((us = dc_find_##x(*p, *l, u->id))) { \ + if (us == u) \ + return us; \ + if (s & DC_REPLACE) { \ + dc_##x##_free(us, s); \ + memmove(us, u, sizeof(*us)); \ + if (s & DC_MAY_FREE) \ + free(u); /* we don't free members, they've been copied */ \ + return us; \ + } \ if (s & DC_MAY_FREE) { \ - dc_##x##_free(u); \ + dc_##x##_free(u, DC_UNSET); \ fprintf(stderr, "debug: %s freed already existing member\n", __func__); \ } \ return us; \ @@ -595,5 +758,6 @@ void dc_api_stack (struct dc_api_io); DC_GEN_X(user, USER) DC_GEN_X(channel, CHANNEL) DC_FIND_LL_X(channel) +DC_GEN_X(guild, GUILD) #define DC_ISAE(a) &a, &a##_sizeof, &a##_length /* ISA Expand */ #define DC_ISAN NULL, NULL, NULL /* ISA NULL */ |