[gupnp] context: Make headers use proper UPnP/x.x version

[Jens Georg <jensgeorg src gnome org>]

commit 295d43505020c1bae0ff154bcced2003a8ad161b
Author: Jens Georg <mail jensge org>
Date:   Sun Feb 3 21:35:14 2019 +0100

    context: Make headers use proper UPnP/x.x version

 libgupnp/gupnp-context.c | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)
---
diff --git a/libgupnp/gupnp-context.c b/libgupnp/gupnp-context.c
index aad034f..65276a4 100644
--- a/libgupnp/gupnp-context.c
+++ b/libgupnp/gupnp-context.c
@@ -127,23 +127,29 @@ typedef struct {
 
 static GInitableIface* initable_parent_iface = NULL;
 
+static const char *GSSDP_UDA_VERSION_STRINGS[] = {
+        [GSSDP_UDA_VERSION_1_0] = "1.0",
+        [GSSDP_UDA_VERSION_1_1] = "1.1"
+};
+
 /*
- * Generates the default server ID.
- **/
+ * Generates the default server ID
+ */
 static char *
-make_server_id (void)
+make_server_id (GSSDPUDAVersion uda_version)
 {
 #ifdef G_OS_WIN32
         OSVERSIONINFO versioninfo;
         versioninfo.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
         if (GetVersionEx (&versioninfo)) {
-                return g_strdup_printf ("Microsoft Windows/%ld.%ld"
-                                        " UPnP/1.0 GUPnP/%s",
+                return g_strdup_printf ("Microsoft Windows/%ld.%ld UPnP/%s GUPnP/%s",
                                         versioninfo.dwMajorVersion,
                                         versioninfo.dwMinorVersion,
+                                        GSSDP_UDA_VERSION_STRINGS[uda_version],
                                         VERSION);
         } else {
-                return g_strdup_printf ("Microsoft Windows UPnP/1.0 GUPnP/%s",
+                return g_strdup_printf ("Microsoft Windows/Unknown UPnP/%s GUPnP/%s",
+                                        GSSDP_UDA_VERSION_STRINGS[uda_version],
                                         VERSION);
         }
 #else
@@ -151,21 +157,16 @@ make_server_id (void)
 
         uname (&sysinfo);
 
-        return g_strdup_printf ("%s/%s UPnP/1.0 GUPnP/%s",
+        return g_strdup_printf ("%s/%s UPnP/%s GUPnP/%s",
                                 sysinfo.sysname,
                                 sysinfo.release,
+                                GSSDP_UDA_VERSION_STRINGS[uda_version],
                                 VERSION);
 #endif
 }
-
 static void
 gupnp_context_init (GUPnPContext *context)
 {
-        char *server_id;
-
-        server_id = make_server_id ();
-        gssdp_client_set_server_id (GSSDP_CLIENT (context), server_id);
-        g_free (server_id);
 }
 
 static gboolean
@@ -174,9 +175,11 @@ gupnp_context_initable_init (GInitable     *initable,
                              GError       **error)
 {
         char *user_agent;
+        char *server_id;
         GError *inner_error = NULL;
         GUPnPContext *context;
         GUPnPContextPrivate *priv;
+        GSSDPUDAVersion version;
 
         if (!initable_parent_iface->init(initable,
                                          cancellable,
@@ -189,6 +192,11 @@ gupnp_context_initable_init (GInitable     *initable,
         context = GUPNP_CONTEXT (initable);
         priv = gupnp_context_get_instance_private (context);
 
+        version = gssdp_client_get_uda_version (GSSDP_CLIENT (context));
+        server_id = make_server_id (version);
+        gssdp_client_set_server_id (GSSDP_CLIENT (context), server_id);
+        g_free (server_id);
+
         priv->session = soup_session_new ();
 
         user_agent = g_strdup_printf ("%s GUPnP/" VERSION " DLNADOC/1.50",