diff options
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/common.h | 11 | ||||
| -rw-r--r-- | src/server/server.c | 10 |
2 files changed, 14 insertions, 7 deletions
diff --git a/src/server/common.h b/src/server/common.h index 5b27768..814b557 100644 --- a/src/server/common.h +++ b/src/server/common.h @@ -6,6 +6,13 @@ #define CAMU_MULTIPLEX_RPC 0x53 #define CAMU_MULTIPLEX_LIANA 0x85 +AL_STATIC_ASSERT(rpc_not_head, CAMU_MULTIPLEX_RPC, !=, 0x48); // HEAD +AL_STATIC_ASSERT(rpc_not_get, CAMU_MULTIPLEX_RPC, !=, 0x47); // GET +AL_STATIC_ASSERT(rpc_not_post, CAMU_MULTIPLEX_RPC, !=, 0x50); // POST +AL_STATIC_ASSERT(liana_not_head, CAMU_MULTIPLEX_LIANA, !=, 0x48); +AL_STATIC_ASSERT(liana_not_get, CAMU_MULTIPLEX_LIANA, !=, 0x47); +AL_STATIC_ASSERT(liana_not_post, CAMU_MULTIPLEX_LIANA, !=, 0x50); + //#define CAMU_DIRECT_MODE enum { @@ -41,6 +48,6 @@ enum { static inline bool camu_is_url(str *s, u32 i) { - return al_str_cmp(s, &al_str_c("https://"), i, 8) == 0 - || al_str_cmp(s, &al_str_c("http://"), i, 7) == 0; + return (al_str_cmp(s, &al_str_c("https://"), i, 8) == 0) || + (al_str_cmp(s, &al_str_c("http://"), i, 7) == 0); } diff --git a/src/server/server.c b/src/server/server.c index e76f6f4..6a5b22a 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -17,7 +17,7 @@ #include "common.h" #include "db.h" -#define RESOURCE_MAX_AGE 7 +#define RESOURCE_MAX_AGE 9 static struct camu_user *get_user_by_username(struct camu_server *server, str *username) { @@ -139,7 +139,7 @@ static bool identify_callback(void *userdata, struct nn_rpc_connection *conn, } client->user = user; al_array_push(server->clients, client); - log_info("User \"%.*s\" logged in.", al_str_x(&user->name)); + log_info("User \'%.*s\' logged in.", al_str_x(&user->name)); write_initial_user_state(server, user, rpacket); break; } @@ -152,7 +152,7 @@ static bool identify_callback(void *userdata, struct nn_rpc_connection *conn, sink->server = server; al_array_push(server->sinks, sink); handle_toggle_sink(server, &al_str_c("default"), sink, true); - log_info("Sink \"%.*s\" connected.", al_str_x(&name)); + log_info("Sink \'%.*s\' connected.", al_str_x(&name)); break; } } @@ -805,7 +805,7 @@ static void connection_closed_callback(void *userdata, struct nn_rpc_connection struct camu_server_client *client; al_array_foreach(server->clients, i, client) { if (client->conn == conn) { - log_info("User \"%.*s\" logged out.", al_str_x(&client->user->name)); + log_info("User \'%.*s\' logged out.", al_str_x(&client->user->name)); cleanup_client(client); al_array_remove_at(server->clients, i); break; @@ -815,7 +815,7 @@ static void connection_closed_callback(void *userdata, struct nn_rpc_connection struct camu_server_sink *sink; al_array_foreach(server->sinks, i, sink) { if (sink->conn == conn) { - log_info("Sink \"%.*s\" removed.", al_str_x(&sink->name)); + log_info("Sink \'%.*s\' removed.", al_str_x(&sink->name)); struct lia_list *list; al_array_foreach(server->lists, j, list) { lia_list_remove_sink(list, sink); |