Add deadline handler for SRTP server

This commit is contained in:
Alexey Khit
2023-07-23 17:09:09 +03:00
parent 6e9574a1bd
commit 3defbd60db
2 changed files with 25 additions and 13 deletions
+9 -3
View File
@@ -1,12 +1,18 @@
package core
import (
cryptorand "crypto/rand"
"github.com/rs/zerolog/log"
"crypto/rand"
"runtime"
"strconv"
"strings"
"time"
"github.com/rs/zerolog/log"
)
const (
ConnDialTimeout = time.Second * 3
ConnDeadline = time.Second * 3
)
// Now90000 - timestamp for Video (clock rate = 90000 samples per second)
@@ -19,7 +25,7 @@ const symbols = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-
// RandString base10 - numbers, base16 - hex, base36 - digits+letters, base64 - URL safe symbols
func RandString(size, base byte) string {
b := make([]byte, size)
if _, err := cryptorand.Read(b); err != nil {
if _, err := rand.Read(b); err != nil {
panic(err)
}
for i := byte(0); i < size; i++ {
+16 -10
View File
@@ -1,11 +1,12 @@
package srtp
import (
"time"
"github.com/AlexxIT/go2rtc/pkg/core"
"github.com/pion/rtcp"
"github.com/pion/rtp"
"github.com/pion/srtp/v2"
"time"
)
type Session struct {
@@ -19,6 +20,8 @@ type Session struct {
Track *core.Receiver
Recv uint32
Deadline *time.Timer
lastSequence uint32
lastTimestamp uint32
//lastPacket *rtp.Packet
@@ -28,17 +31,16 @@ type Session struct {
totalLost uint32
}
func (s *Session) SetKeys(
localKey, localSalt, remoteKey, remoteSalt []byte,
) (err error) {
if s.localCtx, err = srtp.CreateContext(
localKey, localSalt, GuessProfile(localKey),
); err != nil {
func (s *Session) LastTime() time.Time {
return s.lastTime
}
func (s *Session) SetKeys(localKey, localSalt, remoteKey, remoteSalt []byte) (err error) {
s.localCtx, err = srtp.CreateContext(localKey, localSalt, GuessProfile(localKey))
if err != nil {
return
}
s.remoteCtx, err = srtp.CreateContext(
remoteKey, remoteSalt, GuessProfile(remoteKey),
)
s.remoteCtx, err = srtp.CreateContext(remoteKey, remoteSalt, GuessProfile(remoteKey))
return
}
@@ -56,6 +58,10 @@ func (s *Session) HandleRTP(data []byte) (err error) {
return
}
if s.Deadline != nil {
s.Deadline.Reset(core.ConnDeadline)
}
now := time.Now()
// https://www.ietf.org/rfc/rfc3550.txt