From 5206f05fdf77bb65c125ddb133cf46a59608c671 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Tue, 24 Dec 2024 14:52:51 -0500 Subject: Bring in line with dependency changes Signed-off-by: Andrew Opalach --- src/libclient/client.c | 108 ++++++++++++++++++++++++------------------------- src/libclient/client.h | 14 +++---- 2 files changed, 61 insertions(+), 61 deletions(-) (limited to 'src/libclient') diff --git a/src/libclient/client.c b/src/libclient/client.c index 4b9f46a..b4e44da 100644 --- a/src/libclient/client.c +++ b/src/libclient/client.c @@ -3,17 +3,17 @@ #include "../server/common.h" -static bool results_callback(void *userdata, struct aki_rpc_connection *conn, - struct aki_packet *packet, struct aki_packet *rpacket) +static bool results_callback(void *userdata, struct nn_rpc_connection *conn, + struct nn_packet *packet, struct nn_packet *rpacket) { struct camu_client *client = (struct camu_client *)userdata; (void)conn; (void)rpacket; - u8 op = aki_packet_read_u8(packet); + u8 op = nn_packet_read_u8(packet); switch (op) { case CAMU_CLIENT_CREATE_SEARCH: { - s32 id = aki_packet_read_s32(packet); + s32 id = nn_packet_read_s32(packet); client->callback(client->userdata, CAMU_CLIENT_SEARCH_CREATED, &id); break; } @@ -22,115 +22,115 @@ static bool results_callback(void *userdata, struct aki_rpc_connection *conn, break; } - aki_packet_free(packet); + nn_packet_free(packet); return false; } -static struct aki_rpc_command commands[] = { +static struct nn_rpc_command commands[] = { { .op = CAMU_CLIENT_RESULTS, .callback = results_callback, .userdata = NULL } }; -static void idd_callback(void *userdata, struct aki_packet *packet) +static void idd_callback(void *userdata, struct nn_packet *packet) { struct camu_client *client = (struct camu_client *)userdata; client->callback(client->userdata, CAMU_CLIENT_LOGIN, packet); } -static void connection_callback(void *userdata, struct aki_rpc_connection *conn) +static void connection_callback(void *userdata, struct nn_rpc_connection *conn) { struct camu_client *client = (struct camu_client *)userdata; client->conn = conn; - struct aki_packet *packet = aki_rpc_get_packet(&client->client, CAMU_SERVER_IDENTIFY); - aki_packet_write_u8(packet, CAMU_CLIENT); - aki_packet_write_str(packet, &client->username); - aki_rpc_connection_command(client->conn, packet, idd_callback, client); + struct nn_packet *packet = nn_rpc_get_packet(&client->client, CAMU_SERVER_IDENTIFY); + nn_packet_write_u8(packet, CAMU_CLIENT); + nn_packet_write_str(packet, &client->username); + nn_rpc_connection_command(client->conn, packet, idd_callback, client); } -static void connection_closed_callback(void *userdata, struct aki_rpc_connection *conn) +static void connection_closed_callback(void *userdata, struct nn_rpc_connection *conn) { struct camu_client *client = (struct camu_client *)userdata; al_assert(client->conn == NULL || client->conn == conn); client->conn = NULL; } -bool camu_client_login(struct camu_client *client, struct aki_event_loop *loop, +bool camu_client_login(struct camu_client *client, struct nn_event_loop *loop, u8 type, str *addr, u16 port, str *username) { client->loop = loop; al_str_clone(&client->username, username); client->conn = NULL; - aki_rpc_init(&client->client, client->loop, connection_callback, connection_closed_callback, client); + nn_rpc_init(&client->client, client->loop, connection_callback, connection_closed_callback, client); for (u32 i = 0; i < ARRAY_SIZE(commands); i++) { commands[i].userdata = client; - aki_rpc_add_command(&client->client, &commands[i]); + nn_rpc_add_command(&client->client, &commands[i]); } - if (!aki_rpc_prepare_client(&client->client, type, CAMU_MULTIPLEX_RPC)) { + if (!nn_rpc_prepare_client(&client->client, type, CAMU_MULTIPLEX_RPC)) { return false; } - aki_rpc_connect(&client->client, addr, port); + nn_rpc_connect(&client->client, addr, port); return true; } void camu_client_create_list(struct camu_client *client, str *name, - void (*callback)(void *, struct aki_packet *), void *userdata) + void (*callback)(void *, struct nn_packet *), void *userdata) { - struct aki_packet *packet = aki_rpc_get_packet(&client->client, CAMU_SERVER_CLIENT_COMMAND); - aki_packet_write_u8(packet, CAMU_CLIENT_CREATE_LIST); - aki_packet_write_str(packet, name); - aki_rpc_connection_command(client->conn, packet, callback, userdata); + struct nn_packet *packet = nn_rpc_get_packet(&client->client, CAMU_SERVER_CLIENT_COMMAND); + nn_packet_write_u8(packet, CAMU_CLIENT_CREATE_LIST); + nn_packet_write_str(packet, name); + nn_rpc_connection_command(client->conn, packet, callback, userdata); } void camu_client_toggle_sink(struct camu_client *client, str *sink, str *list, bool enable, - void (*callback)(void *, struct aki_packet *), void *userdata) + void (*callback)(void *, struct nn_packet *), void *userdata) { - struct aki_packet *packet = aki_rpc_get_packet(&client->client, CAMU_SERVER_CLIENT_COMMAND); - aki_packet_write_u8(packet, CAMU_CLIENT_TOGGLE_SINK); - aki_packet_write_str(packet, sink); - aki_packet_write_str(packet, list); - aki_packet_write_bool(packet, enable); - aki_rpc_connection_command(client->conn, packet, callback, userdata); + struct nn_packet *packet = nn_rpc_get_packet(&client->client, CAMU_SERVER_CLIENT_COMMAND); + nn_packet_write_u8(packet, CAMU_CLIENT_TOGGLE_SINK); + nn_packet_write_str(packet, sink); + nn_packet_write_str(packet, list); + nn_packet_write_bool(packet, enable); + nn_rpc_connection_command(client->conn, packet, callback, userdata); } void camu_client_create_search(struct camu_client *client, str *module, str *query) { - struct aki_packet *packet = aki_rpc_get_packet(&client->client, CAMU_SERVER_CLIENT_COMMAND); - aki_packet_write_u8(packet, CAMU_CLIENT_CREATE_SEARCH); - aki_packet_write_str(packet, module); - aki_packet_write_str(packet, query); - aki_rpc_connection_command(client->conn, packet, NULL, NULL); + struct nn_packet *packet = nn_rpc_get_packet(&client->client, CAMU_SERVER_CLIENT_COMMAND); + nn_packet_write_u8(packet, CAMU_CLIENT_CREATE_SEARCH); + nn_packet_write_str(packet, module); + nn_packet_write_str(packet, query); + nn_rpc_connection_command(client->conn, packet, NULL, NULL); } void camu_client_get_page(struct camu_client *client, s32 id, u32 num) { - struct aki_packet *packet = aki_rpc_get_packet(&client->client, CAMU_SERVER_CLIENT_COMMAND); - aki_packet_write_u8(packet, CAMU_CLIENT_GET_PAGE); - aki_packet_write_s32(packet, id); - aki_packet_write_u32(packet, num); - aki_rpc_connection_command(client->conn, packet, NULL, NULL); + struct nn_packet *packet = nn_rpc_get_packet(&client->client, CAMU_SERVER_CLIENT_COMMAND); + nn_packet_write_u8(packet, CAMU_CLIENT_GET_PAGE); + nn_packet_write_s32(packet, id); + nn_packet_write_u32(packet, num); + nn_rpc_connection_command(client->conn, packet, NULL, NULL); } void camu_client_add_from_path(struct camu_client *client, str *list, str *path) { - struct aki_packet *packet = aki_rpc_get_packet(&client->client, CAMU_SERVER_LIST_ACTION); - aki_packet_write_str(packet, list); - aki_packet_write_u8(packet, CAMU_LIST_ADD); - aki_packet_write_u8(packet, CAMU_RESOURCE_FILE); - aki_packet_write_str(packet, path); - aki_rpc_connection_command(client->conn, packet, NULL, NULL); + struct nn_packet *packet = nn_rpc_get_packet(&client->client, CAMU_SERVER_LIST_ACTION); + nn_packet_write_str(packet, list); + nn_packet_write_u8(packet, CAMU_LIST_ADD); + nn_packet_write_u8(packet, CAMU_RESOURCE_FILE); + nn_packet_write_str(packet, path); + nn_rpc_connection_command(client->conn, packet, NULL, NULL); } void camu_client_add_from_post(struct camu_client *client, str *list, str *unique_id, u32 index) { - struct aki_packet *packet = aki_rpc_get_packet(&client->client, CAMU_SERVER_LIST_ACTION); - aki_packet_write_str(packet, list); - aki_packet_write_u8(packet, CAMU_LIST_ADD); - aki_packet_write_u8(packet, CAMU_RESOURCE_PORTAL); - aki_packet_write_str(packet, unique_id); - aki_packet_write_u32(packet, index); - aki_rpc_connection_command(client->conn, packet, NULL, NULL); + struct nn_packet *packet = nn_rpc_get_packet(&client->client, CAMU_SERVER_LIST_ACTION); + nn_packet_write_str(packet, list); + nn_packet_write_u8(packet, CAMU_LIST_ADD); + nn_packet_write_u8(packet, CAMU_RESOURCE_PORTAL); + nn_packet_write_str(packet, unique_id); + nn_packet_write_u32(packet, index); + nn_rpc_connection_command(client->conn, packet, NULL, NULL); } void camu_client_disconnect(struct camu_client *client) { - aki_rpc_conn_flush(client->conn); + nn_rpc_conn_flush(client->conn); } diff --git a/src/libclient/client.h b/src/libclient/client.h index c073c9e..63d877d 100644 --- a/src/libclient/client.h +++ b/src/libclient/client.h @@ -1,6 +1,6 @@ #pragma once -#include +#include enum { CAMU_CLIENT_LOGIN = 0, @@ -9,21 +9,21 @@ enum { }; struct camu_client { - struct aki_event_loop *loop; + struct nn_event_loop *loop; str username; - struct aki_rpc client; - struct aki_rpc_connection *conn; + struct nn_rpc client; + struct nn_rpc_connection *conn; void (*callback)(void *, u8, void *); void *userdata; }; -bool camu_client_login(struct camu_client *client, struct aki_event_loop *loop, +bool camu_client_login(struct camu_client *client, struct nn_event_loop *loop, u8 type, str *addr, u16 port, str *username); void camu_client_create_list(struct camu_client *client, str *name, - void (*callback)(void *, struct aki_packet *), void *userdata); + void (*callback)(void *, struct nn_packet *), void *userdata); void camu_client_toggle_sink(struct camu_client *client, str *sink, str *list, bool enable, - void (*callback)(void *, struct aki_packet *), void *userdata); + void (*callback)(void *, struct nn_packet *), void *userdata); void camu_client_create_search(struct camu_client *client, str *module, str *query); void camu_client_get_page(struct camu_client *client, s32 id, u32 num); -- cgit v1.2.3-101-g0448