X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=test%2Ftest-server.c;h=0b2d8ef3c8a83e0bd4b341f497b85620f3977cb1;hb=698f0efbb5a9ef8f502f688808a52888c1e1cee6;hp=d6d9e4676d8b31e9028c82611759b58d91a4937c;hpb=e9904ad0b8193f73258d2085864e03836b7f4b7a;p=cascardo%2Fgnio.git

diff --git a/test/test-server.c b/test/test-server.c
index d6d9e46..0b2d8ef 100644
--- a/test/test-server.c
+++ b/test/test-server.c
@@ -3,11 +3,26 @@
 #include <gnio/ginetsocketaddress.h>
 #include <gnio/ginet4address.h>
 #include <glib.h>
-#include <glib/gprintf.h>
 #include <sys/socket.h>
+#include <errno.h>
 
 GMainLoop *loop;
 
+void accept_callback (GSocket *socket, GAsyncResult *result, gpointer data);
+
+/*
+gboolean
+accept_source (gpointer data)
+{
+	GSocket *socket = G_SOCKET (data);
+
+	g_print ("in source\n");
+
+	g_socket_accept_async (socket, NULL, (GAsyncReadyCallback) accept_callback, NULL);
+
+	return FALSE;	
+}
+
 void
 accept_callback (GSocket *socket, GAsyncResult *result, gpointer data)
 {
@@ -15,16 +30,29 @@ accept_callback (GSocket *socket, GAsyncResult *result, gpointer data)
 	GSocketAddress *address;
 	GError *error = NULL;
 
+	g_print ("in callback\n");
+
 	new_socket = g_socket_accept_finish (socket, result, &error);
 
-	address = g_socket_get_peer_address (new_socket, NULL);
+	if (!new_socket)
+		g_error (error->message);
+
+	address = g_socket_get_remote_address (new_socket, &error);
+
+	if (!address)
+		g_error (error->message);
+
+	g_print ("got a new connection from %s:%d\n", g_inet_address_to_string (g_inet_socket_address_get_address (G_INET_SOCKET_ADDRESS (address))), g_inet_socket_address_get_port (G_INET_SOCKET_ADDRESS (address)));
 
-	g_printf ("got a new connection from %s:%d\n", g_inet_address_to_string (g_inet_socket_address_get_address (G_INET_SOCKET_ADDRESS (address))), g_inet_socket_address_get_port (G_INET_SOCKET_ADDRESS (address)));
+	g_idle_add (accept_source, (gpointer) socket);
 }
+*/
 
 int main (int argc, char *argv[])
 {
-	GSocket *socket;
+	GSocket *socket, *new_socket;
+	GSocketAddress *address;
+	GError *error = NULL;
 
 	g_thread_init (NULL);
 
@@ -32,17 +60,68 @@ int main (int argc, char *argv[])
 
 	loop = g_main_loop_new (NULL, FALSE);
 
-	socket = g_socket_new (AF_INET, SOCK_STREAM, 0);
+	socket = g_socket_new (G_SOCKET_DOMAIN_INET, G_SOCKET_TYPE_STREAM, NULL, NULL);
 
-	g_socket_bind (socket, G_SOCKET_ADDRESS (g_inet_socket_address_new (G_INET_ADDRESS (g_inet4_address_from_string ("127.0.0.1")), 31882)), NULL);
+	g_socket_set_reuse_address (socket, TRUE);
 
-	g_socket_listen (socket, 10);
+	if (!g_socket_bind (socket, G_SOCKET_ADDRESS (g_inet_socket_address_new (G_INET_ADDRESS (g_inet4_address_from_string ("127.0.0.1")), 31882)), &error)) {
+		g_error (error->message);
+		return 0;
+	}
 
-	g_printf ("listening on port 31882...\n");
+	if (!g_socket_listen (socket, &error)) {
+		g_error (error->message);
+		return 0;
+	}
 
-	g_socket_accept_async (socket, NULL, (GAsyncReadyCallback) accept_callback, NULL);
+	g_print ("listening on port 31882...\n");
+
+	new_socket = g_socket_accept (socket, &error);
+
+	if (!new_socket) {
+		g_error (error->message);
+		return 0;
+	}
+
+	address = g_socket_get_remote_address (new_socket, &error);
+
+	if (!address) {
+		g_error (error->message);
+		return 0;
+	}
+
+	g_print ("got a new connection from %s:%d\n", g_inet_address_to_string (g_inet_socket_address_get_address (G_INET_SOCKET_ADDRESS (address))), g_inet_socket_address_get_port (G_INET_SOCKET_ADDRESS (address)));
+
+	while (TRUE) {
+		gchar buffer[128] = { };
+		gssize size;
+
+		if ((size = g_socket_receive (new_socket, buffer, 128, &error)) < 0) {
+			g_error (error->message);
+			return 0;
+		}
+
+		if (size == 0)
+			break;
+
+		g_print ("received %" G_GSSIZE_FORMAT " bytes of data: %s\n", size, buffer);
+
+		if ((size = g_socket_send (new_socket, buffer, size, &error)) < 0) {
+			g_error (error->message);
+			return 0;
+		}
+
+		if (size == 0)
+			break;
+	}
+
+	g_print ("connection closed\n");
+
+	g_object_unref (G_OBJECT (new_socket));
+
+	g_socket_close (socket);
 
-	g_main_loop_run (loop);
+	g_object_unref (G_OBJECT (socket));
 
 	return 0;
 }