gergely/wmud
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added socket_source to wmudClient struct

Browse Source 
Added socket_source GSource to the wmudClient struct, so it can be removed
upon connection closing. It sometimes caused a bug.

Signed-off-by: Gergely POLONKAI <polesz@w00d5t0ck.info>
This commit is contained in:
Gergely POLONKAI 2012-03-23 14:38:36 +01:00
parent f44b1ac6d8
commit e7a5e2976f
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/networking.c
View File

@ -35,6 +35,7 @@ wmud_client_close(wmudClient *client, gboolean send_goodbye)
wmud_player_free(&(client->player)); wmud_player_free(&(client->player));
if (client->buffer) if (client->buffer)
g_string_free(client->buffer, TRUE); g_string_free(client->buffer, TRUE);
g_source_destroy(client->socket_source);
g_free(client); g_free(client);
} }
@ -161,6 +162,7 @@ game_source_callback(GSocket *socket, GIOCondition condition, struct AcceptData
clients = g_slist_prepend(clients, client_data); clients = g_slist_prepend(clients, client_data);
client_source = g_socket_create_source(client_socket, G_IO_IN | G_IO_OUT | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL, NULL); client_source = g_socket_create_source(client_socket, G_IO_IN | G_IO_OUT | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL, NULL);
client_data->socket_source = client_source;
g_source_set_callback(client_source, (GSourceFunc)wmud_client_callback, client_data, NULL); g_source_set_callback(client_source, (GSourceFunc)wmud_client_callback, client_data, NULL);
g_source_attach(client_source, accept_data->context); g_source_attach(client_source, accept_data->context);
g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "New connection."); g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "New connection.");

1
src/wmud_types.h
View File

@ -28,6 +28,7 @@ typedef struct _wmudPlayer {
typedef struct _wmudClient { typedef struct _wmudClient {
GSocket *socket; GSocket *socket;
GSource *socket_source;
GString *buffer; GString *buffer;
wmudClientState state; wmudClientState state;
gboolean authenticated; gboolean authenticated;