Merge branch 'master' into fix-resharper-warnings

# Conflicts:
#	Emby.Server.Implementations/Net/SocketFactory.cs
#	RSSDP/SsdpCommunicationsServer.cs
#	RSSDP/SsdpDeviceLocator.cs
#	RSSDP/SsdpDevicePublisher.cs

2 files changed, 47 insertions, 0 deletions

diff --git a/MediaBrowser.Model/Net/IPData.cs b/MediaBrowser.Model/Net/IPData.cs
index 985b16c6e..e9fcd6797 100644
--- a/MediaBrowser.Model/Net/IPData.cs
+++ b/MediaBrowser.Model/Net/IPData.cs
@@ -48,6 +48,11 @@ public class IPData
     public int Index { get; set; }
 
     /// <summary>
+    /// Gets or sets a value indicating whether the network supports multicast.
+    /// </summary>
+    public bool SupportsMulticast { get; set; } = false;
+
+    /// <summary>
     /// Gets or sets the interface name.
     /// </summary>
     public string Name { get; set; }
diff --git a/MediaBrowser.Model/Net/PublishedServerUriOverride.cs b/MediaBrowser.Model/Net/PublishedServerUriOverride.cs
new file mode 100644
index 000000000..476d1ba38
--- /dev/null
+++ b/MediaBrowser.Model/Net/PublishedServerUriOverride.cs
@@ -0,0 +1,42 @@
+namespace MediaBrowser.Model.Net;
+
+/// <summary>
+/// Class holding information for a published server URI override.
+/// </summary>
+public class PublishedServerUriOverride
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PublishedServerUriOverride"/> class.
+    /// </summary>
+    /// <param name="data">The <see cref="IPData"/>.</param>
+    /// <param name="overrideUri">The override.</param>
+    /// <param name="internalOverride">A value indicating whether the override is for internal requests.</param>
+    /// <param name="externalOverride">A value indicating whether the override is for external requests.</param>
+    public PublishedServerUriOverride(IPData data, string overrideUri, bool internalOverride, bool externalOverride)
+    {
+        Data = data;
+        OverrideUri = overrideUri;
+        IsInternalOverride = internalOverride;
+        IsExternalOverride = externalOverride;
+    }
+
+    /// <summary>
+    /// Gets or sets the object's IP address.
+    /// </summary>
+    public IPData Data { get; set; }
+
+    /// <summary>
+    /// Gets or sets the override URI.
+    /// </summary>
+    public string OverrideUri { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the override should be applied to internal requests.
+    /// </summary>
+    public bool IsInternalOverride { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the override should be applied to external requests.
+    /// </summary>
+    public bool IsExternalOverride { get; set; }
+}