summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Georg <mail@jensge.org>2023-02-09 00:57:12 +0100
committerJens Georg <mail@jensge.org>2023-02-11 08:56:02 +0100
commitc26ed6cc6f0b3c6e3d619b096548cae12b7dadc4 (patch)
tree9da9b3042c88ae8f1ab6be7e9bb0357178fea22b
parent67e28e693b3abe975950d5e248ce145a4b7e2c62 (diff)
downloadrygel-c26ed6cc6f0b3c6e3d619b096548cae12b7dadc4.tar.gz
core, server: Remove deprecated calls to GSSDP
-rw-r--r--src/librygel-core/rygel-energy-management.vala4
-rw-r--r--src/librygel-core/rygel-root-device-factory.vala2
-rw-r--r--src/librygel-server/rygel-http-server.vala4
-rw-r--r--src/librygel-server/rygel-music-item.vala2
-rw-r--r--src/librygel-server/rygel-video-item.vala2
-rw-r--r--src/rygel/application.vala6
6 files changed, 10 insertions, 10 deletions
diff --git a/src/librygel-core/rygel-energy-management.vala b/src/librygel-core/rygel-energy-management.vala
index fe93f53e..ea64d6cf 100644
--- a/src/librygel-core/rygel-energy-management.vala
+++ b/src/librygel-core/rygel-energy-management.vala
@@ -140,11 +140,11 @@ public class Rygel.EnergyManagement : Service {
wake_pattern = wake_pattern.concat (password);
} catch (GLib.Error error) { }
- var ip_addr = new InetAddress.from_string (this.root_device.context.host_ip);
+ var ip_addr = this.root_device.context.address;
bool is_ipv6 = (ip_addr != null && ip_addr.family == SocketFamily.IPV6);
var associated_ips = "<Ipv%d>%s</Ipv%d>".printf
(is_ipv6 ? 6 : 4,
- this.root_device.context.host_ip,
+ ip_addr.to_string(),
is_ipv6 ? 6 : 4);
string mode;
diff --git a/src/librygel-core/rygel-root-device-factory.vala b/src/librygel-core/rygel-root-device-factory.vala
index dca29540..085b93ea 100644
--- a/src/librygel-core/rygel-root-device-factory.vala
+++ b/src/librygel-core/rygel-root-device-factory.vala
@@ -207,7 +207,7 @@ public class Rygel.RootDeviceFactory : Object,
icon_info.file_extension;
} else {
var uri = icon_info.uri;
- uri.replace ("@ADDRESS@", this.context.host_ip);
+ uri.replace ("@ADDRESS@", this.context.address.to_string ());
return uri;
}
}
diff --git a/src/librygel-server/rygel-http-server.vala b/src/librygel-server/rygel-http-server.vala
index 38e97b31..325739aa 100644
--- a/src/librygel-server/rygel-http-server.vala
+++ b/src/librygel-server/rygel-http-server.vala
@@ -69,9 +69,9 @@ public class Rygel.HTTPServer : GLib.Object, Rygel.StateMachine {
this.path_root = "/" + name;
this.replacements = new HashTable <string, string> (str_hash, str_equal);
this.replacements.insert ("@SERVICE_ADDRESS@",
- this.context.host_ip);
+ this.context.address.to_string ());
this.replacements.insert ("@ADDRESS@",
- this.context.host_ip);
+ this.context.address.to_string ());
this.replacements.insert ("@SERVICE_INTERFACE@",
this.context.interface);
this.replacements.insert ("@SERVICE_PORT@",
diff --git a/src/librygel-server/rygel-music-item.vala b/src/librygel-server/rygel-music-item.vala
index 7e71b834..f2b87ae5 100644
--- a/src/librygel-server/rygel-music-item.vala
+++ b/src/librygel-server/rygel-music-item.vala
@@ -122,7 +122,7 @@ public class Rygel.MusicItem : AudioItem {
(http_uri,
-1,
0,
- http_server.context.host_ip);
+ http_server.context.address.to_string ());
}
}
diff --git a/src/librygel-server/rygel-video-item.vala b/src/librygel-server/rygel-video-item.vala
index dc82bd15..1366751f 100644
--- a/src/librygel-server/rygel-video-item.vala
+++ b/src/librygel-server/rygel-video-item.vala
@@ -218,7 +218,7 @@ public class Rygel.VideoItem : AudioItem, VisualItem {
(http_uri,
-1,
0,
- http_server.context.host_ip);
+ http_server.context.address.to_string ());
}
}
}
diff --git a/src/rygel/application.vala b/src/rygel/application.vala
index 8065542d..0c7a3a47 100644
--- a/src/rygel/application.vala
+++ b/src/rygel/application.vala
@@ -258,7 +258,7 @@ public class Rygel.Application : GLib.Application {
debug ("New network %s (%s) context available. IP: %s",
context.network,
context.interface,
- context.host_ip);
+ context.address.to_string ());
context.acl = this.acl;
@@ -270,7 +270,7 @@ public class Rygel.Application : GLib.Application {
if (ifaces == null ||
context.interface in ifaces ||
context.network in ifaces ||
- context.host_ip in ifaces) {
+ context.address.to_string () in ifaces) {
try {
var factory = new RootDeviceFactory (context);
this.factories.add (factory);
@@ -296,7 +296,7 @@ public class Rygel.Application : GLib.Application {
debug ("Network %s (%s) context now unavailable. IP: %s",
context.network,
context.interface,
- context.host_ip);
+ context.address.to_string ());
var factory_iter = this.factories.iterator ();
while (factory_iter.next ()) {