Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

fix(rexctl): accept a voice IP that forwards to this machine (#3860)

Hampus4675c3cf017d
diff --git a/fluxer_rexctl/internal/checks/livekit.go b/fluxer_rexctl/internal/checks/livekit.go
index 84eff2fa8..d7f07a949 100644
--- a/fluxer_rexctl/internal/checks/livekit.go
+++ b/fluxer_rexctl/internal/checks/livekit.go
@@ -8,6 +8,7 @@ import (
"fmt"
"net"
"strings"
+ "time"
"github.com/fluxerapp/fluxer/fluxer_rexctl/internal/engine"
"github.com/fluxerapp/fluxer/fluxer_rexctl/internal/settings"
@@ -36,8 +37,15 @@ func runLiveKitIP(ctx context.Context, e *Env) Result {
}
ip := net.ParseIP(nodeIP)
if perr == nil && ip != nil && !ip.IsPrivate() && !ip.Equal(net.ParseIP(public)) {
+ port := e.value("FLUXER_LIVEKIT_TCP_PORT")
+ if port == "" {
+ port = "7881"
+ }
+ if acceptsVoice(ctx, nodeIP, port) {
+ return pass(fmt.Sprintf("Voice calls use %s, which accepts voice connections on port %s.", nodeIP, port))
+ }
return fixable(warn(fmt.Sprintf("Voice calls use %s and this machine's public IP address is %s.", nodeIP, public),
- "Run rexctl doctor --fix to use "+public+"."))
+ fmt.Sprintf("If %s forwards the voice ports to this machine, also forward TCP port %s, then run rexctl doctor. Otherwise run rexctl doctor --fix to use %s.", nodeIP, port, public)))
}
return pass(fmt.Sprintf("Voice calls use %s.", nodeIP))
}
@@ -64,3 +72,14 @@ func fixLiveKitIP(ctx context.Context, e *Env) error {
e.stage(settings.VoicePublicIP, &public)
return nil
}
+
+func acceptsVoice(ctx context.Context, host, port string) bool {
+ dialCtx, cancel := context.WithTimeout(ctx, 3*time.Second)
+ defer cancel()
+ conn, err := (&net.Dialer{}).DialContext(dialCtx, "tcp", net.JoinHostPort(host, port))
+ if err != nil {
+ return false
+ }
+ _ = conn.Close()
+ return true
+}