Allow setting fixed discovery UDP port number For firewalled environment. https://codeberg.org/pocka/plac-for-gtk4/issues/21

Changes

5 changed files (+30/-1)

• data/jp.pocka.plac.gtk-adwaita.gschema.xml
  • @@ -38,6 +38,11 @@ SPDX-License-Identifier: Apache-2.0
    <summary>Last Connected Server IP Address</summary> <description>TCP port number to use when connecting to server using connected-server-addr.</description> </key> + <key name="discovery-udp-port" type="u"> + <default>0</default> + <summary>Discovery UDP Port</summary> + <description>UDP port number to use for sending and receiving of Roon Server discovery. Set 0 for random port.</description> + </key> <key name="label-parsing-enabled" type="b"> <default>true</default> <summary>Enable label parsing</summary>
• src/Plac/ServerScanner.vala
  • @@ -34,6 +34,8 @@ namespace Plac {
    public int64 read_timeout_us = 1000 * 1000 * 2; + public uint16 discovery_udp_port { get; set; default = 0; } + public ServerScanner() { Object(); }
  • @@ -46,6 +48,10 @@ namespace Plac {
    new GLib.Thread<void>("plac-server-scanner", () => { try { var socket = new GLib.Socket(IPV4, DATAGRAM, UDP); + if (discovery_udp_port > 0) { + GLib.log("Plac", LEVEL_DEBUG, @"Using fixed UDP port $(discovery_udp_port)"); + socket.bind(new InetSocketAddress(new InetAddress.any(IPV4), discovery_udp_port), true); + } socket.set_timeout(3);
• src/Settings.vala
  • @@ -21,6 +21,7 @@ namespace PlacGtkAdwaita {
    private const string CONNECTED_SERVER_PORT = "connected-server-port"; public class Settings { + public const string DISCOVERY_UDP_PORT = "discovery-udp-port"; public const string LABEL_PARSING_ENABLED = "label-parsing-enabled"; public const string SHOW_SEEK_BY_10SECS = "show-seek-by-10secs"; public const string SHOW_BROWSE_ITEM_SEPARATORS = "show-browse-item-separators";
  • @@ -31,6 +32,18 @@ namespace PlacGtkAdwaita {
    settings = new GLib.Settings(Config.PLAC_APP_ID); } + public uint16 discovery_udp_port { + owned get { + var value = settings.get_uint(DISCOVERY_UDP_PORT); + if (value > uint16.MAX) { + return 0; + } + + return (uint16) value; + } + set { settings.set_uint(DISCOVERY_UDP_PORT, value); } + } + public string connected_server_id { owned get { return settings.get_string(CONNECTED_SERVER_ID); } set { settings.set_string(CONNECTED_SERVER_ID, value); }
• src/Windows/MainWindow.vala
  • @@ -167,7 +167,9 @@ namespace PlacGtkAdwaita {
    Plac.Server? server = null; GLib.Error? error = null; - var scanner = new Plac.ServerScanner(); + var scanner = new Plac.ServerScanner() { + discovery_udp_port = settings.discovery_udp_port, + }; scanner.start(); scanner.found.connect((found) => {
• src/Windows/ServerSelectorWindow.vala
  • @@ -37,6 +37,7 @@ namespace PlacGtkAdwaita {
    private ulong error_detail_hid; + private Settings settings = new Settings(); private Plac.ServerScanner scanner = new Plac.ServerScanner(); private Gee.HashMap<string, ServerRow> rows = new Gee.HashMap<string, ServerRow>();
  • @@ -45,6 +46,8 @@ namespace PlacGtkAdwaita {
    } construct { + settings.settings.bind(Settings.DISCOVERY_UDP_PORT, scanner, "discovery-udp-port", GET); + scanner.found.connect((server) => { stack.visible_child_name = "idle";