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

sending welcome packet code in code field

Browse Source
This commit is contained in:
Václav Šmejkal 2025-01-31 12:37:57 +01:00
parent ea018644f2
commit 2e63191085
Signed by: ENGO150
GPG Key ID: 4A57E86482968843
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/chat/misc.c
View File

@ -388,12 +388,16 @@ void send_socket_deallocate(char *text, char *username, int socket) //SAME AS wh
why2_toml_read_free(username); why2_toml_read_free(username);
} }
void send_socket(char *text, char *username, int socket, why2_bool welcome) void send_socket(char *text, char *username, int socket, why2_bool welcome, char *code)
{ {
//VARIABLES
char *output = why2_strdup(""); char *output = why2_strdup("");
struct json_object *json = json_tokener_parse("{}");
if (text != NULL)
{
size_t length_buffer = strlen(text); size_t length_buffer = strlen(text);
char *text_copy = why2_calloc(length_buffer + 2, sizeof(char)); char *text_copy = why2_calloc(length_buffer + 2, sizeof(char));
struct json_object *json = json_tokener_parse("{}");
//COPY text INTO text_copy (WITHOUT LAST CHARACTER WHEN NEWLINE IS AT THE END) //COPY text INTO text_copy (WITHOUT LAST CHARACTER WHEN NEWLINE IS AT THE END)
if (text[length_buffer - 1] == '\n') length_buffer--; if (text[length_buffer - 1] == '\n') length_buffer--;
@ -407,6 +411,11 @@ void send_socket(char *text, char *username, int socket, why2_bool welcome)
//ADD OBJECTS //ADD OBJECTS
json_object_object_add(json, "message", json_object_new_string(text_copy)); json_object_object_add(json, "message", json_object_new_string(text_copy));
//DEALLOCATION
why2_deallocate(text_copy);
}
if (username != NULL) json_object_object_add(json, "username", json_object_new_string(username)); //WAS SENT FROM SERVER if (username != NULL) json_object_object_add(json, "username", json_object_new_string(username)); //WAS SENT FROM SERVER
if (welcome) //SENDING WELCOME MESSAGE TO USER if (welcome) //SENDING WELCOME MESSAGE TO USER
@ -430,6 +439,8 @@ void send_socket(char *text, char *username, int socket, why2_bool welcome)
why2_toml_read_free(server_name); why2_toml_read_free(server_name);
} }
if (code != NULL) json_object_object_add(json, "code", json_object_new_string(code));
//GENERATE JSON STRING //GENERATE JSON STRING
json_object_object_foreach(json, key, value) json_object_object_foreach(json, key, value)
{ {
@ -437,19 +448,17 @@ void send_socket(char *text, char *username, int socket, why2_bool welcome)
} }
add_brackets(&output); add_brackets(&output);
why2_deallocate(text_copy);
json_object_put(json);
//SEND //SEND
send(socket, output, strlen(output), 0); send(socket, output, strlen(output), 0);
//DEALLOCATION //DEALLOCATION
json_object_put(json);
why2_deallocate(output); why2_deallocate(output);
} }
void send_welcome_socket_deallocate(char *text, char *username, int socket) //SAME AS why2_send_socket BUT IT DEALLOCATES username void send_welcome_socket_deallocate(char *text, char *username, int socket) //SAME AS why2_send_socket BUT IT DEALLOCATES username
{ {
send_socket(text, username, socket, 1); send_socket(NULL, username, socket, 1, text);
why2_toml_read_free(username); why2_toml_read_free(username);
} }
@ -485,7 +494,7 @@ unsigned long get_latest_id()
//GLOBAL //GLOBAL
void why2_send_socket(char *text, char *username, int socket) void why2_send_socket(char *text, char *username, int socket)
{ {
send_socket(text, username, socket, 0); send_socket(text, username, socket, 0, NULL);
} }
void *why2_communicate_thread(void *arg) void *why2_communicate_thread(void *arg)