114 lines
3.5 KiB
Diff
114 lines
3.5 KiB
Diff
|
From 79a1e4cf8c256132978a1d8ab718c8ad132386de Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jens Georg <mail@jensge.org>
|
||
|
|
Date: Tue, 3 May 2022 22:39:16 +0200
|
||
|
|
Subject: [PATCH] Port to GUPnP 1.6 API
|
||
|
|
|
||
|
|
And thus to libsoup3. The code changes are even compatible with GUPnP
|
||
|
|
1.4.3 so the gupnp version could be a configure option
|
||
|
|
---
|
||
|
|
NEWS | 2 +-
|
||
|
|
README | 4 ++--
|
||
|
|
libgupnp-igd/meson.build | 2 +-
|
||
|
|
meson.build | 6 +++---
|
||
|
|
subprojects/.gitignore | 4 ++--
|
||
|
|
subprojects/{gupnp-1.2.wrap => gupnp-1.6.wrap} | 2 +-
|
||
|
|
tests/gtest/gupnp-simple-igd.c | 6 +++---
|
||
|
|
7 files changed, 13 insertions(+), 13 deletions(-)
|
||
|
|
rename subprojects/{gupnp-1.2.wrap => gupnp-1.6.wrap} (76%)
|
||
|
|
|
||
|
|
diff --git a/NEWS b/NEWS
|
||
|
|
index 5979f6d..eabb318 100644
|
||
|
|
--- a/NEWS
|
||
|
|
+++ b/NEWS
|
||
|
|
@@ -1,5 +1,5 @@
|
||
|
|
*******************
|
||
|
|
-* GUPnP IGD 1.20 *
|
||
|
|
+* GUPnP IGD 1.2.0 *
|
||
|
|
*******************
|
||
|
|
|
||
|
|
- Switch to GUPnP 1.2.0 API
|
||
|
|
diff --git a/README b/README
|
||
|
|
index 4b74b6f..09884d2 100644
|
||
|
|
--- a/README
|
||
|
|
+++ b/README
|
||
|
|
@@ -1,9 +1,9 @@
|
||
|
|
This is a library to handle UPnP IGD port mapping.
|
||
|
|
|
||
|
|
-It was written by Olivier Crête <olivier.crete@collabora.co.uk>.
|
||
|
|
+It was written by Olivier Crête <olivier.crete@collabora.com>.
|
||
|
|
|
||
|
|
It is supposed to have a very simple API. Read the gtk-doc.
|
||
|
|
|
||
|
|
The only dependencies are:
|
||
|
|
- - GUPnP 1.2
|
||
|
|
+ - GUPnP 1.6
|
||
|
|
- GLib 2.38
|
||
|
|
diff --git a/libgupnp-igd/meson.build b/libgupnp-igd/meson.build
|
||
|
|
index c37ef3d..6dcd394 100644
|
||
|
|
--- a/libgupnp-igd/meson.build
|
||
|
|
+++ b/libgupnp-igd/meson.build
|
||
|
|
@@ -38,7 +38,7 @@ pkg.generate(
|
||
|
|
subdirs : 'gupnp-igd-1.0',
|
||
|
|
filebase : 'gupnp-igd-1.0',
|
||
|
|
description: 'GUPnP Simple IGD library',
|
||
|
|
- requires_private : 'gupnp-1.2'
|
||
|
|
+ requires_private : 'gupnp-1.6'
|
||
|
|
)
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/meson.build b/meson.build
|
||
|
|
index df2fb24..8377d01 100644
|
||
|
|
--- a/meson.build
|
||
|
|
+++ b/meson.build
|
||
|
|
@@ -1,4 +1,4 @@
|
||
|
|
-project('gupnp-igd', 'c', version: '1.2.0')
|
||
|
|
+project('gupnp-igd', 'c', version: '1.5.0')
|
||
|
|
|
||
|
|
gnome = import('gnome')
|
||
|
|
pkg = import('pkgconfig')
|
||
|
|
@@ -7,8 +7,8 @@ glib_req = '>= 2.38'
|
||
|
|
dependencies = [
|
||
|
|
dependency('glib-2.0', version: glib_req, required: true),
|
||
|
|
dependency('gobject-2.0', version: glib_req, required: true),
|
||
|
|
- dependency('gupnp-1.2', version : '>= 1.2.0'),
|
||
|
|
- dependency('gssdp-1.2', version : '>= 1.2.0'),
|
||
|
|
+ dependency('gupnp-1.6', version : '>= 1.5.0'),
|
||
|
|
+ dependency('gssdp-1.6', version : '>= 1.5.0'),
|
||
|
|
dependency('gthread-2.0', required: true)
|
||
|
|
]
|
||
|
|
|
||
|
|
diff --git a/tests/gtest/gupnp-simple-igd.c b/tests/gtest/gupnp-simple-igd.c
|
||
|
|
index 593c46e..ec770ca 100644
|
||
|
|
--- a/tests/gtest/gupnp-simple-igd.c
|
||
|
|
+++ b/tests/gtest/gupnp-simple-igd.c
|
||
|
|
@@ -88,7 +88,7 @@ get_external_ip_address_cb (GUPnPService *service,
|
||
|
|
else
|
||
|
|
g_assert_not_reached ();
|
||
|
|
|
||
|
|
- gupnp_service_action_return (action);
|
||
|
|
+ gupnp_service_action_return_success (action);
|
||
|
|
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -139,7 +139,7 @@ add_port_mapping_cb (GUPnPService *service,
|
||
|
|
if (return_conflict && external_port == INTERNAL_PORT)
|
||
|
|
gupnp_service_action_return_error (action, 718, "ConflictInMappingEntry");
|
||
|
|
else
|
||
|
|
- gupnp_service_action_return (action);
|
||
|
|
+ gupnp_service_action_return_success (action);
|
||
|
|
}
|
||
|
|
|
||
|
|
static gboolean
|
||
|
|
@@ -172,7 +172,7 @@ delete_port_mapping_cb (GUPnPService *service,
|
||
|
|
g_assert (external_port != INTERNAL_PORT);
|
||
|
|
g_assert (proto && !strcmp (proto, "UDP"));
|
||
|
|
|
||
|
|
- gupnp_service_action_return (action);
|
||
|
|
+ gupnp_service_action_return_success (action);
|
||
|
|
|
||
|
|
g_free (remote_host);
|
||
|
|
g_free (proto);
|
||
|
|
--
|
||
|
|
GitLab
|
||
|
|
|