apps/screego
1
0
Fork 0
mirror of https://github.com/screego/server.git synced 2026-04-22 23:47:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use IPv4 stun for IPv6 connections

Browse Source 
* User1 connects with IPv6
* User2 connects with IPv4 (without any support for IPv6)
* User1 asks via STUN for his address, and receives a IPv6 address back
* User2 asks via STUN for his address, and receives a IPv4 address back
* User2 cannot connect to User1 IPv6 address

After this fix: User1 asks both for his IPv4 and IPv6 addresses.

See #56
This commit is contained in:
Jannis Mattheis
2020-12-02 20:33:27 +01:00
parent e845b3d29c
commit d71c303df7
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ws/room.go
+17 -19
View File
@@ -39,16 +39,14 @@ func (r *Room) newSession(host, client xid.ID, rooms *Rooms) {
Client: client,
}
sessionCreatedTotal.Inc()
clientUser := r.Users[client]
hostUser := r.Users[host]
iceHost := []outgoing.ICEServer{}
iceClient := []outgoing.ICEServer{}
switch r.Mode {
case ConnectionLocal:
case ConnectionSTUN:
iceHost = []outgoing.ICEServer{{URLs: []string{rooms.address(hostUser, "stun")}}}
iceClient = []outgoing.ICEServer{{URLs: []string{rooms.address(clientUser, "stun")}}}
iceHost = []outgoing.ICEServer{{URLs: rooms.addresses("stun", false)}}
iceClient = []outgoing.ICEServer{{URLs: rooms.addresses("stun", false)}}
case ConnectionTURN:
hostPW := util.RandString(20)
clientPW := util.RandString(20)
@@ -57,18 +55,12 @@ func (r *Room) newSession(host, client xid.ID, rooms *Rooms) {
clientName := id.String() + "client"
rooms.turnServer.Allow(clientName, clientPW, r.Users[client].Addr)
iceHost = []outgoing.ICEServer{{
URLs: []string{
rooms.address(hostUser, "turn"),
rooms.address(hostUser, "turn") + "?transport=tcp",
},
URLs: rooms.addresses("turn", true),
Credential: hostPW,
Username: hostName,
}}
iceClient = []outgoing.ICEServer{{
URLs: []string{
rooms.address(clientUser, "turn"),
rooms.address(clientUser, "turn") + "?transport=tcp",
},
URLs: rooms.addresses("turn", true),
Credential: clientPW,
Username: clientName,
}}
@@ -78,14 +70,20 @@ func (r *Room) newSession(host, client xid.ID, rooms *Rooms) {
r.Users[client].Write <- outgoing.ClientSession{Peer: host, ID: id, ICEServers: iceClient}
}
func (r *Rooms) address(user *User, prefix string) string {
var ip string
if r.config.ExternalIPV6 == nil || (user.Addr.To4() != nil && r.config.ExternalIPV4 != nil) {
ip = r.config.ExternalIPV4.String()
} else {
ip = fmt.Sprintf("[%s]", r.config.ExternalIPV6)
func (r *Rooms) addresses(prefix string, tcp bool) (result []string) {
if r.config.ExternalIPV4 != nil {
result = append(result, fmt.Sprintf("%s:%s:%s", prefix, r.config.ExternalIPV4.String(), r.turnServer.Port))
if tcp {
result = append(result, fmt.Sprintf("%s:%s:%s?transport=tcp", prefix, r.config.ExternalIPV4.String(), r.turnServer.Port))
}
}
return fmt.Sprintf("%s:%s:%s", prefix, ip, r.turnServer.Port)
if r.config.ExternalIPV6 != nil {
result = append(result, fmt.Sprintf("%s:[%s]:%s", prefix, r.config.ExternalIPV6.String(), r.turnServer.Port))
if tcp {
result = append(result, fmt.Sprintf("%s:[%s]:%s?transport=tcp", prefix, r.config.ExternalIPV6.String(), r.turnServer.Port))
}
}
return
}
func (r *Room) closeSession(rooms *Rooms, id xid.ID) {