ENGO150/WHY2
Template
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

made send_to_all not run in a thread

Browse Source
This commit is contained in:
Václav Šmejkal 2024-02-02 10:59:22 +01:00
parent b41d5703f4
commit 0e9b5df58c
Signed by: ENGO150
GPG Key ID: 4A57E86482968843
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/chat/misc.c
View File

@ -69,18 +69,18 @@ char *get_string_from_json_string(char *json, char *string)
return returning; return returning;
} }
void *send_to_all(void *json) void send_to_all(char *json)
{ {
why2_node_t _first_node = (why2_node_t) { NULL, connection_list.head }; why2_node_t _first_node = (why2_node_t) { NULL, connection_list.head };
why2_node_t *node_buffer = &_first_node; why2_node_t *node_buffer = &_first_node;
connection_node_t connection_buffer; connection_node_t connection_buffer;
//PARSE //PARSE
struct json_object *json_obj = json_tokener_parse((char*) json); struct json_object *json_obj = json_tokener_parse(json);
char *message = get_string_from_json(json_obj, "message"); char *message = get_string_from_json(json_obj, "message");
char *username = get_string_from_json(json_obj, "username"); char *username = get_string_from_json(json_obj, "username");
if (json_obj == NULL) return NULL; //EXIT IF INVALID SYNTAX WAS SENT if (json_obj == NULL) return; //EXIT IF INVALID SYNTAX WAS SENT
while (node_buffer -> next != NULL) //SEND TO ALL CONNECTIONS while (node_buffer -> next != NULL) //SEND TO ALL CONNECTIONS
{ {
@ -93,8 +93,6 @@ void *send_to_all(void *json)
//DEALLOCATION //DEALLOCATION
json_object_put(json_obj); json_object_put(json_obj);
return NULL;
} }
void append(char **destination, char *key, char *value) void append(char **destination, char *key, char *value)
@ -462,7 +460,6 @@ void *why2_communicate_thread(void *arg)
raw = why2_strdup(""); raw = why2_strdup("");
char *raw_output; char *raw_output;
pthread_t thread_buffer;
char *connection_message = why2_malloc(strlen(username) + 11); char *connection_message = why2_malloc(strlen(username) + 11);
//BUILD connection_message //BUILD connection_message
@ -479,8 +476,7 @@ void *why2_communicate_thread(void *arg)
add_brackets(&raw); add_brackets(&raw);
json_object_put(json); json_object_put(json);
pthread_create(&thread_buffer, NULL, send_to_all, raw); //SEND send_to_all(raw); //FUCKING SEND TO ALL YOU TWAT
pthread_join(thread_buffer, NULL);
why2_deallocate(raw); why2_deallocate(raw);
why2_deallocate(connection_message); why2_deallocate(connection_message);
@ -529,8 +525,7 @@ void *why2_communicate_thread(void *arg)
} }
add_brackets(&raw_output); add_brackets(&raw_output);
pthread_create(&thread_buffer, NULL, send_to_all, raw_output); send_to_all(raw_output); //e
pthread_join(thread_buffer, NULL);
deallocation: deallocation: