diff --git a/doc/openapi/components/schemas/config/nodes/webrtc.yaml b/doc/openapi/components/schemas/config/nodes/webrtc.yaml index 96d507161..17122dd35 100644 --- a/doc/openapi/components/schemas/config/nodes/webrtc.yaml +++ b/doc/openapi/components/schemas/config/nodes/webrtc.yaml @@ -16,7 +16,7 @@ allOf: type: string title: Signaling Server Address description: Address to the websocket signaling server - default: wss://ws-signal.villas.k8s.eonerc.rwth-aachen.de + default: wss://villas.k8s.eonerc.rwth-aachen.de/ws/signaling ice: type: object diff --git a/etc/examples/nodes/webrtc.conf b/etc/examples/nodes/webrtc.conf index 604b8535e..69b130eae 100644 --- a/etc/examples/nodes/webrtc.conf +++ b/etc/examples/nodes/webrtc.conf @@ -8,7 +8,7 @@ nodes = { session = "my-session-name" # Address to the websocket signaling server - server = "wss://ws-signal.villas.k8s.eonerc.rwth-aachen.de" + server = "wss://villas.k8s.eonerc.rwth-aachen.de/ws/signaling" # Setting for Interactive Connectivity Establishment ice = { diff --git a/go/pkg/nodes/webrtc/node.go b/go/pkg/nodes/webrtc/node.go index 7496aef93..9cb2e7e22 100644 --- a/go/pkg/nodes/webrtc/node.go +++ b/go/pkg/nodes/webrtc/node.go @@ -38,7 +38,8 @@ var ( DefaultConfig = Config{ Server: &url.URL{ Scheme: "wss", - Host: "wss://ws-signal.villas.k8s.eonerc.rwth-aachen.de", + Host: "villas.k8s.eonerc.rwth-aachen.de", + Path: "/ws/signaling", }, WebRTC: webrtc.Configuration{ ICEServers: []webrtc.ICEServer{ diff --git a/go/pkg/nodes/webrtc/webrtc.go b/go/pkg/nodes/webrtc/webrtc.go index cb64bc736..538fd9f7b 100644 --- a/go/pkg/nodes/webrtc/webrtc.go +++ b/go/pkg/nodes/webrtc/webrtc.go @@ -25,6 +25,7 @@ package webrtc import ( "fmt" "sync" + "path" "git.rwth-aachen.de/acs/public/villas/node/go/pkg/nodes" "github.com/pion/webrtc/v3" @@ -55,7 +56,7 @@ type PeerConnection struct { func NewPeerConnection(config *Config, logger nodes.Logger) (*PeerConnection, error) { u := *config.Server - u.Path = "/" + config.Session + u.Path = path.Join(u.Path, config.Session) sc, err := NewSignalingClient(&u, logger) if err != nil { return nil, fmt.Errorf("failed to create signaling client: %w", err) diff --git a/web/webrtc.html b/web/webrtc.html index ac7e037e5..78bd9da5e 100644 --- a/web/webrtc.html +++ b/web/webrtc.html @@ -113,7 +113,7 @@ var dc = null; // RTCDataChannel for the local (sender) var sc = null; // Signaling Client - var server = 'wss://ws-signal.villas.k8s.eonerc.rwth-aachen.de'; + var server = 'wss://villas.k8s.eonerc.rwth-aachen.de/ws/signaling'; var sessionName = 'my-session-name'; var iceUsername = 'villas'; var icePassword = 'villas';