Remove the async stuff per IRC discussion

[cascardo/gnio.git] / test / test-server.c

diff --git a/test/test-server.c b/test/test-server.c
index 9a7c9d6..8121cc0 100644 (file)
--- a/test/test-server.c
+++ b/test/test-server.c
@@ -8,6 +8,21 @@
 
 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,17 +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_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);
 
@@ -33,15 +60,26 @@ 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);
+       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);
 
        g_socket_listen (socket, 10);
 
        g_printf ("listening on port 31882...\n");
 
-       g_socket_accept_async (socket, NULL, (GAsyncReadyCallback) accept_callback, NULL);
+       new_socket = g_socket_accept (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_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_main_loop_run (loop);