Moved networking code to networking.[ch]
This commit is contained in:
Polonkai Gergely
parent
12706d7e85
commit
73ffc4a8fb
@ -1,5 +1,5 @@
|
||||
bin_PROGRAMS = wmud
|
||||
AM_CFLAGS = $(MEMCACHED_CFLAGS) $(GLIB_CFLAGS) $(GIO_CFLAGS) $(SQLITE3_CFLAGS)
|
||||
AM_CFLAGS = $(MEMCACHED_CFLAGS) $(GLIB_CFLAGS) $(GIO_CFLAGS) $(GTHREAD_CFLAGS) $(SQLITE3_CFLAGS)
|
||||
|
||||
wmud_SOURCES = main.c
|
||||
wmud_LDADD = $(MEMCACHED_LIBS) $(GLIB_LIBS) $(GIO_LIBS) $(SQLITE3_LIBS)
|
||||
wmud_SOURCES = main.c networking.c
|
||||
wmud_LDADD = $(MEMCACHED_LIBS) $(GLIB_LIBS) $(GIO_LIBS) $(GTHREAD_LIBS) $(SQLITE3_LIBS)
|
||||
|
||||
149
src/main.c
149
src/main.c
@ -4,6 +4,9 @@
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "main.h"
|
||||
#include "networking.h"
|
||||
|
||||
#define MAX_RECV_LEN 1024
|
||||
|
||||
struct {
|
||||
@ -11,53 +14,7 @@ struct {
|
||||
int line;
|
||||
} debug_context_loc = {NULL, 0};
|
||||
|
||||
struct AcceptData {
|
||||
GSocketListener *listener;
|
||||
GMainContext *context;
|
||||
};
|
||||
|
||||
gboolean
|
||||
client_callback(GSocket *client, GIOCondition condition, struct AcceptData *accept_data)
|
||||
{
|
||||
if (condition & G_IO_HUP)
|
||||
{
|
||||
g_print("Connection closed.\n");
|
||||
g_socket_close(client, NULL);
|
||||
return FALSE;
|
||||
}
|
||||
else if ((condition & G_IO_IN) || (condition & G_IO_PRI))
|
||||
{
|
||||
gssize len;
|
||||
gchar *buf = g_malloc0(sizeof(gchar) * (MAX_RECV_LEN + 1));
|
||||
|
||||
if ((len = g_socket_receive(client, buf, MAX_RECV_LEN, NULL, NULL)) == 0)
|
||||
{
|
||||
g_print("Connection closed.\n");
|
||||
g_socket_close(client, NULL);
|
||||
g_free(buf);
|
||||
return FALSE;
|
||||
}
|
||||
g_print("Client data arrived (%d bytes): \"%s\"\n", len, buf);
|
||||
g_free(buf);
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
gboolean
|
||||
game_source_callback(GSocket *socket, GIOCondition condition, struct AcceptData *accept_data)
|
||||
{
|
||||
GSocket *client_socket;
|
||||
GSource *client_source;
|
||||
|
||||
client_socket = g_socket_listener_accept_socket(accept_data->listener, NULL, NULL, 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);
|
||||
g_source_set_callback(client_source, (GSourceFunc)client_callback, client_socket, NULL);
|
||||
g_source_attach(client_source, accept_data->context);
|
||||
g_print("New connection.\n");
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
GMainContext *game_context;
|
||||
|
||||
gboolean
|
||||
rl_sec_elapsed(gpointer user_data)
|
||||
@ -85,16 +42,9 @@ debug_context(char *file, int line)
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
{
|
||||
GMainContext *game_context;
|
||||
GMainLoop *game_loop;
|
||||
GSource *timeout_source,
|
||||
*game_net_source4 = NULL,
|
||||
*game_net_source6 = NULL;
|
||||
GSource *timeout_source;
|
||||
guint timeout_id;
|
||||
GError *err = NULL;
|
||||
GSocket *game_socket6,
|
||||
*game_socket4;
|
||||
gboolean need_ipv4_socket = TRUE;
|
||||
GSocketListener *game_listener;
|
||||
|
||||
g_thread_init();
|
||||
@ -112,94 +62,7 @@ main(int argc, char **argv)
|
||||
|
||||
game_listener = g_socket_listener_new();
|
||||
|
||||
/* The following snippet is borrowed from GLib 2.30's gsocketlistener.c
|
||||
* code, to create the necessary sockets to listen on both IPv4 and
|
||||
* IPv6 address */
|
||||
if ((game_socket6 = g_socket_new(G_SOCKET_FAMILY_IPV6, G_SOCKET_TYPE_STREAM, G_SOCKET_PROTOCOL_DEFAULT, &err)) != NULL)
|
||||
{
|
||||
GInetAddress *inet_address;
|
||||
GSocketAddress *address;
|
||||
gboolean result;
|
||||
|
||||
inet_address = g_inet_address_new_any(G_SOCKET_FAMILY_IPV6);
|
||||
address = g_inet_socket_address_new(inet_address, 4000);
|
||||
g_object_unref(inet_address);
|
||||
|
||||
g_socket_set_listen_backlog(game_socket6, 10);
|
||||
|
||||
result = g_socket_bind(game_socket6, address, TRUE, &err)
|
||||
&& g_socket_listen(game_socket6, &err);
|
||||
|
||||
g_object_unref(address);
|
||||
|
||||
if (!result)
|
||||
{
|
||||
g_object_unref(game_socket6);
|
||||
g_print("Unable to create listener IPv6 socket!\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (g_socket_speaks_ipv4(game_socket6))
|
||||
need_ipv4_socket = FALSE;
|
||||
|
||||
game_net_source6 = g_socket_create_source(game_socket6, G_IO_IN, NULL);
|
||||
g_socket_listener_add_socket(game_listener, game_socket6, NULL, &err);
|
||||
}
|
||||
|
||||
if (need_ipv4_socket)
|
||||
{
|
||||
if ((game_socket4 = g_socket_new(G_SOCKET_FAMILY_IPV4, G_SOCKET_TYPE_STREAM, G_SOCKET_PROTOCOL_DEFAULT, &err)) != NULL)
|
||||
{
|
||||
GInetAddress *inet_address;
|
||||
GSocketAddress *address;
|
||||
gboolean result;
|
||||
|
||||
inet_address = g_inet_address_new_any(G_SOCKET_FAMILY_IPV4);
|
||||
address = g_inet_socket_address_new(inet_address, 4000);
|
||||
g_object_unref(inet_address);
|
||||
|
||||
g_socket_set_listen_backlog(game_socket4, 10);
|
||||
|
||||
result = g_socket_bind(game_socket4, address, TRUE, &err)
|
||||
&& g_socket_listen(game_socket4, &err);
|
||||
|
||||
g_object_unref(address);
|
||||
|
||||
if (!result)
|
||||
{
|
||||
g_object_unref(game_socket4);
|
||||
if (!game_socket6)
|
||||
g_object_unref(game_socket6);
|
||||
|
||||
g_print("Unable to create listener IPv4 socket!\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
game_net_source4 = g_socket_create_source(game_socket4, G_IO_IN, NULL);
|
||||
g_socket_listener_add_socket(game_listener, game_socket4, NULL, &err);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (game_socket6 != NULL)
|
||||
g_clear_error(&err);
|
||||
else
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (game_net_source6)
|
||||
{
|
||||
struct AcceptData accept_data = {game_listener, game_context};
|
||||
g_source_set_callback(game_net_source6, (GSourceFunc)game_source_callback, (gpointer)&accept_data, NULL);
|
||||
g_source_attach(game_net_source6, game_context);
|
||||
}
|
||||
if (game_net_source4)
|
||||
{
|
||||
struct AcceptData accept_data = {game_listener, game_context};
|
||||
g_source_set_callback(game_net_source4, (GSourceFunc)game_source_callback, (gpointer)&accept_data, NULL);
|
||||
g_source_attach(game_net_source4, game_context);
|
||||
}
|
||||
|
||||
wmud_networking_init(4000);
|
||||
|
||||
g_print("Startup finished\n");
|
||||
|
||||
|
||||
10
src/main.h
Normal file
10
src/main.h
Normal file
@ -0,0 +1,10 @@
|
||||
#ifndef __WMUD_MAIN_H__
|
||||
# define __WMUD_MAIN_H__
|
||||
|
||||
# include <glib.h>
|
||||
|
||||
extern GMainContext *game_context;
|
||||
extern gulong elapsed_seconds;
|
||||
|
||||
#endif /* __WMUD_MAIN_H__ */
|
||||
|
||||
174
src/networking.c
Normal file
174
src/networking.c
Normal file
@ -0,0 +1,174 @@
|
||||
#include <glib.h>
|
||||
#include <gio/gio.h>
|
||||
|
||||
#include "main.h"
|
||||
|
||||
#define MAX_RECV_LEN 1024
|
||||
|
||||
struct AcceptData {
|
||||
GMainContext *context;
|
||||
GSocketListener *listener;
|
||||
};
|
||||
|
||||
gboolean
|
||||
client_callback(GSocket *client, GIOCondition condition, struct AcceptData *accept_data)
|
||||
{
|
||||
GError *err = NULL;
|
||||
|
||||
if (condition & G_IO_HUP)
|
||||
{
|
||||
g_print("Connection closed.\n");
|
||||
/* TODO: Error checking */
|
||||
g_socket_close(client, &err);
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
else if ((condition & G_IO_IN) || (condition & G_IO_PRI))
|
||||
{
|
||||
gssize len;
|
||||
gchar *buf = g_malloc0(sizeof(gchar) * (MAX_RECV_LEN + 1));
|
||||
|
||||
/* TODO: Error checking */
|
||||
if ((len = g_socket_receive(client, buf, MAX_RECV_LEN, NULL, &err)) == 0)
|
||||
{
|
||||
g_print("Connection closed.\n");
|
||||
/* TODO: Error checking */
|
||||
g_socket_close(client, &err);
|
||||
g_free(buf);
|
||||
return FALSE;
|
||||
}
|
||||
g_print("Client data arrived (%d bytes): \"%s\"\n", len, buf);
|
||||
g_free(buf);
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
gboolean
|
||||
game_source_callback(GSocket *socket, GIOCondition condition, struct AcceptData *accept_data)
|
||||
{
|
||||
GSocket *client_socket;
|
||||
GSource *client_source;
|
||||
GError *err = NULL;
|
||||
|
||||
/* TODO: Error checking */
|
||||
client_socket = g_socket_listener_accept_socket(accept_data->listener, NULL, NULL, &err);
|
||||
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);
|
||||
g_source_set_callback(client_source, (GSourceFunc)client_callback, client_socket, NULL);
|
||||
g_source_attach(client_source, accept_data->context);
|
||||
g_print("New connection.\n");
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
gboolean
|
||||
wmud_networking_init(guint port_number)
|
||||
{
|
||||
struct AcceptData *accept_data;
|
||||
GSocketListener *game_listener;
|
||||
gboolean need_ipv4_socket = TRUE;
|
||||
GSocket *game_socket6,
|
||||
*game_socket4;
|
||||
GError *err = NULL;
|
||||
GSource *game_net_source4 = NULL,
|
||||
*game_net_source6 = NULL;
|
||||
|
||||
game_listener = g_socket_listener_new();
|
||||
|
||||
/* The following snippet is borrowed from GLib 2.30's gsocketlistener.c
|
||||
* code, to create the necessary sockets to listen on both IPv4 and
|
||||
* IPv6 address */
|
||||
if ((game_socket6 = g_socket_new(G_SOCKET_FAMILY_IPV6, G_SOCKET_TYPE_STREAM, G_SOCKET_PROTOCOL_DEFAULT, &err)) != NULL)
|
||||
{
|
||||
GInetAddress *inet_address;
|
||||
GSocketAddress *address;
|
||||
gboolean result;
|
||||
|
||||
inet_address = g_inet_address_new_any(G_SOCKET_FAMILY_IPV6);
|
||||
address = g_inet_socket_address_new(inet_address, port_number);
|
||||
g_object_unref(inet_address);
|
||||
|
||||
g_socket_set_listen_backlog(game_socket6, 10);
|
||||
|
||||
result = g_socket_bind(game_socket6, address, TRUE, &err)
|
||||
&& g_socket_listen(game_socket6, &err);
|
||||
|
||||
g_object_unref(address);
|
||||
|
||||
if (!result)
|
||||
{
|
||||
g_object_unref(game_socket6);
|
||||
g_print("Unable to create listener IPv6 socket!\n");
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (g_socket_speaks_ipv4(game_socket6))
|
||||
need_ipv4_socket = FALSE;
|
||||
|
||||
game_net_source6 = g_socket_create_source(game_socket6, G_IO_IN, NULL);
|
||||
/* TODO: error checking */
|
||||
g_socket_listener_add_socket(game_listener, game_socket6, NULL, &err);
|
||||
}
|
||||
/* TODO: else { error checking } */
|
||||
|
||||
if (need_ipv4_socket)
|
||||
{
|
||||
if ((game_socket4 = g_socket_new(G_SOCKET_FAMILY_IPV4, G_SOCKET_TYPE_STREAM, G_SOCKET_PROTOCOL_DEFAULT, &err)) != NULL)
|
||||
{
|
||||
GInetAddress *inet_address;
|
||||
GSocketAddress *address;
|
||||
gboolean result;
|
||||
|
||||
inet_address = g_inet_address_new_any(G_SOCKET_FAMILY_IPV4);
|
||||
address = g_inet_socket_address_new(inet_address, port_number);
|
||||
g_object_unref(inet_address);
|
||||
|
||||
g_socket_set_listen_backlog(game_socket4, 10);
|
||||
|
||||
result = g_socket_bind(game_socket4, address, TRUE, &err)
|
||||
&& g_socket_listen(game_socket4, &err);
|
||||
|
||||
g_object_unref(address);
|
||||
|
||||
if (!result)
|
||||
{
|
||||
g_object_unref(game_socket4);
|
||||
if (!game_socket6)
|
||||
g_object_unref(game_socket6);
|
||||
|
||||
g_print("Unable to create listener IPv4 socket!\n");
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
game_net_source4 = g_socket_create_source(game_socket4, G_IO_IN, NULL);
|
||||
/* TODO: error checking */
|
||||
g_socket_listener_add_socket(game_listener, game_socket4, NULL, &err);
|
||||
}
|
||||
/* TODO: else { error checking } */
|
||||
}
|
||||
else
|
||||
{
|
||||
if (game_socket6 != NULL)
|
||||
g_clear_error(&err);
|
||||
else
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
accept_data = g_new(struct AcceptData, 1);
|
||||
accept_data->listener = game_listener;
|
||||
accept_data->context = game_context;
|
||||
|
||||
if (game_net_source6)
|
||||
{
|
||||
g_source_set_callback(game_net_source6, (GSourceFunc)game_source_callback, (gpointer)accept_data, NULL);
|
||||
g_source_attach(game_net_source6, game_context);
|
||||
}
|
||||
if (game_net_source4)
|
||||
{
|
||||
g_source_set_callback(game_net_source4, (GSourceFunc)game_source_callback, (gpointer)accept_data, NULL);
|
||||
g_source_attach(game_net_source4, game_context);
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
6
src/networking.h
Normal file
6
src/networking.h
Normal file
@ -0,0 +1,6 @@
|
||||
#ifndef __WMUD_NETWORKING_H__
|
||||
# define __WMUD_NETWORKING_H__
|
||||
|
||||
gboolean wmud_networking_init(guint port_number);
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue
Block a user