X-Git-Url: https://git.cworth.org/git?p=loudgame;a=blobdiff_plain;f=loudgame.c;h=65aeb35f31ab95cfe420dbfb526b874b6997f452;hp=53b392b1b0d9440f97da8162b204cae85b8e3123;hb=6e8ab3d68b2c0e5c9874a3d2f4ba34de56efa6b8;hpb=a812ce8bebf9c5a2408537626e1a8bb593fe9879

diff --git a/loudgame.c b/loudgame.c
index 53b392b..65aeb35 100644
--- a/loudgame.c
+++ b/loudgame.c
@@ -33,11 +33,16 @@ loudgame_quit (loudgame_t *lg, int return_value)
 
     lg->return_value = return_value;
 
-    if (! lm_connection_close (lg->connection, &error))
-	g_print ("An error occurred during lm_connection_close: %s\n",
-		 error->message);
-
-    lm_connection_unref (lg->connection);
+    if (lg->connection)
+    {
+	if (! lm_connection_close (lg->connection, &error))
+	{
+	    g_print ("An error occurred during lm_connection_close: %s\n",
+		     error->message);
+	}
+	lm_connection_unref (lg->connection);
+	lg->connection = NULL;
+    }
 
     g_main_loop_quit (lg->main_loop);
 }
@@ -70,11 +75,10 @@ connection_open_cb (LmConnection *connection, gboolean result, loudgame_t *lg)
 				authentication_cb, lg, FALSE,  NULL);
 }
 
-static void
-send_reply (LmConnection	*connection,
-	    const char		*peer,
-	    const char		*message,
-	    loudgame_t		*lg)
+void
+loudgame_send (loudgame_t	*lg,
+	       const char	*peer,
+	       const char	*message)
 {
     LmMessage *reply;
     gboolean result;
@@ -84,15 +88,46 @@ send_reply (LmConnection	*connection,
 
     lm_message_node_add_child (reply->node, "body", message);
 
-    result = lm_connection_send (connection, reply, &error);
+    result = lm_connection_send (lg->connection, reply, &error);
     lm_message_unref (reply);
 
     if (! result) {
-	g_error ("lm_connection_send failed: error->message");
+	g_error ("lm_connection_send failed: %s\n",
+		 error->message);
 	loudgame_quit (lg, 1);
     }
 }
 
+void
+loudgame_vsendf (loudgame_t	*lg,
+		 const char	*peer,
+		 const char	*format,
+		 va_list	 va)
+{
+    char *str;
+
+    str = g_strdup_vprintf (format, va);
+
+    loudgame_send (lg, peer, str);
+
+    free (str);
+}
+
+void
+loudgame_sendf (loudgame_t	*lg,
+		const char	*peer,
+		const char	*format,
+		...)
+{
+    va_list va;
+
+    va_start (va, format);
+
+    loudgame_vsendf (lg, peer, format, va);
+
+    va_end (va);
+}
+
 static void
 handle_command (LmConnection	*connection,
 		const char	*peer,
@@ -107,7 +142,7 @@ handle_command (LmConnection	*connection,
     }
 
     error = g_strdup_printf ("Unknown command: '%s'", command);
-    send_reply (connection, peer, error, lg);
+    loudgame_send (lg, peer, error);
     free (error);
 }
  
@@ -170,6 +205,11 @@ make_connection (gpointer closure)
 	loudgame_quit (lg, 1);
     }
 
+    /* It seems to be necessary to explicitly tell the server we're
+     * still here. Let's see if one keep-alive every 60 seconds is
+     * sufficient. */
+    lm_connection_set_keep_alive_rate (lg->connection, 60);
+
     /* Return false to not schedule another call. */
     return 0;
 }