mirror of
https://github.com/openlibrecommunity/olcrtc.git
synced 2026-05-26 07:08:11 +00:00
docs: replace 1.1.1.1 with 8.8.8.8 as default DNS server
This commit is contained in:
@@ -45,7 +45,7 @@ ENV OLCRTC_MODE=srv \
|
|||||||
OLCRTC_CARRIER= \
|
OLCRTC_CARRIER= \
|
||||||
OLCRTC_TRANSPORT=datachannel \
|
OLCRTC_TRANSPORT=datachannel \
|
||||||
OLCRTC_DATA_DIR=/usr/share/olcrtc \
|
OLCRTC_DATA_DIR=/usr/share/olcrtc \
|
||||||
OLCRTC_DNS=1.1.1.1:53 \
|
OLCRTC_DNS=8.8.8.8:53 \
|
||||||
OLCRTC_KEY_FILE=/var/lib/olcrtc/key.hex \
|
OLCRTC_KEY_FILE=/var/lib/olcrtc/key.hex \
|
||||||
OLCRTC_SOCKS_HOST=127.0.0.1 \
|
OLCRTC_SOCKS_HOST=127.0.0.1 \
|
||||||
OLCRTC_SOCKS_PORT=8808 \
|
OLCRTC_SOCKS_PORT=8808 \
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ var errBoom = errors.New("boom")
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
testAuthWBStream = "wbstream"
|
testAuthWBStream = "wbstream"
|
||||||
testDNSServer = "1.1.1.1:53"
|
testDNSServer = "8.8.8.8:53"
|
||||||
)
|
)
|
||||||
|
|
||||||
func writeYAML(t *testing.T, body string) string {
|
func writeYAML(t *testing.T, body string) string {
|
||||||
@@ -90,7 +90,7 @@ func TestRunWithConfigValidationAndDataDirErrors(t *testing.T) {
|
|||||||
Auth: "jitsi",
|
Auth: "jitsi",
|
||||||
RoomID: "https://meet.small-dm.ru/test",
|
RoomID: "https://meet.small-dm.ru/test",
|
||||||
KeyHex: "key",
|
KeyHex: "key",
|
||||||
DNSServer: "1.1.1.1:53",
|
DNSServer: "8.8.8.8:53",
|
||||||
}
|
}
|
||||||
if err := runWithConfig(loadedConfig{scfg: scfg}); !errors.Is(err, ErrDataDirRequired) {
|
if err := runWithConfig(loadedConfig{scfg: scfg}); !errors.Is(err, ErrDataDirRequired) {
|
||||||
t.Fatalf("runWithConfig(no data dir) = %v, want %v", err, ErrDataDirRequired)
|
t.Fatalf("runWithConfig(no data dir) = %v, want %v", err, ErrDataDirRequired)
|
||||||
@@ -140,7 +140,7 @@ crypto:
|
|||||||
key: key
|
key: key
|
||||||
net:
|
net:
|
||||||
transport: datachannel
|
transport: datachannel
|
||||||
dns: 1.1.1.1:53
|
dns: 8.8.8.8:53
|
||||||
data: `+dir+`
|
data: `+dir+`
|
||||||
`)
|
`)
|
||||||
|
|
||||||
@@ -181,7 +181,7 @@ crypto:
|
|||||||
key: key
|
key: key
|
||||||
net:
|
net:
|
||||||
transport: vp8channel
|
transport: vp8channel
|
||||||
dns: 1.1.1.1:53
|
dns: 8.8.8.8:53
|
||||||
data: `+dir+`
|
data: `+dir+`
|
||||||
`)
|
`)
|
||||||
|
|
||||||
@@ -216,7 +216,7 @@ link: direct
|
|||||||
crypto:
|
crypto:
|
||||||
key: key
|
key: key
|
||||||
net:
|
net:
|
||||||
dns: 1.1.1.1:53
|
dns: 8.8.8.8:53
|
||||||
profiles:
|
profiles:
|
||||||
- name: wb-primary
|
- name: wb-primary
|
||||||
auth:
|
auth:
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ services:
|
|||||||
OLCRTC_ROOM_ID: "${OLCRTC_ROOM_ID:?set OLCRTC_ROOM_ID to the server room}"
|
OLCRTC_ROOM_ID: "${OLCRTC_ROOM_ID:?set OLCRTC_ROOM_ID to the server room}"
|
||||||
OLCRTC_KEY: "${OLCRTC_KEY:?set OLCRTC_KEY to the server encryption key}"
|
OLCRTC_KEY: "${OLCRTC_KEY:?set OLCRTC_KEY to the server encryption key}"
|
||||||
OLCRTC_KEY_FILE: "${OLCRTC_KEY_FILE:-/var/lib/olcrtc/key.hex}"
|
OLCRTC_KEY_FILE: "${OLCRTC_KEY_FILE:-/var/lib/olcrtc/key.hex}"
|
||||||
OLCRTC_DNS: "${OLCRTC_DNS:-1.1.1.1:53}"
|
OLCRTC_DNS: "${OLCRTC_DNS:-8.8.8.8:53}"
|
||||||
OLCRTC_SOCKS_HOST: "${OLCRTC_SOCKS_HOST:-127.0.0.1}"
|
OLCRTC_SOCKS_HOST: "${OLCRTC_SOCKS_HOST:-127.0.0.1}"
|
||||||
OLCRTC_SOCKS_PORT: "${OLCRTC_SOCKS_PORT:-8808}"
|
OLCRTC_SOCKS_PORT: "${OLCRTC_SOCKS_PORT:-8808}"
|
||||||
OLCRTC_SOCKS_USER: "${OLCRTC_SOCKS_USER:-}"
|
OLCRTC_SOCKS_USER: "${OLCRTC_SOCKS_USER:-}"
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ services:
|
|||||||
OLCRTC_ROOM_ID: "${OLCRTC_ROOM_ID:-}"
|
OLCRTC_ROOM_ID: "${OLCRTC_ROOM_ID:-}"
|
||||||
OLCRTC_KEY: "${OLCRTC_KEY:-}"
|
OLCRTC_KEY: "${OLCRTC_KEY:-}"
|
||||||
OLCRTC_KEY_FILE: "${OLCRTC_KEY_FILE:-/var/lib/olcrtc/key.hex}"
|
OLCRTC_KEY_FILE: "${OLCRTC_KEY_FILE:-/var/lib/olcrtc/key.hex}"
|
||||||
OLCRTC_DNS: "${OLCRTC_DNS:-1.1.1.1:53}"
|
OLCRTC_DNS: "${OLCRTC_DNS:-8.8.8.8:53}"
|
||||||
OLCRTC_SOCKS_PROXY: "${OLCRTC_SOCKS_PROXY:-}"
|
OLCRTC_SOCKS_PROXY: "${OLCRTC_SOCKS_PROXY:-}"
|
||||||
OLCRTC_SOCKS_PROXY_PORT: "${OLCRTC_SOCKS_PROXY_PORT:-1080}"
|
OLCRTC_SOCKS_PROXY_PORT: "${OLCRTC_SOCKS_PROXY_PORT:-1080}"
|
||||||
OLCRTC_VIDEO_W: "${OLCRTC_VIDEO_W:-0}"
|
OLCRTC_VIDEO_W: "${OLCRTC_VIDEO_W:-0}"
|
||||||
|
|||||||
@@ -117,12 +117,12 @@ mode: srv
|
|||||||
auth:
|
auth:
|
||||||
provider: jitsi
|
provider: jitsi
|
||||||
room:
|
room:
|
||||||
id: "https://meet.small-dm.ru/myroom"
|
id: "https://meet.small-dm.ru/REPLACE_ME_WITH_ROOM_ID"
|
||||||
crypto:
|
crypto:
|
||||||
key: "REPLACE_ME_WITH_64_HEX_CHARS"
|
key: "REPLACE_ME_WITH_64_HEX_CHARS"
|
||||||
net:
|
net:
|
||||||
transport: datachannel
|
transport: datachannel
|
||||||
dns: "1.1.1.1:53"
|
dns: "8.8.8.8:53"
|
||||||
data: data
|
data: data
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -133,12 +133,12 @@ mode: cnc
|
|||||||
auth:
|
auth:
|
||||||
provider: jitsi
|
provider: jitsi
|
||||||
room:
|
room:
|
||||||
id: "https://meet.small-dm.ru/myroom"
|
id: "https://meet.small-dm.ru/REPLACE_ME_WITH_ROOM_ID"
|
||||||
crypto:
|
crypto:
|
||||||
key: "REPLACE_ME_WITH_64_HEX_CHARS"
|
key: "REPLACE_ME_WITH_64_HEX_CHARS"
|
||||||
net:
|
net:
|
||||||
transport: datachannel
|
transport: datachannel
|
||||||
dns: "1.1.1.1:53"
|
dns: "8.8.8.8:53"
|
||||||
socks:
|
socks:
|
||||||
host: "127.0.0.1"
|
host: "127.0.0.1"
|
||||||
port: 8808
|
port: 8808
|
||||||
@@ -215,7 +215,7 @@ srv := tunnel.New(tunnel.Config{
|
|||||||
Carrier: "jitsi",
|
Carrier: "jitsi",
|
||||||
RoomURL: "https://meet.small-dm.ru/myroom",
|
RoomURL: "https://meet.small-dm.ru/myroom",
|
||||||
KeyHex: "<64-char hex>",
|
KeyHex: "<64-char hex>",
|
||||||
DNSServer: "1.1.1.1:53",
|
DNSServer: "8.8.8.8:53",
|
||||||
})
|
})
|
||||||
err := srv.Run(ctx)
|
err := srv.Run(ctx)
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ crypto:
|
|||||||
key: "REPLACE_ME_WITH_64_HEX_CHARS"
|
key: "REPLACE_ME_WITH_64_HEX_CHARS"
|
||||||
net:
|
net:
|
||||||
transport: datachannel
|
transport: datachannel
|
||||||
dns: "1.1.1.1:53"
|
dns: "8.8.8.8:53"
|
||||||
data: data
|
data: data
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -101,7 +101,7 @@ crypto:
|
|||||||
key: "REPLACE_ME_WITH_64_HEX_CHARS"
|
key: "REPLACE_ME_WITH_64_HEX_CHARS"
|
||||||
net:
|
net:
|
||||||
transport: datachannel
|
transport: datachannel
|
||||||
dns: "1.1.1.1:53"
|
dns: "8.8.8.8:53"
|
||||||
socks:
|
socks:
|
||||||
host: "127.0.0.1"
|
host: "127.0.0.1"
|
||||||
port: 8808
|
port: 8808
|
||||||
@@ -154,7 +154,7 @@ mode: srv
|
|||||||
crypto:
|
crypto:
|
||||||
key_file: ./olcrtc.key
|
key_file: ./olcrtc.key
|
||||||
net:
|
net:
|
||||||
dns: "1.1.1.1:53"
|
dns: "8.8.8.8:53"
|
||||||
data: data
|
data: data
|
||||||
|
|
||||||
profiles:
|
profiles:
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ crypto:
|
|||||||
key_file: "./olcrtc.key"
|
key_file: "./olcrtc.key"
|
||||||
|
|
||||||
net:
|
net:
|
||||||
dns: "1.1.1.1:53"
|
dns: "8.8.8.8:53"
|
||||||
|
|
||||||
liveness:
|
liveness:
|
||||||
interval: 10s
|
interval: 10s
|
||||||
|
|||||||
@@ -162,7 +162,7 @@ crypto:
|
|||||||
key: "d823fa01cb3e0609b67322f7cf984c4ee2e4ce2e294936fc24ef38c9e59f4799"
|
key: "d823fa01cb3e0609b67322f7cf984c4ee2e4ce2e294936fc24ef38c9e59f4799"
|
||||||
net:
|
net:
|
||||||
transport: datachannel
|
transport: datachannel
|
||||||
dns: "1.1.1.1:53"
|
dns: "8.8.8.8:53"
|
||||||
data: data
|
data: data
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -193,7 +193,7 @@ crypto:
|
|||||||
key: "d823fa01cb3e0609b67322f7cf984c4ee2e4ce2e294936fc24ef38c9e59f4799"
|
key: "d823fa01cb3e0609b67322f7cf984c4ee2e4ce2e294936fc24ef38c9e59f4799"
|
||||||
net:
|
net:
|
||||||
transport: vp8channel
|
transport: vp8channel
|
||||||
dns: "1.1.1.1:53"
|
dns: "8.8.8.8:53"
|
||||||
data: data
|
data: data
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -236,7 +236,7 @@ crypto:
|
|||||||
key: "<hex-key-такой-же-как-на-сервере>"
|
key: "<hex-key-такой-же-как-на-сервере>"
|
||||||
net:
|
net:
|
||||||
transport: datachannel
|
transport: datachannel
|
||||||
dns: "1.1.1.1:53"
|
dns: "8.8.8.8:53"
|
||||||
socks:
|
socks:
|
||||||
host: "127.0.0.1"
|
host: "127.0.0.1"
|
||||||
port: 8808
|
port: 8808
|
||||||
@@ -262,7 +262,7 @@ crypto:
|
|||||||
key: "<hex-key>"
|
key: "<hex-key>"
|
||||||
net:
|
net:
|
||||||
transport: vp8channel
|
transport: vp8channel
|
||||||
dns: "1.1.1.1:53"
|
dns: "8.8.8.8:53"
|
||||||
socks:
|
socks:
|
||||||
host: "127.0.0.1"
|
host: "127.0.0.1"
|
||||||
port: 8808
|
port: 8808
|
||||||
@@ -292,7 +292,7 @@ crypto:
|
|||||||
key: "<hex-key>"
|
key: "<hex-key>"
|
||||||
net:
|
net:
|
||||||
transport: vp8channel
|
transport: vp8channel
|
||||||
dns: "1.1.1.1:53"
|
dns: "8.8.8.8:53"
|
||||||
socks:
|
socks:
|
||||||
host: "127.0.0.1"
|
host: "127.0.0.1"
|
||||||
port: 8808
|
port: 8808
|
||||||
|
|||||||
@@ -48,7 +48,7 @@
|
|||||||
| `room.id` | Room ID |
|
| `room.id` | Room ID |
|
||||||
| `crypto.key` или `crypto.key_file` | Ключ шифрования hex 64 символа. Генерация: `openssl rand -hex 32` |
|
| `crypto.key` или `crypto.key_file` | Ключ шифрования hex 64 символа. Генерация: `openssl rand -hex 32` |
|
||||||
| `data` | Всегда `data` |
|
| `data` | Всегда `data` |
|
||||||
| `net.dns` | DNS-сервер, например `1.1.1.1:53` |
|
| `net.dns` | DNS-сервер, например `8.8.8.8:53` |
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -201,7 +201,7 @@ crypto:
|
|||||||
key: "<hex-key>"
|
key: "<hex-key>"
|
||||||
net:
|
net:
|
||||||
transport: datachannel
|
transport: datachannel
|
||||||
dns: "1.1.1.1:53"
|
dns: "8.8.8.8:53"
|
||||||
data: data
|
data: data
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -216,7 +216,7 @@ crypto:
|
|||||||
key: "<hex-key>"
|
key: "<hex-key>"
|
||||||
net:
|
net:
|
||||||
transport: datachannel
|
transport: datachannel
|
||||||
dns: "1.1.1.1:53"
|
dns: "8.8.8.8:53"
|
||||||
socks:
|
socks:
|
||||||
host: "127.0.0.1"
|
host: "127.0.0.1"
|
||||||
port: 8808
|
port: 8808
|
||||||
@@ -236,7 +236,7 @@ crypto:
|
|||||||
key: "<hex-key>"
|
key: "<hex-key>"
|
||||||
net:
|
net:
|
||||||
transport: datachannel
|
transport: datachannel
|
||||||
dns: "1.1.1.1:53"
|
dns: "8.8.8.8:53"
|
||||||
socks:
|
socks:
|
||||||
host: "127.0.0.1"
|
host: "127.0.0.1"
|
||||||
port: 8808
|
port: 8808
|
||||||
@@ -267,7 +267,7 @@ crypto:
|
|||||||
key: "<hex-key>"
|
key: "<hex-key>"
|
||||||
net:
|
net:
|
||||||
transport: vp8channel
|
transport: vp8channel
|
||||||
dns: "1.1.1.1:53"
|
dns: "8.8.8.8:53"
|
||||||
vp8:
|
vp8:
|
||||||
fps: 60
|
fps: 60
|
||||||
batch_size: 64
|
batch_size: 64
|
||||||
@@ -285,7 +285,7 @@ crypto:
|
|||||||
key: "<hex-key>"
|
key: "<hex-key>"
|
||||||
net:
|
net:
|
||||||
transport: vp8channel
|
transport: vp8channel
|
||||||
dns: "1.1.1.1:53"
|
dns: "8.8.8.8:53"
|
||||||
socks:
|
socks:
|
||||||
host: "127.0.0.1"
|
host: "127.0.0.1"
|
||||||
port: 8808
|
port: 8808
|
||||||
@@ -310,7 +310,7 @@ crypto:
|
|||||||
key: "<hex-key>"
|
key: "<hex-key>"
|
||||||
net:
|
net:
|
||||||
transport: seichannel
|
transport: seichannel
|
||||||
dns: "1.1.1.1:53"
|
dns: "8.8.8.8:53"
|
||||||
sei:
|
sei:
|
||||||
fps: 60
|
fps: 60
|
||||||
batch_size: 64
|
batch_size: 64
|
||||||
@@ -330,7 +330,7 @@ crypto:
|
|||||||
key: "<hex-key>"
|
key: "<hex-key>"
|
||||||
net:
|
net:
|
||||||
transport: seichannel
|
transport: seichannel
|
||||||
dns: "1.1.1.1:53"
|
dns: "8.8.8.8:53"
|
||||||
socks:
|
socks:
|
||||||
host: "127.0.0.1"
|
host: "127.0.0.1"
|
||||||
port: 8808
|
port: 8808
|
||||||
@@ -355,7 +355,7 @@ crypto:
|
|||||||
key: "<hex-key>"
|
key: "<hex-key>"
|
||||||
net:
|
net:
|
||||||
transport: videochannel
|
transport: videochannel
|
||||||
dns: "1.1.1.1:53"
|
dns: "8.8.8.8:53"
|
||||||
video:
|
video:
|
||||||
codec: qrcode
|
codec: qrcode
|
||||||
width: 1080
|
width: 1080
|
||||||
@@ -377,7 +377,7 @@ crypto:
|
|||||||
key: "<hex-key>"
|
key: "<hex-key>"
|
||||||
net:
|
net:
|
||||||
transport: videochannel
|
transport: videochannel
|
||||||
dns: "1.1.1.1:53"
|
dns: "8.8.8.8:53"
|
||||||
socks:
|
socks:
|
||||||
host: "127.0.0.1"
|
host: "127.0.0.1"
|
||||||
port: 8808
|
port: 8808
|
||||||
|
|||||||
@@ -130,7 +130,7 @@ func TestValidate(t *testing.T) {
|
|||||||
Auth: "telemost",
|
Auth: "telemost",
|
||||||
RoomID: "room-1",
|
RoomID: "room-1",
|
||||||
KeyHex: "00112233445566778899aabbccddeeff00112233445566778899aabbccddeeff",
|
KeyHex: "00112233445566778899aabbccddeeff00112233445566778899aabbccddeeff",
|
||||||
DNSServer: "1.1.1.1:53", //nolint:goconst // test literal, repetition is intentional
|
DNSServer: "8.8.8.8:53", //nolint:goconst // test literal, repetition is intentional
|
||||||
}
|
}
|
||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
@@ -577,17 +577,17 @@ func TestValidateGen(t *testing.T) {
|
|||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "wbstream room generation unsupported",
|
name: "wbstream room generation unsupported",
|
||||||
cfg: Config{Auth: testAuthWBStream, DNSServer: "1.1.1.1:53", Amount: 3},
|
cfg: Config{Auth: testAuthWBStream, DNSServer: "8.8.8.8:53", Amount: 3},
|
||||||
want: ErrUnsupportedCarrier,
|
want: ErrUnsupportedCarrier,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "missing auth",
|
name: "missing auth",
|
||||||
cfg: Config{DNSServer: "1.1.1.1:53", Amount: 1},
|
cfg: Config{DNSServer: "8.8.8.8:53", Amount: 1},
|
||||||
want: ErrAuthRequired,
|
want: ErrAuthRequired,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "unsupported auth",
|
name: "unsupported auth",
|
||||||
cfg: Config{Auth: "unknown", DNSServer: "1.1.1.1:53", Amount: 1},
|
cfg: Config{Auth: "unknown", DNSServer: "8.8.8.8:53", Amount: 1},
|
||||||
want: ErrUnsupportedCarrier,
|
want: ErrUnsupportedCarrier,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -597,12 +597,12 @@ func TestValidateGen(t *testing.T) {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "amount zero",
|
name: "amount zero",
|
||||||
cfg: Config{Auth: testAuthWBStream, DNSServer: "1.1.1.1:53", Amount: 0},
|
cfg: Config{Auth: testAuthWBStream, DNSServer: "8.8.8.8:53", Amount: 0},
|
||||||
want: ErrAmountRequired,
|
want: ErrAmountRequired,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "amount negative",
|
name: "amount negative",
|
||||||
cfg: Config{Auth: testAuthWBStream, DNSServer: "1.1.1.1:53", Amount: -1},
|
cfg: Config{Auth: testAuthWBStream, DNSServer: "8.8.8.8:53", Amount: -1},
|
||||||
want: ErrAmountRequired,
|
want: ErrAmountRequired,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@@ -625,7 +625,7 @@ func TestValidateGen(t *testing.T) {
|
|||||||
|
|
||||||
func TestGenUnsupportedAuth(t *testing.T) {
|
func TestGenUnsupportedAuth(t *testing.T) {
|
||||||
RegisterDefaults()
|
RegisterDefaults()
|
||||||
cfg := Config{Auth: "telemost", DNSServer: "1.1.1.1:53", Amount: 1}
|
cfg := Config{Auth: "telemost", DNSServer: "8.8.8.8:53", Amount: 1}
|
||||||
err := Gen(context.Background(), cfg, func(string) {})
|
err := Gen(context.Background(), cfg, func(string) {})
|
||||||
if !errors.Is(err, ErrUnsupportedCarrier) {
|
if !errors.Is(err, ErrUnsupportedCarrier) {
|
||||||
t.Fatalf("Gen(telemost) error = %v, want ErrUnsupportedCarrier", err)
|
t.Fatalf("Gen(telemost) error = %v, want ErrUnsupportedCarrier", err)
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ const (
|
|||||||
testAuthProvider = "wbstream"
|
testAuthProvider = "wbstream"
|
||||||
testRoomID = "r1"
|
testRoomID = "r1"
|
||||||
testCryptoKey = "deadbeef"
|
testCryptoKey = "deadbeef"
|
||||||
|
testDNSServer = "8.8.8.8:53"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestLoadAndApply(t *testing.T) {
|
func TestLoadAndApply(t *testing.T) {
|
||||||
@@ -30,7 +31,7 @@ crypto:
|
|||||||
key: deadbeef
|
key: deadbeef
|
||||||
net:
|
net:
|
||||||
transport: datachannel
|
transport: datachannel
|
||||||
dns: 1.1.1.1:53
|
dns: 8.8.8.8:53
|
||||||
socks:
|
socks:
|
||||||
host: 127.0.0.1
|
host: 127.0.0.1
|
||||||
port: 1080
|
port: 1080
|
||||||
@@ -91,7 +92,7 @@ func requireAppliedConfig(t *testing.T, got session.Config) {
|
|||||||
RoomID: testRoomID,
|
RoomID: testRoomID,
|
||||||
KeyHex: testCryptoKey,
|
KeyHex: testCryptoKey,
|
||||||
Transport: "datachannel",
|
Transport: "datachannel",
|
||||||
DNSServer: "1.1.1.1:53",
|
DNSServer: testDNSServer,
|
||||||
SOCKSHost: "127.0.0.1",
|
SOCKSHost: "127.0.0.1",
|
||||||
SOCKSPort: 1080,
|
SOCKSPort: 1080,
|
||||||
SOCKSUser: "u",
|
SOCKSUser: "u",
|
||||||
@@ -147,7 +148,7 @@ link: direct
|
|||||||
crypto:
|
crypto:
|
||||||
key: shared-key
|
key: shared-key
|
||||||
net:
|
net:
|
||||||
dns: 1.1.1.1:53
|
dns: 8.8.8.8:53
|
||||||
liveness:
|
liveness:
|
||||||
interval: 5s
|
interval: 5s
|
||||||
timeout: 2s
|
timeout: 2s
|
||||||
@@ -207,7 +208,7 @@ failover:
|
|||||||
if first.Auth != "wbstream" || first.Transport != "vp8channel" || first.RoomID != "wb-room" {
|
if first.Auth != "wbstream" || first.Transport != "vp8channel" || first.RoomID != "wb-room" {
|
||||||
t.Fatalf("first profile = %+v", first)
|
t.Fatalf("first profile = %+v", first)
|
||||||
}
|
}
|
||||||
if first.KeyHex != "shared-key" || first.DNSServer != "1.1.1.1:53" || first.VP8.FPS != 30 ||
|
if first.KeyHex != "shared-key" || first.DNSServer != testDNSServer || first.VP8.FPS != 30 ||
|
||||||
first.LivenessInterval != "1s" || first.LivenessTimeout != "2s" || first.LivenessFailures != 5 ||
|
first.LivenessInterval != "1s" || first.LivenessTimeout != "2s" || first.LivenessFailures != 5 ||
|
||||||
first.MaxSessionDuration != "30m" || first.TrafficMaxPayloadSize != 4096 ||
|
first.MaxSessionDuration != "30m" || first.TrafficMaxPayloadSize != 4096 ||
|
||||||
first.TrafficMinDelay != "10ms" || first.TrafficMaxDelay != "20ms" {
|
first.TrafficMinDelay != "10ms" || first.TrafficMaxDelay != "20ms" {
|
||||||
@@ -215,7 +216,7 @@ failover:
|
|||||||
}
|
}
|
||||||
second := ApplyProfile(base, f.Profiles[1])
|
second := ApplyProfile(base, f.Profiles[1])
|
||||||
if second.Auth != "jitsi" || second.Transport != "datachannel" ||
|
if second.Auth != "jitsi" || second.Transport != "datachannel" ||
|
||||||
second.RoomID != "https://meet.example/room" || second.DNSServer != "8.8.8.8:53" {
|
second.RoomID != "https://meet.example/room" || second.DNSServer != testDNSServer {
|
||||||
t.Fatalf("second profile = %+v", second)
|
t.Fatalf("second profile = %+v", second)
|
||||||
}
|
}
|
||||||
if second.LivenessInterval != "5s" || second.LivenessTimeout != "2s" || second.LivenessFailures != 5 ||
|
if second.LivenessInterval != "5s" || second.LivenessTimeout != "2s" || second.LivenessFailures != 5 ||
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ var (
|
|||||||
const (
|
const (
|
||||||
defaultTransport = "vp8channel"
|
defaultTransport = "vp8channel"
|
||||||
dataTransport = "datachannel"
|
dataTransport = "datachannel"
|
||||||
defaultDNSServer = "1.1.1.1:53"
|
defaultDNSServer = "8.8.8.8:53"
|
||||||
defaultHTTPPingURL = "https://www.google.com/generate_204"
|
defaultHTTPPingURL = "https://www.google.com/generate_204"
|
||||||
carrierWBStream = "wbstream"
|
carrierWBStream = "wbstream"
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ type Config struct {
|
|||||||
// --- common ---
|
// --- common ---
|
||||||
// Name is the display name used when joining the room.
|
// Name is the display name used when joining the room.
|
||||||
Name string
|
Name string
|
||||||
// DNSServer is an optional custom DNS resolver (e.g. "1.1.1.1:53").
|
// DNSServer is an optional custom DNS resolver (e.g. "8.8.8.8:53").
|
||||||
DNSServer string
|
DNSServer string
|
||||||
// ProxyAddr / ProxyPort configure an outbound SOCKS5 proxy.
|
// ProxyAddr / ProxyPort configure an outbound SOCKS5 proxy.
|
||||||
ProxyAddr string
|
ProxyAddr string
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
// Carrier: "jitsi",
|
// Carrier: "jitsi",
|
||||||
// RoomURL: "https://meet.small-dm.ru/myroom",
|
// RoomURL: "https://meet.small-dm.ru/myroom",
|
||||||
// KeyHex: "<64-char hex>",
|
// KeyHex: "<64-char hex>",
|
||||||
// DNSServer: "1.1.1.1:53",
|
// DNSServer: "8.8.8.8:53",
|
||||||
// AuthHook: func(deviceID string, claims map[string]any) (string, error) {
|
// AuthHook: func(deviceID string, claims map[string]any) (string, error) {
|
||||||
// // reject unknown devices, enrich session with a DB-issued ID
|
// // reject unknown devices, enrich session with a DB-issued ID
|
||||||
// return db.IssueSession(deviceID, claims)
|
// return db.IssueSession(deviceID, claims)
|
||||||
@@ -82,7 +82,7 @@ type Config struct {
|
|||||||
|
|
||||||
// --- crypto & networking ---
|
// --- crypto & networking ---
|
||||||
KeyHex string // 64-char hex (32 bytes) shared with the client
|
KeyHex string // 64-char hex (32 bytes) shared with the client
|
||||||
DNSServer string // resolver used for target dials, e.g. "1.1.1.1:53"
|
DNSServer string // resolver used for target dials, e.g. "8.8.8.8:53"
|
||||||
SOCKSProxyAddr string // optional outbound SOCKS5 proxy host
|
SOCKSProxyAddr string // optional outbound SOCKS5 proxy host
|
||||||
SOCKSProxyPort int // optional outbound SOCKS5 proxy port
|
SOCKSProxyPort int // optional outbound SOCKS5 proxy port
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ func TestRun_FailsWithoutKey(t *testing.T) {
|
|||||||
Transport: "datachannel",
|
Transport: "datachannel",
|
||||||
Carrier: "telemost",
|
Carrier: "telemost",
|
||||||
RoomURL: "room-1",
|
RoomURL: "room-1",
|
||||||
DNSServer: "1.1.1.1:53",
|
DNSServer: "8.8.8.8:53",
|
||||||
}).Run(context.Background())
|
}).Run(context.Background())
|
||||||
if err == nil {
|
if err == nil {
|
||||||
t.Fatal("Run(no key) error = nil")
|
t.Fatal("Run(no key) error = nil")
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ room_id="${OLCRTC_ROOM_ID:-}"
|
|||||||
carrier="${OLCRTC_CARRIER:-${OLCRTC_AUTH:-}}"
|
carrier="${OLCRTC_CARRIER:-${OLCRTC_AUTH:-}}"
|
||||||
transport="${OLCRTC_TRANSPORT:-}"
|
transport="${OLCRTC_TRANSPORT:-}"
|
||||||
data_dir="${OLCRTC_DATA_DIR:-/usr/share/olcrtc}"
|
data_dir="${OLCRTC_DATA_DIR:-/usr/share/olcrtc}"
|
||||||
dns_server="${OLCRTC_DNS:-1.1.1.1:53}"
|
dns_server="${OLCRTC_DNS:-8.8.8.8:53}"
|
||||||
key="${OLCRTC_KEY:-}"
|
key="${OLCRTC_KEY:-}"
|
||||||
key_file="${OLCRTC_KEY_FILE:-/var/lib/olcrtc/key.hex}"
|
key_file="${OLCRTC_KEY_FILE:-/var/lib/olcrtc/key.hex}"
|
||||||
socks_proxy="${OLCRTC_SOCKS_PROXY:-}"
|
socks_proxy="${OLCRTC_SOCKS_PROXY:-}"
|
||||||
|
|||||||
Reference in New Issue
Block a user