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 dd51b02..8121cc0 100644 (file)
--- a/test/test-server.c
+++ b/test/test-server.c
@@ -10,6 +10,7 @@ GMainLoop *loop;
 
 void accept_callback (GSocket *socket, GAsyncResult *result, gpointer data);
 
+/*
 gboolean
 accept_source (gpointer data)
 {
@@ -36,7 +37,7 @@ accept_callback (GSocket *socket, GAsyncResult *result, gpointer data)
        if (!new_socket)
                g_error (error->message);
 
-       address = g_socket_get_peer_address (new_socket, &error);
+       address = g_socket_get_remote_address (new_socket, &error);
 
        if (!address)
                g_error (error->message);
@@ -45,10 +46,12 @@ accept_callback (GSocket *socket, GAsyncResult *result, gpointer data)
 
        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);
@@ -66,7 +69,17 @@ int main (int argc, char *argv[])
 
        g_printf ("listening on port 31882...\n");
 
-       g_idle_add (accept_source, (gpointer) socket);
+       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);