apps/go2rtc
1
0
Fork 0
mirror of https://github.com/AlexxIT/go2rtc.git synced 2025-10-07 17:21:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Restore IPv6 support for API and RTSP #532

Browse Source
This commit is contained in:
Alexey Khit
2023-07-20 21:51:55 +03:00
parent 6c0918662e
commit 189f142fae
6 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/api/api.go
View File

@@ -4,14 +4,15 @@ import (
"crypto/tls"
"encoding/json"
"fmt"
"github.com/AlexxIT/go2rtc/internal/app"
"github.com/rs/zerolog"
"net"
"net/http"
"os"
"strconv"
"strings"
"sync"
"github.com/AlexxIT/go2rtc/internal/app"
"github.com/rs/zerolog"
)
func Init() {
@@ -30,7 +31,7 @@ func Init() {
}
// default config
cfg.Mod.Listen = ":1984"
cfg.Mod.Listen = "0.0.0.0:1984"
// load config from YAML
app.LoadConfig(&cfg)
@@ -49,7 +50,7 @@ func Init() {
HandleFunc("api/exit", exitHandler)
// ensure we can listen without errors
listener, err := net.Listen("tcp4", cfg.Mod.Listen)
listener, err := net.Listen("tcp", cfg.Mod.Listen)
if err != nil {
log.Fatal().Err(err).Msg("[api] listen")
return
@@ -87,7 +88,7 @@ func Init() {
return
}
tlsListener, err := net.Listen("tcp4", cfg.Mod.TLSListen)
tlsListener, err := net.Listen("tcp", cfg.Mod.TLSListen)
if err != nil {
log.Fatal().Err(err).Caller().Send()
return
@@ -169,7 +170,7 @@ func middlewareLog(next http.Handler) http.Handler {
func middlewareAuth(username, password string, next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if !strings.HasPrefix(r.RemoteAddr, "127.") {
if !strings.HasPrefix(r.RemoteAddr, "127.") && !strings.HasPrefix(r.RemoteAddr, "[::1]") {
user, pass, ok := r.BasicAuth()
if !ok || user != username || pass != password {
w.Header().Set("Www-Authenticate", `Basic realm="go2rtc"`)

4
internal/rtsp/rtsp.go
View File

@@ -26,7 +26,7 @@ func Init() {
}
// default config
conf.Mod.Listen = ":8554"
conf.Mod.Listen = "0.0.0.0:8554"
conf.Mod.DefaultQuery = "video&audio"
app.LoadConfig(&conf)
@@ -45,7 +45,7 @@ func Init() {
return
}
ln, err := net.Listen("tcp4", address)
ln, err := net.Listen("tcp", address)
if err != nil {
log.Error().Err(err).Msg("[rtsp] listen")
return

5
internal/srtp/srtp.go
View File

@@ -1,9 +1,10 @@
package srtp
import (
"net"
"github.com/AlexxIT/go2rtc/internal/app"
"github.com/AlexxIT/go2rtc/pkg/srtp"
"net"
)
func Init() {
@@ -14,7 +15,7 @@ func Init() {
}
// default config
cfg.Mod.Listen = ":8443"
cfg.Mod.Listen = "0.0.0.0:8443"
// load config from YAML
app.LoadConfig(&cfg)

2
internal/webrtc/webrtc.go
View File

@@ -23,7 +23,7 @@ func Init() {
} `yaml:"webrtc"`
}
cfg.Mod.Listen = ":8555/tcp"
cfg.Mod.Listen = "0.0.0.0:8555/tcp"
cfg.Mod.IceServers = []pion.ICEServer{
{URLs: []string{"stun:stun.l.google.com:19302"}},
}

2
pkg/bubble/client.go
View File

@@ -62,7 +62,7 @@ func (c *Client) Dial() (err error) {
return
}
if c.conn, err = net.DialTimeout("tcp4", u.Host, Timeout); err != nil {
if c.conn, err = net.DialTimeout("tcp", u.Host, Timeout); err != nil {
return
}

7
pkg/rtsp/client_test.go
View File

@@ -1,17 +1,18 @@
package rtsp
import (
"github.com/stretchr/testify/require"
"net"
"os"
"testing"
"time"
"github.com/stretchr/testify/require"
)
func TestTimeout(t *testing.T) {
Timeout = time.Millisecond
ln, err := net.Listen("tcp4", "localhost:0")
ln, err := net.Listen("tcp", "localhost:0")
require.Nil(t, err)
client := NewClient("rtsp://" + ln.Addr().String() + "/stream")
@@ -27,7 +28,7 @@ func TestTimeout(t *testing.T) {
func TestMissedControl(t *testing.T) {
Timeout = time.Millisecond
ln, err := net.Listen("tcp4", "localhost:0")
ln, err := net.Listen("tcp", "localhost:0")
require.Nil(t, err)
go func() {