deblan-mirror/nextcloud-spreed-signaling
deblan-mirror/nextcloud-spreed-signaling
1
0
Fork 0
mirror of https://github.com/strukturag/nextcloud-spreed-signaling synced 2024-05-17 04:56:33 +02:00
Code Issues Releases Wiki Activity

Merge pull request #667 from strukturag/dnsmonitor-port

Browse source 
Support ports in full URLs for DNS monitor.
This commit is contained in:
Joachim Bauch 2024-02-27 09:00:49 +01:00 committed by GitHub
parent f5007df0ad 1f8b536c8a
commit 3ea60cfe31
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dns_monitor.go
View file

@ -197,11 +197,11 @@ func (m *DnsMonitor) Add(target string, callback DnsMonitorCallback) (*DnsMonito
} }
hostname = parsed.Host hostname = parsed.Host
} else { } else {
// Hostname with optional port passed. // Hostname only passed.
hostname = target hostname = target
if h, _, err := net.SplitHostPort(target); err == nil { }
hostname = h if h, _, err := net.SplitHostPort(hostname); err == nil {
} hostname = h
} }
m.mu.Lock() m.mu.Lock()

2
dns_monitor_test.go
View file

@ -240,7 +240,7 @@ func TestDnsMonitor(t *testing.T) {
rec1 := newDnsMonitorReceiverForTest(t) rec1 := newDnsMonitorReceiverForTest(t)
rec1.Expect(ips1, ips1, nil, nil) rec1.Expect(ips1, ips1, nil, nil)
entry1, err := monitor.Add("https://foo", rec1.OnLookup) entry1, err := monitor.Add("https://foo:12345", rec1.OnLookup)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

3
server/main.go
View file

@ -160,6 +160,9 @@ func main() {
if err != nil { if err != nil {
log.Fatal("Could not create DNS monitor: ", err) log.Fatal("Could not create DNS monitor: ", err)
} }
if err := dnsMonitor.Start(); err != nil {
log.Fatal("Could not start DNS monitor: ", err)
}
defer dnsMonitor.Stop() defer dnsMonitor.Stop()
etcdClient, err := signaling.NewEtcdClient(config, "mcu") etcdClient, err := signaling.NewEtcdClient(config, "mcu")