From a4b31a44f5e18eafd7af76a6673a376f80510677 Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Sun, 26 Mar 2023 09:48:49 +0800 Subject: [PATCH 01/36] feat: (WIP) webrtc2sip gateway. --- examples/b2bua/b2bua/b2bua.go | 13 +- examples/b2bua/b2bua/call.go | 40 +++++ examples/b2bua/b2bua/udp.go | 320 +++++++++++++++++++++++++++++++++ examples/b2bua/b2bua/util.go | 322 ++++++++++++++++++++++++++++++++++ go.mod | 6 +- go.sum | 125 +++++++++++-- pkg/utils/atomic.go | 34 ++++ 7 files changed, 834 insertions(+), 26 deletions(-) create mode 100644 examples/b2bua/b2bua/call.go create mode 100644 examples/b2bua/b2bua/udp.go create mode 100644 examples/b2bua/b2bua/util.go create mode 100644 pkg/utils/atomic.go diff --git a/examples/b2bua/b2bua/b2bua.go b/examples/b2bua/b2bua/b2bua.go index 4942ae1..f540afa 100644 --- a/examples/b2bua/b2bua/b2bua.go +++ b/examples/b2bua/b2bua/b2bua.go @@ -20,6 +20,7 @@ import ( ) type B2BCall struct { + ua *ua.UserAgent src *session.Session //TODO: Add support for forked calls dest *session.Session @@ -61,7 +62,7 @@ func init() { logger = utils.NewLogrusLogger(log.InfoLevel, "B2BUA", nil) } -//NewB2BUA . +// NewB2BUA . func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { b := &B2BUA{ registry: registry.Registry(registry.NewMemoryRegistry()), @@ -257,7 +258,7 @@ func (b *B2BUA) removeCall(sess *session.Session) { } } -//Shutdown . +// Shutdown . func (b *B2BUA) Shutdown() { b.ua.Shutdown() } @@ -287,22 +288,22 @@ func (b *B2BUA) requiresChallenge(req sip.Request) bool { return false } -//AddAccount . +// AddAccount . func (b *B2BUA) AddAccount(username string, password string) { b.accounts[username] = password } -//GetAccounts . +// GetAccounts . func (b *B2BUA) GetAccounts() map[string]string { return b.accounts } -//GetRegistry . +// GetRegistry . func (b *B2BUA) GetRegistry() registry.Registry { return b.registry } -//GetRFC8599 . +// GetRFC8599 . func (b *B2BUA) GetRFC8599() *registry.RFC8599 { return b.rfc8599 } diff --git a/examples/b2bua/b2bua/call.go b/examples/b2bua/b2bua/call.go new file mode 100644 index 0000000..dabc469 --- /dev/null +++ b/examples/b2bua/b2bua/call.go @@ -0,0 +1,40 @@ +package b2bua + +type CallType string + +const ( + SIP CallType = "SIP" + RTC CallType = "WebRTC" +) + +type CallStatus string + +const ( + Connecting CallStatus = "Connecting" + Ringing CallStatus = "Ringing" + EarlyMedia CallStatus = "EarlyMedia" + Confirmed CallStatus = "Confirmed" + Failure CallStatus = "Failure" + Terminated CallStatus = "Terminated" +) + +// Call interface. +type Call interface { + Init() + Terminate() + ChannelID() int + Offer() (*Desc, error) + OnEarlyMedia(desc *Desc) error + OnAnswer(desc *Desc) error + OnOffer(sdp *Desc) error + Answer() (*Desc, error) + Called() string + Type() CallType + ID() string + Status() chan CallStatus +} + +type Desc struct { + Type string `json:"type"` + SDP string `json:"sdp"` +} diff --git a/examples/b2bua/b2bua/udp.go b/examples/b2bua/b2bua/udp.go new file mode 100644 index 0000000..2ea948d --- /dev/null +++ b/examples/b2bua/b2bua/udp.go @@ -0,0 +1,320 @@ +package b2bua + +import ( + "context" + "net" + "sync" + "time" + + "github.com/cloudwebrtc/go-sip-ua/pkg/account" + "github.com/cloudwebrtc/go-sip-ua/pkg/session" + "github.com/cloudwebrtc/go-sip-ua/pkg/ua" + "github.com/cloudwebrtc/go-sip-ua/pkg/utils" + "github.com/ghettovoice/gosip/sip" + "github.com/ghettovoice/gosip/sip/parser" + "github.com/pixelbender/go-sdp/sdp" +) + +// SIPCall . +type SIPCall struct { + ua *ua.UserAgent + sess *session.Session + profile *account.Profile + dir session.Direction + localSdp *sdp.Session + remoteSdp *sdp.Session + udpConn *net.UDPConn + closed utils.AtomicBool + called sip.SipUri + currentStatus CallStatus + ch chan CallStatus + id string + hasMediaStream utils.AtomicBool + ctx context.Context + cancel context.CancelFunc + mutex sync.Mutex +} + +func NewSIPCall(ua *ua.UserAgent, sess *session.Session, profile *account.Profile, dir session.Direction, cid string) *SIPCall { + c := &SIPCall{ + ua: ua, + sess: sess, + profile: profile, + dir: dir, + ch: make(chan CallStatus, 1), + id: cid, + } + c.ctx, c.cancel = context.WithCancel(context.TODO()) + c.closed.Set(false) + c.hasMediaStream.Set(false) + + return c +} + +func (c *SIPCall) Init(ExternalIP string) error { + lAddr := &net.UDPAddr{IP: net.ParseIP("0.0.0.0"), Port: 0} + var err error + c.udpConn, err = ListenUDPInPortRange(3000, 5000, "udp", lAddr) + if err != nil { + logger.Errorf("ListenUDP: err => %v", err) + return err + } + host := "127.0.0.1" + if v, err := ResolveSelfIP(); err == nil { + host = v.String() + } + + if len(ExternalIP) > 0 { + host = ExternalIP + } + + c.localSdp = &sdp.Session{ + Origin: &sdp.Origin{ + Username: "-", + Address: host, + SessionID: time.Now().UnixNano() / 1e6, + SessionVersion: time.Now().UnixNano() / 1e6, + }, + Timing: &sdp.Timing{Start: time.Time{}, Stop: time.Time{}}, + //Name: "Example", + Connection: &sdp.Connection{ + Address: host, + }, + //Bandwidth: []*sdp.Bandwidth{{Type: "AS", Value: 117}}, + Media: []*sdp.Media{ + { + //Bandwidth: []*sdp.Bandwidth{{Type: "TIAS", Value: 96000}}, + Connection: []*sdp.Connection{{Address: host}}, + Mode: sdp.SendRecv, + Type: "audio", + Port: lAddr.Port, + Proto: "RTP/AVP", + Format: []*sdp.Format{ + {Payload: 0, Name: "PCMU", ClockRate: 8000}, + {Payload: 8, Name: "PCMA", ClockRate: 8000}, + //{Payload: 18, Name: "G729", ClockRate: 8000, Params: []string{"annexb=yes"}}, + {Payload: 116, Name: "telephone-event", ClockRate: 8000, Params: []string{"0-16"}}, + }, + }, + }, + } + logger.Warnf("SIPCall.Init") + return nil +} + +func (c *SIPCall) OnFailure(code int, reason string) { + if !c.sess.IsEnded() { + c.sess.End() + } + c.ch <- Failure + logger.Warnf("SIPCall.Failure") +} + +func (c *SIPCall) OnTerminate() { + { + c.mutex.Lock() + defer c.mutex.Unlock() + + if !c.closed.Get() { + c.closed.Set(true) + } + + if c.udpConn != nil { + c.udpConn.Close() + c.udpConn = nil + } + } + c.ch <- Terminated +} + +func (c *SIPCall) Terminate() { + { + c.mutex.Lock() + defer c.mutex.Unlock() + //TODO: close udp conn + + if !c.closed.Get() { + c.closed.Set(true) + } + if c.udpConn != nil { + c.udpConn.Close() + c.udpConn = nil + } + } + + if !c.sess.IsEnded() { + c.sess.End() + } + c.cancel() + logger.Warnf("SIPCall.Terminate") +} + +func (c *SIPCall) Close() { + c.Terminate() + logger.Warnf("SIPCall.Close") +} + +func (c *SIPCall) Offer(called sip.SipUri) (string, error) { + c.called = called + sdp := c.localSdp.String() + recipient := sip.SipUri{ + FUser: sip.String{Str: c.called.User().String()}, + FHost: c.called.Host(), + FPort: c.called.Port(), + } + + uri, err := parser.ParseUri("sip:" + c.called.User().String() + "@" + c.called.Host()) + if err != nil { + logger.Error(err) + return "", err + } + + logger.Infof("SIPCall Invite => %v", sdp) + + sess, err := c.ua.Invite(c.profile, uri, recipient, &sdp) + if err != nil { + return "", err + } + c.sess = sess + + return sdp, nil +} + +func (c *SIPCall) OnEarlyMedia(answer string) error { + var err error + c.remoteSdp, err = sdp.Parse([]byte(answer)) + if err != nil { + logger.Errorf("err => %v", err) + } + + c.currentStatus = EarlyMedia + c.ch <- c.currentStatus + + rAddr := &net.UDPAddr{IP: net.ParseIP(c.remoteSdp.Origin.Address), Port: c.remoteSdp.Media[0].Port} + + if !c.hasMediaStream.Get() { + c.hasMediaStream.Set(true) + go c.startStreamLoop(rAddr) + } + + return err +} + +func (c *SIPCall) OnAnswer(answer string) error { + + logger.Infof("SIPCall onAnswer => %v", answer) + + var err error + c.remoteSdp, err = sdp.Parse([]byte(answer)) + if err != nil { + logger.Errorf("err => %v", err) + } + + rAddr := &net.UDPAddr{IP: net.ParseIP(c.remoteSdp.Origin.Address), Port: c.remoteSdp.Media[0].Port} + + if !c.hasMediaStream.Get() { + c.hasMediaStream.Set(true) + go c.startStreamLoop(rAddr) + } + + if c.currentStatus != Confirmed { + c.currentStatus = Confirmed + c.ch <- c.currentStatus + } + return err +} + +func (c *SIPCall) OnOffer(offer string) error { + var err error + logger.Warnf("offer %v", offer) + c.remoteSdp, err = sdp.Parse([]byte(offer)) + if err != nil { + logger.Errorf("err => %v", err) + } + return nil +} + +func (c *SIPCall) Answer() (string, error) { + + rAddr := &net.UDPAddr{IP: net.ParseIP(c.remoteSdp.Origin.Address), Port: c.remoteSdp.Media[0].Port} + + c.localSdp.Media[0].Format = c.remoteSdp.Media[0].Format + sdp := c.localSdp.String() + logger.Warnf("answer %v", sdp) + c.sess.ProvideAnswer(sdp) + c.sess.Accept(sip.StatusCode(200)) + + if !c.hasMediaStream.Get() { + c.hasMediaStream.Set(true) + go c.startStreamLoop(rAddr) + } + + if c.currentStatus != Confirmed { + c.currentStatus = Confirmed + c.ch <- c.currentStatus + } + return "", nil +} + +func (c *SIPCall) startStreamLoop(rAddr *net.UDPAddr) { + logger.Warnf("SIPCall::startStream, Read rtp from: %v", rAddr.String()) + + /* + write rtp/rtcp to udp transport. + rtpTransport := media.NewGoRtpTransport(func(buffer string) int { + size := len(buffer) + if c.udpConn != nil { + c.udpConn.WriteToUDP([]byte(buffer), rAddr) + } + + return size + }, func(buffer string) int { + size := len(buffer) + if c.udpConn != nil { + c.udpConn.WriteToUDP([]byte(buffer), rAddr) + } + return size + }) + */ + + buf := make([]byte, 1500) + for { + if c.closed.Get() { + logger.Infof("Terminate: stop rtp conn now!") + return + } + _, raddr, err := c.udpConn.ReadFrom(buf) + if err != nil { + logger.Infof("RTP Conn [%v] refused, stop now!", raddr) + return + } + //logger.Debugf("raddr: %v, size %d", raddr, n) + if !c.closed.Get() { + //c.stream.OnReadRtpPacket(string(buf[:n])) + } + } +} + +func (c *SIPCall) Called() string { + return c.called.User().String() +} + +func (c *SIPCall) Host() string { + return c.called.Host() +} + +func (c *SIPCall) Type() CallType { + return SIP +} + +func (c *SIPCall) ID() string { + return c.id +} + +func (c *SIPCall) Sess() *session.Session { + return c.sess +} + +func (c *SIPCall) StatusChan() chan CallStatus { + return c.ch +} diff --git a/examples/b2bua/b2bua/util.go b/examples/b2bua/b2bua/util.go new file mode 100644 index 0000000..d0d8d7f --- /dev/null +++ b/examples/b2bua/b2bua/util.go @@ -0,0 +1,322 @@ +package b2bua + +import ( + "bytes" + "encoding/binary" + "encoding/json" + "errors" + "fmt" + "io/ioutil" + "math/rand" + "net" + "os" + "runtime" + "runtime/debug" + "strconv" + "strings" + "time" + "unicode/utf8" +) + +type Map map[string]interface{} + +var ( + localIPPrefix = [...]string{"192.168", "10.0", "169.254", "172.16"} + ErrPort = errors.New("invalid port") +) + +func IsLocalIP(ip string) bool { + for i := 0; i < len(localIPPrefix); i++ { + if strings.HasPrefix(ip, localIPPrefix[i]) { + return true + } + } + return false +} + +func GetIntefaceIP() string { + addrs, _ := net.InterfaceAddrs() + + // get internet ip first + for _, a := range addrs { + if ipnet, ok := a.(*net.IPNet); ok && !ipnet.IP.IsLoopback() && ipnet.IP.To4() != nil { + if !IsLocalIP(ipnet.IP.String()) { + return ipnet.IP.String() + } + } + } + + // get internat ip + for _, a := range addrs { + if ipnet, ok := a.(*net.IPNet); ok && !ipnet.IP.IsLoopback() && ipnet.IP.To4() != nil { + return ipnet.IP.String() + } + } + + return "" +} + +func ResolveSelfIP() (net.IP, error) { + ifaces, err := net.Interfaces() + if err != nil { + return nil, err + } + for _, iface := range ifaces { + if iface.Flags&net.FlagUp == 0 { + continue // interface down + } + if iface.Flags&net.FlagLoopback != 0 { + continue // loopback interface + } + addrs, err := iface.Addrs() + if err != nil { + return nil, err + } + for _, addr := range addrs { + var ip net.IP + switch v := addr.(type) { + case *net.IPNet: + ip = v.IP + case *net.IPAddr: + ip = v.IP + } + if ip == nil || ip.IsLoopback() { + continue + } + ip = ip.To4() + if ip == nil { + continue // not an ipv4 address + } + return ip, nil + } + } + return nil, errors.New("server not connected to any network") +} + +func Recover(flag string) { + _, _, l, _ := runtime.Caller(1) + if err := recover(); err != nil { + logger.Errorf("[%s] Recover panic line => %v", flag, l) + logger.Errorf("[%s] Recover err => %v", flag, err) + debug.PrintStack() + } +} + +func Marshal(m map[string]interface{}) string { + if byt, err := json.Marshal(m); err != nil { + logger.Errorf("Marshal: err ===> %v", err) + return "" + } else { + return string(byt) + } +} + +// get value from map +func Val(msg map[string]interface{}, key string) string { + if msg == nil { + return "" + } + val := msg[key] + if val == nil { + return "" + } + switch val.(type) { + case string: + return val.(string) + case map[string]interface{}: + return Marshal(val.(map[string]interface{})) + default: + return fmt.Sprint(val) + } +} + +func StrToInt(str string) int { + i, _ := strconv.ParseInt(str, 10, 32) + //logger.Infof("StrToUint32 str=%v i=%v err=%v", str, i, err) + return int(i) +} + +func StrToInt64(str string) int64 { + i, _ := strconv.ParseInt(str, 10, 64) + //logger.Infof("StrToUint32 str=%v i=%v err=%v", str, i, err) + return int64(i) +} + +// fileExists checks if a file exists and is not a directory before we +// try using it to prevent further errors. +func FileExists(filename string) bool { + info, err := os.Stat(filename) + if os.IsNotExist(err) { + return false + } + return !info.IsDir() +} + +func DialUDPInPortRange(portMin, portMax int, network string, laddr *net.UDPAddr, raddr *net.UDPAddr) (*net.UDPConn, error) { + if (laddr.Port != 0) || ((portMin == 0) && (portMax == 0)) { + return net.DialUDP(network, laddr, raddr) + } + var i, j int + i = portMin + if i == 0 { + i = 1 + } + j = portMax + if j == 0 { + j = 0xFFFF + } + if i > j { + return nil, ErrPort + } + + portStart := rand.Intn(j-i+1) + i + portCurrent := portStart + for { + *laddr = net.UDPAddr{IP: laddr.IP, Port: portCurrent} + c, e := net.DialUDP(network, laddr, raddr) + if e == nil { + return c, e + } + logger.Debugf("failed to listen %s: %v", laddr.String(), e) + portCurrent++ + if portCurrent > j { + portCurrent = i + } + if portCurrent == portStart { + break + } + } + return nil, ErrPort +} + +func ListenUDPInPortRange(portMin, portMax int, network string, laddr *net.UDPAddr) (*net.UDPConn, error) { + if (laddr.Port != 0) || ((portMin == 0) && (portMax == 0)) { + return net.ListenUDP(network, laddr) + } + var i, j int + i = portMin + if i == 0 { + i = 1 + } + j = portMax + if j == 0 { + j = 0xFFFF + } + if i > j { + return nil, ErrPort + } + + portStart := rand.Intn(j-i+1) + i + portCurrent := portStart + for { + *laddr = net.UDPAddr{IP: laddr.IP, Port: portCurrent} + c, e := net.ListenUDP(network, laddr) + if e == nil { + return c, e + } + logger.Errorf("failed to listen %s: %v", laddr.String(), e) + portCurrent++ + if portCurrent > j { + portCurrent = i + } + if portCurrent == portStart { + break + } + } + return nil, ErrPort +} + +func PathExists(path string) (bool, error) { + _, err := os.Stat(path) + if err == nil { + return true, nil + } + if os.IsNotExist(err) { + return false, nil + } + return false, err +} + +func GetAllFiles(pathname string) ([]string, error) { + files := make([]string, 0) + rd, err := ioutil.ReadDir(pathname) + for _, fi := range rd { + if fi.IsDir() { + //fmt.Printf("[%s]\n", pathname+"\\"+fi.Name()) + fls, err := GetAllFiles(pathname + fi.Name() + "\\") + if err != nil { + continue + } + files = append(files, fls...) + } else { + files = append(files, fi.Name()) + } + } + return files, err +} + +func GetUtf8Length(str string) int { + return utf8.RuneCountInString(str) +} + +func JsonEncode(str string) map[string]interface{} { + var data map[string]interface{} + if err := json.Unmarshal([]byte(str), &data); err != nil { + panic(err) + } + return data +} + +func BytesCombine(pBytes ...[]byte) []byte { + len := len(pBytes) + s := make([][]byte, len) + for index := 0; index < len; index++ { + s[index] = pBytes[index] + } + sep := []byte("") + return bytes.Join(s, sep) +} + +func IntToBytes(n int) []byte { + x := int32(n) + bytesBuffer := bytes.NewBuffer([]byte{}) + binary.Write(bytesBuffer, binary.BigEndian, x) + return bytesBuffer.Bytes() +} + +func BytesToInt(b []byte) int { + bytesBuffer := bytes.NewBuffer(b) + var x int32 + binary.Read(bytesBuffer, binary.BigEndian, &x) + return int(x) +} + +func RandInt64(min, max int64) int64 { + if min >= max || min == 0 || max == 0 { + return max + } + return rand.Int63n(max-min) + min +} + +var letterRunes = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890") + +func RandomString(n int) string { + rand.Seed(time.Now().UnixNano()) + b := make([]rune, n) + for i := range b { + b[i] = letterRunes[rand.Intn(len(letterRunes))] + } + return string(b) +} + +// make kv to map, args should be multiple of 2 +func NewMap(args ...interface{}) map[string]interface{} { + if len(args)%2 != 0 { + return nil + } + msg := make(map[string]interface{}) + for i := 0; i < len(args)/2; i++ { + msg[args[2*i].(string)] = args[2*i+1] + } + return msg +} diff --git a/go.mod b/go.mod index c494369..9b88507 100644 --- a/go.mod +++ b/go.mod @@ -6,14 +6,16 @@ require ( cloud.google.com/go/firestore v1.5.0 // indirect firebase.google.com/go v3.13.0+incompatible github.com/c-bata/go-prompt v0.2.6 - github.com/ghettovoice/gosip v0.0.0-20211014110559-f0c4b77a298b + github.com/ghettovoice/gosip v0.0.0-20230130140202-1060e22fde79 github.com/google/uuid v1.3.0 github.com/kr/pretty v0.2.0 // indirect github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect + github.com/onsi/ginkgo v1.16.5 // indirect + github.com/onsi/gomega v1.27.2 // indirect github.com/pixelbender/go-sdp v1.1.0 github.com/sirupsen/logrus v1.8.1 github.com/tevino/abool v1.2.0 github.com/x-cray/logrus-prefixed-formatter v0.5.2 - golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 + golang.org/x/crypto v0.1.0 google.golang.org/api v0.43.0 ) diff --git a/go.sum b/go.sum index b7c7fd6..6427247 100644 --- a/go.sum +++ b/go.sum @@ -68,11 +68,15 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/ghettovoice/gosip v0.0.0-20211014110559-f0c4b77a298b h1:mQKefPaJ9bfIVxBhRLJdRK94C4DPbN8r/MSJ3YPxFuU= -github.com/ghettovoice/gosip v0.0.0-20211014110559-f0c4b77a298b/go.mod h1:yTr3BEYSFe9As6XM7ldyrVgqsPwlnw8Ahc4N28VFM2g= +github.com/ghettovoice/gosip v0.0.0-20230130140202-1060e22fde79 h1:eYr/WyAoFmd8LtLrWAyw2oSdS5oDM3cs3Vhrl6INunE= +github.com/ghettovoice/gosip v0.0.0-20230130140202-1060e22fde79/go.mod h1:yTr3BEYSFe9As6XM7ldyrVgqsPwlnw8Ahc4N28VFM2g= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= +github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU= github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM= github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og= @@ -105,8 +109,10 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -119,8 +125,10 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -138,6 +146,8 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE= +github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= @@ -178,16 +188,39 @@ github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyex github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/nxadm/tail v1.4.5 h1:obHEce3upls1IBn1gTw/o7bCv7OJb6Ib/o7wNO+4eKw= github.com/nxadm/tail v1.4.5/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.14.2 h1:8mVmC9kjFFmA8H4pKMUhcblgifdkOIXPvbhN1T36q1M= github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= +github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= +github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= +github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU= +github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk= +github.com/onsi/ginkgo/v2 v2.3.0/go.mod h1:Eew0uilEqZmIEZr8JrvYlvOM7Rr6xzTmMV8AyFNU9d0= +github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkAt4OrFo= +github.com/onsi/ginkgo/v2 v2.5.0/go.mod h1:Luc4sArBICYCS8THh8v3i3i5CuSZO+RaQRaJoeNwomw= +github.com/onsi/ginkgo/v2 v2.7.0/go.mod h1:yjiuMwPokqY1XauOgju45q3sJt6VzQ/Fict1LFVcsAo= +github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc= +github.com/onsi/ginkgo/v2 v2.8.4 h1:gf5mIQ8cLFieruNLAdgijHF1PYfLphKm2dxxcUtcqK0= +github.com/onsi/ginkgo/v2 v2.8.4/go.mod h1:427dEDQZkDKsBvCjc2A/ZPefhKxsTTrsQegMlayL730= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.10.4 h1:NiTx7EEvBzu9sFOD1zORteLSt3o8gnlvZZwSE9TnY9U= github.com/onsi/gomega v1.10.4/go.mod h1:g/HbgYopi++010VEqkFgJHKC09uJiW9UkXvMUuKHUCQ= +github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= +github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= +github.com/onsi/gomega v1.20.1/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= +github.com/onsi/gomega v1.21.1/go.mod h1:iYAIXgPSaDHak0LCMA+AWBpIKBr8WZicMxnE8luStNc= +github.com/onsi/gomega v1.22.1/go.mod h1:x6n7VNe4hw0vkyYUM4mjIXx3JbLiPaBPNgB7PRQ1tuM= +github.com/onsi/gomega v1.24.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2vQAg= +github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM= +github.com/onsi/gomega v1.26.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM= +github.com/onsi/gomega v1.27.1/go.mod h1:aHX5xOykVYzWOV4WqQy0sy8BQptgukenXpCXfadcIAw= +github.com/onsi/gomega v1.27.2 h1:SKU0CXeKE/WVgIV1T61kSa3+IRE8Ekrv9rdXDwwTqnY= +github.com/onsi/gomega v1.27.2/go.mod h1:5mR3phAHpkAVIDkHEUBY6HGVsU+cpcEscrGPB4oPlZI= github.com/pixelbender/go-sdp v1.1.0 h1:rkm9aFBNKrnB+YGfhLmAkal3pC8XYXb9h+172PlrCBU= github.com/pixelbender/go-sdp v1.1.0/go.mod h1:6IBlz9+BrUHoFTea7gcp4S54khtOhjCW/nVDLhmZBAs= github.com/pkg/term v1.2.0-beta.2 h1:L3y/h2jkuBVFdWiJvNfYfKmzcCnILw7mJWm2JQuMppw= @@ -217,6 +250,8 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -230,8 +265,9 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= +golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -265,8 +301,13 @@ golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.1 h1:Kvvh58BN8Y9/lBi7hTekvtMpm07eUZ0ck5pRHpsMWrY= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= +golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -302,8 +343,19 @@ golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= +golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= +golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= +golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= +golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -327,6 +379,9 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -371,23 +426,48 @@ golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201214095126-aec9a390925b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210223095934-7937bea0104d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= +golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= +golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= +golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -435,14 +515,19 @@ golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82u golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= +golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= +golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= @@ -541,8 +626,11 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -552,10 +640,11 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/pkg/utils/atomic.go b/pkg/utils/atomic.go new file mode 100644 index 0000000..de63651 --- /dev/null +++ b/pkg/utils/atomic.go @@ -0,0 +1,34 @@ +package utils + +import "sync/atomic" + +type AtomicBool int32 + +func (a *AtomicBool) Set(value bool) (swapped bool) { + if value { + return atomic.SwapInt32((*int32)(a), 1) == 0 + } + return atomic.SwapInt32((*int32)(a), 0) == 1 +} + +func (a *AtomicBool) Get() bool { + return atomic.LoadInt32((*int32)(a)) != 0 +} + +type AtomicUInt32 uint32 + +func (ai *AtomicUInt32) Set(value uint32) (result uint32) { + return atomic.SwapUint32((*uint32)(ai), value) +} + +func (ai *AtomicUInt32) Get() uint32 { + return atomic.LoadUint32((*uint32)(ai)) +} + +func (ai *AtomicUInt32) Incr() { + ai.Set(ai.Get() + 1) +} + +func (ai *AtomicUInt32) Decr() { + ai.Set(ai.Get() - 1) +} From db715457732cad4669ae73326798ccc8eb866f92 Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Sun, 2 Apr 2023 01:30:49 +0800 Subject: [PATCH 02/36] chore: more code. --- examples/b2bua/b2bua/b2bua.go | 47 ++-- examples/b2bua/b2bua/call.go | 194 +++++++++++++--- examples/b2bua/b2bua/conf.go | 6 + examples/b2bua/b2bua/rtc.go | 370 +++++++++++++++++++++++++++++++ examples/b2bua/b2bua/track.go | 32 +++ examples/b2bua/b2bua/udp.go | 326 +++++++-------------------- examples/b2bua/b2bua/udp_port.go | 151 +++++++++++++ examples/b2bua/b2bua/util.go | 78 ++++++- go.mod | 6 +- go.sum | 54 ++++- 10 files changed, 955 insertions(+), 309 deletions(-) create mode 100644 examples/b2bua/b2bua/conf.go create mode 100644 examples/b2bua/b2bua/rtc.go create mode 100644 examples/b2bua/b2bua/track.go create mode 100644 examples/b2bua/b2bua/udp_port.go diff --git a/examples/b2bua/b2bua/b2bua.go b/examples/b2bua/b2bua/b2bua.go index f540afa..28b211d 100644 --- a/examples/b2bua/b2bua/b2bua.go +++ b/examples/b2bua/b2bua/b2bua.go @@ -19,17 +19,6 @@ import ( "github.com/ghettovoice/gosip/transport" ) -type B2BCall struct { - ua *ua.UserAgent - src *session.Session - //TODO: Add support for forked calls - dest *session.Session -} - -func (b *B2BCall) ToString() string { - return b.src.Contact() + " => " + b.dest.Contact() -} - func pushCallback(pn *registry.PNParams, payload map[string]string) error { fmt.Printf("Handle Push Request:\nprovider=%v\nparam=%v\nprid=%v\npayload=%v", pn.Provider, pn.Param, pn.PRID, payload) switch pn.Provider { @@ -49,17 +38,21 @@ type B2BUA struct { ua *ua.UserAgent accounts map[string]string registry registry.Registry - domains []string calls []*B2BCall rfc8599 *registry.RFC8599 } var ( - logger log.Logger + logger log.Logger + callConfig CallConfig ) func init() { logger = utils.NewLogrusLogger(log.InfoLevel, "B2BUA", nil) + callConfig = CallConfig{ + Codecs: []string{"PCMU", "PCMA", "opus", "H264"}, + ExternalRtpAddress: "0.0.0.0", + } } // NewB2BUA . @@ -129,6 +122,12 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { if from.DisplayName != nil { displayName = from.DisplayName.String() } + call := &B2BCall{src: sess, ua: ua} + + call.Init() + + offer := sess.RemoteSdp() + call.SetALegOffer(&Desc{Type: "offer", SDP: offer}) // Create a temporary profile. In the future, it will support reading profiles from files or data // For example: use a specific ip or sip account as outbound trunk @@ -139,13 +138,17 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { logger.Error(err2) } - offer := sess.RemoteSdp() - dest, err := ua.Invite(profile, called, recipient, &offer) + bLegOffer, _ := call.CreateBLegOffer() + + dest, err := ua.Invite(profile, called, recipient, &bLegOffer.SDP) if err != nil { logger.Errorf("B-Leg session error: %v", err) return } - b.calls = append(b.calls, &B2BCall{src: sess, dest: dest}) + + call.dest = dest + + b.calls = append(b.calls, call) } // Try to find online contact records. @@ -165,7 +168,7 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { instance, err := pusher.WaitContactOnline() if err != nil { logger.Errorf("Push failed, error: %v", err) - sess.Reject(500, fmt.Sprint("Push failed")) + sess.Reject(500, "Push failed") return } doInvite(instance) @@ -192,7 +195,9 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { call := b.findCall(sess) if call != nil && call.dest == sess { answer := call.dest.RemoteSdp() - call.src.ProvideAnswer(answer) + call.SetBLegAnswer(&Desc{Type: "answer", SDP: answer}) + aLegAnswer, _ := call.CreateALegAnswer() + call.src.ProvideAnswer(aLegAnswer.SDP) call.src.Provisional((*resp).StatusCode(), (*resp).Reason()) } @@ -202,7 +207,9 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { call := b.findCall(sess) if call != nil && call.dest == sess { answer := call.dest.RemoteSdp() - call.src.ProvideAnswer(answer) + call.SetBLegAnswer(&Desc{Type: "answer", SDP: answer}) + aLegAnswer, _ := call.CreateALegAnswer() + call.src.ProvideAnswer(aLegAnswer.SDP) call.src.Accept(200) } @@ -221,6 +228,8 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { call.src.End() } } + + call.Terminate() b.removeCall(sess) } diff --git a/examples/b2bua/b2bua/call.go b/examples/b2bua/b2bua/call.go index dabc469..9b80791 100644 --- a/examples/b2bua/b2bua/call.go +++ b/examples/b2bua/b2bua/call.go @@ -1,40 +1,180 @@ package b2bua -type CallType string +import ( + "fmt" -const ( - SIP CallType = "SIP" - RTC CallType = "WebRTC" + "github.com/cloudwebrtc/go-sip-ua/pkg/session" + "github.com/cloudwebrtc/go-sip-ua/pkg/ua" + "github.com/pixelbender/go-sdp/sdp" ) -type CallStatus string +type CallState string const ( - Connecting CallStatus = "Connecting" - Ringing CallStatus = "Ringing" - EarlyMedia CallStatus = "EarlyMedia" - Confirmed CallStatus = "Confirmed" - Failure CallStatus = "Failure" - Terminated CallStatus = "Terminated" + New CallState = "New" + Connecting CallState = "Connecting" + Ringing CallState = "Ringing" + EarlyMedia CallState = "EarlyMedia" + Confirmed CallState = "Confirmed" + Failure CallState = "Failure" + Terminated CallState = "Terminated" ) -// Call interface. -type Call interface { - Init() - Terminate() - ChannelID() int - Offer() (*Desc, error) - OnEarlyMedia(desc *Desc) error - OnAnswer(desc *Desc) error - OnOffer(sdp *Desc) error - Answer() (*Desc, error) - Called() string - Type() CallType - ID() string - Status() chan CallStatus -} - type Desc struct { Type string `json:"type"` SDP string `json:"sdp"` } + +func (d *Desc) Parse() (*sdp.Session, error) { + return sdp.Parse([]byte(d.SDP)) +} + +func (d *Desc) FromSdpSession(sess *sdp.Session) error { + d.SDP = sess.String() + return nil +} + +type B2BCall struct { + ua *ua.UserAgent + src *session.Session + dest *session.Session + + trans map[*session.Session]Transport + + state CallState + + srcTrackInfos []*TrackInfo +} + +func (b *B2BCall) ToString() string { + return b.src.Contact() + " => " + b.dest.Contact() +} + +func (b *B2BCall) Init() { + b.state = New + b.trans = make(map[*session.Session]Transport) +} + +func (b *B2BCall) State() CallState { + return b.state +} + +func (b *B2BCall) SetState(state CallState) { + b.state = state +} + +func (b *B2BCall) Terminate() { + for _, trans := range b.trans { + if err := trans.Close(); err != nil { + logger.Errorf("Close transport error: %v", err) + } + } +} + +func (b *B2BCall) SetALegOffer(sdp *Desc) error { + + sdpSess, _ := sdp.Parse() + transType := ParseTransportType(sdpSess) + logger.Infof("TransportType: %v", transType) + trackInfos, err := ParseTrackInfos(sdpSess) + if err != nil { + logger.Errorf("ParseTrackInfos error: %v", err) + return err + } + + logger.Infof("TrackInfos: %v", trackInfos) + b.srcTrackInfos = trackInfos + print(sdpSess.String()) + + var trans Transport + if transType == TransportTypeRTC { + trans = NewWebRTCTransport(trackInfos) + } else { + trans = NewUdpTansport(trackInfos) + } + + err = trans.Init(callConfig) + + if err != nil { + logger.Errorf("Init transport error: %v", err) + return err + } + + err = trans.OnOffer(sdp) + if err != nil { + logger.Errorf("OnOffer error: %v", err) + return err + } + + b.trans[b.src] = trans + return nil +} + +func (b *B2BCall) CreateBLegOffer() (*Desc, error) { + //TODO: create transport by b.srcOffer + trans := NewUdpTansport(b.srcTrackInfos) + + err := trans.Init(callConfig) + + if err != nil { + logger.Errorf("Init transport error: %v", err) + return nil, err + } + + b.trans[b.dest] = trans + + offer, err := trans.CreateOffer() + if err != nil { + logger.Errorf("Offer error: %v", err) + return nil, err + } + return offer, nil +} + +func (b *B2BCall) SetBLegAnswer(sdp *Desc) error { + + if trans, found := b.trans[b.dest]; found { + err := trans.OnAnswer(sdp) + if err != nil { + logger.Errorf("OnAnswer error: %v", err) + return err + } + } else { + logger.Errorf("Transport not found") + return fmt.Errorf("Transport not found") + } + + return nil +} + +func (b *B2BCall) CreateALegAnswer() (*Desc, error) { + if trans, found := b.trans[b.src]; found { + answer, err := trans.CreateAnswer() + if err != nil { + logger.Errorf("Answer error: %v", err) + return nil, err + } + return answer, nil + } else { + logger.Errorf("Transport not found") + return nil, fmt.Errorf("Transport not found") + } +} + +type TransportType string + +const ( + TransportTypeSIP TransportType = "SIP" + TransportTypeRTC TransportType = "WebRTC" + TransportTypeUnknown TransportType = "Unknown" +) + +type Transport interface { + Init(config CallConfig) error + Close() error + CreateOffer() (*Desc, error) + OnAnswer(desc *Desc) error + OnOffer(sdp *Desc) error + CreateAnswer() (*Desc, error) + Type() TransportType +} diff --git a/examples/b2bua/b2bua/conf.go b/examples/b2bua/b2bua/conf.go new file mode 100644 index 0000000..c3ab7a7 --- /dev/null +++ b/examples/b2bua/b2bua/conf.go @@ -0,0 +1,6 @@ +package b2bua + +type CallConfig struct { + Codecs []string `json:"codecs"` + ExternalRtpAddress string `json:"external_rtp_address"` +} diff --git a/examples/b2bua/b2bua/rtc.go b/examples/b2bua/b2bua/rtc.go new file mode 100644 index 0000000..4a99a84 --- /dev/null +++ b/examples/b2bua/b2bua/rtc.go @@ -0,0 +1,370 @@ +package b2bua + +import ( + "context" + "fmt" + "math/rand" + "net" + + "github.com/cloudwebrtc/go-sip-ua/pkg/utils" + "github.com/pion/interceptor" + "github.com/pion/rtcp" + "github.com/pion/webrtc/v3" +) + +var ( + webrtcSettings webrtc.SettingEngine +) + +const ( + mimeTypeH264 = "video/h264" + mimeTypeOpus = "audio/opus" + mimeTypeVP8 = "video/vp8" + mimeTypeVP9 = "video/vp9" + mineTypePCMA = "audio/PCMA" +) + +func init() { + webrtcSettings = webrtc.SettingEngine{} + udpListener, err := net.ListenUDP("udp", &net.UDPAddr{ + IP: net.IP{0, 0, 0, 0}, + Port: 50160, + }) + if err != nil { + panic(err) + } + webrtcSettings.SetICEUDPMux(webrtc.NewICEUDPMux(nil, udpListener)) +} + +const DefaultPayloadTypeOpus = 111 + +var ( + setting webrtc.SettingEngine + cfg = webrtc.Configuration{ + SDPSemantics: webrtc.SDPSemanticsUnifiedPlanWithFallback, + } +) + +type WebRTCTransport struct { + pc *webrtc.PeerConnection + mediaEngine webrtc.MediaEngine + api *webrtc.API + answer webrtc.SessionDescription + offer webrtc.SessionDescription + track *webrtc.TrackLocalStaticRTP + + closed utils.AtomicBool + ctx context.Context + cancel context.CancelFunc + + trackInfos []*TrackInfo +} + +func NewWebRTCTransport(trackInfos []*TrackInfo) *WebRTCTransport { + c := &WebRTCTransport{ + trackInfos: trackInfos, + } + c.ctx, c.cancel = context.WithCancel(context.Background()) + c.closed.Set(false) + return c +} + +func (c *WebRTCTransport) Type() TransportType { + return TransportTypeRTC +} + +func (c *WebRTCTransport) Init(callConfig CallConfig) error { + // Create a MediaEngine object to configure the supported codec + m := &webrtc.MediaEngine{} + + for _, codec := range []webrtc.RTPCodecParameters{ + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypePCMU, ClockRate: 8000, Channels: 1, SDPFmtpLine: "", RTCPFeedback: nil}, + PayloadType: 0, + }, + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypePCMA, ClockRate: 8000, Channels: 1, SDPFmtpLine: "", RTCPFeedback: nil}, + PayloadType: 8, + }, + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeOpus, ClockRate: 48000, Channels: 2, SDPFmtpLine: "minptime=10;useinbandfec=1", RTCPFeedback: nil}, + PayloadType: 111, + }, + } { + if err := m.RegisterCodec(codec, webrtc.RTPCodecTypeAudio); err != nil { + return err + } + } + + videoRTCPFeedback := []webrtc.RTCPFeedback{{"goog-remb", ""}, {"ccm", "fir"}, {"nack", ""}, {"nack", "pli"}} + + for _, codec := range []webrtc.RTPCodecParameters{ + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeH264, ClockRate: 90000, SDPFmtpLine: "level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=42001f", RTCPFeedback: videoRTCPFeedback}, + PayloadType: 125, + }, + } { + if err := m.RegisterCodec(codec, webrtc.RTPCodecTypeVideo); err != nil { + return err + } + } + + // Create a InterceptorRegistry. This is the user configurable RTP/RTCP Pipeline. + // This provides NACKs, RTCP Reports and other features. If you use `webrtc.NewPeerConnection` + // this is enabled by default. If you are manually managing You MUST create a InterceptorRegistry + // for each PeerConnection. + i := &interceptor.Registry{} + + // Use the default set of Interceptors + if err := webrtc.RegisterDefaultInterceptors(m, i); err != nil { + panic(err) + } + + // Create the API object with the MediaEngine + api := webrtc.NewAPI(webrtc.WithMediaEngine(m), webrtc.WithInterceptorRegistry(i)) + + // Prepare the configuration + config := webrtc.Configuration{ + ICEServers: []webrtc.ICEServer{}, + SDPSemantics: webrtc.SDPSemanticsUnifiedPlanWithFallback, + //RTCPMuxPolicy: webrtc.RTCPMuxPolicyRequire, + BundlePolicy: webrtc.BundlePolicyBalanced, + } + + // Create a new RTCPeerConnection + pc, err := api.NewPeerConnection(config) + if err != nil { + panic(err) + } + + c.pc = pc + + c.pc.OnICEConnectionStateChange(func(connectionState webrtc.ICEConnectionState) { + logger.Infof("ICE Connection State has changed: %s\n", connectionState.String()) + }) + c.pc.OnConnectionStateChange(func(state webrtc.PeerConnectionState) { + logger.Infof("PeerConnection State has changed: %s\n", state.String()) + }) + return nil +} + +func (c *WebRTCTransport) Close() error { + if c.closed.Get() { + return nil + } + c.closed.Set(true) + c.cancel() + return c.pc.Close() +} + +func (c *WebRTCTransport) CreateOffer() (*Desc, error) { + var err error = nil + + c.track, err = webrtc.NewTrackLocalStaticRTP( + webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypePCMU}, + fmt.Sprintf("audio-%d", rand.Uint32()), + fmt.Sprintf("rtc-%d", rand.Uint32()), + ) + + if err != nil { + logger.Errorf("NewTrack: panic => %v", err) + return nil, err + } + + if _, err = c.pc.AddTrack(c.track); err != nil { + logger.Errorf("AddTrack: panic => %v", err) + return nil, err + } + + c.offer, err = c.pc.CreateOffer(nil) + if err != nil { + logger.Errorf("CreateOffer: panic => %v", err) + return nil, err + } + gatherComplete := webrtc.GatheringCompletePromise(c.pc) + if err = c.pc.SetLocalDescription(c.offer); err != nil { + logger.Errorf("SetLocalDescription: panic => %v", err) + return nil, err + } + <-gatherComplete + c.offer = *c.pc.LocalDescription() + return &Desc{SDP: c.offer.SDP, Type: "offer"}, nil +} + +func (c *WebRTCTransport) OnAnswer(answer *Desc) error { + c.answer = webrtc.SessionDescription{ + Type: webrtc.SDPTypeAnswer, + SDP: answer.SDP, + } + if err := c.pc.SetRemoteDescription(c.answer); err != nil { + logger.Errorf("SetRemoteDescription: panic => %v", err) + return err + } + return nil +} + +func (c *WebRTCTransport) OnOffer(offer *Desc) error { + + c.pc.OnTrack(func(track *webrtc.TrackRemote, recevier *webrtc.RTPReceiver) { + buf := make([]byte, 1500) + for { + if c.closed.Get() { + logger.Infof("OnTrack: stop now!") + break + } + // Read + n, _, readErr := track.Read(buf) + if readErr != nil { + logger.Errorf("track.Read: readErr => %v", readErr) + break + } + logger.Infof("OnTrack: read %d bytes", n) + ///TODO: c.stream.OnReadPacket(buf[:n], false) + } + + }) + + var err error = nil + c.track, err = webrtc.NewTrackLocalStaticRTP( + webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypePCMU}, + fmt.Sprintf("audio-%d", rand.Uint32()), + fmt.Sprintf("audio-%d", rand.Uint32()), + ) + + if err != nil { + logger.Errorf("NewTrack: panic => %v", err) + return err + } + + if _, err = c.pc.AddTrack(c.track); err != nil { + logger.Errorf("AddTrack: panic => %v", err) + return err + } + + desc := webrtc.SessionDescription{ + Type: webrtc.SDPTypeOffer, + SDP: offer.SDP, + } + + if err := c.pc.SetRemoteDescription(desc); err != nil { + logger.Errorf("SetRemoteDescription: panic => %v", err) + return err + } + return nil +} + +func (c *WebRTCTransport) CreateAnswer() (*Desc, error) { + var err error = nil + c.answer, err = c.pc.CreateAnswer(nil) + if err != nil { + logger.Errorf("CreateAnswer: panic => %v", err) + return nil, err + } + + gatherComplete := webrtc.GatheringCompletePromise(c.pc) + if err = c.pc.SetLocalDescription(c.answer); err != nil { + logger.Errorf("SetLocalDescription: panic => %v", err) + return nil, err + } + <-gatherComplete + c.answer = *c.pc.LocalDescription() + + return &Desc{SDP: c.answer.SDP, Type: "answer"}, nil +} + +func (c *WebRTCTransport) HandleRtcpFb(rtpSender *webrtc.RTPSender) { + // Read incoming RTCP packets + // Before these packets are returned they are processed by interceptors. For things + // like NACK this needs to be called. + go func() { + rtcpBuf := make([]byte, 1500) + for { + n, _, rtcpErr := rtpSender.Read(rtcpBuf) + if rtcpErr != nil { + return + } + bytes := rtcpBuf[:n] + pkts, err := rtcp.Unmarshal(bytes) + if err != nil { + logger.Errorf("Unmarshal rtcp receiver packets err %v", err) + } + var fwdPkts []rtcp.Packet + pliOnce := true + firOnce := true + var ( + maxRatePacketLoss uint8 + expectedMinBitrate uint64 + ) + for _, pkt := range pkts { + switch p := pkt.(type) { + case *rtcp.PictureLossIndication: + if pliOnce { + fwdPkts = append(fwdPkts, p) + logger.Infof("PictureLossIndication") + //hi.CameraSendKeyFrame() + pliOnce = false + } + case *rtcp.FullIntraRequest: + if firOnce { + fwdPkts = append(fwdPkts, p) + //logger.Infof("FullIntraRequest") + firOnce = false + } + case *rtcp.ReceiverEstimatedMaximumBitrate: + if expectedMinBitrate == 0 || expectedMinBitrate > uint64(p.Bitrate) { + expectedMinBitrate = uint64(p.Bitrate) + //hi.CameraUpdateBitrate(uint32(expectedMinBitrate / 1024)) + logger.Infof("ReceiverEstimatedMaximumBitrate %d", expectedMinBitrate/1024) + } + case *rtcp.ReceiverReport: + for _, r := range p.Reports { + if maxRatePacketLoss == 0 || maxRatePacketLoss < r.FractionLost { + maxRatePacketLoss = r.FractionLost + logger.Infof("maxRatePacketLoss %d", maxRatePacketLoss) + } + } + case *rtcp.TransportLayerNack: + } + } + } + }() + +} + +// InitWebRTC init WebRTCTransport setting +func InitWebRTC(nat1to1 []string, icelite bool, iceServers []webrtc.ICEServer, icePortStart, icePortEnd uint16, iceSinglePort int) error { + var err error + if icePortStart != 0 || icePortEnd != 0 { + err = setting.SetEphemeralUDPPortRange(icePortStart, icePortEnd) + if err != nil { + logger.Errorf("SetEphemeralUDPPortRange: err => %v", err) + return err + } + } + + if len(nat1to1) > 0 { + setting.SetNAT1To1IPs(nat1to1, webrtc.ICECandidateTypeHost) + } + if icelite { + setting.SetLite(icelite) + cfg.ICEServers = []webrtc.ICEServer{} + } else { + cfg.ICEServers = iceServers + } + + setting.DisableMediaEngineCopy(true) + + if iceSinglePort != 0 { + logger.Info("Listen on ", "single-port") + udpListener, err := net.ListenUDP("udp", &net.UDPAddr{ + IP: net.IP{0, 0, 0, 0}, + Port: iceSinglePort, + }) + if err != nil { + panic(err) + } + setting.SetICEUDPMux(webrtc.NewICEUDPMux(nil, udpListener)) + } + + return err +} diff --git a/examples/b2bua/b2bua/track.go b/examples/b2bua/b2bua/track.go new file mode 100644 index 0000000..42ed2a3 --- /dev/null +++ b/examples/b2bua/b2bua/track.go @@ -0,0 +1,32 @@ +package b2bua + +import "github.com/pixelbender/go-sdp/sdp" + +type TrackType string + +const ( + TrackTypeAudio TrackType = "audio" + TrackTypeVideo TrackType = "video" +) + +type TrackInfo struct { + TrackType TrackType + Codecs []*sdp.Format + Connection *sdp.Connection +} + +type Track interface { + Type() TrackType + + Codec() string + + PayloadType() int + + WriteRtpPacket(packet []byte) error + WriteRtcpPacket(packet []byte) error + + ReadRtpPacket(func(packet []byte) error) error + ReadRtcpPacket(func(packet []byte) error) error + + RequestKeyFrame() error +} diff --git a/examples/b2bua/b2bua/udp.go b/examples/b2bua/b2bua/udp.go index 2ea948d..30477d2 100644 --- a/examples/b2bua/b2bua/udp.go +++ b/examples/b2bua/b2bua/udp.go @@ -1,93 +1,63 @@ package b2bua import ( - "context" "net" - "sync" "time" - "github.com/cloudwebrtc/go-sip-ua/pkg/account" - "github.com/cloudwebrtc/go-sip-ua/pkg/session" - "github.com/cloudwebrtc/go-sip-ua/pkg/ua" - "github.com/cloudwebrtc/go-sip-ua/pkg/utils" - "github.com/ghettovoice/gosip/sip" - "github.com/ghettovoice/gosip/sip/parser" "github.com/pixelbender/go-sdp/sdp" ) -// SIPCall . -type SIPCall struct { - ua *ua.UserAgent - sess *session.Session - profile *account.Profile - dir session.Direction - localSdp *sdp.Session - remoteSdp *sdp.Session - udpConn *net.UDPConn - closed utils.AtomicBool - called sip.SipUri - currentStatus CallStatus - ch chan CallStatus - id string - hasMediaStream utils.AtomicBool - ctx context.Context - cancel context.CancelFunc - mutex sync.Mutex +type UdpTansport struct { + trackInfos []*TrackInfo + ports map[TrackType]*UdpPort + localDescription *sdp.Session + remoteDescription *sdp.Session } -func NewSIPCall(ua *ua.UserAgent, sess *session.Session, profile *account.Profile, dir session.Direction, cid string) *SIPCall { - c := &SIPCall{ - ua: ua, - sess: sess, - profile: profile, - dir: dir, - ch: make(chan CallStatus, 1), - id: cid, +func NewUdpTansport(trackInfos []*TrackInfo) *UdpTansport { + return &UdpTansport{ + trackInfos: trackInfos, + ports: make(map[TrackType]*UdpPort), } - c.ctx, c.cancel = context.WithCancel(context.TODO()) - c.closed.Set(false) - c.hasMediaStream.Set(false) - - return c } -func (c *SIPCall) Init(ExternalIP string) error { - lAddr := &net.UDPAddr{IP: net.ParseIP("0.0.0.0"), Port: 0} - var err error - c.udpConn, err = ListenUDPInPortRange(3000, 5000, "udp", lAddr) - if err != nil { - logger.Errorf("ListenUDP: err => %v", err) - return err - } - host := "127.0.0.1" - if v, err := ResolveSelfIP(); err == nil { - host = v.String() - } +func (c *UdpTansport) Init(config CallConfig) error { - if len(ExternalIP) > 0 { - host = ExternalIP + for _, trackInfo := range c.trackInfos { + udpPort, err := NewUdpPort(trackInfo.TrackType, config.ExternalRtpAddress) + if err != nil { + return err + } + udpPort.Init() + udpPort.OnRtpPacketReceived(func(packet []byte, raddr net.Addr) { + c.OnRtpPacketReceived(trackInfo.TrackType, packet, raddr) + }) + udpPort.OnRtcpPacketReceived(func(packet []byte, raddr net.Addr) { + c.OnRtcpPacketReceived(trackInfo.TrackType, packet, raddr) + }) + c.ports[trackInfo.TrackType] = udpPort } - c.localSdp = &sdp.Session{ + c.localDescription = &sdp.Session{ Origin: &sdp.Origin{ Username: "-", - Address: host, + Address: callConfig.ExternalRtpAddress, SessionID: time.Now().UnixNano() / 1e6, SessionVersion: time.Now().UnixNano() / 1e6, }, Timing: &sdp.Timing{Start: time.Time{}, Stop: time.Time{}}, //Name: "Example", Connection: &sdp.Connection{ - Address: host, + Address: callConfig.ExternalRtpAddress, }, //Bandwidth: []*sdp.Bandwidth{{Type: "AS", Value: 117}}, Media: []*sdp.Media{ { //Bandwidth: []*sdp.Bandwidth{{Type: "TIAS", Value: 96000}}, - Connection: []*sdp.Connection{{Address: host}}, + Connection: []*sdp.Connection{{Address: callConfig.ExternalRtpAddress}}, Mode: sdp.SendRecv, Type: "audio", - Port: lAddr.Port, + Port: c.ports[TrackTypeAudio].LocalPort(), Proto: "RTP/AVP", Format: []*sdp.Format{ {Payload: 0, Name: "PCMU", ClockRate: 8000}, @@ -96,225 +66,83 @@ func (c *SIPCall) Init(ExternalIP string) error { {Payload: 116, Name: "telephone-event", ClockRate: 8000, Params: []string{"0-16"}}, }, }, + { + //Bandwidth: []*sdp.Bandwidth{{Type: "TIAS", Value: 96000}}, + Connection: []*sdp.Connection{{Address: callConfig.ExternalRtpAddress}}, + Mode: sdp.SendRecv, + Type: "video", + Port: c.ports[TrackTypeVideo].LocalPort(), + Proto: "RTP/AVP", + Format: []*sdp.Format{ + {Payload: 96, Name: "H264", ClockRate: 90000, Params: []string{"packetization-mode=1"}}, + }, + }, }, } - logger.Warnf("SIPCall.Init") return nil } -func (c *SIPCall) OnFailure(code int, reason string) { - if !c.sess.IsEnded() { - c.sess.End() - } - c.ch <- Failure - logger.Warnf("SIPCall.Failure") +func (c *UdpTansport) OnRtpPacketReceived(trackType TrackType, packet []byte, raddr net.Addr) error { + return nil } -func (c *SIPCall) OnTerminate() { - { - c.mutex.Lock() - defer c.mutex.Unlock() - - if !c.closed.Get() { - c.closed.Set(true) - } - - if c.udpConn != nil { - c.udpConn.Close() - c.udpConn = nil - } - } - c.ch <- Terminated +func (c *UdpTansport) OnRtcpPacketReceived(trackType TrackType, packet []byte, raddr net.Addr) error { + return nil } -func (c *SIPCall) Terminate() { - { - c.mutex.Lock() - defer c.mutex.Unlock() - //TODO: close udp conn - - if !c.closed.Get() { - c.closed.Set(true) - } - if c.udpConn != nil { - c.udpConn.Close() - c.udpConn = nil - } - } - - if !c.sess.IsEnded() { - c.sess.End() - } - c.cancel() - logger.Warnf("SIPCall.Terminate") +func (c UdpTansport) WriteRtpPacket(trackType TrackType, packet []byte) error { + udpPort := c.ports[trackType] + raddr := udpPort.GetRemoteRtpAddress() + return udpPort.WriteRtpPacket(packet, *raddr) } -func (c *SIPCall) Close() { - c.Terminate() - logger.Warnf("SIPCall.Close") +func (c UdpTansport) WriteRtcpPacket(trackType TrackType, packet []byte) error { + udpPort := c.ports[trackType] + raddr := udpPort.GetRemoteRtcpAddress() + return udpPort.WriteRtpPacket(packet, *raddr) } -func (c *SIPCall) Offer(called sip.SipUri) (string, error) { - c.called = called - sdp := c.localSdp.String() - recipient := sip.SipUri{ - FUser: sip.String{Str: c.called.User().String()}, - FHost: c.called.Host(), - FPort: c.called.Port(), - } - - uri, err := parser.ParseUri("sip:" + c.called.User().String() + "@" + c.called.Host()) - if err != nil { - logger.Error(err) - return "", err - } - - logger.Infof("SIPCall Invite => %v", sdp) - - sess, err := c.ua.Invite(c.profile, uri, recipient, &sdp) - if err != nil { - return "", err - } - c.sess = sess - - return sdp, nil +func (c *UdpTansport) Type() TransportType { + return TransportTypeSIP } -func (c *SIPCall) OnEarlyMedia(answer string) error { - var err error - c.remoteSdp, err = sdp.Parse([]byte(answer)) - if err != nil { - logger.Errorf("err => %v", err) - } - - c.currentStatus = EarlyMedia - c.ch <- c.currentStatus - - rAddr := &net.UDPAddr{IP: net.ParseIP(c.remoteSdp.Origin.Address), Port: c.remoteSdp.Media[0].Port} - - if !c.hasMediaStream.Get() { - c.hasMediaStream.Set(true) - go c.startStreamLoop(rAddr) +func (c *UdpTansport) Close() error { + for _, udpPort := range c.ports { + udpPort.Close() } - return err + return nil } -func (c *SIPCall) OnAnswer(answer string) error { - - logger.Infof("SIPCall onAnswer => %v", answer) - - var err error - c.remoteSdp, err = sdp.Parse([]byte(answer)) - if err != nil { - logger.Errorf("err => %v", err) - } - - rAddr := &net.UDPAddr{IP: net.ParseIP(c.remoteSdp.Origin.Address), Port: c.remoteSdp.Media[0].Port} - - if !c.hasMediaStream.Get() { - c.hasMediaStream.Set(true) - go c.startStreamLoop(rAddr) - } - - if c.currentStatus != Confirmed { - c.currentStatus = Confirmed - c.ch <- c.currentStatus - } - return err +func (c *UdpTansport) CreateOffer() (*Desc, error) { + return &Desc{ + Type: "offer", + SDP: c.localDescription.String(), + }, nil } -func (c *SIPCall) OnOffer(offer string) error { - var err error - logger.Warnf("offer %v", offer) - c.remoteSdp, err = sdp.Parse([]byte(offer)) +func (c *UdpTansport) OnAnswer(answer *Desc) error { + sess, err := sdp.Parse([]byte(answer.SDP)) if err != nil { - logger.Errorf("err => %v", err) + return err } + c.remoteDescription = sess return nil } -func (c *SIPCall) Answer() (string, error) { - - rAddr := &net.UDPAddr{IP: net.ParseIP(c.remoteSdp.Origin.Address), Port: c.remoteSdp.Media[0].Port} - - c.localSdp.Media[0].Format = c.remoteSdp.Media[0].Format - sdp := c.localSdp.String() - logger.Warnf("answer %v", sdp) - c.sess.ProvideAnswer(sdp) - c.sess.Accept(sip.StatusCode(200)) - - if !c.hasMediaStream.Get() { - c.hasMediaStream.Set(true) - go c.startStreamLoop(rAddr) - } - - if c.currentStatus != Confirmed { - c.currentStatus = Confirmed - c.ch <- c.currentStatus - } - return "", nil -} - -func (c *SIPCall) startStreamLoop(rAddr *net.UDPAddr) { - logger.Warnf("SIPCall::startStream, Read rtp from: %v", rAddr.String()) - - /* - write rtp/rtcp to udp transport. - rtpTransport := media.NewGoRtpTransport(func(buffer string) int { - size := len(buffer) - if c.udpConn != nil { - c.udpConn.WriteToUDP([]byte(buffer), rAddr) - } - - return size - }, func(buffer string) int { - size := len(buffer) - if c.udpConn != nil { - c.udpConn.WriteToUDP([]byte(buffer), rAddr) - } - return size - }) - */ - - buf := make([]byte, 1500) - for { - if c.closed.Get() { - logger.Infof("Terminate: stop rtp conn now!") - return - } - _, raddr, err := c.udpConn.ReadFrom(buf) - if err != nil { - logger.Infof("RTP Conn [%v] refused, stop now!", raddr) - return - } - //logger.Debugf("raddr: %v, size %d", raddr, n) - if !c.closed.Get() { - //c.stream.OnReadRtpPacket(string(buf[:n])) - } +func (c *UdpTansport) OnOffer(offer *Desc) error { + sess, err := sdp.Parse([]byte(offer.SDP)) + if err != nil { + return err } -} - -func (c *SIPCall) Called() string { - return c.called.User().String() -} - -func (c *SIPCall) Host() string { - return c.called.Host() -} + c.remoteDescription = sess -func (c *SIPCall) Type() CallType { - return SIP -} - -func (c *SIPCall) ID() string { - return c.id -} - -func (c *SIPCall) Sess() *session.Session { - return c.sess + return nil } -func (c *SIPCall) StatusChan() chan CallStatus { - return c.ch +func (c *UdpTansport) CreateAnswer() (*Desc, error) { + return &Desc{ + Type: "offer", + SDP: c.localDescription.String(), + }, nil } diff --git a/examples/b2bua/b2bua/udp_port.go b/examples/b2bua/b2bua/udp_port.go new file mode 100644 index 0000000..5e44549 --- /dev/null +++ b/examples/b2bua/b2bua/udp_port.go @@ -0,0 +1,151 @@ +package b2bua + +import ( + "context" + "fmt" + "net" + "sync" + + "github.com/cloudwebrtc/go-sip-ua/pkg/utils" +) + +// UdpPort . +type UdpPort struct { + udpConns []*net.UDPConn + closed utils.AtomicBool + ctx context.Context + cancel context.CancelFunc + onRtpPacketReceivedFunc func(packet []byte, raddr net.Addr) + onRtcpPacketReceivedFunc func(packet []byte, raddr net.Addr) + mutex sync.Mutex + trackType TrackType + externalRtpAddress string + rAddr *net.Addr + rRtcpAddr *net.Addr +} + +func NewUdpPort(trackType TrackType, externalRtpAddress string) (*UdpPort, error) { + c := &UdpPort{ + trackType: trackType, + externalRtpAddress: externalRtpAddress, + } + c.ctx, c.cancel = context.WithCancel(context.TODO()) + c.closed.Set(false) + return c, nil +} + +func (c *UdpPort) Init() error { + lAddr := &net.UDPAddr{IP: net.ParseIP("0.0.0.0"), Port: 0} + lRtcpAddr := &net.UDPAddr{IP: net.ParseIP("0.0.0.0"), Port: 0} + + rtpConns, err := ListenRTPInPortRange(3000, 5000, "udp", lAddr, lRtcpAddr) + if err != nil { + logger.Errorf("ListenUDP: err => %v", err) + return err + } + + logger.Infof("ListenUDP: rtp %v, rtcp ", rtpConns[0].LocalAddr().String(), rtpConns[1].LocalAddr().String()) + + go c.loop(rtpConns[0], func(packet []byte, raddr net.Addr) { + c.mutex.Lock() + defer c.mutex.Unlock() + if c.onRtpPacketReceivedFunc != nil { + c.onRtpPacketReceivedFunc(packet, raddr) + } + c.rAddr = &raddr + }) + + go c.loop(rtpConns[1], func(packet []byte, raddr net.Addr) { + c.mutex.Lock() + defer c.mutex.Unlock() + if c.onRtcpPacketReceivedFunc != nil { + c.onRtcpPacketReceivedFunc(packet, raddr) + } + c.rRtcpAddr = &raddr + }) + + c.udpConns = rtpConns + return nil +} + +func (c *UdpPort) LocalPort() int { + return c.udpConns[0].LocalAddr().(*net.UDPAddr).Port +} + +func (c *UdpPort) GetRemoteRtpAddress() *net.Addr { + return c.rAddr +} + +func (c *UdpPort) GetRemoteRtcpAddress() *net.Addr { + if c.rRtcpAddr == nil { + return c.rAddr + } + return c.rRtcpAddr +} + +func (c *UdpPort) Close() { + c.mutex.Lock() + defer c.mutex.Unlock() + + if !c.closed.Get() { + c.closed.Set(true) + } + c.cancel() + + for _, conn := range c.udpConns { + conn.Close() + } + c.udpConns = nil + +} + +func (c *UdpPort) OnRtpPacketReceived(callback func(packet []byte, raddr net.Addr)) { + c.mutex.Lock() + defer c.mutex.Unlock() + c.onRtpPacketReceivedFunc = callback +} + +func (c *UdpPort) OnRtcpPacketReceived(callback func(packet []byte, raddr net.Addr)) { + c.mutex.Lock() + defer c.mutex.Unlock() + c.onRtcpPacketReceivedFunc = callback +} + +func (c *UdpPort) WriteRtpPacket(data []byte, raddr net.Addr) error { + if c.closed.Get() { + return fmt.Errorf("closed") + } + if c.udpConns != nil { + _, err := c.udpConns[0].WriteToUDP(data, raddr.(*net.UDPAddr)) + return err + } + return nil +} + +func (c *UdpPort) WriteRtcpPacket(data []byte, raddr net.Addr) error { + if c.closed.Get() { + return fmt.Errorf("closed") + } + if c.udpConns != nil { + _, err := c.udpConns[1].WriteToUDP(data, raddr.(*net.UDPAddr)) + return err + } + return nil +} + +func (c *UdpPort) loop(conn *net.UDPConn, onPacketReceived func(data []byte, raddr net.Addr)) { + buf := make([]byte, 1500) + for { + if c.closed.Get() { + logger.Infof("Terminate: stop rtp conn now!") + return + } + n, raddr, err := conn.ReadFrom(buf) + if err != nil { + logger.Infof("RTP Conn [%v] refused, stop now!", raddr) + return + } + logger.Debugf("raddr: %v, size %d", raddr, n) + onPacketReceived(buf[:n], raddr) + } +} diff --git a/examples/b2bua/b2bua/util.go b/examples/b2bua/b2bua/util.go index d0d8d7f..2ae3591 100644 --- a/examples/b2bua/b2bua/util.go +++ b/examples/b2bua/b2bua/util.go @@ -16,6 +16,8 @@ import ( "strings" "time" "unicode/utf8" + + "github.com/pixelbender/go-sdp/sdp" ) type Map map[string]interface{} @@ -189,10 +191,7 @@ func DialUDPInPortRange(portMin, portMax int, network string, laddr *net.UDPAddr return nil, ErrPort } -func ListenUDPInPortRange(portMin, portMax int, network string, laddr *net.UDPAddr) (*net.UDPConn, error) { - if (laddr.Port != 0) || ((portMin == 0) && (portMax == 0)) { - return net.ListenUDP(network, laddr) - } +func ListenRTPInPortRange(portMin, portMax int, network string, lRtpAddr *net.UDPAddr, lRtcpAddr *net.UDPAddr) ([]*net.UDPConn, error) { var i, j int i = portMin if i == 0 { @@ -208,13 +207,26 @@ func ListenUDPInPortRange(portMin, portMax int, network string, laddr *net.UDPAd portStart := rand.Intn(j-i+1) + i portCurrent := portStart + + conns := make([]*net.UDPConn, 2) for { - *laddr = net.UDPAddr{IP: laddr.IP, Port: portCurrent} - c, e := net.ListenUDP(network, laddr) + *lRtpAddr = net.UDPAddr{IP: lRtpAddr.IP, Port: portCurrent} + c, e := net.ListenUDP(network, lRtpAddr) if e == nil { - return c, e + if conns[0] == nil { + conns[0] = c + } else { + conns[1] = c + return conns, e + } + *lRtcpAddr = net.UDPAddr{IP: lRtcpAddr.IP, Port: portCurrent + 1} + c, e = net.ListenUDP(network, lRtcpAddr) + if e == nil { + conns[1] = c + return conns, e + } } - logger.Errorf("failed to listen %s: %v", laddr.String(), e) + logger.Errorf("failed to listen %s: %v", lRtpAddr.String(), e) portCurrent++ if portCurrent > j { portCurrent = i @@ -223,7 +235,8 @@ func ListenUDPInPortRange(portMin, portMax int, network string, laddr *net.UDPAd break } } - return nil, ErrPort + + return conns, ErrPort } func PathExists(path string) (bool, error) { @@ -320,3 +333,50 @@ func NewMap(args ...interface{}) map[string]interface{} { } return msg } + +func HasWebRTCAttributes(attributes []*sdp.Attr) bool { + hasIce := false + hasDtls := false + for _, a := range attributes { + if a.Name == "ice-ufrag" { + hasIce = true + } + if a.Name == "fingerprint" { + hasDtls = true + } + } + return hasIce && hasDtls +} + +func ParseTransportType(sdp *sdp.Session) TransportType { + if sdp == nil { + return TransportTypeUnknown + } + for _, m := range sdp.Media { + // Proto: "UDP/TLS/RTP/SAVPF" + if strings.Contains(m.Proto, "SAVPF") && HasWebRTCAttributes(m.Attributes) { + return TransportTypeRTC + } + } + return TransportTypeSIP +} + +func ParseTrackInfos(sdp *sdp.Session) ([]*TrackInfo, error) { + if sdp == nil { + return nil, errors.New("sdp is nil") + } + trackInfos := make([]*TrackInfo, 0) + for _, m := range sdp.Media { + trackInfo := &TrackInfo{} + trackInfo.Codecs = m.Format + if m.Type == "audio" { + trackInfo.TrackType = TrackTypeAudio + } else if m.Type == "video" { + trackInfo.TrackType = TrackTypeVideo + } else { + continue + } + trackInfos = append(trackInfos, trackInfo) + } + return trackInfos, nil +} diff --git a/go.mod b/go.mod index 9b88507..6481014 100644 --- a/go.mod +++ b/go.mod @@ -10,12 +10,14 @@ require ( github.com/google/uuid v1.3.0 github.com/kr/pretty v0.2.0 // indirect github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect - github.com/onsi/ginkgo v1.16.5 // indirect github.com/onsi/gomega v1.27.2 // indirect + github.com/pion/interceptor v0.1.12 + github.com/pion/rtcp v1.2.10 + github.com/pion/webrtc/v3 v3.1.59 github.com/pixelbender/go-sdp v1.1.0 github.com/sirupsen/logrus v1.8.1 github.com/tevino/abool v1.2.0 github.com/x-cray/logrus-prefixed-formatter v0.5.2 - golang.org/x/crypto v0.1.0 + golang.org/x/crypto v0.6.0 google.golang.org/api v0.43.0 ) diff --git a/go.sum b/go.sum index 6427247..e326a9e 100644 --- a/go.sum +++ b/go.sum @@ -221,6 +221,44 @@ github.com/onsi/gomega v1.26.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdM github.com/onsi/gomega v1.27.1/go.mod h1:aHX5xOykVYzWOV4WqQy0sy8BQptgukenXpCXfadcIAw= github.com/onsi/gomega v1.27.2 h1:SKU0CXeKE/WVgIV1T61kSa3+IRE8Ekrv9rdXDwwTqnY= github.com/onsi/gomega v1.27.2/go.mod h1:5mR3phAHpkAVIDkHEUBY6HGVsU+cpcEscrGPB4oPlZI= +github.com/pion/datachannel v1.5.5 h1:10ef4kwdjije+M9d7Xm9im2Y3O6A6ccQb0zcqZcJew8= +github.com/pion/datachannel v1.5.5/go.mod h1:iMz+lECmfdCMqFRhXhcA/219B0SQlbpoR2V118yimL0= +github.com/pion/dtls/v2 v2.2.6 h1:yXMxKr0Skd+Ub6A8UqXTRLSywskx93ooMRHsQUtd+Z4= +github.com/pion/dtls/v2 v2.2.6/go.mod h1:t8fWJCIquY5rlQZwA2yWxUS1+OCrAdXrhVKXB5oD/wY= +github.com/pion/ice/v2 v2.3.2 h1:vh+fi4RkZ8H5fB4brZ/jm3j4BqFgMmNs+aB3X52Hu7M= +github.com/pion/ice/v2 v2.3.2/go.mod h1:AMIpuJqcpe+UwloocNebmTSWhCZM1TUCo9v7nW50jX0= +github.com/pion/interceptor v0.1.12 h1:CslaNriCFUItiXS5o+hh5lpL0t0ytQkFnUcbbCs2Zq8= +github.com/pion/interceptor v0.1.12/go.mod h1:bDtgAD9dRkBZpWHGKaoKb42FhDHTG2rX8Ii9LRALLVA= +github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= +github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= +github.com/pion/mdns v0.0.7 h1:P0UB4Sr6xDWEox0kTVxF0LmQihtCbSAdW0H2nEgkA3U= +github.com/pion/mdns v0.0.7/go.mod h1:4iP2UbeFhLI/vWju/bw6ZfwjJzk0z8DNValjGxR/dD8= +github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA= +github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8= +github.com/pion/rtcp v1.2.10 h1:nkr3uj+8Sp97zyItdN60tE/S6vk4al5CPRR6Gejsdjc= +github.com/pion/rtcp v1.2.10/go.mod h1:ztfEwXZNLGyF1oQDttz/ZKIBaeeg/oWbRYqzBM9TL1I= +github.com/pion/rtp v1.7.13 h1:qcHwlmtiI50t1XivvoawdCGTP4Uiypzfrsap+bijcoA= +github.com/pion/rtp v1.7.13/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= +github.com/pion/sctp v1.8.5/go.mod h1:SUFFfDpViyKejTAdwD1d/HQsCu+V/40cCs2nZIvC3s0= +github.com/pion/sctp v1.8.6 h1:CUex11Vkt9YS++VhLf8b55O3VqKrWL6W3SDwX4jAqsI= +github.com/pion/sctp v1.8.6/go.mod h1:SUFFfDpViyKejTAdwD1d/HQsCu+V/40cCs2nZIvC3s0= +github.com/pion/sdp/v3 v3.0.6 h1:WuDLhtuFUUVpTfus9ILC4HRyHsW6TdugjEX/QY9OiUw= +github.com/pion/sdp/v3 v3.0.6/go.mod h1:iiFWFpQO8Fy3S5ldclBkpXqmWy02ns78NOKoLLL0YQw= +github.com/pion/srtp/v2 v2.0.12 h1:WrmiVCubGMOAObBU1vwWjG0H3VSyQHawKeer2PVA5rY= +github.com/pion/srtp/v2 v2.0.12/go.mod h1:C3Ep44hlOo2qEYaq4ddsmK5dL63eLehXFbHaZ9F5V9Y= +github.com/pion/stun v0.4.0 h1:vgRrbBE2htWHy7l3Zsxckk7rkjnjOsSM7PHZnBwo8rk= +github.com/pion/stun v0.4.0/go.mod h1:QPsh1/SbXASntw3zkkrIk3ZJVKz4saBY2G7S10P3wCw= +github.com/pion/transport v0.14.1 h1:XSM6olwW+o8J4SCmOBb/BpwZypkHeyM0PGFCxNQBr40= +github.com/pion/transport v0.14.1/go.mod h1:4tGmbk00NeYA3rUa9+n+dzCCoKkcy3YlYb99Jn2fNnI= +github.com/pion/transport/v2 v2.0.0/go.mod h1:HS2MEBJTwD+1ZI2eSXSvHJx/HnzQqRy2/LXxt6eVMHc= +github.com/pion/transport/v2 v2.0.2 h1:St+8o+1PEzPT51O9bv+tH/KYYLMNR5Vwm5Z3Qkjsywg= +github.com/pion/transport/v2 v2.0.2/go.mod h1:vrz6bUbFr/cjdwbnxq8OdDDzHf7JJfGsIRkxfpZoTA0= +github.com/pion/turn/v2 v2.1.0 h1:5wGHSgGhJhP/RpabkUb/T9PdsAjkGLS6toYz5HNzoSI= +github.com/pion/turn/v2 v2.1.0/go.mod h1:yrT5XbXSGX1VFSF31A3c1kCNB5bBZgk/uu5LET162qs= +github.com/pion/udp/v2 v2.0.1 h1:xP0z6WNux1zWEjhC7onRA3EwwSliXqu1ElUZAQhUP54= +github.com/pion/udp/v2 v2.0.1/go.mod h1:B7uvTMP00lzWdyMr/1PVZXtV3wpPIxBRd4Wl6AksXn8= +github.com/pion/webrtc/v3 v3.1.59 h1:B3YFo8q6dwBYKA2LUjWRChP59Qtt+xvv1Ul7UPDp6Zc= +github.com/pion/webrtc/v3 v3.1.59/go.mod h1:rJGgStRoFyFOWJULHLayaimsG+jIEoenhJ5MB5gIFqw= github.com/pixelbender/go-sdp v1.1.0 h1:rkm9aFBNKrnB+YGfhLmAkal3pC8XYXb9h+172PlrCBU= github.com/pixelbender/go-sdp v1.1.0/go.mod h1:6IBlz9+BrUHoFTea7gcp4S54khtOhjCW/nVDLhmZBAs= github.com/pkg/term v1.2.0-beta.2 h1:L3y/h2jkuBVFdWiJvNfYfKmzcCnILw7mJWm2JQuMppw= @@ -231,16 +269,23 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1: github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b h1:gQZ0qzfKHQIybLANtM3mBXNUtOfsCFXeTsnBqCsx1KM= github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/tevino/abool v0.0.0-20170917061928-9b9efcf221b5/go.mod h1:f1SCnEOt6sc3fOJfPQDRDzHOtSXuTtnz0ImG9kPRDV0= github.com/tevino/abool v1.2.0 h1:heAkClL8H6w+mK5md9dzsuohKeXHUpY7Vw0ZCKW+huA= github.com/tevino/abool v1.2.0/go.mod h1:qc66Pna1RiIsPa7O4Egxxs9OqkuxDX55zznh9K07Tzg= @@ -266,8 +311,10 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= +golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= +golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc= +golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -632,8 +679,9 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= From eda28af785a16760b821569f111298819ce1f17c Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Sun, 2 Apr 2023 14:32:57 +0800 Subject: [PATCH 03/36] chore: add media bridge. --- examples/b2bua/b2bua/b2bua.go | 21 +++- examples/b2bua/b2bua/call.go | 97 ++++++++++----- examples/b2bua/b2bua/conf.go | 1 + examples/b2bua/b2bua/rtc.go | 201 ++++++++++++++++++++++--------- examples/b2bua/b2bua/track.go | 4 +- examples/b2bua/b2bua/udp.go | 177 +++++++++++++++++++-------- examples/b2bua/b2bua/udp_port.go | 66 +++++----- 7 files changed, 393 insertions(+), 174 deletions(-) diff --git a/examples/b2bua/b2bua/b2bua.go b/examples/b2bua/b2bua/b2bua.go index 28b211d..16ee8bd 100644 --- a/examples/b2bua/b2bua/b2bua.go +++ b/examples/b2bua/b2bua/b2bua.go @@ -52,6 +52,7 @@ func init() { callConfig = CallConfig{ Codecs: []string{"PCMU", "PCMA", "opus", "H264"}, ExternalRtpAddress: "0.0.0.0", + RtcpFeedback: []string{"nack", "nack pli", "ccm fir", "goog-remb", "transport-cc"}, } } @@ -149,6 +150,8 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { call.dest = dest b.calls = append(b.calls, call) + + call.SetState(Connecting) } // Try to find online contact records. @@ -195,10 +198,18 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { call := b.findCall(sess) if call != nil && call.dest == sess { answer := call.dest.RemoteSdp() - call.SetBLegAnswer(&Desc{Type: "answer", SDP: answer}) - aLegAnswer, _ := call.CreateALegAnswer() - call.src.ProvideAnswer(aLegAnswer.SDP) + if len(answer) > 0 { + call.SetBLegAnswer(&Desc{Type: "answer", SDP: answer}) + aLegAnswer, err := call.CreateALegAnswer() + if err == nil { + call.src.ProvideAnswer(aLegAnswer.SDP) + } + call.SetState(EarlyMedia) + } else { + call.SetState(Ringing) + } call.src.Provisional((*resp).StatusCode(), (*resp).Reason()) + } // Handle 200OK or ACK @@ -211,6 +222,8 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { aLegAnswer, _ := call.CreateALegAnswer() call.src.ProvideAnswer(aLegAnswer.SDP) call.src.Accept(200) + call.SetState(Confirmed) + call.BridgeMediaStream() } // Handle 4XX+ @@ -227,9 +240,9 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { } else if call.dest == sess { call.src.End() } + call.Terminate() } - call.Terminate() b.removeCall(sess) } diff --git a/examples/b2bua/b2bua/call.go b/examples/b2bua/b2bua/call.go index 9b80791..bff9267 100644 --- a/examples/b2bua/b2bua/call.go +++ b/examples/b2bua/b2bua/call.go @@ -1,8 +1,6 @@ package b2bua import ( - "fmt" - "github.com/cloudwebrtc/go-sip-ua/pkg/session" "github.com/cloudwebrtc/go-sip-ua/pkg/ua" "github.com/pixelbender/go-sdp/sdp" @@ -39,7 +37,8 @@ type B2BCall struct { src *session.Session dest *session.Session - trans map[*session.Session]Transport + srcTrans Transport + destTrans Transport state CallState @@ -52,7 +51,6 @@ func (b *B2BCall) ToString() string { func (b *B2BCall) Init() { b.state = New - b.trans = make(map[*session.Session]Transport) } func (b *B2BCall) State() CallState { @@ -64,11 +62,28 @@ func (b *B2BCall) SetState(state CallState) { } func (b *B2BCall) Terminate() { - for _, trans := range b.trans { - if err := trans.Close(); err != nil { - logger.Errorf("Close transport error: %v", err) - } + + b.srcTrans.OnRtpPacket(nil) + b.destTrans.OnRtpPacket(nil) + + b.srcTrans.OnRtcpPacket(nil) + b.destTrans.OnRtcpPacket(nil) + + if err := b.srcTrans.Close(); err != nil { + logger.Errorf("Close src transport error: %v", err) } + + if err := b.destTrans.Close(); err != nil { + logger.Errorf("Close dest transport error: %v", err) + } + + if b.state != Confirmed { + b.src.End() + } else { + b.src.Bye() + } + + b.state = Terminated } func (b *B2BCall) SetALegOffer(sdp *Desc) error { @@ -106,7 +121,7 @@ func (b *B2BCall) SetALegOffer(sdp *Desc) error { return err } - b.trans[b.src] = trans + b.srcTrans = trans return nil } @@ -121,7 +136,7 @@ func (b *B2BCall) CreateBLegOffer() (*Desc, error) { return nil, err } - b.trans[b.dest] = trans + b.destTrans = trans offer, err := trans.CreateOffer() if err != nil { @@ -132,33 +147,51 @@ func (b *B2BCall) CreateBLegOffer() (*Desc, error) { } func (b *B2BCall) SetBLegAnswer(sdp *Desc) error { - - if trans, found := b.trans[b.dest]; found { - err := trans.OnAnswer(sdp) - if err != nil { - logger.Errorf("OnAnswer error: %v", err) - return err - } - } else { - logger.Errorf("Transport not found") - return fmt.Errorf("Transport not found") + err := b.destTrans.OnAnswer(sdp) + if err != nil { + logger.Errorf("OnAnswer error: %v", err) + return err } return nil } func (b *B2BCall) CreateALegAnswer() (*Desc, error) { - if trans, found := b.trans[b.src]; found { - answer, err := trans.CreateAnswer() + answer, err := b.srcTrans.CreateAnswer() + if err != nil { + logger.Errorf("Answer error: %v", err) + return nil, err + } + return answer, nil +} + +func (b *B2BCall) BridgeMediaStream() error { + b.srcTrans.OnRtpPacket(func(trackType TrackType, payload []byte) { + _, err := b.destTrans.WriteRTP(trackType, payload) if err != nil { - logger.Errorf("Answer error: %v", err) - return nil, err + logger.Errorf("WriteRTP error: %v", err) } - return answer, nil - } else { - logger.Errorf("Transport not found") - return nil, fmt.Errorf("Transport not found") - } + }) + b.srcTrans.OnRtcpPacket(func(trackType TrackType, payload []byte) { + _, err := b.destTrans.WriteRTCP(trackType, payload) + if err != nil { + logger.Errorf("WriteRTCP error: %v", err) + } + }) + + b.destTrans.OnRtpPacket(func(trackType TrackType, payload []byte) { + _, err := b.srcTrans.WriteRTP(trackType, payload) + if err != nil { + logger.Errorf("WriteRTP error: %v", err) + } + }) + b.destTrans.OnRtcpPacket(func(trackType TrackType, payload []byte) { + _, err := b.srcTrans.WriteRTCP(trackType, payload) + if err != nil { + logger.Errorf("WriteRTCP error: %v", err) + } + }) + return nil } type TransportType string @@ -177,4 +210,10 @@ type Transport interface { OnOffer(sdp *Desc) error CreateAnswer() (*Desc, error) Type() TransportType + + OnRtpPacket(rtpHandler func(trackType TrackType, payload []byte)) + OnRtcpPacket(rtcpHandler func(trackType TrackType, payload []byte)) + + WriteRTP(trackType TrackType, payload []byte) (int, error) + WriteRTCP(trackType TrackType, payload []byte) (int, error) } diff --git a/examples/b2bua/b2bua/conf.go b/examples/b2bua/b2bua/conf.go index c3ab7a7..443c021 100644 --- a/examples/b2bua/b2bua/conf.go +++ b/examples/b2bua/b2bua/conf.go @@ -3,4 +3,5 @@ package b2bua type CallConfig struct { Codecs []string `json:"codecs"` ExternalRtpAddress string `json:"external_rtp_address"` + RtcpFeedback []string `json:"rtcp_feedback"` } diff --git a/examples/b2bua/b2bua/rtc.go b/examples/b2bua/b2bua/rtc.go index 4a99a84..b3f28cb 100644 --- a/examples/b2bua/b2bua/rtc.go +++ b/examples/b2bua/b2bua/rtc.go @@ -5,6 +5,7 @@ import ( "fmt" "math/rand" "net" + "sync" "github.com/cloudwebrtc/go-sip-ua/pkg/utils" "github.com/pion/interceptor" @@ -47,22 +48,23 @@ var ( type WebRTCTransport struct { pc *webrtc.PeerConnection - mediaEngine webrtc.MediaEngine - api *webrtc.API answer webrtc.SessionDescription offer webrtc.SessionDescription - track *webrtc.TrackLocalStaticRTP - - closed utils.AtomicBool - ctx context.Context - cancel context.CancelFunc - - trackInfos []*TrackInfo + localTracks map[TrackType]*webrtc.TrackLocalStaticRTP + closed utils.AtomicBool + ctx context.Context + cancel context.CancelFunc + trackInfos []*TrackInfo + + mu sync.RWMutex + rtpHandler func(trackType TrackType, payload []byte) + rtcpHandler func(trackType TrackType, payload []byte) } func NewWebRTCTransport(trackInfos []*TrackInfo) *WebRTCTransport { c := &WebRTCTransport{ - trackInfos: trackInfos, + trackInfos: trackInfos, + localTracks: make(map[TrackType]*webrtc.TrackLocalStaticRTP), } c.ctx, c.cancel = context.WithCancel(context.Background()) c.closed.Set(false) @@ -81,15 +83,15 @@ func (c *WebRTCTransport) Init(callConfig CallConfig) error { { RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypePCMU, ClockRate: 8000, Channels: 1, SDPFmtpLine: "", RTCPFeedback: nil}, PayloadType: 0, - }, - { - RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypePCMA, ClockRate: 8000, Channels: 1, SDPFmtpLine: "", RTCPFeedback: nil}, - PayloadType: 8, - }, - { - RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeOpus, ClockRate: 48000, Channels: 2, SDPFmtpLine: "minptime=10;useinbandfec=1", RTCPFeedback: nil}, - PayloadType: 111, - }, + }, /* + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypePCMA, ClockRate: 8000, Channels: 1, SDPFmtpLine: "", RTCPFeedback: nil}, + PayloadType: 8, + }, + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeOpus, ClockRate: 48000, Channels: 2, SDPFmtpLine: "minptime=10;useinbandfec=1", RTCPFeedback: nil}, + PayloadType: 111, + },*/ } { if err := m.RegisterCodec(codec, webrtc.RTPCodecTypeAudio); err != nil { return err @@ -145,9 +147,96 @@ func (c *WebRTCTransport) Init(callConfig CallConfig) error { c.pc.OnConnectionStateChange(func(state webrtc.PeerConnectionState) { logger.Infof("PeerConnection State has changed: %s\n", state.String()) }) + + c.pc.OnTrack(func(track *webrtc.TrackRemote, recevier *webrtc.RTPReceiver) { + buf := make([]byte, 1500) + for { + if c.closed.Get() { + logger.Infof("OnTrack: stop now!") + break + } + // Read + n, _, readErr := track.Read(buf) + if readErr != nil { + logger.Errorf("track.Read: readErr => %v", readErr) + break + } + //logger.Infof("WebRTCTransport::OnTrack: read %d bytes", n) + if track.Kind() == webrtc.RTPCodecTypeAudio { + c.onRtpPacket(TrackTypeAudio, buf[:n]) + } else if track.Kind() == webrtc.RTPCodecTypeVideo { + c.onRtpPacket(TrackTypeVideo, buf[:n]) + } + } + + }) + return nil +} + +func (c *WebRTCTransport) OnRtpPacket(rtpHandler func(trackType TrackType, payload []byte)) { + c.mu.Lock() + defer c.mu.Unlock() + c.rtpHandler = rtpHandler +} + +func (c *WebRTCTransport) OnRtcpPacket(rtcpHandler func(trackType TrackType, payload []byte)) { + c.mu.Lock() + defer c.mu.Unlock() + c.rtcpHandler = rtcpHandler +} + +func (c *WebRTCTransport) onRtpPacket(trackType TrackType, packet []byte) error { + logger.Infof("WebRTCTransport::OnRtpPacketReceived: %v read %d bytes", trackType, len(packet)) + c.mu.RLock() + defer c.mu.RUnlock() + if c.rtpHandler != nil { + c.rtpHandler(trackType, packet) + } + return nil +} + +func (c *WebRTCTransport) onRtcpPacket(trackType TrackType, packet []byte) error { + logger.Infof("WebRTCTransport::OnRtcpPacketReceived: %v read %d bytes", trackType, len(packet)) + c.mu.RLock() + defer c.mu.RUnlock() + if c.rtcpHandler != nil { + c.rtcpHandler(trackType, packet) + } return nil } +func (c *WebRTCTransport) WriteRTP(trackType TrackType, packet []byte) (int, error) { + if c.closed.Get() { + return 0, fmt.Errorf("WebRTCTransport::SendRtpPacket: closed") + } + if trackType == TrackTypeAudio { + if c.localTracks[TrackTypeAudio] != nil { + return c.localTracks[TrackTypeAudio].Write(packet) + } + } else if trackType == TrackTypeVideo { + if c.localTracks[TrackTypeVideo] != nil { + return c.localTracks[TrackTypeVideo].Write(packet) + } + } + return 0, fmt.Errorf("WebRTCTransport::SendRtpPacket: invalid trackType %v", trackType) +} + +func (c *WebRTCTransport) WriteRTCP(trackType TrackType, packet []byte) (n int, err error) { + if c.closed.Get() { + return 0, fmt.Errorf("WebRTCTransport::SendRtcpPacket: closed") + } + rtcpPacket, err := rtcp.Unmarshal(packet) + if err != nil { + return 0, fmt.Errorf("WebRTCTransport::SendRtcpPacket: rtcp.Unmarshal err => %v", err) + } + err = c.pc.WriteRTCP(rtcpPacket) + if err != nil { + return 0, fmt.Errorf("WebRTCTransport::SendRtcpPacket: pc.WriteRTCP err => %v", err) + } + + return len(packet), nil +} + func (c *WebRTCTransport) Close() error { if c.closed.Get() { return nil @@ -157,10 +246,9 @@ func (c *WebRTCTransport) Close() error { return c.pc.Close() } -func (c *WebRTCTransport) CreateOffer() (*Desc, error) { - var err error = nil +func (c *WebRTCTransport) AddLocalTracks() error { - c.track, err = webrtc.NewTrackLocalStaticRTP( + audioTrack, err := webrtc.NewTrackLocalStaticRTP( webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypePCMU}, fmt.Sprintf("audio-%d", rand.Uint32()), fmt.Sprintf("rtc-%d", rand.Uint32()), @@ -168,11 +256,42 @@ func (c *WebRTCTransport) CreateOffer() (*Desc, error) { if err != nil { logger.Errorf("NewTrack: panic => %v", err) - return nil, err + return err } - if _, err = c.pc.AddTrack(c.track); err != nil { + if _, err = c.pc.AddTrack(audioTrack); err != nil { logger.Errorf("AddTrack: panic => %v", err) + return err + } + + c.localTracks[TrackTypeAudio] = audioTrack + + videoTrack, err := webrtc.NewTrackLocalStaticRTP( + webrtc.RTPCodecCapability{MimeType: mimeTypeH264}, + fmt.Sprintf("video-%d", rand.Uint32()), + fmt.Sprintf("rtc-%d", rand.Uint32()), + ) + + if err != nil { + logger.Errorf("NewTrack: panic => %v", err) + return err + } + + if _, err = c.pc.AddTrack(videoTrack); err != nil { + logger.Errorf("AddTrack: panic => %v", err) + return err + } + + c.localTracks[TrackTypeVideo] = videoTrack + + return nil +} + +func (c *WebRTCTransport) CreateOffer() (*Desc, error) { + + err := c.AddLocalTracks() + if err != nil { + logger.Errorf("AddLocalTracks: panic => %v", err) return nil, err } @@ -205,39 +324,9 @@ func (c *WebRTCTransport) OnAnswer(answer *Desc) error { func (c *WebRTCTransport) OnOffer(offer *Desc) error { - c.pc.OnTrack(func(track *webrtc.TrackRemote, recevier *webrtc.RTPReceiver) { - buf := make([]byte, 1500) - for { - if c.closed.Get() { - logger.Infof("OnTrack: stop now!") - break - } - // Read - n, _, readErr := track.Read(buf) - if readErr != nil { - logger.Errorf("track.Read: readErr => %v", readErr) - break - } - logger.Infof("OnTrack: read %d bytes", n) - ///TODO: c.stream.OnReadPacket(buf[:n], false) - } - - }) - - var err error = nil - c.track, err = webrtc.NewTrackLocalStaticRTP( - webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypePCMU}, - fmt.Sprintf("audio-%d", rand.Uint32()), - fmt.Sprintf("audio-%d", rand.Uint32()), - ) - + err := c.AddLocalTracks() if err != nil { - logger.Errorf("NewTrack: panic => %v", err) - return err - } - - if _, err = c.pc.AddTrack(c.track); err != nil { - logger.Errorf("AddTrack: panic => %v", err) + logger.Errorf("AddLocalTracks: panic => %v", err) return err } diff --git a/examples/b2bua/b2bua/track.go b/examples/b2bua/b2bua/track.go index 42ed2a3..66134af 100644 --- a/examples/b2bua/b2bua/track.go +++ b/examples/b2bua/b2bua/track.go @@ -22,8 +22,8 @@ type Track interface { PayloadType() int - WriteRtpPacket(packet []byte) error - WriteRtcpPacket(packet []byte) error + WriteRtpPacket(packet []byte) (int, error) + WriteRtcpPacket(packet []byte) (int, error) ReadRtpPacket(func(packet []byte) error) error ReadRtcpPacket(func(packet []byte) error) error diff --git a/examples/b2bua/b2bua/udp.go b/examples/b2bua/b2bua/udp.go index 30477d2..e967117 100644 --- a/examples/b2bua/b2bua/udp.go +++ b/examples/b2bua/b2bua/udp.go @@ -2,8 +2,11 @@ package b2bua import ( "net" + "sync" "time" + "github.com/ghettovoice/gosip/util" + "github.com/pion/rtcp" "github.com/pixelbender/go-sdp/sdp" ) @@ -12,6 +15,10 @@ type UdpTansport struct { ports map[TrackType]*UdpPort localDescription *sdp.Session remoteDescription *sdp.Session + + mu sync.RWMutex + rtpHandler func(trackType TrackType, payload []byte) + rtcpHandler func(trackType TrackType, payload []byte) } func NewUdpTansport(trackInfos []*TrackInfo) *UdpTansport { @@ -23,83 +30,113 @@ func NewUdpTansport(trackInfos []*TrackInfo) *UdpTansport { func (c *UdpTansport) Init(config CallConfig) error { - for _, trackInfo := range c.trackInfos { - udpPort, err := NewUdpPort(trackInfo.TrackType, config.ExternalRtpAddress) - if err != nil { - return err + host := callConfig.ExternalRtpAddress + + if host == "" || host == "0.0.0.0" { + if v, err := util.ResolveSelfIP(); err == nil { + host = v.String() } - udpPort.Init() - udpPort.OnRtpPacketReceived(func(packet []byte, raddr net.Addr) { - c.OnRtpPacketReceived(trackInfo.TrackType, packet, raddr) - }) - udpPort.OnRtcpPacketReceived(func(packet []byte, raddr net.Addr) { - c.OnRtcpPacketReceived(trackInfo.TrackType, packet, raddr) - }) - c.ports[trackInfo.TrackType] = udpPort } c.localDescription = &sdp.Session{ Origin: &sdp.Origin{ Username: "-", - Address: callConfig.ExternalRtpAddress, + Address: host, SessionID: time.Now().UnixNano() / 1e6, SessionVersion: time.Now().UnixNano() / 1e6, }, Timing: &sdp.Timing{Start: time.Time{}, Stop: time.Time{}}, //Name: "Example", Connection: &sdp.Connection{ - Address: callConfig.ExternalRtpAddress, + Address: host, }, //Bandwidth: []*sdp.Bandwidth{{Type: "AS", Value: 117}}, - Media: []*sdp.Media{ - { - //Bandwidth: []*sdp.Bandwidth{{Type: "TIAS", Value: 96000}}, - Connection: []*sdp.Connection{{Address: callConfig.ExternalRtpAddress}}, - Mode: sdp.SendRecv, - Type: "audio", - Port: c.ports[TrackTypeAudio].LocalPort(), - Proto: "RTP/AVP", - Format: []*sdp.Format{ - {Payload: 0, Name: "PCMU", ClockRate: 8000}, - {Payload: 8, Name: "PCMA", ClockRate: 8000}, - //{Payload: 18, Name: "G729", ClockRate: 8000, Params: []string{"annexb=yes"}}, - {Payload: 116, Name: "telephone-event", ClockRate: 8000, Params: []string{"0-16"}}, - }, - }, - { - //Bandwidth: []*sdp.Bandwidth{{Type: "TIAS", Value: 96000}}, - Connection: []*sdp.Connection{{Address: callConfig.ExternalRtpAddress}}, - Mode: sdp.SendRecv, - Type: "video", - Port: c.ports[TrackTypeVideo].LocalPort(), - Proto: "RTP/AVP", - Format: []*sdp.Format{ - {Payload: 96, Name: "H264", ClockRate: 90000, Params: []string{"packetization-mode=1"}}, - }, - }, - }, } + + var medias []*sdp.Media + + for _, trackInfo := range c.trackInfos { + udpPort, err := NewUdpPort(trackInfo.TrackType, config.ExternalRtpAddress) + if err != nil { + return err + } + udpPort.Init() + udpPort.OnRtpPacketReceived(c.onRtpPacket) + udpPort.OnRtcpPacketReceived(c.onRtcpPacket) + c.ports[trackInfo.TrackType] = udpPort + + media := &sdp.Media{} + media.Type = string(trackInfo.TrackType) + media.Port = udpPort.LocalPort() + media.Proto = "RTP/AVP" + media.Mode = sdp.SendRecv + media.Connection = []*sdp.Connection{{Address: host}} + //Bandwidth: []*sdp.Bandwidth{{Type: "TIAS", Value: 96000}}, + + var formats []*sdp.Format + for _, codec := range trackInfo.Codecs { + for _, enabledCodec := range callConfig.Codecs { + if codec.Name == enabledCodec { + formats = append(formats, &sdp.Format{ + Payload: codec.Payload, + Name: codec.Name, + ClockRate: codec.ClockRate, + Params: codec.Params, + }) + } + } + + } + media.Format = formats + medias = append(medias, media) + } + + c.localDescription.Media = medias return nil } -func (c *UdpTansport) OnRtpPacketReceived(trackType TrackType, packet []byte, raddr net.Addr) error { +func (c *UdpTansport) OnRtpPacket(rtpHandler func(trackType TrackType, payload []byte)) { + c.mu.Lock() + defer c.mu.Unlock() + c.rtpHandler = rtpHandler +} + +func (c *UdpTansport) OnRtcpPacket(rtcpHandler func(trackType TrackType, payload []byte)) { + c.mu.Lock() + defer c.mu.Unlock() + c.rtcpHandler = rtcpHandler +} + +func (c *UdpTansport) onRtpPacket(trackType TrackType, packet []byte, raddr net.Addr) error { + logger.Infof("UdpTansport::OnRtpPacketReceived: %v read %d bytes, raddr %v", trackType, len(packet), raddr) + c.mu.RLock() + defer c.mu.RUnlock() + if c.rtpHandler != nil { + c.rtpHandler(trackType, packet) + } return nil } -func (c *UdpTansport) OnRtcpPacketReceived(trackType TrackType, packet []byte, raddr net.Addr) error { +func (c *UdpTansport) onRtcpPacket(trackType TrackType, packet []byte, raddr net.Addr) error { + logger.Infof("UdpTansport::OnRtcpPacketReceived: %v read %d bytes, raddr %v", trackType, len(packet), raddr) + c.mu.RLock() + defer c.mu.RUnlock() + if c.rtcpHandler != nil { + c.rtcpHandler(trackType, packet) + } return nil } -func (c UdpTansport) WriteRtpPacket(trackType TrackType, packet []byte) error { - udpPort := c.ports[trackType] - raddr := udpPort.GetRemoteRtpAddress() - return udpPort.WriteRtpPacket(packet, *raddr) +func (c *UdpTansport) WriteRTP(trackType TrackType, packet []byte) (int, error) { + port := c.ports[trackType] + raddr := port.GetRemoteRtpAddress() + return port.WriteRtpPacket(packet, *raddr) } -func (c UdpTansport) WriteRtcpPacket(trackType TrackType, packet []byte) error { - udpPort := c.ports[trackType] - raddr := udpPort.GetRemoteRtcpAddress() - return udpPort.WriteRtpPacket(packet, *raddr) +func (c *UdpTansport) WriteRTCP(trackType TrackType, packet []byte) (int, error) { + port := c.ports[trackType] + raddr := port.GetRemoteRtcpAddress() + return port.WriteRtcpPacket(packet, *raddr) } func (c *UdpTansport) Type() TransportType { @@ -126,6 +163,24 @@ func (c *UdpTansport) OnAnswer(answer *Desc) error { if err != nil { return err } + /* + =0 + o=100 703 1242 IN IP4 192.168.1.154 + s=Talk + c=IN IP4 192.168.1.154 + t=0 0 + m=audio 40063 RTP/AVP 0 8 116 + a=rtpmap:116 telephone-event/8000 + a=rtcp:49374 + m=video 47878 RTP/AVP 96 + a=rtpmap:96 H264/90000 + a=fmtp:96 profile-level-id=42801F; packetization-mode=1 + a=rtcp:37679 + */ + conn := sess.Connection + if conn != nil { + logger.Infof("remote connection address: %s", conn.Address) + } c.remoteDescription = sess return nil } @@ -146,3 +201,23 @@ func (c *UdpTansport) CreateAnswer() (*Desc, error) { SDP: c.localDescription.String(), }, nil } + +func (c *UdpTansport) RequestKeyFrame(ssrc uint32) error { + go func() { + ticker := time.NewTicker(time.Second * 3) + for range ticker.C { + pli := rtcp.PictureLossIndication{MediaSSRC: uint32(ssrc)} + buf, err := pli.Marshal() + if err != nil { + logger.Error(err) + return + } + _, errSend := c.WriteRTCP(TrackTypeVideo, buf) + if errSend != nil { + logger.Error(errSend) + return + } + } + }() + return nil +} diff --git a/examples/b2bua/b2bua/udp_port.go b/examples/b2bua/b2bua/udp_port.go index 5e44549..48291a7 100644 --- a/examples/b2bua/b2bua/udp_port.go +++ b/examples/b2bua/b2bua/udp_port.go @@ -11,17 +11,17 @@ import ( // UdpPort . type UdpPort struct { - udpConns []*net.UDPConn - closed utils.AtomicBool - ctx context.Context - cancel context.CancelFunc - onRtpPacketReceivedFunc func(packet []byte, raddr net.Addr) - onRtcpPacketReceivedFunc func(packet []byte, raddr net.Addr) - mutex sync.Mutex - trackType TrackType - externalRtpAddress string - rAddr *net.Addr - rRtcpAddr *net.Addr + udpConns []*net.UDPConn + closed utils.AtomicBool + ctx context.Context + cancel context.CancelFunc + onRtpPacketCallback func(trackType TrackType, packet []byte, raddr net.Addr) error + onRtcpPacketCallback func(trackType TrackType, packet []byte, raddr net.Addr) error + mutex sync.Mutex + trackType TrackType + externalRtpAddress string + rAddr *net.Addr + rRtcpAddr *net.Addr } func NewUdpPort(trackType TrackType, externalRtpAddress string) (*UdpPort, error) { @@ -49,25 +49,29 @@ func (c *UdpPort) Init() error { go c.loop(rtpConns[0], func(packet []byte, raddr net.Addr) { c.mutex.Lock() defer c.mutex.Unlock() - if c.onRtpPacketReceivedFunc != nil { - c.onRtpPacketReceivedFunc(packet, raddr) - } c.rAddr = &raddr + if c.onRtpPacketCallback != nil { + c.onRtpPacketCallback(c.trackType, packet, raddr) + } }) go c.loop(rtpConns[1], func(packet []byte, raddr net.Addr) { c.mutex.Lock() defer c.mutex.Unlock() - if c.onRtcpPacketReceivedFunc != nil { - c.onRtcpPacketReceivedFunc(packet, raddr) - } c.rRtcpAddr = &raddr + if c.onRtcpPacketCallback != nil { + c.onRtcpPacketCallback(c.trackType, packet, raddr) + } }) c.udpConns = rtpConns return nil } +func (c *UdpPort) GetTrackType() TrackType { + return c.trackType +} + func (c *UdpPort) LocalPort() int { return c.udpConns[0].LocalAddr().(*net.UDPAddr).Port } @@ -99,38 +103,36 @@ func (c *UdpPort) Close() { } -func (c *UdpPort) OnRtpPacketReceived(callback func(packet []byte, raddr net.Addr)) { +func (c *UdpPort) OnRtpPacketReceived(callback func(trackType TrackType, packet []byte, raddr net.Addr) error) { c.mutex.Lock() defer c.mutex.Unlock() - c.onRtpPacketReceivedFunc = callback + c.onRtpPacketCallback = callback } -func (c *UdpPort) OnRtcpPacketReceived(callback func(packet []byte, raddr net.Addr)) { +func (c *UdpPort) OnRtcpPacketReceived(callback func(trackType TrackType, packet []byte, raddr net.Addr) error) { c.mutex.Lock() defer c.mutex.Unlock() - c.onRtcpPacketReceivedFunc = callback + c.onRtcpPacketCallback = callback } -func (c *UdpPort) WriteRtpPacket(data []byte, raddr net.Addr) error { +func (c *UdpPort) WriteRtpPacket(data []byte, raddr net.Addr) (int, error) { if c.closed.Get() { - return fmt.Errorf("closed") + return 0, fmt.Errorf("closed") } if c.udpConns != nil { - _, err := c.udpConns[0].WriteToUDP(data, raddr.(*net.UDPAddr)) - return err + return c.udpConns[0].WriteToUDP(data, raddr.(*net.UDPAddr)) } - return nil + return 0, fmt.Errorf("udpConns is nil") } -func (c *UdpPort) WriteRtcpPacket(data []byte, raddr net.Addr) error { +func (c *UdpPort) WriteRtcpPacket(data []byte, raddr net.Addr) (int, error) { if c.closed.Get() { - return fmt.Errorf("closed") + return 0, fmt.Errorf("closed") } if c.udpConns != nil { - _, err := c.udpConns[1].WriteToUDP(data, raddr.(*net.UDPAddr)) - return err + return c.udpConns[1].WriteToUDP(data, raddr.(*net.UDPAddr)) } - return nil + return 0, fmt.Errorf("udpConns is nil") } func (c *UdpPort) loop(conn *net.UDPConn, onPacketReceived func(data []byte, raddr net.Addr)) { @@ -145,7 +147,7 @@ func (c *UdpPort) loop(conn *net.UDPConn, onPacketReceived func(data []byte, rad logger.Infof("RTP Conn [%v] refused, stop now!", raddr) return } - logger.Debugf("raddr: %v, size %d", raddr, n) + //logger.Infof("raddr: %v, size %d", raddr, n) onPacketReceived(buf[:n], raddr) } } From 9d0f24f941980e252cdea34fc9e4ee9d10bd24ab Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Sun, 2 Apr 2023 14:37:33 +0800 Subject: [PATCH 04/36] update. --- go.mod | 12 +- go.sum | 1022 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 955 insertions(+), 79 deletions(-) diff --git a/go.mod b/go.mod index 6481014..ad3473f 100644 --- a/go.mod +++ b/go.mod @@ -3,21 +3,17 @@ module github.com/cloudwebrtc/go-sip-ua go 1.13 require ( - cloud.google.com/go/firestore v1.5.0 // indirect firebase.google.com/go v3.13.0+incompatible github.com/c-bata/go-prompt v0.2.6 - github.com/ghettovoice/gosip v0.0.0-20230130140202-1060e22fde79 + github.com/ghettovoice/gosip v0.0.0-20230322091832-d77de1c97f89 github.com/google/uuid v1.3.0 - github.com/kr/pretty v0.2.0 // indirect - github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect - github.com/onsi/gomega v1.27.2 // indirect github.com/pion/interceptor v0.1.12 github.com/pion/rtcp v1.2.10 github.com/pion/webrtc/v3 v3.1.59 github.com/pixelbender/go-sdp v1.1.0 - github.com/sirupsen/logrus v1.8.1 + github.com/sirupsen/logrus v1.9.0 github.com/tevino/abool v1.2.0 github.com/x-cray/logrus-prefixed-formatter v0.5.2 - golang.org/x/crypto v0.6.0 - google.golang.org/api v0.43.0 + golang.org/x/crypto v0.7.0 + google.golang.org/api v0.114.0 ) diff --git a/go.sum b/go.sum index e326a9e..e767d73 100644 --- a/go.sum +++ b/go.sum @@ -3,6 +3,7 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= @@ -17,36 +18,539 @@ cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKP cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= -cloud.google.com/go v0.79.0 h1:oqqswrt4x6b9OGBnNqdssxBl1xf0rSUNjU2BR4BZar0= cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= +cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= +cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= +cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= +cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= +cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= +cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= +cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= +cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= +cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= +cloud.google.com/go v0.100.1/go.mod h1:fs4QogzfH5n2pBXBP9vRiU+eCny7lD2vmFZy79Iuw1U= +cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= +cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= +cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= +cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= +cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM= +cloud.google.com/go v0.107.0/go.mod h1:wpc2eNrD7hXUTy8EKS10jkxpZBjASrORK7goS+3YX2I= +cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys= +cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY= +cloud.google.com/go/accessapproval v1.4.0/go.mod h1:zybIuC3KpDOvotz59lFe5qxRZx6C75OtwbisN56xYB4= +cloud.google.com/go/accessapproval v1.5.0/go.mod h1:HFy3tuiGvMdcd/u+Cu5b9NkO1pEICJ46IR82PoUdplw= +cloud.google.com/go/accessapproval v1.6.0/go.mod h1:R0EiYnwV5fsRFiKZkPHr6mwyk2wxUJ30nL4j2pcFY2E= +cloud.google.com/go/accesscontextmanager v1.3.0/go.mod h1:TgCBehyr5gNMz7ZaH9xubp+CE8dkrszb4oK9CWyvD4o= +cloud.google.com/go/accesscontextmanager v1.4.0/go.mod h1:/Kjh7BBu/Gh83sv+K60vN9QE5NJcd80sU33vIe2IFPE= +cloud.google.com/go/accesscontextmanager v1.6.0/go.mod h1:8XCvZWfYw3K/ji0iVnp+6pu7huxoQTLmxAbVjbloTtM= +cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= +cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= +cloud.google.com/go/aiplatform v1.27.0/go.mod h1:Bvxqtl40l0WImSb04d0hXFU7gDOiq9jQmorivIiWcKg= +cloud.google.com/go/aiplatform v1.35.0/go.mod h1:7MFT/vCaOyZT/4IIFfxH4ErVg/4ku6lKv3w0+tFTgXQ= +cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= +cloud.google.com/go/analytics v0.12.0/go.mod h1:gkfj9h6XRf9+TS4bmuhPEShsh3hH8PAZzm/41OOhQd4= +cloud.google.com/go/analytics v0.17.0/go.mod h1:WXFa3WSym4IZ+JiKmavYdJwGG/CvpqiqczmL59bTD9M= +cloud.google.com/go/analytics v0.18.0/go.mod h1:ZkeHGQlcIPkw0R/GW+boWHhCOR43xz9RN/jn7WcqfIE= +cloud.google.com/go/apigateway v1.3.0/go.mod h1:89Z8Bhpmxu6AmUxuVRg/ECRGReEdiP3vQtk4Z1J9rJk= +cloud.google.com/go/apigateway v1.4.0/go.mod h1:pHVY9MKGaH9PQ3pJ4YLzoj6U5FUDeDFBllIz7WmzJoc= +cloud.google.com/go/apigateway v1.5.0/go.mod h1:GpnZR3Q4rR7LVu5951qfXPJCHquZt02jf7xQx7kpqN8= +cloud.google.com/go/apigeeconnect v1.3.0/go.mod h1:G/AwXFAKo0gIXkPTVfZDd2qA1TxBXJ3MgMRBQkIi9jc= +cloud.google.com/go/apigeeconnect v1.4.0/go.mod h1:kV4NwOKqjvt2JYR0AoIWo2QGfoRtn/pkS3QlHp0Ni04= +cloud.google.com/go/apigeeconnect v1.5.0/go.mod h1:KFaCqvBRU6idyhSNyn3vlHXc8VMDJdRmwDF6JyFRqZ8= +cloud.google.com/go/apigeeregistry v0.4.0/go.mod h1:EUG4PGcsZvxOXAdyEghIdXwAEi/4MEaoqLMLDMIwKXY= +cloud.google.com/go/apigeeregistry v0.5.0/go.mod h1:YR5+s0BVNZfVOUkMa5pAR2xGd0A473vA5M7j247o1wM= +cloud.google.com/go/apikeys v0.4.0/go.mod h1:XATS/yqZbaBK0HOssf+ALHp8jAlNHUgyfprvNcBIszU= +cloud.google.com/go/apikeys v0.5.0/go.mod h1:5aQfwY4D+ewMMWScd3hm2en3hCj+BROlyrt3ytS7KLI= +cloud.google.com/go/appengine v1.4.0/go.mod h1:CS2NhuBuDXM9f+qscZ6V86m1MIIqPj3WC/UoEuR1Sno= +cloud.google.com/go/appengine v1.5.0/go.mod h1:TfasSozdkFI0zeoxW3PTBLiNqRmzraodCWatWI9Dmak= +cloud.google.com/go/appengine v1.6.0/go.mod h1:hg6i0J/BD2cKmDJbaFSYHFyZkgBEfQrDg/X0V5fJn84= +cloud.google.com/go/area120 v0.5.0/go.mod h1:DE/n4mp+iqVyvxHN41Vf1CR602GiHQjFPusMFW6bGR4= +cloud.google.com/go/area120 v0.6.0/go.mod h1:39yFJqWVgm0UZqWTOdqkLhjoC7uFfgXRC8g/ZegeAh0= +cloud.google.com/go/area120 v0.7.0/go.mod h1:a3+8EUD1SX5RUcCs3MY5YasiO1z6yLiNLRiFrykbynY= +cloud.google.com/go/area120 v0.7.1/go.mod h1:j84i4E1RboTWjKtZVWXPqvK5VHQFJRF2c1Nm69pWm9k= +cloud.google.com/go/artifactregistry v1.6.0/go.mod h1:IYt0oBPSAGYj/kprzsBjZ/4LnG/zOcHyFHjWPCi6SAQ= +cloud.google.com/go/artifactregistry v1.7.0/go.mod h1:mqTOFOnGZx8EtSqK/ZWcsm/4U8B77rbcLP6ruDU2Ixk= +cloud.google.com/go/artifactregistry v1.8.0/go.mod h1:w3GQXkJX8hiKN0v+at4b0qotwijQbYUqF2GWkZzAhC0= +cloud.google.com/go/artifactregistry v1.9.0/go.mod h1:2K2RqvA2CYvAeARHRkLDhMDJ3OXy26h3XW+3/Jh2uYc= +cloud.google.com/go/artifactregistry v1.11.1/go.mod h1:lLYghw+Itq9SONbCa1YWBoWs1nOucMH0pwXN1rOBZFI= +cloud.google.com/go/artifactregistry v1.11.2/go.mod h1:nLZns771ZGAwVLzTX/7Al6R9ehma4WUEhZGWV6CeQNQ= +cloud.google.com/go/asset v1.5.0/go.mod h1:5mfs8UvcM5wHhqtSv8J1CtxxaQq3AdBxxQi2jGW/K4o= +cloud.google.com/go/asset v1.7.0/go.mod h1:YbENsRK4+xTiL+Ofoj5Ckf+O17kJtgp3Y3nn4uzZz5s= +cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjbytpUaW0= +cloud.google.com/go/asset v1.9.0/go.mod h1:83MOE6jEJBMqFKadM9NLRcs80Gdw76qGuHn8m3h8oHQ= +cloud.google.com/go/asset v1.10.0/go.mod h1:pLz7uokL80qKhzKr4xXGvBQXnzHn5evJAEAtZiIb0wY= +cloud.google.com/go/asset v1.11.1/go.mod h1:fSwLhbRvC9p9CXQHJ3BgFeQNM4c9x10lqlrdEUYXlJo= +cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY= +cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw= +cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI= +cloud.google.com/go/assuredworkloads v1.8.0/go.mod h1:AsX2cqyNCOvEQC8RMPnoc0yEarXQk6WEKkxYfL6kGIo= +cloud.google.com/go/assuredworkloads v1.9.0/go.mod h1:kFuI1P78bplYtT77Tb1hi0FMxM0vVpRC7VVoJC3ZoT0= +cloud.google.com/go/assuredworkloads v1.10.0/go.mod h1:kwdUQuXcedVdsIaKgKTp9t0UJkE5+PAVNhdQm4ZVq2E= +cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= +cloud.google.com/go/automl v1.6.0/go.mod h1:ugf8a6Fx+zP0D59WLhqgTDsQI9w07o64uf/Is3Nh5p8= +cloud.google.com/go/automl v1.7.0/go.mod h1:RL9MYCCsJEOmt0Wf3z9uzG0a7adTT1fe+aObgSpkCt8= +cloud.google.com/go/automl v1.8.0/go.mod h1:xWx7G/aPEe/NP+qzYXktoBSDfjO+vnKMGgsApGJJquM= +cloud.google.com/go/automl v1.12.0/go.mod h1:tWDcHDp86aMIuHmyvjuKeeHEGq76lD7ZqfGLN6B0NuU= +cloud.google.com/go/baremetalsolution v0.3.0/go.mod h1:XOrocE+pvK1xFfleEnShBlNAXf+j5blPPxrhjKgnIFc= +cloud.google.com/go/baremetalsolution v0.4.0/go.mod h1:BymplhAadOO/eBa7KewQ0Ppg4A4Wplbn+PsFKRLo0uI= +cloud.google.com/go/baremetalsolution v0.5.0/go.mod h1:dXGxEkmR9BMwxhzBhV0AioD0ULBmuLZI8CdwalUxuss= +cloud.google.com/go/batch v0.3.0/go.mod h1:TR18ZoAekj1GuirsUsR1ZTKN3FC/4UDnScjT8NXImFE= +cloud.google.com/go/batch v0.4.0/go.mod h1:WZkHnP43R/QCGQsZ+0JyG4i79ranE2u8xvjq/9+STPE= +cloud.google.com/go/batch v0.7.0/go.mod h1:vLZN95s6teRUqRQ4s3RLDsH8PvboqBK+rn1oevL159g= +cloud.google.com/go/beyondcorp v0.2.0/go.mod h1:TB7Bd+EEtcw9PCPQhCJtJGjk/7TC6ckmnSFS+xwTfm4= +cloud.google.com/go/beyondcorp v0.3.0/go.mod h1:E5U5lcrcXMsCuoDNyGrpyTm/hn7ne941Jz2vmksAxW8= +cloud.google.com/go/beyondcorp v0.4.0/go.mod h1:3ApA0mbhHx6YImmuubf5pyW8srKnCEPON32/5hj+RmM= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/bigquery v1.42.0/go.mod h1:8dRTJxhtG+vwBKzE5OseQn/hiydoQN3EedCaOdYmxRA= +cloud.google.com/go/bigquery v1.43.0/go.mod h1:ZMQcXHsl+xmU1z36G2jNGZmKp9zNY5BUua5wDgmNCfw= +cloud.google.com/go/bigquery v1.44.0/go.mod h1:0Y33VqXTEsbamHJvJHdFmtqHvMIY28aK1+dFsvaChGc= +cloud.google.com/go/bigquery v1.47.0/go.mod h1:sA9XOgy0A8vQK9+MWhEQTY6Tix87M/ZurWFIxmF9I/E= +cloud.google.com/go/bigquery v1.48.0/go.mod h1:QAwSz+ipNgfL5jxiaK7weyOhzdoAy1zFm0Nf1fysJac= +cloud.google.com/go/billing v1.4.0/go.mod h1:g9IdKBEFlItS8bTtlrZdVLWSSdSyFUZKXNS02zKMOZY= +cloud.google.com/go/billing v1.5.0/go.mod h1:mztb1tBc3QekhjSgmpf/CV4LzWXLzCArwpLmP2Gm88s= +cloud.google.com/go/billing v1.6.0/go.mod h1:WoXzguj+BeHXPbKfNWkqVtDdzORazmCjraY+vrxcyvI= +cloud.google.com/go/billing v1.7.0/go.mod h1:q457N3Hbj9lYwwRbnlD7vUpyjq6u5U1RAOArInEiD5Y= +cloud.google.com/go/billing v1.12.0/go.mod h1:yKrZio/eu+okO/2McZEbch17O5CB5NpZhhXG6Z766ss= +cloud.google.com/go/binaryauthorization v1.1.0/go.mod h1:xwnoWu3Y84jbuHa0zd526MJYmtnVXn0syOjaJgy4+dM= +cloud.google.com/go/binaryauthorization v1.2.0/go.mod h1:86WKkJHtRcv5ViNABtYMhhNWRrD1Vpi//uKEy7aYEfI= +cloud.google.com/go/binaryauthorization v1.3.0/go.mod h1:lRZbKgjDIIQvzYQS1p99A7/U1JqvqeZg0wiI5tp6tg0= +cloud.google.com/go/binaryauthorization v1.4.0/go.mod h1:tsSPQrBd77VLplV70GUhBf/Zm3FsKmgSqgm4UmiDItk= +cloud.google.com/go/binaryauthorization v1.5.0/go.mod h1:OSe4OU1nN/VswXKRBmciKpo9LulY41gch5c68htf3/Q= +cloud.google.com/go/certificatemanager v1.3.0/go.mod h1:n6twGDvcUBFu9uBgt4eYvvf3sQ6My8jADcOVwHmzadg= +cloud.google.com/go/certificatemanager v1.4.0/go.mod h1:vowpercVFyqs8ABSmrdV+GiFf2H/ch3KyudYQEMM590= +cloud.google.com/go/certificatemanager v1.6.0/go.mod h1:3Hh64rCKjRAX8dXgRAyOcY5vQ/fE1sh8o+Mdd6KPgY8= +cloud.google.com/go/channel v1.8.0/go.mod h1:W5SwCXDJsq/rg3tn3oG0LOxpAo6IMxNa09ngphpSlnk= +cloud.google.com/go/channel v1.9.0/go.mod h1:jcu05W0my9Vx4mt3/rEHpfxc9eKi9XwsdDL8yBMbKUk= +cloud.google.com/go/channel v1.11.0/go.mod h1:IdtI0uWGqhEeatSB62VOoJ8FSUhJ9/+iGkJVqp74CGE= +cloud.google.com/go/cloudbuild v1.3.0/go.mod h1:WequR4ULxlqvMsjDEEEFnOG5ZSRSgWOywXYDb1vPE6U= +cloud.google.com/go/cloudbuild v1.4.0/go.mod h1:5Qwa40LHiOXmz3386FrjrYM93rM/hdRr7b53sySrTqA= +cloud.google.com/go/cloudbuild v1.6.0/go.mod h1:UIbc/w9QCbH12xX+ezUsgblrWv+Cv4Tw83GiSMHOn9M= +cloud.google.com/go/cloudbuild v1.7.0/go.mod h1:zb5tWh2XI6lR9zQmsm1VRA+7OCuve5d8S+zJUul8KTg= +cloud.google.com/go/clouddms v1.3.0/go.mod h1:oK6XsCDdW4Ib3jCCBugx+gVjevp2TMXFtgxvPSee3OM= +cloud.google.com/go/clouddms v1.4.0/go.mod h1:Eh7sUGCC+aKry14O1NRljhjyrr0NFC0G2cjwX0cByRk= +cloud.google.com/go/clouddms v1.5.0/go.mod h1:QSxQnhikCLUw13iAbffF2CZxAER3xDGNHjsTAkQJcQA= +cloud.google.com/go/cloudtasks v1.5.0/go.mod h1:fD92REy1x5woxkKEkLdvavGnPJGEn8Uic9nWuLzqCpY= +cloud.google.com/go/cloudtasks v1.6.0/go.mod h1:C6Io+sxuke9/KNRkbQpihnW93SWDU3uXt92nu85HkYI= +cloud.google.com/go/cloudtasks v1.7.0/go.mod h1:ImsfdYWwlWNJbdgPIIGJWC+gemEGTBK/SunNQQNCAb4= +cloud.google.com/go/cloudtasks v1.8.0/go.mod h1:gQXUIwCSOI4yPVK7DgTVFiiP0ZW/eQkydWzwVMdHxrI= +cloud.google.com/go/cloudtasks v1.9.0/go.mod h1:w+EyLsVkLWHcOaqNEyvcKAsWp9p29dL6uL9Nst1cI7Y= +cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow= +cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= +cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= +cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s= +cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= +cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= +cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU= +cloud.google.com/go/compute v1.12.0/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU= +cloud.google.com/go/compute v1.12.1/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU= +cloud.google.com/go/compute v1.13.0/go.mod h1:5aPTS0cUNMIc1CE546K+Th6weJUNQErARyZtRXDJ8GE= +cloud.google.com/go/compute v1.14.0/go.mod h1:YfLtxrj9sU4Yxv+sXzZkyPjEyPBZfXHUvjxega5vAdo= +cloud.google.com/go/compute v1.15.1/go.mod h1:bjjoF/NtFUrkD/urWfdHaKuOPDR5nWIs63rR+SXhcpA= +cloud.google.com/go/compute v1.18.0 h1:FEigFqoDbys2cvFkZ9Fjq4gnHBP55anJ0yQyau2f9oY= +cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOVXvgU0yacs= +cloud.google.com/go/compute/metadata v0.1.0/go.mod h1:Z1VN+bulIf6bt4P/C37K4DyZYZEXYonfTBHHFPO/4UU= +cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= +cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM= +cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= +cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= +cloud.google.com/go/contactcenterinsights v1.3.0/go.mod h1:Eu2oemoePuEFc/xKFPjbTuPSj0fYJcPls9TFlPNnHHY= +cloud.google.com/go/contactcenterinsights v1.4.0/go.mod h1:L2YzkGbPsv+vMQMCADxJoT9YiTTnSEd6fEvCeHTYVck= +cloud.google.com/go/contactcenterinsights v1.6.0/go.mod h1:IIDlT6CLcDoyv79kDv8iWxMSTZhLxSCofVV5W6YFM/w= +cloud.google.com/go/container v1.6.0/go.mod h1:Xazp7GjJSeUYo688S+6J5V+n/t+G5sKBTFkKNudGRxg= +cloud.google.com/go/container v1.7.0/go.mod h1:Dp5AHtmothHGX3DwwIHPgq45Y8KmNsgN3amoYfxVkLo= +cloud.google.com/go/container v1.13.1/go.mod h1:6wgbMPeQRw9rSnKBCAJXnds3Pzj03C4JHamr8asWKy4= +cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= +cloud.google.com/go/containeranalysis v0.6.0/go.mod h1:HEJoiEIu+lEXM+k7+qLCci0h33lX3ZqoYFdmPcoO7s4= +cloud.google.com/go/containeranalysis v0.7.0/go.mod h1:9aUL+/vZ55P2CXfuZjS4UjQ9AgXoSw8Ts6lemfmxBxI= +cloud.google.com/go/datacatalog v1.3.0/go.mod h1:g9svFY6tuR+j+hrTw3J2dNcmI0dzmSiyOzm8kpLq0a0= +cloud.google.com/go/datacatalog v1.5.0/go.mod h1:M7GPLNQeLfWqeIm3iuiruhPzkt65+Bx8dAKvScX8jvs= +cloud.google.com/go/datacatalog v1.6.0/go.mod h1:+aEyF8JKg+uXcIdAmmaMUmZ3q1b/lKLtXCmXdnc0lbc= +cloud.google.com/go/datacatalog v1.7.0/go.mod h1:9mEl4AuDYWw81UGc41HonIHH7/sn52H0/tc8f8ZbZIE= +cloud.google.com/go/datacatalog v1.8.0/go.mod h1:KYuoVOv9BM8EYz/4eMFxrr4DUKhGIOXxZoKYF5wdISM= +cloud.google.com/go/datacatalog v1.8.1/go.mod h1:RJ58z4rMp3gvETA465Vg+ag8BGgBdnRPEMMSTr5Uv+M= +cloud.google.com/go/datacatalog v1.12.0/go.mod h1:CWae8rFkfp6LzLumKOnmVh4+Zle4A3NXLzVJ1d1mRm0= +cloud.google.com/go/dataflow v0.6.0/go.mod h1:9QwV89cGoxjjSR9/r7eFDqqjtvbKxAK2BaYU6PVk9UM= +cloud.google.com/go/dataflow v0.7.0/go.mod h1:PX526vb4ijFMesO1o202EaUmouZKBpjHsTlCtB4parQ= +cloud.google.com/go/dataflow v0.8.0/go.mod h1:Rcf5YgTKPtQyYz8bLYhFoIV/vP39eL7fWNcSOyFfLJE= +cloud.google.com/go/dataform v0.3.0/go.mod h1:cj8uNliRlHpa6L3yVhDOBrUXH+BPAO1+KFMQQNSThKo= +cloud.google.com/go/dataform v0.4.0/go.mod h1:fwV6Y4Ty2yIFL89huYlEkwUPtS7YZinZbzzj5S9FzCE= +cloud.google.com/go/dataform v0.5.0/go.mod h1:GFUYRe8IBa2hcomWplodVmUx/iTL0FrsauObOM3Ipr0= +cloud.google.com/go/dataform v0.6.0/go.mod h1:QPflImQy33e29VuapFdf19oPbE4aYTJxr31OAPV+ulA= +cloud.google.com/go/datafusion v1.4.0/go.mod h1:1Zb6VN+W6ALo85cXnM1IKiPw+yQMKMhB9TsTSRDo/38= +cloud.google.com/go/datafusion v1.5.0/go.mod h1:Kz+l1FGHB0J+4XF2fud96WMmRiq/wj8N9u007vyXZ2w= +cloud.google.com/go/datafusion v1.6.0/go.mod h1:WBsMF8F1RhSXvVM8rCV3AeyWVxcC2xY6vith3iw3S+8= +cloud.google.com/go/datalabeling v0.5.0/go.mod h1:TGcJ0G2NzcsXSE/97yWjIZO0bXj0KbVlINXMG9ud42I= +cloud.google.com/go/datalabeling v0.6.0/go.mod h1:WqdISuk/+WIGeMkpw/1q7bK/tFEZxsrFJOJdY2bXvTQ= +cloud.google.com/go/datalabeling v0.7.0/go.mod h1:WPQb1y08RJbmpM3ww0CSUAGweL0SxByuW2E+FU+wXcM= +cloud.google.com/go/dataplex v1.3.0/go.mod h1:hQuRtDg+fCiFgC8j0zV222HvzFQdRd+SVX8gdmFcZzA= +cloud.google.com/go/dataplex v1.4.0/go.mod h1:X51GfLXEMVJ6UN47ESVqvlsRplbLhcsAt0kZCCKsU0A= +cloud.google.com/go/dataplex v1.5.2/go.mod h1:cVMgQHsmfRoI5KFYq4JtIBEUbYwc3c7tXmIDhRmNNVQ= +cloud.google.com/go/dataproc v1.7.0/go.mod h1:CKAlMjII9H90RXaMpSxQ8EU6dQx6iAYNPcYPOkSbi8s= +cloud.google.com/go/dataproc v1.8.0/go.mod h1:5OW+zNAH0pMpw14JVrPONsxMQYMBqJuzORhIBfBn9uI= +cloud.google.com/go/dataproc v1.12.0/go.mod h1:zrF3aX0uV3ikkMz6z4uBbIKyhRITnxvr4i3IjKsKrw4= +cloud.google.com/go/dataqna v0.5.0/go.mod h1:90Hyk596ft3zUQ8NkFfvICSIfHFh1Bc7C4cK3vbhkeo= +cloud.google.com/go/dataqna v0.6.0/go.mod h1:1lqNpM7rqNLVgWBJyk5NF6Uen2PHym0jtVJonplVsDA= +cloud.google.com/go/dataqna v0.7.0/go.mod h1:Lx9OcIIeqCrw1a6KdO3/5KMP1wAmTc0slZWwP12Qq3c= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.5.0 h1:4qNItsmc4GP6UOZPGemmHY4ZfPofVhcaKXsYw9wm9oA= -cloud.google.com/go/firestore v1.5.0/go.mod h1:c4nNYR1qdq7eaZ+jSc5fonrQN2k3M7sWATcYTiakjEo= +cloud.google.com/go/datastore v1.10.0/go.mod h1:PC5UzAmDEkAmkfaknstTYbNpgE49HAgW2J1gcgUfmdM= +cloud.google.com/go/datastream v1.2.0/go.mod h1:i/uTP8/fZwgATHS/XFu0TcNUhuA0twZxxQ3EyCUQMwo= +cloud.google.com/go/datastream v1.3.0/go.mod h1:cqlOX8xlyYF/uxhiKn6Hbv6WjwPPuI9W2M9SAXwaLLQ= +cloud.google.com/go/datastream v1.4.0/go.mod h1:h9dpzScPhDTs5noEMQVWP8Wx8AFBRyS0s8KWPx/9r0g= +cloud.google.com/go/datastream v1.5.0/go.mod h1:6TZMMNPwjUqZHBKPQ1wwXpb0d5VDVPl2/XoS5yi88q4= +cloud.google.com/go/datastream v1.6.0/go.mod h1:6LQSuswqLa7S4rPAOZFVjHIG3wJIjZcZrw8JDEDJuIs= +cloud.google.com/go/deploy v1.4.0/go.mod h1:5Xghikd4VrmMLNaF6FiRFDlHb59VM59YoDQnOUdsH/c= +cloud.google.com/go/deploy v1.5.0/go.mod h1:ffgdD0B89tToyW/U/D2eL0jN2+IEV/3EMuXHA0l4r+s= +cloud.google.com/go/deploy v1.6.0/go.mod h1:f9PTHehG/DjCom3QH0cntOVRm93uGBDt2vKzAPwpXQI= +cloud.google.com/go/dialogflow v1.15.0/go.mod h1:HbHDWs33WOGJgn6rfzBW1Kv807BE3O1+xGbn59zZWI4= +cloud.google.com/go/dialogflow v1.16.1/go.mod h1:po6LlzGfK+smoSmTBnbkIZY2w8ffjz/RcGSS+sh1el0= +cloud.google.com/go/dialogflow v1.17.0/go.mod h1:YNP09C/kXA1aZdBgC/VtXX74G/TKn7XVCcVumTflA+8= +cloud.google.com/go/dialogflow v1.18.0/go.mod h1:trO7Zu5YdyEuR+BhSNOqJezyFQ3aUzz0njv7sMx/iek= +cloud.google.com/go/dialogflow v1.19.0/go.mod h1:JVmlG1TwykZDtxtTXujec4tQ+D8SBFMoosgy+6Gn0s0= +cloud.google.com/go/dialogflow v1.29.0/go.mod h1:b+2bzMe+k1s9V+F2jbJwpHPzrnIyHihAdRFMtn2WXuM= +cloud.google.com/go/dialogflow v1.31.0/go.mod h1:cuoUccuL1Z+HADhyIA7dci3N5zUssgpBJmCzI6fNRB4= +cloud.google.com/go/dlp v1.6.0/go.mod h1:9eyB2xIhpU0sVwUixfBubDoRwP+GjeUoxxeueZmqvmM= +cloud.google.com/go/dlp v1.7.0/go.mod h1:68ak9vCiMBjbasxeVD17hVPxDEck+ExiHavX8kiHG+Q= +cloud.google.com/go/dlp v1.9.0/go.mod h1:qdgmqgTyReTz5/YNSSuueR8pl7hO0o9bQ39ZhtgkWp4= +cloud.google.com/go/documentai v1.7.0/go.mod h1:lJvftZB5NRiFSX4moiye1SMxHx0Bc3x1+p9e/RfXYiU= +cloud.google.com/go/documentai v1.8.0/go.mod h1:xGHNEB7CtsnySCNrCFdCyyMz44RhFEEX2Q7UD0c5IhU= +cloud.google.com/go/documentai v1.9.0/go.mod h1:FS5485S8R00U10GhgBC0aNGrJxBP8ZVpEeJ7PQDZd6k= +cloud.google.com/go/documentai v1.10.0/go.mod h1:vod47hKQIPeCfN2QS/jULIvQTugbmdc0ZvxxfQY1bg4= +cloud.google.com/go/documentai v1.16.0/go.mod h1:o0o0DLTEZ+YnJZ+J4wNfTxmDVyrkzFvttBXXtYRMHkM= +cloud.google.com/go/domains v0.6.0/go.mod h1:T9Rz3GasrpYk6mEGHh4rymIhjlnIuB4ofT1wTxDeT4Y= +cloud.google.com/go/domains v0.7.0/go.mod h1:PtZeqS1xjnXuRPKE/88Iru/LdfoRyEHYA9nFQf4UKpg= +cloud.google.com/go/domains v0.8.0/go.mod h1:M9i3MMDzGFXsydri9/vW+EWz9sWb4I6WyHqdlAk0idE= +cloud.google.com/go/edgecontainer v0.1.0/go.mod h1:WgkZ9tp10bFxqO8BLPqv2LlfmQF1X8lZqwW4r1BTajk= +cloud.google.com/go/edgecontainer v0.2.0/go.mod h1:RTmLijy+lGpQ7BXuTDa4C4ssxyXT34NIuHIgKuP4s5w= +cloud.google.com/go/edgecontainer v0.3.0/go.mod h1:FLDpP4nykgwwIfcLt6zInhprzw0lEi2P1fjO6Ie0qbc= +cloud.google.com/go/errorreporting v0.3.0/go.mod h1:xsP2yaAp+OAW4OIm60An2bbLpqIhKXdWR/tawvl7QzU= +cloud.google.com/go/essentialcontacts v1.3.0/go.mod h1:r+OnHa5jfj90qIfZDO/VztSFqbQan7HV75p8sA+mdGI= +cloud.google.com/go/essentialcontacts v1.4.0/go.mod h1:8tRldvHYsmnBCHdFpvU+GL75oWiBKl80BiqlFh9tp+8= +cloud.google.com/go/essentialcontacts v1.5.0/go.mod h1:ay29Z4zODTuwliK7SnX8E86aUF2CTzdNtvv42niCX0M= +cloud.google.com/go/eventarc v1.7.0/go.mod h1:6ctpF3zTnaQCxUjHUdcfgcA1A2T309+omHZth7gDfmc= +cloud.google.com/go/eventarc v1.8.0/go.mod h1:imbzxkyAU4ubfsaKYdQg04WS1NvncblHEup4kvF+4gw= +cloud.google.com/go/eventarc v1.10.0/go.mod h1:u3R35tmZ9HvswGRBnF48IlYgYeBcPUCjkr4BTdem2Kw= +cloud.google.com/go/filestore v1.3.0/go.mod h1:+qbvHGvXU1HaKX2nD0WEPo92TP/8AQuCVEBXNY9z0+w= +cloud.google.com/go/filestore v1.4.0/go.mod h1:PaG5oDfo9r224f8OYXURtAsY+Fbyq/bLYoINEK8XQAI= +cloud.google.com/go/filestore v1.5.0/go.mod h1:FqBXDWBp4YLHqRnVGveOkHDf8svj9r5+mUDLupOWEDs= +cloud.google.com/go/firestore v1.9.0 h1:IBlRyxgGySXu5VuW0RgGFlTtLukSnNkpDiEOMkQkmpA= +cloud.google.com/go/firestore v1.9.0/go.mod h1:HMkjKHNTtRyZNiMzu7YAsLr9K3X2udY2AMwDaMEQiiE= +cloud.google.com/go/functions v1.6.0/go.mod h1:3H1UA3qiIPRWD7PeZKLvHZ9SaQhR26XIJcC0A5GbvAk= +cloud.google.com/go/functions v1.7.0/go.mod h1:+d+QBcWM+RsrgZfV9xo6KfA1GlzJfxcfZcRPEhDDfzg= +cloud.google.com/go/functions v1.8.0/go.mod h1:RTZ4/HsQjIqIYP9a9YPbU+QFoQsAlYgrwOXJWHn1POY= +cloud.google.com/go/functions v1.9.0/go.mod h1:Y+Dz8yGguzO3PpIjhLTbnqV1CWmgQ5UwtlpzoyquQ08= +cloud.google.com/go/functions v1.10.0/go.mod h1:0D3hEOe3DbEvCXtYOZHQZmD+SzYsi1YbI7dGvHfldXw= +cloud.google.com/go/gaming v1.5.0/go.mod h1:ol7rGcxP/qHTRQE/RO4bxkXq+Fix0j6D4LFPzYTIrDM= +cloud.google.com/go/gaming v1.6.0/go.mod h1:YMU1GEvA39Qt3zWGyAVA9bpYz/yAhTvaQ1t2sK4KPUA= +cloud.google.com/go/gaming v1.7.0/go.mod h1:LrB8U7MHdGgFG851iHAfqUdLcKBdQ55hzXy9xBJz0+w= +cloud.google.com/go/gaming v1.8.0/go.mod h1:xAqjS8b7jAVW0KFYeRUxngo9My3f33kFmua++Pi+ggM= +cloud.google.com/go/gaming v1.9.0/go.mod h1:Fc7kEmCObylSWLO334NcO+O9QMDyz+TKC4v1D7X+Bc0= +cloud.google.com/go/gkebackup v0.2.0/go.mod h1:XKvv/4LfG829/B8B7xRkk8zRrOEbKtEam6yNfuQNH60= +cloud.google.com/go/gkebackup v0.3.0/go.mod h1:n/E671i1aOQvUxT541aTkCwExO/bTer2HDlj4TsBRAo= +cloud.google.com/go/gkebackup v0.4.0/go.mod h1:byAyBGUwYGEEww7xsbnUTBHIYcOPy/PgUWUtOeRm9Vg= +cloud.google.com/go/gkeconnect v0.5.0/go.mod h1:c5lsNAg5EwAy7fkqX/+goqFsU1Da/jQFqArp+wGNr/o= +cloud.google.com/go/gkeconnect v0.6.0/go.mod h1:Mln67KyU/sHJEBY8kFZ0xTeyPtzbq9StAVvEULYK16A= +cloud.google.com/go/gkeconnect v0.7.0/go.mod h1:SNfmVqPkaEi3bF/B3CNZOAYPYdg7sU+obZ+QTky2Myw= +cloud.google.com/go/gkehub v0.9.0/go.mod h1:WYHN6WG8w9bXU0hqNxt8rm5uxnk8IH+lPY9J2TV7BK0= +cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y977wO+hBH0= +cloud.google.com/go/gkehub v0.11.0/go.mod h1:JOWHlmN+GHyIbuWQPl47/C2RFhnFKH38jH9Ascu3n0E= +cloud.google.com/go/gkemulticloud v0.3.0/go.mod h1:7orzy7O0S+5kq95e4Hpn7RysVA7dPs8W/GgfUtsPbrA= +cloud.google.com/go/gkemulticloud v0.4.0/go.mod h1:E9gxVBnseLWCk24ch+P9+B2CoDFJZTyIgLKSalC7tuI= +cloud.google.com/go/gkemulticloud v0.5.0/go.mod h1:W0JDkiyi3Tqh0TJr//y19wyb1yf8llHVto2Htf2Ja3Y= +cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc= +cloud.google.com/go/gsuiteaddons v1.3.0/go.mod h1:EUNK/J1lZEZO8yPtykKxLXI6JSVN2rg9bN8SXOa0bgM= +cloud.google.com/go/gsuiteaddons v1.4.0/go.mod h1:rZK5I8hht7u7HxFQcFei0+AtfS9uSushomRlg+3ua1o= +cloud.google.com/go/gsuiteaddons v1.5.0/go.mod h1:TFCClYLd64Eaa12sFVmUyG62tk4mdIsI7pAnSXRkcFo= +cloud.google.com/go/iam v0.1.0/go.mod h1:vcUNEa0pEm0qRVpmWepWaFMIAI8/hjB9mO8rNCJtF6c= +cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= +cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= +cloud.google.com/go/iam v0.6.0/go.mod h1:+1AH33ueBne5MzYccyMHtEKqLE4/kJOibtffMHDMFMc= +cloud.google.com/go/iam v0.7.0/go.mod h1:H5Br8wRaDGNc8XP3keLc4unfUUZeyH3Sfl9XpQEYOeg= +cloud.google.com/go/iam v0.8.0/go.mod h1:lga0/y3iH6CX7sYqypWJ33hf7kkfXJag67naqGESjkE= +cloud.google.com/go/iam v0.11.0/go.mod h1:9PiLDanza5D+oWFZiH1uG+RnRCfEGKoyl6yo4cgWZGY= +cloud.google.com/go/iam v0.12.0 h1:DRtTY29b75ciH6Ov1PHb4/iat2CLCvrOm40Q0a6DFpE= +cloud.google.com/go/iam v0.12.0/go.mod h1:knyHGviacl11zrtZUoDuYpDgLjvr28sLQaG0YB2GYAY= +cloud.google.com/go/iap v1.4.0/go.mod h1:RGFwRJdihTINIe4wZ2iCP0zF/qu18ZwyKxrhMhygBEc= +cloud.google.com/go/iap v1.5.0/go.mod h1:UH/CGgKd4KyohZL5Pt0jSKE4m3FR51qg6FKQ/z/Ix9A= +cloud.google.com/go/iap v1.6.0/go.mod h1:NSuvI9C/j7UdjGjIde7t7HBz+QTwBcapPE07+sSRcLk= +cloud.google.com/go/ids v1.1.0/go.mod h1:WIuwCaYVOzHIj2OhN9HAwvW+DBdmUAdcWlFxRl+KubM= +cloud.google.com/go/ids v1.2.0/go.mod h1:5WXvp4n25S0rA/mQWAg1YEEBBq6/s+7ml1RDCW1IrcY= +cloud.google.com/go/ids v1.3.0/go.mod h1:JBdTYwANikFKaDP6LtW5JAi4gubs57SVNQjemdt6xV4= +cloud.google.com/go/iot v1.3.0/go.mod h1:r7RGh2B61+B8oz0AGE+J72AhA0G7tdXItODWsaA2oLs= +cloud.google.com/go/iot v1.4.0/go.mod h1:dIDxPOn0UvNDUMD8Ger7FIaTuvMkj+aGk94RPP0iV+g= +cloud.google.com/go/iot v1.5.0/go.mod h1:mpz5259PDl3XJthEmh9+ap0affn/MqNSP4My77Qql9o= +cloud.google.com/go/kms v1.4.0/go.mod h1:fajBHndQ+6ubNw6Ss2sSd+SWvjL26RNo/dr7uxsnnOA= +cloud.google.com/go/kms v1.5.0/go.mod h1:QJS2YY0eJGBg3mnDfuaCyLauWwBJiHRboYxJ++1xJNg= +cloud.google.com/go/kms v1.6.0/go.mod h1:Jjy850yySiasBUDi6KFUwUv2n1+o7QZFyuUJg6OgjA0= +cloud.google.com/go/kms v1.8.0/go.mod h1:4xFEhYFqvW+4VMELtZyxomGSYtSQKzM178ylFW4jMAg= +cloud.google.com/go/kms v1.9.0/go.mod h1:qb1tPTgfF9RQP8e1wq4cLFErVuTJv7UsSC915J8dh3w= +cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= +cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= +cloud.google.com/go/language v1.7.0/go.mod h1:DJ6dYN/W+SQOjF8e1hLQXMF21AkH2w9wiPzPCJa2MIE= +cloud.google.com/go/language v1.8.0/go.mod h1:qYPVHf7SPoNNiCL2Dr0FfEFNil1qi3pQEyygwpgVKB8= +cloud.google.com/go/language v1.9.0/go.mod h1:Ns15WooPM5Ad/5no/0n81yUetis74g3zrbeJBE+ptUY= +cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= +cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= +cloud.google.com/go/lifesciences v0.8.0/go.mod h1:lFxiEOMqII6XggGbOnKiyZ7IBwoIqA84ClvoezaA/bo= +cloud.google.com/go/logging v1.6.1/go.mod h1:5ZO0mHHbvm8gEmeEUHrmDlTDSu5imF6MUP9OfilNXBw= +cloud.google.com/go/logging v1.7.0/go.mod h1:3xjP2CjkM3ZkO73aj4ASA5wRPGGCRrPIAeNqVNkzY8M= +cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE= +cloud.google.com/go/longrunning v0.3.0/go.mod h1:qth9Y41RRSUE69rDcOn6DdK3HfQfsUI0YSmW3iIlLJc= +cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= +cloud.google.com/go/longrunning v0.4.1/go.mod h1:4iWDqhBZ70CvZ6BfETbvam3T8FMvLK+eFj0E6AaRQTo= +cloud.google.com/go/managedidentities v1.3.0/go.mod h1:UzlW3cBOiPrzucO5qWkNkh0w33KFtBJU281hacNvsdE= +cloud.google.com/go/managedidentities v1.4.0/go.mod h1:NWSBYbEMgqmbZsLIyKvxrYbtqOsxY1ZrGM+9RgDqInM= +cloud.google.com/go/managedidentities v1.5.0/go.mod h1:+dWcZ0JlUmpuxpIDfyP5pP5y0bLdRwOS4Lp7gMni/LA= +cloud.google.com/go/maps v0.1.0/go.mod h1:BQM97WGyfw9FWEmQMpZ5T6cpovXXSd1cGmFma94eubI= +cloud.google.com/go/maps v0.6.0/go.mod h1:o6DAMMfb+aINHz/p/jbcY+mYeXBoZoxTfdSQ8VAJaCw= +cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= +cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w= +cloud.google.com/go/mediatranslation v0.7.0/go.mod h1:LCnB/gZr90ONOIQLgSXagp8XUW1ODs2UmUMvcgMfI2I= +cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= +cloud.google.com/go/memcache v1.5.0/go.mod h1:dk3fCK7dVo0cUU2c36jKb4VqKPS22BTkf81Xq617aWM= +cloud.google.com/go/memcache v1.6.0/go.mod h1:XS5xB0eQZdHtTuTF9Hf8eJkKtR3pVRCcvJwtm68T3rA= +cloud.google.com/go/memcache v1.7.0/go.mod h1:ywMKfjWhNtkQTxrWxCkCFkoPjLHPW6A7WOTVI8xy3LY= +cloud.google.com/go/memcache v1.9.0/go.mod h1:8oEyzXCu+zo9RzlEaEjHl4KkgjlNDaXbCQeQWlzNFJM= +cloud.google.com/go/metastore v1.5.0/go.mod h1:2ZNrDcQwghfdtCwJ33nM0+GrBGlVuh8rakL3vdPY3XY= +cloud.google.com/go/metastore v1.6.0/go.mod h1:6cyQTls8CWXzk45G55x57DVQ9gWg7RiH65+YgPsNh9s= +cloud.google.com/go/metastore v1.7.0/go.mod h1:s45D0B4IlsINu87/AsWiEVYbLaIMeUSoxlKKDqBGFS8= +cloud.google.com/go/metastore v1.8.0/go.mod h1:zHiMc4ZUpBiM7twCIFQmJ9JMEkDSyZS9U12uf7wHqSI= +cloud.google.com/go/metastore v1.10.0/go.mod h1:fPEnH3g4JJAk+gMRnrAnoqyv2lpUCqJPWOodSaf45Eo= +cloud.google.com/go/monitoring v1.7.0/go.mod h1:HpYse6kkGo//7p6sT0wsIC6IBDET0RhIsnmlA53dvEk= +cloud.google.com/go/monitoring v1.8.0/go.mod h1:E7PtoMJ1kQXWxPjB6mv2fhC5/15jInuulFdYYtlcvT4= +cloud.google.com/go/monitoring v1.12.0/go.mod h1:yx8Jj2fZNEkL/GYZyTLS4ZtZEZN8WtDEiEqG4kLK50w= +cloud.google.com/go/networkconnectivity v1.4.0/go.mod h1:nOl7YL8odKyAOtzNX73/M5/mGZgqqMeryi6UPZTk/rA= +cloud.google.com/go/networkconnectivity v1.5.0/go.mod h1:3GzqJx7uhtlM3kln0+x5wyFvuVH1pIBJjhCpjzSt75o= +cloud.google.com/go/networkconnectivity v1.6.0/go.mod h1:OJOoEXW+0LAxHh89nXd64uGG+FbQoeH8DtxCHVOMlaM= +cloud.google.com/go/networkconnectivity v1.7.0/go.mod h1:RMuSbkdbPwNMQjB5HBWD5MpTBnNm39iAVpC3TmsExt8= +cloud.google.com/go/networkconnectivity v1.10.0/go.mod h1:UP4O4sWXJG13AqrTdQCD9TnLGEbtNRqjuaaA7bNjF5E= +cloud.google.com/go/networkmanagement v1.4.0/go.mod h1:Q9mdLLRn60AsOrPc8rs8iNV6OHXaGcDdsIQe1ohekq8= +cloud.google.com/go/networkmanagement v1.5.0/go.mod h1:ZnOeZ/evzUdUsnvRt792H0uYEnHQEMaz+REhhzJRcf4= +cloud.google.com/go/networkmanagement v1.6.0/go.mod h1:5pKPqyXjB/sgtvB5xqOemumoQNB7y95Q7S+4rjSOPYY= +cloud.google.com/go/networksecurity v0.5.0/go.mod h1:xS6fOCoqpVC5zx15Z/MqkfDwH4+m/61A3ODiDV1xmiQ= +cloud.google.com/go/networksecurity v0.6.0/go.mod h1:Q5fjhTr9WMI5mbpRYEbiexTzROf7ZbDzvzCrNl14nyU= +cloud.google.com/go/networksecurity v0.7.0/go.mod h1:mAnzoxx/8TBSyXEeESMy9OOYwo1v+gZ5eMRnsT5bC8k= +cloud.google.com/go/notebooks v1.2.0/go.mod h1:9+wtppMfVPUeJ8fIWPOq1UnATHISkGXGqTkxeieQ6UY= +cloud.google.com/go/notebooks v1.3.0/go.mod h1:bFR5lj07DtCPC7YAAJ//vHskFBxA5JzYlH68kXVdk34= +cloud.google.com/go/notebooks v1.4.0/go.mod h1:4QPMngcwmgb6uw7Po99B2xv5ufVoIQ7nOGDyL4P8AgA= +cloud.google.com/go/notebooks v1.5.0/go.mod h1:q8mwhnP9aR8Hpfnrc5iN5IBhrXUy8S2vuYs+kBJ/gu0= +cloud.google.com/go/notebooks v1.7.0/go.mod h1:PVlaDGfJgj1fl1S3dUwhFMXFgfYGhYQt2164xOMONmE= +cloud.google.com/go/optimization v1.1.0/go.mod h1:5po+wfvX5AQlPznyVEZjGJTMr4+CAkJf2XSTQOOl9l4= +cloud.google.com/go/optimization v1.2.0/go.mod h1:Lr7SOHdRDENsh+WXVmQhQTrzdu9ybg0NecjHidBq6xs= +cloud.google.com/go/optimization v1.3.1/go.mod h1:IvUSefKiwd1a5p0RgHDbWCIbDFgKuEdB+fPPuP0IDLI= +cloud.google.com/go/orchestration v1.3.0/go.mod h1:Sj5tq/JpWiB//X/q3Ngwdl5K7B7Y0KZ7bfv0wL6fqVA= +cloud.google.com/go/orchestration v1.4.0/go.mod h1:6W5NLFWs2TlniBphAViZEVhrXRSMgUGDfW7vrWKvsBk= +cloud.google.com/go/orchestration v1.6.0/go.mod h1:M62Bevp7pkxStDfFfTuCOaXgaaqRAga1yKyoMtEoWPQ= +cloud.google.com/go/orgpolicy v1.4.0/go.mod h1:xrSLIV4RePWmP9P3tBl8S93lTmlAxjm06NSm2UTmKvE= +cloud.google.com/go/orgpolicy v1.5.0/go.mod h1:hZEc5q3wzwXJaKrsx5+Ewg0u1LxJ51nNFlext7Tanwc= +cloud.google.com/go/orgpolicy v1.10.0/go.mod h1:w1fo8b7rRqlXlIJbVhOMPrwVljyuW5mqssvBtU18ONc= +cloud.google.com/go/osconfig v1.7.0/go.mod h1:oVHeCeZELfJP7XLxcBGTMBvRO+1nQ5tFG9VQTmYS2Fs= +cloud.google.com/go/osconfig v1.8.0/go.mod h1:EQqZLu5w5XA7eKizepumcvWx+m8mJUhEwiPqWiZeEdg= +cloud.google.com/go/osconfig v1.9.0/go.mod h1:Yx+IeIZJ3bdWmzbQU4fxNl8xsZ4amB+dygAwFPlvnNo= +cloud.google.com/go/osconfig v1.10.0/go.mod h1:uMhCzqC5I8zfD9zDEAfvgVhDS8oIjySWh+l4WK6GnWw= +cloud.google.com/go/osconfig v1.11.0/go.mod h1:aDICxrur2ogRd9zY5ytBLV89KEgT2MKB2L/n6x1ooPw= +cloud.google.com/go/oslogin v1.4.0/go.mod h1:YdgMXWRaElXz/lDk1Na6Fh5orF7gvmJ0FGLIs9LId4E= +cloud.google.com/go/oslogin v1.5.0/go.mod h1:D260Qj11W2qx/HVF29zBg+0fd6YCSjSqLUkY/qEenQU= +cloud.google.com/go/oslogin v1.6.0/go.mod h1:zOJ1O3+dTU8WPlGEkFSh7qeHPPSoxrcMbbK1Nm2iX70= +cloud.google.com/go/oslogin v1.7.0/go.mod h1:e04SN0xO1UNJ1M5GP0vzVBFicIe4O53FOfcixIqTyXo= +cloud.google.com/go/oslogin v1.9.0/go.mod h1:HNavntnH8nzrn8JCTT5fj18FuJLFJc4NaZJtBnQtKFs= +cloud.google.com/go/phishingprotection v0.5.0/go.mod h1:Y3HZknsK9bc9dMi+oE8Bim0lczMU6hrX0UpADuMefr0= +cloud.google.com/go/phishingprotection v0.6.0/go.mod h1:9Y3LBLgy0kDTcYET8ZH3bq/7qni15yVUoAxiFxnlSUA= +cloud.google.com/go/phishingprotection v0.7.0/go.mod h1:8qJI4QKHoda/sb/7/YmMQ2omRLSLYSu9bU0EKCNI+Lk= +cloud.google.com/go/policytroubleshooter v1.3.0/go.mod h1:qy0+VwANja+kKrjlQuOzmlvscn4RNsAc0e15GGqfMxg= +cloud.google.com/go/policytroubleshooter v1.4.0/go.mod h1:DZT4BcRw3QoO8ota9xw/LKtPa8lKeCByYeKTIf/vxdE= +cloud.google.com/go/policytroubleshooter v1.5.0/go.mod h1:Rz1WfV+1oIpPdN2VvvuboLVRsB1Hclg3CKQ53j9l8vw= +cloud.google.com/go/privatecatalog v0.5.0/go.mod h1:XgosMUvvPyxDjAVNDYxJ7wBW8//hLDDYmnsNcMGq1K0= +cloud.google.com/go/privatecatalog v0.6.0/go.mod h1:i/fbkZR0hLN29eEWiiwue8Pb+GforiEIBnV9yrRUOKI= +cloud.google.com/go/privatecatalog v0.7.0/go.mod h1:2s5ssIFO69F5csTXcwBP7NPFTZvps26xGzvQ2PQaBYg= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/pubsub v1.26.0/go.mod h1:QgBH3U/jdJy/ftjPhTkyXNj543Tin1pRYcdcPRnFIRI= +cloud.google.com/go/pubsub v1.27.1/go.mod h1:hQN39ymbV9geqBnfQq6Xf63yNhUAhv9CZhzp5O6qsW0= +cloud.google.com/go/pubsub v1.28.0/go.mod h1:vuXFpwaVoIPQMGXqRyUQigu/AX1S3IWugR9xznmcXX8= +cloud.google.com/go/pubsublite v1.5.0/go.mod h1:xapqNQ1CuLfGi23Yda/9l4bBCKz/wC3KIJ5gKcxveZg= +cloud.google.com/go/pubsublite v1.6.0/go.mod h1:1eFCS0U11xlOuMFV/0iBqw3zP12kddMeCbj/F3FSj9k= +cloud.google.com/go/recaptchaenterprise v1.3.1/go.mod h1:OdD+q+y4XGeAlxRaMn1Y7/GveP6zmq76byL6tjPE7d4= +cloud.google.com/go/recaptchaenterprise/v2 v2.1.0/go.mod h1:w9yVqajwroDNTfGuhmOjPDN//rZGySaf6PtFVcSCa7o= +cloud.google.com/go/recaptchaenterprise/v2 v2.2.0/go.mod h1:/Zu5jisWGeERrd5HnlS3EUGb/D335f9k51B/FVil0jk= +cloud.google.com/go/recaptchaenterprise/v2 v2.3.0/go.mod h1:O9LwGCjrhGHBQET5CA7dd5NwwNQUErSgEDit1DLNTdo= +cloud.google.com/go/recaptchaenterprise/v2 v2.4.0/go.mod h1:Am3LHfOuBstrLrNCBrlI5sbwx9LBg3te2N6hGvHn2mE= +cloud.google.com/go/recaptchaenterprise/v2 v2.5.0/go.mod h1:O8LzcHXN3rz0j+LBC91jrwI3R+1ZSZEWrfL7XHgNo9U= +cloud.google.com/go/recaptchaenterprise/v2 v2.6.0/go.mod h1:RPauz9jeLtB3JVzg6nCbe12qNoaa8pXc4d/YukAmcnA= +cloud.google.com/go/recommendationengine v0.5.0/go.mod h1:E5756pJcVFeVgaQv3WNpImkFP8a+RptV6dDLGPILjvg= +cloud.google.com/go/recommendationengine v0.6.0/go.mod h1:08mq2umu9oIqc7tDy8sx+MNJdLG0fUi3vaSVbztHgJ4= +cloud.google.com/go/recommendationengine v0.7.0/go.mod h1:1reUcE3GIu6MeBz/h5xZJqNLuuVjNg1lmWMPyjatzac= +cloud.google.com/go/recommender v1.5.0/go.mod h1:jdoeiBIVrJe9gQjwd759ecLJbxCDED4A6p+mqoqDvTg= +cloud.google.com/go/recommender v1.6.0/go.mod h1:+yETpm25mcoiECKh9DEScGzIRyDKpZ0cEhWGo+8bo+c= +cloud.google.com/go/recommender v1.7.0/go.mod h1:XLHs/W+T8olwlGOgfQenXBTbIseGclClff6lhFVe9Bs= +cloud.google.com/go/recommender v1.8.0/go.mod h1:PkjXrTT05BFKwxaUxQmtIlrtj0kph108r02ZZQ5FE70= +cloud.google.com/go/recommender v1.9.0/go.mod h1:PnSsnZY7q+VL1uax2JWkt/UegHssxjUVVCrX52CuEmQ= +cloud.google.com/go/redis v1.7.0/go.mod h1:V3x5Jq1jzUcg+UNsRvdmsfuFnit1cfe3Z/PGyq/lm4Y= +cloud.google.com/go/redis v1.8.0/go.mod h1:Fm2szCDavWzBk2cDKxrkmWBqoCiL1+Ctwq7EyqBCA/A= +cloud.google.com/go/redis v1.9.0/go.mod h1:HMYQuajvb2D0LvMgZmLDZW8V5aOC/WxstZHiy4g8OiA= +cloud.google.com/go/redis v1.10.0/go.mod h1:ThJf3mMBQtW18JzGgh41/Wld6vnDDc/F/F35UolRZPM= +cloud.google.com/go/redis v1.11.0/go.mod h1:/X6eicana+BWcUda5PpwZC48o37SiFVTFSs0fWAJ7uQ= +cloud.google.com/go/resourcemanager v1.3.0/go.mod h1:bAtrTjZQFJkiWTPDb1WBjzvc6/kifjj4QBYuKCCoqKA= +cloud.google.com/go/resourcemanager v1.4.0/go.mod h1:MwxuzkumyTX7/a3n37gmsT3py7LIXwrShilPh3P1tR0= +cloud.google.com/go/resourcemanager v1.5.0/go.mod h1:eQoXNAiAvCf5PXxWxXjhKQoTMaUSNrEfg+6qdf/wots= +cloud.google.com/go/resourcesettings v1.3.0/go.mod h1:lzew8VfESA5DQ8gdlHwMrqZs1S9V87v3oCnKCWoOuQU= +cloud.google.com/go/resourcesettings v1.4.0/go.mod h1:ldiH9IJpcrlC3VSuCGvjR5of/ezRrOxFtpJoJo5SmXg= +cloud.google.com/go/resourcesettings v1.5.0/go.mod h1:+xJF7QSG6undsQDfsCJyqWXyBwUoJLhetkRMDRnIoXA= +cloud.google.com/go/retail v1.8.0/go.mod h1:QblKS8waDmNUhghY2TI9O3JLlFk8jybHeV4BF19FrE4= +cloud.google.com/go/retail v1.9.0/go.mod h1:g6jb6mKuCS1QKnH/dpu7isX253absFl6iE92nHwlBUY= +cloud.google.com/go/retail v1.10.0/go.mod h1:2gDk9HsL4HMS4oZwz6daui2/jmKvqShXKQuB2RZ+cCc= +cloud.google.com/go/retail v1.11.0/go.mod h1:MBLk1NaWPmh6iVFSz9MeKG/Psyd7TAgm6y/9L2B4x9Y= +cloud.google.com/go/retail v1.12.0/go.mod h1:UMkelN/0Z8XvKymXFbD4EhFJlYKRx1FGhQkVPU5kF14= +cloud.google.com/go/run v0.2.0/go.mod h1:CNtKsTA1sDcnqqIFR3Pb5Tq0usWxJJvsWOCPldRU3Do= +cloud.google.com/go/run v0.3.0/go.mod h1:TuyY1+taHxTjrD0ZFk2iAR+xyOXEA0ztb7U3UNA0zBo= +cloud.google.com/go/run v0.8.0/go.mod h1:VniEnuBwqjigv0A7ONfQUaEItaiCRVujlMqerPPiktM= +cloud.google.com/go/scheduler v1.4.0/go.mod h1:drcJBmxF3aqZJRhmkHQ9b3uSSpQoltBPGPxGAWROx6s= +cloud.google.com/go/scheduler v1.5.0/go.mod h1:ri073ym49NW3AfT6DZi21vLZrG07GXr5p3H1KxN5QlI= +cloud.google.com/go/scheduler v1.6.0/go.mod h1:SgeKVM7MIwPn3BqtcBntpLyrIJftQISRrYB5ZtT+KOk= +cloud.google.com/go/scheduler v1.7.0/go.mod h1:jyCiBqWW956uBjjPMMuX09n3x37mtyPJegEWKxRsn44= +cloud.google.com/go/scheduler v1.8.0/go.mod h1:TCET+Y5Gp1YgHT8py4nlg2Sew8nUHMqcpousDgXJVQc= +cloud.google.com/go/secretmanager v1.6.0/go.mod h1:awVa/OXF6IiyaU1wQ34inzQNc4ISIDIrId8qE5QGgKA= +cloud.google.com/go/secretmanager v1.8.0/go.mod h1:hnVgi/bN5MYHd3Gt0SPuTPPp5ENina1/LxM+2W9U9J4= +cloud.google.com/go/secretmanager v1.9.0/go.mod h1:b71qH2l1yHmWQHt9LC80akm86mX8AL6X1MA01dW8ht4= +cloud.google.com/go/secretmanager v1.10.0/go.mod h1:MfnrdvKMPNra9aZtQFvBcvRU54hbPD8/HayQdlUgJpU= +cloud.google.com/go/security v1.5.0/go.mod h1:lgxGdyOKKjHL4YG3/YwIL2zLqMFCKs0UbQwgyZmfJl4= +cloud.google.com/go/security v1.7.0/go.mod h1:mZklORHl6Bg7CNnnjLH//0UlAlaXqiG7Lb9PsPXLfD0= +cloud.google.com/go/security v1.8.0/go.mod h1:hAQOwgmaHhztFhiQ41CjDODdWP0+AE1B3sX4OFlq+GU= +cloud.google.com/go/security v1.9.0/go.mod h1:6Ta1bO8LXI89nZnmnsZGp9lVoVWXqsVbIq/t9dzI+2Q= +cloud.google.com/go/security v1.10.0/go.mod h1:QtOMZByJVlibUT2h9afNDWRZ1G96gVywH8T5GUSb9IA= +cloud.google.com/go/security v1.12.0/go.mod h1:rV6EhrpbNHrrxqlvW0BWAIawFWq3X90SduMJdFwtLB8= +cloud.google.com/go/securitycenter v1.13.0/go.mod h1:cv5qNAqjY84FCN6Y9z28WlkKXyWsgLO832YiWwkCWcU= +cloud.google.com/go/securitycenter v1.14.0/go.mod h1:gZLAhtyKv85n52XYWt6RmeBdydyxfPeTrpToDPw4Auc= +cloud.google.com/go/securitycenter v1.15.0/go.mod h1:PeKJ0t8MoFmmXLXWm41JidyzI3PJjd8sXWaVqg43WWk= +cloud.google.com/go/securitycenter v1.16.0/go.mod h1:Q9GMaLQFUD+5ZTabrbujNWLtSLZIZF7SAR0wWECrjdk= +cloud.google.com/go/securitycenter v1.18.1/go.mod h1:0/25gAzCM/9OL9vVx4ChPeM/+DlfGQJDwBy/UC8AKK0= +cloud.google.com/go/servicecontrol v1.4.0/go.mod h1:o0hUSJ1TXJAmi/7fLJAedOovnujSEvjKCAFNXPQ1RaU= +cloud.google.com/go/servicecontrol v1.5.0/go.mod h1:qM0CnXHhyqKVuiZnGKrIurvVImCs8gmqWsDoqe9sU1s= +cloud.google.com/go/servicecontrol v1.10.0/go.mod h1:pQvyvSRh7YzUF2efw7H87V92mxU8FnFDawMClGCNuAA= +cloud.google.com/go/servicecontrol v1.11.0/go.mod h1:kFmTzYzTUIuZs0ycVqRHNaNhgR+UMUpw9n02l/pY+mc= +cloud.google.com/go/servicedirectory v1.4.0/go.mod h1:gH1MUaZCgtP7qQiI+F+A+OpeKF/HQWgtAddhTbhL2bs= +cloud.google.com/go/servicedirectory v1.5.0/go.mod h1:QMKFL0NUySbpZJ1UZs3oFAmdvVxhhxB6eJ/Vlp73dfg= +cloud.google.com/go/servicedirectory v1.6.0/go.mod h1:pUlbnWsLH9c13yGkxCmfumWEPjsRs1RlmJ4pqiNjVL4= +cloud.google.com/go/servicedirectory v1.7.0/go.mod h1:5p/U5oyvgYGYejufvxhgwjL8UVXjkuw7q5XcG10wx1U= +cloud.google.com/go/servicedirectory v1.8.0/go.mod h1:srXodfhY1GFIPvltunswqXpVxFPpZjf8nkKQT7XcXaY= +cloud.google.com/go/servicemanagement v1.4.0/go.mod h1:d8t8MDbezI7Z2R1O/wu8oTggo3BI2GKYbdG4y/SJTco= +cloud.google.com/go/servicemanagement v1.5.0/go.mod h1:XGaCRe57kfqu4+lRxaFEAuqmjzF0r+gWHjWqKqBvKFo= +cloud.google.com/go/servicemanagement v1.6.0/go.mod h1:aWns7EeeCOtGEX4OvZUWCCJONRZeFKiptqKf1D0l/Jc= +cloud.google.com/go/serviceusage v1.3.0/go.mod h1:Hya1cozXM4SeSKTAgGXgj97GlqUvF5JaoXacR1JTP/E= +cloud.google.com/go/serviceusage v1.4.0/go.mod h1:SB4yxXSaYVuUBYUml6qklyONXNLt83U0Rb+CXyhjEeU= +cloud.google.com/go/serviceusage v1.5.0/go.mod h1:w8U1JvqUqwJNPEOTQjrMHkw3IaIFLoLsPLvsE3xueec= +cloud.google.com/go/shell v1.3.0/go.mod h1:VZ9HmRjZBsjLGXusm7K5Q5lzzByZmJHf1d0IWHEN5X4= +cloud.google.com/go/shell v1.4.0/go.mod h1:HDxPzZf3GkDdhExzD/gs8Grqk+dmYcEjGShZgYa9URw= +cloud.google.com/go/shell v1.6.0/go.mod h1:oHO8QACS90luWgxP3N9iZVuEiSF84zNyLytb+qE2f9A= +cloud.google.com/go/spanner v1.41.0/go.mod h1:MLYDBJR/dY4Wt7ZaMIQ7rXOTLjYrmxLE/5ve9vFfWos= +cloud.google.com/go/spanner v1.44.0/go.mod h1:G8XIgYdOK+Fbcpbs7p2fiprDw4CaZX63whnSMLVBxjk= +cloud.google.com/go/speech v1.6.0/go.mod h1:79tcr4FHCimOp56lwC01xnt/WPJZc4v3gzyT7FoBkCM= +cloud.google.com/go/speech v1.7.0/go.mod h1:KptqL+BAQIhMsj1kOP2la5DSEEerPDuOP/2mmkhHhZQ= +cloud.google.com/go/speech v1.8.0/go.mod h1:9bYIl1/tjsAnMgKGHKmBZzXKEkGgtU+MpdDPTE9f7y0= +cloud.google.com/go/speech v1.9.0/go.mod h1:xQ0jTcmnRFFM2RfX/U+rk6FQNUF6DQlydUSyoooSpco= +cloud.google.com/go/speech v1.14.1/go.mod h1:gEosVRPJ9waG7zqqnsHpYTOoAS4KouMRLDFMekpJ0J0= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -cloud.google.com/go/storage v1.10.0 h1:STgFzyU5/8miMl0//zKh2aQeTyeaUH3WN9bSUiJ09bA= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= +cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= +cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc= +cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s= +cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI= +cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y= +cloud.google.com/go/storagetransfer v1.5.0/go.mod h1:dxNzUopWy7RQevYFHewchb29POFv3/AaBgnhqzqiK0w= +cloud.google.com/go/storagetransfer v1.6.0/go.mod h1:y77xm4CQV/ZhFZH75PLEXY0ROiS7Gh6pSKrM8dJyg6I= +cloud.google.com/go/storagetransfer v1.7.0/go.mod h1:8Giuj1QNb1kfLAiWM1bN6dHzfdlDAVC9rv9abHot2W4= +cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw= +cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g= +cloud.google.com/go/talent v1.3.0/go.mod h1:CmcxwJ/PKfRgd1pBjQgU6W3YBwiewmUzQYH5HHmSCmM= +cloud.google.com/go/talent v1.4.0/go.mod h1:ezFtAgVuRf8jRsvyE6EwmbTK5LKciD4KVnHuDEFmOOA= +cloud.google.com/go/talent v1.5.0/go.mod h1:G+ODMj9bsasAEJkQSzO2uHQWXHHXUomArjWQQYkqK6c= +cloud.google.com/go/texttospeech v1.4.0/go.mod h1:FX8HQHA6sEpJ7rCMSfXuzBcysDAuWusNNNvN9FELDd8= +cloud.google.com/go/texttospeech v1.5.0/go.mod h1:oKPLhR4n4ZdQqWKURdwxMy0uiTS1xU161C8W57Wkea4= +cloud.google.com/go/texttospeech v1.6.0/go.mod h1:YmwmFT8pj1aBblQOI3TfKmwibnsfvhIBzPXcW4EBovc= +cloud.google.com/go/tpu v1.3.0/go.mod h1:aJIManG0o20tfDQlRIej44FcwGGl/cD0oiRyMKG19IQ= +cloud.google.com/go/tpu v1.4.0/go.mod h1:mjZaX8p0VBgllCzF6wcU2ovUXN9TONFLd7iz227X2Xg= +cloud.google.com/go/tpu v1.5.0/go.mod h1:8zVo1rYDFuW2l4yZVY0R0fb/v44xLh3llq7RuV61fPM= +cloud.google.com/go/trace v1.3.0/go.mod h1:FFUE83d9Ca57C+K8rDl/Ih8LwOzWIV1krKgxg6N0G28= +cloud.google.com/go/trace v1.4.0/go.mod h1:UG0v8UBqzusp+z63o7FK74SdFE+AXpCLdFb1rshXG+Y= +cloud.google.com/go/trace v1.8.0/go.mod h1:zH7vcsbAhklH8hWFig58HvxcxyQbaIqMarMg9hn5ECA= +cloud.google.com/go/translate v1.3.0/go.mod h1:gzMUwRjvOqj5i69y/LYLd8RrNQk+hOmIXTi9+nb3Djs= +cloud.google.com/go/translate v1.4.0/go.mod h1:06Dn/ppvLD6WvA5Rhdp029IX2Mi3Mn7fpMRLPvXT5Wg= +cloud.google.com/go/translate v1.5.0/go.mod h1:29YDSYveqqpA1CQFD7NQuP49xymq17RXNaUDdc0mNu0= +cloud.google.com/go/translate v1.6.0/go.mod h1:lMGRudH1pu7I3n3PETiOB2507gf3HnfLV8qlkHZEyos= +cloud.google.com/go/video v1.8.0/go.mod h1:sTzKFc0bUSByE8Yoh8X0mn8bMymItVGPfTuUBUyRgxk= +cloud.google.com/go/video v1.9.0/go.mod h1:0RhNKFRF5v92f8dQt0yhaHrEuH95m068JYOvLZYnJSw= +cloud.google.com/go/video v1.12.0/go.mod h1:MLQew95eTuaNDEGriQdcYn0dTwf9oWiA4uYebxM5kdg= +cloud.google.com/go/video v1.13.0/go.mod h1:ulzkYlYgCp15N2AokzKjy7MQ9ejuynOJdf1tR5lGthk= +cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU= +cloud.google.com/go/videointelligence v1.7.0/go.mod h1:k8pI/1wAhjznARtVT9U1llUaFNPh7muw8QyOUpavru4= +cloud.google.com/go/videointelligence v1.8.0/go.mod h1:dIcCn4gVDdS7yte/w+koiXn5dWVplOZkE+xwG9FgK+M= +cloud.google.com/go/videointelligence v1.9.0/go.mod h1:29lVRMPDYHikk3v8EdPSaL8Ku+eMzDljjuvRs105XoU= +cloud.google.com/go/videointelligence v1.10.0/go.mod h1:LHZngX1liVtUhZvi2uNS0VQuOzNi2TkY1OakiuoUOjU= +cloud.google.com/go/vision v1.2.0/go.mod h1:SmNwgObm5DpFBme2xpyOyasvBc1aPdjvMk2bBk0tKD0= +cloud.google.com/go/vision/v2 v2.2.0/go.mod h1:uCdV4PpN1S0jyCyq8sIM42v2Y6zOLkZs+4R9LrGYwFo= +cloud.google.com/go/vision/v2 v2.3.0/go.mod h1:UO61abBx9QRMFkNBbf1D8B1LXdS2cGiiCRx0vSpZoUo= +cloud.google.com/go/vision/v2 v2.4.0/go.mod h1:VtI579ll9RpVTrdKdkMzckdnwMyX2JILb+MhPqRbPsY= +cloud.google.com/go/vision/v2 v2.5.0/go.mod h1:MmaezXOOE+IWa+cS7OhRRLK2cNv1ZL98zhqFFZaaH2E= +cloud.google.com/go/vision/v2 v2.6.0/go.mod h1:158Hes0MvOS9Z/bDMSFpjwsUrZ5fPrdwuyyvKSGAGMY= +cloud.google.com/go/vmmigration v1.2.0/go.mod h1:IRf0o7myyWFSmVR1ItrBSFLFD/rJkfDCUTO4vLlJvsE= +cloud.google.com/go/vmmigration v1.3.0/go.mod h1:oGJ6ZgGPQOFdjHuocGcLqX4lc98YQ7Ygq8YQwHh9A7g= +cloud.google.com/go/vmmigration v1.5.0/go.mod h1:E4YQ8q7/4W9gobHjQg4JJSgXXSgY21nA5r8swQV+Xxc= +cloud.google.com/go/vmwareengine v0.1.0/go.mod h1:RsdNEf/8UDvKllXhMz5J40XxDrNJNN4sagiox+OI208= +cloud.google.com/go/vmwareengine v0.2.2/go.mod h1:sKdctNJxb3KLZkE/6Oui94iw/xs9PRNC2wnNLXsHvH8= +cloud.google.com/go/vpcaccess v1.4.0/go.mod h1:aQHVbTWDYUR1EbTApSVvMq1EnT57ppDmQzZ3imqIk4w= +cloud.google.com/go/vpcaccess v1.5.0/go.mod h1:drmg4HLk9NkZpGfCmZ3Tz0Bwnm2+DKqViEpeEpOq0m8= +cloud.google.com/go/vpcaccess v1.6.0/go.mod h1:wX2ILaNhe7TlVa4vC5xce1bCnqE3AeH27RV31lnmZes= +cloud.google.com/go/webrisk v1.4.0/go.mod h1:Hn8X6Zr+ziE2aNd8SliSDWpEnSS1u4R9+xXZmFiHmGE= +cloud.google.com/go/webrisk v1.5.0/go.mod h1:iPG6fr52Tv7sGk0H6qUFzmL3HHZev1htXuWDEEsqMTg= +cloud.google.com/go/webrisk v1.6.0/go.mod h1:65sW9V9rOosnc9ZY7A7jsy1zoHS5W9IAXv6dGqhMQMc= +cloud.google.com/go/webrisk v1.7.0/go.mod h1:mVMHgEYH0r337nmt1JyLthzMr6YxwN1aAIEc2fTcq7A= +cloud.google.com/go/webrisk v1.8.0/go.mod h1:oJPDuamzHXgUc+b8SiHRcVInZQuybnvEW72PqTc7sSg= +cloud.google.com/go/websecurityscanner v1.3.0/go.mod h1:uImdKm2wyeXQevQJXeh8Uun/Ym1VqworNDlBXQevGMo= +cloud.google.com/go/websecurityscanner v1.4.0/go.mod h1:ebit/Fp0a+FWu5j4JOmJEV8S8CzdTkAS77oDsiSqYWQ= +cloud.google.com/go/websecurityscanner v1.5.0/go.mod h1:Y6xdCPy81yi0SQnDY1xdNTNpfY1oAgXUlcfN3B3eSng= +cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0= +cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M= +cloud.google.com/go/workflows v1.8.0/go.mod h1:ysGhmEajwZxGn1OhGOGKsTXc5PyxOc0vfKf5Af+to4M= +cloud.google.com/go/workflows v1.9.0/go.mod h1:ZGkj1aFIOd9c8Gerkjjq7OW7I5+l6cSvT3ujaO/WwSA= +cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcPALq2CxzdePw= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= firebase.google.com/go v3.13.0+incompatible h1:3TdYC3DDi6aHn20qoRkxwGqNgdjtblwVAyRLQwGn/+4= firebase.google.com/go v3.13.0+incompatible/go.mod h1:xlah6XbEyW6tbfSklcfe5FHJIwjt8toICdV5Wh9ptHs= +gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8= +git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9/go.mod h1:JynElWSGnm/4RlzPXRlREEwqTHAN3T56Bv2ITsFT3gY= +github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19/go.mod h1:T13YZdzov6OU0A1+RfKZiZN9ca6VeKdBdyDV+BY97Tk= +github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= +github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b/go.mod h1:1KcenG0jGWcpt8ov532z81sp/kMMUG485J2InIOyADM= +github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0= +github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= +github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= +github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/c-bata/go-prompt v0.2.6 h1:POP+nrHE+DfLYx370bedwNhsqmpCUynWPxuHi0C5vZI= github.com/c-bata/go-prompt v0.2.6/go.mod h1:/LMAke8wD2FsNu9EXNdHxNLbd9MedkPnCdfpU9wwHfY= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -54,28 +558,56 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/discoviking/fsm v0.0.0-20150126104936-f4a273feecca h1:cTTdXpkQ1aVbOOmHwdwtYuwUZcQtcMrleD1UXLWhAq8= github.com/discoviking/fsm v0.0.0-20150126104936-f4a273feecca/go.mod h1:W+3LQaEkN8qAwwcw0KC546sUEnX86GIT8CcMLZC4mG0= +github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= +github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= +github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= +github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= +github.com/envoyproxy/go-control-plane v0.10.3/go.mod h1:fJJn/j26vwOu972OllsvAgJJM//w9BV6Fxbg2LuVd34= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo= +github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w= +github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= +github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/ghettovoice/gosip v0.0.0-20230130140202-1060e22fde79 h1:eYr/WyAoFmd8LtLrWAyw2oSdS5oDM3cs3Vhrl6INunE= -github.com/ghettovoice/gosip v0.0.0-20230130140202-1060e22fde79/go.mod h1:yTr3BEYSFe9As6XM7ldyrVgqsPwlnw8Ahc4N28VFM2g= +github.com/ghettovoice/gosip v0.0.0-20230322091832-d77de1c97f89 h1:bUtgAwa7cfrp0bEnlfr+k6fgsfn7/OFQ0pvQvoujOAo= +github.com/ghettovoice/gosip v0.0.0-20230322091832-d77de1c97f89/go.mod h1:rlD1yLOErWYohWTryG/2bTTpmzB79p52ntLA/uIFXeI= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g= +github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks= +github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY= +github.com/go-fonts/liberation v0.2.0/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY= +github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmnUIzUY= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= -github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= +github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2CSIqUrmQPqA0gdRIlnLEY0gK5JGjh37zN5U= +github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81/go.mod h1:SX0U8uGpxhq9o2S/CELCSUxEWWAuoCUcVCQWv7G2OCk= +github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= +github.com/go-pdf/fpdf v0.6.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU= github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM= @@ -83,7 +615,10 @@ github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og= github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.1.0-rc.1 h1:VK3aeRXMI8osaS6YCDKNZhU6RKtcP3B2wzqxOogNDz8= github.com/gobwas/ws v1.1.0-rc.1/go.mod h1:nzvNcVha5eUziGrbxFCo6qFIojQHjJV5cLYIbezhfL0= +github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= @@ -96,6 +631,7 @@ github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -111,10 +647,15 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -126,14 +667,18 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.1.0 h1:wCKgOCHuUEVfsaQLpPSJb7VdYCdTVZQAuOdYm1yc/60= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= +github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= +github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -146,47 +691,82 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE= -github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= +github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= +github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= +github.com/googleapis/enterprise-certificate-proxy v0.2.1/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= +github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k= +github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= +github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= +github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM= +github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM= +github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= +github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo= +github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY= +github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8= +github.com/googleapis/gax-go/v2 v2.7.1 h1:gF4c0zjUP2H/s/hEGyLA3I0fA2ZWjzYiONAD6cvPr8A= +github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI= +github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= +github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= +github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= +github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE= +github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= +github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= +github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.7 h1:bQGKb3vps/j0E9GfJQ03JyhRuxsvdAanXlT9BTw3mdw= github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= -github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-runewidth v0.0.6/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/mattn/go-tty v0.0.3 h1:5OfyWorkyO7xP52Mq7tB36ajHDG5OHrmBGIS/DtakQI= github.com/mattn/go-tty v0.0.3/go.mod h1:ihxohKRERHTVzN+aSVRwACLCeqIoZAWpoICkkvrWyR0= +github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= -github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI= -github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= +github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY= +github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.5/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= @@ -197,30 +777,15 @@ github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9k github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= -github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU= -github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk= -github.com/onsi/ginkgo/v2 v2.3.0/go.mod h1:Eew0uilEqZmIEZr8JrvYlvOM7Rr6xzTmMV8AyFNU9d0= -github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkAt4OrFo= -github.com/onsi/ginkgo/v2 v2.5.0/go.mod h1:Luc4sArBICYCS8THh8v3i3i5CuSZO+RaQRaJoeNwomw= -github.com/onsi/ginkgo/v2 v2.7.0/go.mod h1:yjiuMwPokqY1XauOgju45q3sJt6VzQ/Fict1LFVcsAo= -github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc= -github.com/onsi/ginkgo/v2 v2.8.4 h1:gf5mIQ8cLFieruNLAdgijHF1PYfLphKm2dxxcUtcqK0= -github.com/onsi/ginkgo/v2 v2.8.4/go.mod h1:427dEDQZkDKsBvCjc2A/ZPefhKxsTTrsQegMlayL730= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.4/go.mod h1:g/HbgYopi++010VEqkFgJHKC09uJiW9UkXvMUuKHUCQ= +github.com/onsi/gomega v1.17.0 h1:9Luw4uT5HTjHTN8+aNcSThgH1vdXnmdJ8xIfZ4wyTRE= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= -github.com/onsi/gomega v1.20.1/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= -github.com/onsi/gomega v1.21.1/go.mod h1:iYAIXgPSaDHak0LCMA+AWBpIKBr8WZicMxnE8luStNc= -github.com/onsi/gomega v1.22.1/go.mod h1:x6n7VNe4hw0vkyYUM4mjIXx3JbLiPaBPNgB7PRQ1tuM= -github.com/onsi/gomega v1.24.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2vQAg= -github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM= -github.com/onsi/gomega v1.26.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM= -github.com/onsi/gomega v1.27.1/go.mod h1:aHX5xOykVYzWOV4WqQy0sy8BQptgukenXpCXfadcIAw= -github.com/onsi/gomega v1.27.2 h1:SKU0CXeKE/WVgIV1T61kSa3+IRE8Ekrv9rdXDwwTqnY= -github.com/onsi/gomega v1.27.2/go.mod h1:5mR3phAHpkAVIDkHEUBY6HGVsU+cpcEscrGPB4oPlZI= +github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY= +github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI= +github.com/phpdave11/gofpdi v1.0.13/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI= +github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pion/datachannel v1.5.5 h1:10ef4kwdjije+M9d7Xm9im2Y3O6A6ccQb0zcqZcJew8= github.com/pion/datachannel v1.5.5/go.mod h1:iMz+lECmfdCMqFRhXhcA/219B0SQlbpoR2V118yimL0= github.com/pion/dtls/v2 v2.2.6 h1:yXMxKr0Skd+Ub6A8UqXTRLSywskx93ooMRHsQUtd+Z4= @@ -261,18 +826,35 @@ github.com/pion/webrtc/v3 v3.1.59 h1:B3YFo8q6dwBYKA2LUjWRChP59Qtt+xvv1Ul7UPDp6Zc github.com/pion/webrtc/v3 v3.1.59/go.mod h1:rJGgStRoFyFOWJULHLayaimsG+jIEoenhJ5MB5gIFqw= github.com/pixelbender/go-sdp v1.1.0 h1:rkm9aFBNKrnB+YGfhLmAkal3pC8XYXb9h+172PlrCBU= github.com/pixelbender/go-sdp v1.1.0/go.mod h1:6IBlz9+BrUHoFTea7gcp4S54khtOhjCW/nVDLhmZBAs= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= +github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pkg/term v1.2.0-beta.2 h1:L3y/h2jkuBVFdWiJvNfYfKmzcCnILw7mJWm2JQuMppw= github.com/pkg/term v1.2.0-beta.2/go.mod h1:E25nymQcrSllhX42Ok8MRm1+hyBdHY0dCeiKZ9jpNGw= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w= +github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245/go.mod h1:pQAZKsJ8yyVxGRWYNEm9oFB8ieLgKFnamEyDmSA0BRk= github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b h1:gQZ0qzfKHQIybLANtM3mBXNUtOfsCFXeTsnBqCsx1KM= github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= -github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= +github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= +github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= @@ -281,6 +863,7 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= @@ -295,38 +878,63 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= +github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= +go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= +go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= +golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= -golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= +golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= +golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= +golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3/go.mod h1:NOZ3BPKG0ec/BKJQgnvsSFpcKLM5xXVWnvZS97DWHgE= golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= +golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20200119044424-58c23975cae1/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20210216034530-4410531fe030/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20210607152325-775e3b0c77b9/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= +golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= +golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= +golang.org/x/image v0.0.0-20220302094943-723b81ca9867/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -337,8 +945,8 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 h1:2M3HP5CCK1Si9FQhwnzYhXdG6DXeebvUHFpre8QvbyI= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= @@ -349,11 +957,11 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= +golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -391,18 +999,31 @@ golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= +golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= -golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -413,8 +1034,25 @@ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84 h1:duBc5zuJsmJXYOVVE/6PxejI+N3AaCqKjtsoLn1Je5Q= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= +golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= +golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= +golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= +golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= +golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= +golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec= +golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= +golang.org/x/oauth2 v0.6.0 h1:Lh8GPgSKBfWSwFvtuWOfeI3aAAnbXTSutYxJiOJFgIw= +golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -426,7 +1064,10 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -445,7 +1086,6 @@ golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -471,36 +1111,63 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201214095126-aec9a390925b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210223095934-7937bea0104d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210304124612-50617c2ba197/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= -golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= -golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw= +golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -510,16 +1177,23 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.1.0 h1:xYY+Bajn2a7VBmTM5GikTmnK8ZuX8YgnQCqZpbBNtmA= +golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= @@ -532,6 +1206,7 @@ golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190927191325-030b2cf1153e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -560,22 +1235,39 @@ golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= +golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= -golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= -golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= +golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= +golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= +gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= +gonum.org/v1/gonum v0.9.3/go.mod h1:TZumC3NeyVQskjXqmyWt4S3bINhy7B4eYwW69EbyX+0= +gonum.org/v1/gonum v0.11.0/go.mod h1:fSG4YDCxxUZQJ7rKsQrj0gMOg00Il0Z96/qMA4bVQhA= +gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= +gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= +gonum.org/v1/plot v0.9.0/go.mod h1:3Pcqqmp6RHvJI72kgb8fThyUnav364FOsdDo2aGW5lY= +gonum.org/v1/plot v0.10.1/go.mod h1:VZW5OlhkL1mysU9vaqNHnsy86inf6Ot+jB3r+BczCEo= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -596,8 +1288,44 @@ google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= -google.golang.org/api v0.43.0 h1:4sAyIHT6ZohtAQDoxws+ez7bROYmUlOVvsUscYCDTqA= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= +google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= +google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= +google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= +google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= +google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= +google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= +google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= +google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= +google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= +google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= +google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8= +google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs= +google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= +google.golang.org/api v0.77.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= +google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= +google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= +google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= +google.golang.org/api v0.85.0/go.mod h1:AqZf8Ep9uZ2pyTvgL+x0D3Zt0eoT9b5E8fmzfu6FO2g= +google.golang.org/api v0.90.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= +google.golang.org/api v0.93.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= +google.golang.org/api v0.95.0/go.mod h1:eADj+UBuxkh5zlrSntJghuNeg8HwQ1w5lTKkuqaETEI= +google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= +google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= +google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= +google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08= +google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= +google.golang.org/api v0.102.0/go.mod h1:3VFl6/fzoA+qNuS1N1/VfXY4LjoXN/wzeIp7TweWwGo= +google.golang.org/api v0.103.0/go.mod h1:hGtW6nK1AC+d9si/UBhw8Xli+QMOf6xyNAyJw4qU9w0= +google.golang.org/api v0.106.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY= +google.golang.org/api v0.107.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY= +google.golang.org/api v0.108.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY= +google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI= +google.golang.org/api v0.111.0/go.mod h1:qtFHvU9mhgTJegR31csQ+rwxyUTHOKFqCKWp1J0fdw0= +google.golang.org/api v0.114.0 h1:1xQPji6cO2E2vLiI+C/XiFAnsn1WV3mjaEwGLhi3grE= +google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -629,6 +1357,7 @@ google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= @@ -642,10 +1371,97 @@ google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6 h1:4Xw2NwItrJOFR5s6PnK98PI6Bgw1LhMP1j/rO5WP0S4= google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210329143202-679c6ae281ee/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= +google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= +google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= +google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= +google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= +google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= +google.golang.org/genproto v0.0.0-20220329172620-7be39ac1afc7/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220722212130-b98a9ff5e252/go.mod h1:GkXuJDJ6aQ7lnJcRF+SJVgFdQhypqgl3LB1C9vabdRE= +google.golang.org/genproto v0.0.0-20220801145646-83ce21fca29f/go.mod h1:iHe1svFLAZg9VWz891+QbRMwUv9O/1Ww+/mngYeThbc= +google.golang.org/genproto v0.0.0-20220815135757-37a418bb8959/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= +google.golang.org/genproto v0.0.0-20220817144833-d7fd3f11b9b1/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= +google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= +google.golang.org/genproto v0.0.0-20220829144015-23454907ede3/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= +google.golang.org/genproto v0.0.0-20220829175752-36a9c930ecbf/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= +google.golang.org/genproto v0.0.0-20220913154956-18f8339a66a5/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= +google.golang.org/genproto v0.0.0-20220914142337-ca0e39ece12f/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= +google.golang.org/genproto v0.0.0-20220915135415-7fd63a7952de/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= +google.golang.org/genproto v0.0.0-20220916172020-2692e8806bfa/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= +google.golang.org/genproto v0.0.0-20220919141832-68c03719ef51/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= +google.golang.org/genproto v0.0.0-20220920201722-2b89144ce006/go.mod h1:ht8XFiar2npT/g4vkk7O0WYS1sHOHbdujxbEp7CJWbw= +google.golang.org/genproto v0.0.0-20220926165614-551eb538f295/go.mod h1:woMGP53BroOrRY3xTxlbr8Y3eB/nzAvvFM83q7kG2OI= +google.golang.org/genproto v0.0.0-20220926220553-6981cbe3cfce/go.mod h1:woMGP53BroOrRY3xTxlbr8Y3eB/nzAvvFM83q7kG2OI= +google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U= +google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= +google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= +google.golang.org/genproto v0.0.0-20221024153911-1573dae28c9c/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= +google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= +google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo= +google.golang.org/genproto v0.0.0-20221109142239-94d6d90a7d66/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= +google.golang.org/genproto v0.0.0-20221114212237-e4508ebdbee1/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= +google.golang.org/genproto v0.0.0-20221117204609-8f9c96812029/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= +google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= +google.golang.org/genproto v0.0.0-20221201164419-0e50fba7f41c/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= +google.golang.org/genproto v0.0.0-20221201204527-e3fa12d562f3/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= +google.golang.org/genproto v0.0.0-20221202195650-67e5cbc046fd/go.mod h1:cTsE614GARnxrLsqKREzmNYJACSWWpAWdNMwnD7c2BE= +google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= +google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= +google.golang.org/genproto v0.0.0-20230112194545-e10362b5ecf9/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= +google.golang.org/genproto v0.0.0-20230113154510-dbe35b8444a5/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= +google.golang.org/genproto v0.0.0-20230123190316-2c411cf9d197/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= +google.golang.org/genproto v0.0.0-20230124163310-31e0e69b6fc2/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= +google.golang.org/genproto v0.0.0-20230125152338-dcaf20b6aeaa/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= +google.golang.org/genproto v0.0.0-20230127162408-596548ed4efa/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= +google.golang.org/genproto v0.0.0-20230209215440-0dfe4f8abfcc/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= +google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44/go.mod h1:8B0gmkoRebU8ukX6HP+4wrVQUY1+6PkQ44BSyIlflHA= +google.golang.org/genproto v0.0.0-20230222225845-10f96fb3dbec/go.mod h1:3Dl5ZL0q0isWJt+FVcfpQyirqemEuLAK/iFvg1UP1Hw= +google.golang.org/genproto v0.0.0-20230223222841-637eb2293923/go.mod h1:3Dl5ZL0q0isWJt+FVcfpQyirqemEuLAK/iFvg1UP1Hw= +google.golang.org/genproto v0.0.0-20230303212802-e74f57abe488/go.mod h1:TvhZT5f700eVlTNwND1xoEZQeWTB2RY/65kplwl/bFA= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -659,11 +1475,33 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.0 h1:o1bcQ6imQMIOpdrO3SWf2z5RV72WbDwdXuK0MDlc8As= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= +google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= +google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= +google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= +google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww= +google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc= +google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -676,19 +1514,25 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.29.1 h1:7QBf+IK2gx70Ap/hDsOmam3GE0v9HicjfEdAxE62UoM= +google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= @@ -700,6 +1544,42 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= +lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= +lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= +modernc.org/cc/v3 v3.36.0/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= +modernc.org/cc/v3 v3.36.2/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= +modernc.org/cc/v3 v3.36.3/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= +modernc.org/ccgo/v3 v3.0.0-20220428102840-41399a37e894/go.mod h1:eI31LL8EwEBKPpNpA4bU1/i+sKOwOrQy8D87zWUcRZc= +modernc.org/ccgo/v3 v3.0.0-20220430103911-bc99d88307be/go.mod h1:bwdAnOoaIt8Ax9YdWGjxWsdkPcZyRPHqrOvJxaKAKGw= +modernc.org/ccgo/v3 v3.16.4/go.mod h1:tGtX0gE9Jn7hdZFeU88slbTh1UtCYKusWOoCJuvkWsQ= +modernc.org/ccgo/v3 v3.16.6/go.mod h1:tGtX0gE9Jn7hdZFeU88slbTh1UtCYKusWOoCJuvkWsQ= +modernc.org/ccgo/v3 v3.16.8/go.mod h1:zNjwkizS+fIFDrDjIAgBSCLkWbJuHF+ar3QRn+Z9aws= +modernc.org/ccgo/v3 v3.16.9/go.mod h1:zNMzC9A9xeNUepy6KuZBbugn3c0Mc9TeiJO4lgvkJDo= +modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ= +modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM= +modernc.org/libc v0.0.0-20220428101251-2d5f3daf273b/go.mod h1:p7Mg4+koNjc8jkqwcoFBJx7tXkpj00G77X7A72jXPXA= +modernc.org/libc v1.16.0/go.mod h1:N4LD6DBE9cf+Dzf9buBlzVJndKr/iJHG97vGLHYnb5A= +modernc.org/libc v1.16.1/go.mod h1:JjJE0eu4yeK7tab2n4S1w8tlWd9MxXLRzheaRnAKymU= +modernc.org/libc v1.16.17/go.mod h1:hYIV5VZczAmGZAnG15Vdngn5HSF5cSkbvfz2B7GRuVU= +modernc.org/libc v1.16.19/go.mod h1:p7Mg4+koNjc8jkqwcoFBJx7tXkpj00G77X7A72jXPXA= +modernc.org/libc v1.17.0/go.mod h1:XsgLldpP4aWlPlsjqKRdHPqCxCjISdHfM/yeWC5GyW0= +modernc.org/libc v1.17.1/go.mod h1:FZ23b+8LjxZs7XtFMbSzL/EhPxNbfZbErxEHc7cbD9s= +modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= +modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= +modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= +modernc.org/memory v1.1.1/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw= +modernc.org/memory v1.2.0/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw= +modernc.org/memory v1.2.1/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= +modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= +modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= +modernc.org/sqlite v1.18.1/go.mod h1:6ho+Gow7oX5V+OiOQ6Tr4xeqbx13UZ6t+Fw9IRUG4d4= +modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw= +modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw= +modernc.org/tcl v1.13.1/go.mod h1:XOLfOwzhkljL4itZkK6T72ckMgvj0BDsnKNdZVUOecw= +modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= +modernc.org/z v1.5.1/go.mod h1:eWFB510QWW5Th9YGZT81s+LwvaAs3Q2yr4sP0rmLkv8= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= From c7d53dbde1a9e75d1c82df4020b9671fe987c94f Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Sun, 2 Apr 2023 20:08:06 +0800 Subject: [PATCH 05/36] fix: fix bug for call end. --- examples/b2bua/b2bua/b2bua.go | 7 +------ examples/b2bua/b2bua/call.go | 19 +++++++++++++------ pkg/ua/ua.go | 12 ++++++------ 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/examples/b2bua/b2bua/b2bua.go b/examples/b2bua/b2bua/b2bua.go index 16ee8bd..e0aaab5 100644 --- a/examples/b2bua/b2bua/b2bua.go +++ b/examples/b2bua/b2bua/b2bua.go @@ -235,12 +235,7 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { //TODO: Add support for forked calls call := b.findCall(sess) if call != nil { - if call.src == sess { - call.dest.End() - } else if call.dest == sess { - call.src.End() - } - call.Terminate() + call.Terminate(sess) } b.removeCall(sess) diff --git a/examples/b2bua/b2bua/call.go b/examples/b2bua/b2bua/call.go index bff9267..f2f8cd6 100644 --- a/examples/b2bua/b2bua/call.go +++ b/examples/b2bua/b2bua/call.go @@ -61,7 +61,7 @@ func (b *B2BCall) SetState(state CallState) { b.state = state } -func (b *B2BCall) Terminate() { +func (b *B2BCall) Terminate(sess *session.Session) { b.srcTrans.OnRtpPacket(nil) b.destTrans.OnRtpPacket(nil) @@ -77,12 +77,19 @@ func (b *B2BCall) Terminate() { logger.Errorf("Close dest transport error: %v", err) } - if b.state != Confirmed { - b.src.End() - } else { - b.src.Bye() + if b.src == sess { + if b.state != Confirmed { + b.dest.End() + } else { + b.dest.Bye() + } + } else if b.dest == sess { + if b.state != Confirmed { + b.src.End() + } else { + b.src.Bye() + } } - b.state = Terminated } diff --git a/pkg/ua/ua.go b/pkg/ua/ua.go index 38726ba..af9ff03 100644 --- a/pkg/ua/ua.go +++ b/pkg/ua/ua.go @@ -28,8 +28,8 @@ type SessionKey struct { // NewSessionKey - Build a Session Key quickly func NewSessionKey(callID sip.CallID, branchID sip.MaybeString) SessionKey { return SessionKey{ - CallID: callID, - BranchID: branchID, + CallID: callID, + //BranchID: branchID, } } @@ -38,13 +38,13 @@ type UserAgentConfig struct { SipStack *stack.SipStack } -//InviteSessionHandler . +// InviteSessionHandler . type InviteSessionHandler func(s *session.Session, req *sip.Request, resp *sip.Response, status session.Status) -//RegisterHandler . +// RegisterHandler . type RegisterHandler func(regState account.RegisterState) -//UserAgent . +// UserAgent . type UserAgent struct { InviteStateHandler InviteSessionHandler RegisterStateHandler RegisterHandler @@ -53,7 +53,7 @@ type UserAgent struct { log log.Logger } -//NewUserAgent . +// NewUserAgent . func NewUserAgent(config *UserAgentConfig) *UserAgent { ua := &UserAgent{ config: config, From 6fb2832e02066fd201d96e9c74eacad7dfd005f3 Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Sun, 2 Apr 2023 20:53:28 +0800 Subject: [PATCH 06/36] update. --- examples/b2bua/b2bua/b2bua.go | 2 +- examples/b2bua/b2bua/call.go | 8 ++++---- examples/b2bua/b2bua/rtc.go | 21 ++++++++++++++------- examples/b2bua/b2bua/udp.go | 5 +++-- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/examples/b2bua/b2bua/b2bua.go b/examples/b2bua/b2bua/b2bua.go index e0aaab5..1ab007e 100644 --- a/examples/b2bua/b2bua/b2bua.go +++ b/examples/b2bua/b2bua/b2bua.go @@ -97,7 +97,7 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { logger.Panic(err) } - if err := stack.ListenTLS("wss", "0.0.0.0:5081", tlsOptions); err != nil { + if err := stack.ListenTLS("wss", "0.0.0.0:8089", tlsOptions); err != nil { logger.Panic(err) } } diff --git a/examples/b2bua/b2bua/call.go b/examples/b2bua/b2bua/call.go index f2f8cd6..59ff757 100644 --- a/examples/b2bua/b2bua/call.go +++ b/examples/b2bua/b2bua/call.go @@ -176,26 +176,26 @@ func (b *B2BCall) BridgeMediaStream() error { b.srcTrans.OnRtpPacket(func(trackType TrackType, payload []byte) { _, err := b.destTrans.WriteRTP(trackType, payload) if err != nil { - logger.Errorf("WriteRTP error: %v", err) + logger.Errorf("WriteRTP[%v] %v error: %v", b.destTrans.Type(), trackType, err) } }) b.srcTrans.OnRtcpPacket(func(trackType TrackType, payload []byte) { _, err := b.destTrans.WriteRTCP(trackType, payload) if err != nil { - logger.Errorf("WriteRTCP error: %v", err) + logger.Errorf("WriteRTCP[%v] %v error: %v", b.destTrans.Type(), trackType, err) } }) b.destTrans.OnRtpPacket(func(trackType TrackType, payload []byte) { _, err := b.srcTrans.WriteRTP(trackType, payload) if err != nil { - logger.Errorf("WriteRTP error: %v", err) + logger.Errorf("WriteRTP[%v] %v error: %v", b.srcTrans.Type(), trackType, err) } }) b.destTrans.OnRtcpPacket(func(trackType TrackType, payload []byte) { _, err := b.srcTrans.WriteRTCP(trackType, payload) if err != nil { - logger.Errorf("WriteRTCP error: %v", err) + logger.Errorf("WriteRTCP[%v] %v error: %v", b.srcTrans.Type(), trackType, err) } }) return nil diff --git a/examples/b2bua/b2bua/rtc.go b/examples/b2bua/b2bua/rtc.go index b3f28cb..97685ac 100644 --- a/examples/b2bua/b2bua/rtc.go +++ b/examples/b2bua/b2bua/rtc.go @@ -186,7 +186,7 @@ func (c *WebRTCTransport) OnRtcpPacket(rtcpHandler func(trackType TrackType, pay } func (c *WebRTCTransport) onRtpPacket(trackType TrackType, packet []byte) error { - logger.Infof("WebRTCTransport::OnRtpPacketReceived: %v read %d bytes", trackType, len(packet)) + logger.Debugf("WebRTCTransport::OnRtpPacketReceived: %v read %d bytes", trackType, len(packet)) c.mu.RLock() defer c.mu.RUnlock() if c.rtpHandler != nil { @@ -196,7 +196,7 @@ func (c *WebRTCTransport) onRtpPacket(trackType TrackType, packet []byte) error } func (c *WebRTCTransport) onRtcpPacket(trackType TrackType, packet []byte) error { - logger.Infof("WebRTCTransport::OnRtcpPacketReceived: %v read %d bytes", trackType, len(packet)) + logger.Debugf("WebRTCTransport::OnRtcpPacketReceived: %v read %d bytes", trackType, len(packet)) c.mu.RLock() defer c.mu.RUnlock() if c.rtcpHandler != nil { @@ -277,7 +277,9 @@ func (c *WebRTCTransport) AddLocalTracks() error { return err } - if _, err = c.pc.AddTrack(videoTrack); err != nil { + if rtpSender, err := c.pc.AddTrack(videoTrack); err == nil { + c.HandleRtcpFb(rtpSender) + } else { logger.Errorf("AddTrack: panic => %v", err) return err } @@ -389,30 +391,35 @@ func (c *WebRTCTransport) HandleRtcpFb(rtpSender *webrtc.RTPSender) { case *rtcp.PictureLossIndication: if pliOnce { fwdPkts = append(fwdPkts, p) - logger.Infof("PictureLossIndication") + logger.Infof("Picture Loss Indication") //hi.CameraSendKeyFrame() + buf, _ := p.Marshal() + c.onRtcpPacket(TrackTypeVideo, buf) pliOnce = false } case *rtcp.FullIntraRequest: if firOnce { fwdPkts = append(fwdPkts, p) - //logger.Infof("FullIntraRequest") + logger.Infof("FullIntraRequest") firOnce = false } case *rtcp.ReceiverEstimatedMaximumBitrate: if expectedMinBitrate == 0 || expectedMinBitrate > uint64(p.Bitrate) { expectedMinBitrate = uint64(p.Bitrate) //hi.CameraUpdateBitrate(uint32(expectedMinBitrate / 1024)) - logger.Infof("ReceiverEstimatedMaximumBitrate %d", expectedMinBitrate/1024) + logger.Debugf("ReceiverEstimatedMaximumBitrate %d", expectedMinBitrate/1024) } case *rtcp.ReceiverReport: for _, r := range p.Reports { if maxRatePacketLoss == 0 || maxRatePacketLoss < r.FractionLost { maxRatePacketLoss = r.FractionLost - logger.Infof("maxRatePacketLoss %d", maxRatePacketLoss) + logger.Debugf("maxRatePacketLoss %d", maxRatePacketLoss) } } case *rtcp.TransportLayerNack: + logger.Infof("Nack") + buf, _ := p.Marshal() + c.onRtcpPacket(TrackTypeVideo, buf) } } } diff --git a/examples/b2bua/b2bua/udp.go b/examples/b2bua/b2bua/udp.go index e967117..01e1f01 100644 --- a/examples/b2bua/b2bua/udp.go +++ b/examples/b2bua/b2bua/udp.go @@ -82,6 +82,7 @@ func (c *UdpTansport) Init(config CallConfig) error { Name: codec.Name, ClockRate: codec.ClockRate, Params: codec.Params, + Feedback: codec.Feedback, }) } } @@ -108,7 +109,7 @@ func (c *UdpTansport) OnRtcpPacket(rtcpHandler func(trackType TrackType, payload } func (c *UdpTansport) onRtpPacket(trackType TrackType, packet []byte, raddr net.Addr) error { - logger.Infof("UdpTansport::OnRtpPacketReceived: %v read %d bytes, raddr %v", trackType, len(packet), raddr) + logger.Debugf("UdpTansport::OnRtpPacketReceived: %v read %d bytes, raddr %v", trackType, len(packet), raddr) c.mu.RLock() defer c.mu.RUnlock() if c.rtpHandler != nil { @@ -118,7 +119,7 @@ func (c *UdpTansport) onRtpPacket(trackType TrackType, packet []byte, raddr net. } func (c *UdpTansport) onRtcpPacket(trackType TrackType, packet []byte, raddr net.Addr) error { - logger.Infof("UdpTansport::OnRtcpPacketReceived: %v read %d bytes, raddr %v", trackType, len(packet), raddr) + logger.Debugf("UdpTansport::OnRtcpPacketReceived: %v read %d bytes, raddr %v", trackType, len(packet), raddr) c.mu.RLock() defer c.mu.RUnlock() if c.rtcpHandler != nil { From bf191e5aea438426df2d5dd3adb3fae79bcbfda9 Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Sun, 2 Apr 2023 21:27:27 +0800 Subject: [PATCH 07/36] update. --- examples/b2bua/b2bua/rtc.go | 2 ++ examples/b2bua/b2bua/udp.go | 41 +++++++++++++++++++++++++++++++++++-- go.mod | 1 + 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/examples/b2bua/b2bua/rtc.go b/examples/b2bua/b2bua/rtc.go index 97685ac..a391a4f 100644 --- a/examples/b2bua/b2bua/rtc.go +++ b/examples/b2bua/b2bua/rtc.go @@ -187,6 +187,7 @@ func (c *WebRTCTransport) OnRtcpPacket(rtcpHandler func(trackType TrackType, pay func (c *WebRTCTransport) onRtpPacket(trackType TrackType, packet []byte) error { logger.Debugf("WebRTCTransport::OnRtpPacketReceived: %v read %d bytes", trackType, len(packet)) + c.mu.RLock() defer c.mu.RUnlock() if c.rtpHandler != nil { @@ -197,6 +198,7 @@ func (c *WebRTCTransport) onRtpPacket(trackType TrackType, packet []byte) error func (c *WebRTCTransport) onRtcpPacket(trackType TrackType, packet []byte) error { logger.Debugf("WebRTCTransport::OnRtcpPacketReceived: %v read %d bytes", trackType, len(packet)) + c.mu.RLock() defer c.mu.RUnlock() if c.rtcpHandler != nil { diff --git a/examples/b2bua/b2bua/udp.go b/examples/b2bua/b2bua/udp.go index 01e1f01..94d9573 100644 --- a/examples/b2bua/b2bua/udp.go +++ b/examples/b2bua/b2bua/udp.go @@ -7,6 +7,7 @@ import ( "github.com/ghettovoice/gosip/util" "github.com/pion/rtcp" + "github.com/pion/rtp" "github.com/pixelbender/go-sdp/sdp" ) @@ -82,7 +83,7 @@ func (c *UdpTansport) Init(config CallConfig) error { Name: codec.Name, ClockRate: codec.ClockRate, Params: codec.Params, - Feedback: codec.Feedback, + //Feedback: codec.Feedback, }) } } @@ -129,14 +130,50 @@ func (c *UdpTansport) onRtcpPacket(trackType TrackType, packet []byte, raddr net } func (c *UdpTansport) WriteRTP(trackType TrackType, packet []byte) (int, error) { + + p := &rtp.Packet{} + if err := p.Unmarshal(packet); err != nil { + + } + logger.Infof("WebRTCTransport::OnRtpPacketReceived: %v read %d bytes, seq %d, ts %d", trackType, len(packet), p.SequenceNumber, p.Timestamp) + p.Extension = false + p.ExtensionProfile = 0 + p.Extensions = nil + p.Padding = false + p.PaddingSize = 0 + if trackType == TrackTypeVideo { + p.PayloadType = 98 + } + + pktbuf, err := p.Marshal() + + if err != nil { + logger.Errorf("Marshal rtp receiver packets err %v", err) + } + port := c.ports[trackType] raddr := port.GetRemoteRtpAddress() - return port.WriteRtpPacket(packet, *raddr) + if raddr == nil { + logger.Errorf("raddr is nil") + return 0, nil + } + return port.WriteRtpPacket(pktbuf, *raddr) } func (c *UdpTansport) WriteRTCP(trackType TrackType, packet []byte) (int, error) { + + pkts, err := rtcp.Unmarshal(packet) + if err != nil { + logger.Errorf("Unmarshal rtcp receiver packets err %v", err) + } + logger.Infof("WebRTCTransport::OnRtcpPacketReceived: %v read %d packets", trackType, len(pkts)) + port := c.ports[trackType] raddr := port.GetRemoteRtcpAddress() + if raddr == nil { + logger.Errorf("raddr is nil") + return 0, nil + } return port.WriteRtcpPacket(packet, *raddr) } diff --git a/go.mod b/go.mod index ad3473f..24bb50b 100644 --- a/go.mod +++ b/go.mod @@ -9,6 +9,7 @@ require ( github.com/google/uuid v1.3.0 github.com/pion/interceptor v0.1.12 github.com/pion/rtcp v1.2.10 + github.com/pion/rtp v1.7.13 github.com/pion/webrtc/v3 v3.1.59 github.com/pixelbender/go-sdp v1.1.0 github.com/sirupsen/logrus v1.9.0 From ad1d1ce749510fcda6f2482eafbec37a55980fd1 Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Sun, 2 Apr 2023 23:42:55 +0800 Subject: [PATCH 08/36] update. --- examples/b2bua/b2bua/rtc.go | 2 +- examples/b2bua/b2bua/udp.go | 58 +++++++++++++++++++++++++++++--- examples/b2bua/b2bua/udp_port.go | 2 +- 3 files changed, 55 insertions(+), 7 deletions(-) diff --git a/examples/b2bua/b2bua/rtc.go b/examples/b2bua/b2bua/rtc.go index a391a4f..7b660a6 100644 --- a/examples/b2bua/b2bua/rtc.go +++ b/examples/b2bua/b2bua/rtc.go @@ -419,7 +419,7 @@ func (c *WebRTCTransport) HandleRtcpFb(rtpSender *webrtc.RTPSender) { } } case *rtcp.TransportLayerNack: - logger.Infof("Nack") + logger.Debugf("Nack") buf, _ := p.Marshal() c.onRtcpPacket(TrackTypeVideo, buf) } diff --git a/examples/b2bua/b2bua/udp.go b/examples/b2bua/b2bua/udp.go index 94d9573..61f1bc3 100644 --- a/examples/b2bua/b2bua/udp.go +++ b/examples/b2bua/b2bua/udp.go @@ -1,10 +1,12 @@ package b2bua import ( + "context" "net" "sync" "time" + "github.com/cloudwebrtc/go-sip-ua/pkg/utils" "github.com/ghettovoice/gosip/util" "github.com/pion/rtcp" "github.com/pion/rtp" @@ -20,13 +22,23 @@ type UdpTansport struct { mu sync.RWMutex rtpHandler func(trackType TrackType, payload []byte) rtcpHandler func(trackType TrackType, payload []byte) + + videoSSRC uint32 + closed utils.AtomicBool + ctx context.Context + cancel context.CancelFunc } func NewUdpTansport(trackInfos []*TrackInfo) *UdpTansport { - return &UdpTansport{ + t := &UdpTansport{ trackInfos: trackInfos, ports: make(map[TrackType]*UdpPort), + videoSSRC: 0, } + + t.ctx, t.cancel = context.WithCancel(context.TODO()) + t.closed.Set(false) + return t } func (c *UdpTansport) Init(config CallConfig) error { @@ -111,6 +123,19 @@ func (c *UdpTansport) OnRtcpPacket(rtcpHandler func(trackType TrackType, payload func (c *UdpTansport) onRtpPacket(trackType TrackType, packet []byte, raddr net.Addr) error { logger.Debugf("UdpTansport::OnRtpPacketReceived: %v read %d bytes, raddr %v", trackType, len(packet), raddr) + + p := &rtp.Packet{} + if err := p.Unmarshal(packet); err != nil { + logger.Errorf("rtp.Packet Unmarshal: e %v len %v", err, len(packet)) + } + + logger.Debugf("UdpTansport::onRtpPacket: [%v] read %d bytes, seq %d, ts %d, ssrc %v, payload %v", trackType, len(packet), p.SequenceNumber, p.Timestamp, p.SSRC, p.PayloadType) + + if trackType == TrackTypeVideo && c.videoSSRC == 0 { + c.videoSSRC = p.SSRC + c.RequestKeyFrame(c.videoSSRC) + } + c.mu.RLock() defer c.mu.RUnlock() if c.rtpHandler != nil { @@ -133,14 +158,16 @@ func (c *UdpTansport) WriteRTP(trackType TrackType, packet []byte) (int, error) p := &rtp.Packet{} if err := p.Unmarshal(packet); err != nil { - + logger.Errorf("tp.Packet Unmarshal: e %v", err) } - logger.Infof("WebRTCTransport::OnRtpPacketReceived: %v read %d bytes, seq %d, ts %d", trackType, len(packet), p.SequenceNumber, p.Timestamp) + logger.Debugf("UdpTansport::WriteRTP: %v, write %d bytes, seq %d, ts %d", trackType, len(packet), p.SequenceNumber, p.Timestamp) + p.Extension = false p.ExtensionProfile = 0 p.Extensions = nil p.Padding = false p.PaddingSize = 0 + if trackType == TrackTypeVideo { p.PayloadType = 98 } @@ -157,6 +184,8 @@ func (c *UdpTansport) WriteRTP(trackType TrackType, packet []byte) (int, error) logger.Errorf("raddr is nil") return 0, nil } + + logger.Debugf("UdpTansport::WriteRTP: %v, raddr %v", trackType, *raddr) return port.WriteRtpPacket(pktbuf, *raddr) } @@ -166,14 +195,16 @@ func (c *UdpTansport) WriteRTCP(trackType TrackType, packet []byte) (int, error) if err != nil { logger.Errorf("Unmarshal rtcp receiver packets err %v", err) } - logger.Infof("WebRTCTransport::OnRtcpPacketReceived: %v read %d packets", trackType, len(pkts)) + + logger.Debugf("UdpTansport::WriteRTCP: %v read %d packets", trackType, len(pkts)) port := c.ports[trackType] raddr := port.GetRemoteRtcpAddress() if raddr == nil { logger.Errorf("raddr is nil") - return 0, nil + raddr = port.GetRemoteRtpAddress() } + logger.Infof("UdpTansport::WriteRTCP: %v read %d packets, raddr %v", trackType, len(pkts), *raddr) return port.WriteRtcpPacket(packet, *raddr) } @@ -182,6 +213,18 @@ func (c *UdpTansport) Type() TransportType { } func (c *UdpTansport) Close() error { + + c.mu.Lock() + defer c.mu.Unlock() + + c.rtcpHandler = nil + c.rtpHandler = nil + + if !c.closed.Get() { + c.closed.Set(true) + } + c.cancel() + for _, udpPort := range c.ports { udpPort.Close() } @@ -244,6 +287,10 @@ func (c *UdpTansport) RequestKeyFrame(ssrc uint32) error { go func() { ticker := time.NewTicker(time.Second * 3) for range ticker.C { + if c.closed.Get() { + logger.Infof("Terminate: stop pli loop now!") + return + } pli := rtcp.PictureLossIndication{MediaSSRC: uint32(ssrc)} buf, err := pli.Marshal() if err != nil { @@ -255,6 +302,7 @@ func (c *UdpTansport) RequestKeyFrame(ssrc uint32) error { logger.Error(errSend) return } + logger.Infof("Sent PLI %v", pli) } }() return nil diff --git a/examples/b2bua/b2bua/udp_port.go b/examples/b2bua/b2bua/udp_port.go index 48291a7..ac0d985 100644 --- a/examples/b2bua/b2bua/udp_port.go +++ b/examples/b2bua/b2bua/udp_port.go @@ -142,7 +142,7 @@ func (c *UdpPort) loop(conn *net.UDPConn, onPacketReceived func(data []byte, rad logger.Infof("Terminate: stop rtp conn now!") return } - n, raddr, err := conn.ReadFrom(buf) + n, raddr, err := conn.ReadFromUDP(buf) if err != nil { logger.Infof("RTP Conn [%v] refused, stop now!", raddr) return From ef319bda1f246caf528a7c0eb9fa37287f23b6c9 Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Sun, 23 Apr 2023 10:19:36 +0800 Subject: [PATCH 09/36] more files. --- examples/b2bua/b2bua/b2bua.go | 33 +- examples/b2bua/b2bua/buffer/bucket.go | 114 ++++ examples/b2bua/b2bua/buffer/bucket_test.go | 139 +++++ examples/b2bua/b2bua/buffer/buffer.go | 595 ++++++++++++++++++++ examples/b2bua/b2bua/buffer/buffer_test.go | 184 ++++++ examples/b2bua/b2bua/buffer/errors.go | 10 + examples/b2bua/b2bua/buffer/factory.go | 97 ++++ examples/b2bua/b2bua/buffer/helpers.go | 212 +++++++ examples/b2bua/b2bua/buffer/helpers_test.go | 94 ++++ examples/b2bua/b2bua/buffer/nack.go | 100 ++++ examples/b2bua/b2bua/buffer/nack_test.go | 181 ++++++ examples/b2bua/b2bua/buffer/rtcpreader.go | 44 ++ examples/b2bua/b2bua/call.go | 16 + examples/b2bua/b2bua/rtc.go | 130 ++++- examples/b2bua/b2bua/sequencer.go | 129 +++++ examples/b2bua/b2bua/sequencer_test.go | 99 ++++ examples/b2bua/b2bua/udp.go | 85 ++- examples/b2bua/b2bua/udp_port.go | 2 +- examples/b2bua/b2bua/util.go | 4 + go.mod | 6 + go.sum | 578 ++++++++++++++++++- 21 files changed, 2795 insertions(+), 57 deletions(-) create mode 100644 examples/b2bua/b2bua/buffer/bucket.go create mode 100644 examples/b2bua/b2bua/buffer/bucket_test.go create mode 100644 examples/b2bua/b2bua/buffer/buffer.go create mode 100644 examples/b2bua/b2bua/buffer/buffer_test.go create mode 100644 examples/b2bua/b2bua/buffer/errors.go create mode 100644 examples/b2bua/b2bua/buffer/factory.go create mode 100644 examples/b2bua/b2bua/buffer/helpers.go create mode 100644 examples/b2bua/b2bua/buffer/helpers_test.go create mode 100644 examples/b2bua/b2bua/buffer/nack.go create mode 100644 examples/b2bua/b2bua/buffer/nack_test.go create mode 100644 examples/b2bua/b2bua/buffer/rtcpreader.go create mode 100644 examples/b2bua/b2bua/sequencer.go create mode 100644 examples/b2bua/b2bua/sequencer_test.go diff --git a/examples/b2bua/b2bua/b2bua.go b/examples/b2bua/b2bua/b2bua.go index 1ab007e..464d047 100644 --- a/examples/b2bua/b2bua/b2bua.go +++ b/examples/b2bua/b2bua/b2bua.go @@ -152,6 +152,16 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { b.calls = append(b.calls, call) call.SetState(Connecting) + + aLegAnswer, err := call.CreateALegAnswer() + if err == nil { + call.src.ProvideAnswer(aLegAnswer.SDP) + } + call.SetState(EarlyMedia) + //call.src.Provisional((*resp).StatusCode(), (*resp).Reason()) + call.src.Accept(200) + + call.BridgeMediaStream() } // Try to find online contact records. @@ -197,18 +207,9 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { case session.Provisional: call := b.findCall(sess) if call != nil && call.dest == sess { - answer := call.dest.RemoteSdp() - if len(answer) > 0 { - call.SetBLegAnswer(&Desc{Type: "answer", SDP: answer}) - aLegAnswer, err := call.CreateALegAnswer() - if err == nil { - call.src.ProvideAnswer(aLegAnswer.SDP) - } - call.SetState(EarlyMedia) - } else { - call.SetState(Ringing) - } - call.src.Provisional((*resp).StatusCode(), (*resp).Reason()) + //answer := call.dest.RemoteSdp() + + //call.SetBLegAnswer(&Desc{Type: "answer", SDP: answer}) } @@ -219,11 +220,11 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { if call != nil && call.dest == sess { answer := call.dest.RemoteSdp() call.SetBLegAnswer(&Desc{Type: "answer", SDP: answer}) - aLegAnswer, _ := call.CreateALegAnswer() - call.src.ProvideAnswer(aLegAnswer.SDP) - call.src.Accept(200) + //aLegAnswer, _ := call.CreateALegAnswer() + //call.src.ProvideAnswer(aLegAnswer.SDP) + call.SetState(Confirmed) - call.BridgeMediaStream() + } // Handle 4XX+ diff --git a/examples/b2bua/b2bua/buffer/bucket.go b/examples/b2bua/b2bua/buffer/bucket.go new file mode 100644 index 0000000..8344486 --- /dev/null +++ b/examples/b2bua/b2bua/buffer/bucket.go @@ -0,0 +1,114 @@ +package buffer + +import ( + "encoding/binary" + "math" +) + +const maxPktSize = 1500 + +type Bucket struct { + buf []byte + src *[]byte + + init bool + step int + headSN uint16 + maxSteps int +} + +func NewBucket(buf *[]byte) *Bucket { + return &Bucket{ + src: buf, + buf: *buf, + maxSteps: int(math.Floor(float64(len(*buf))/float64(maxPktSize))) - 1, + } +} + +func (b *Bucket) AddPacket(pkt []byte, sn uint16, latest bool) ([]byte, error) { + if !b.init { + b.headSN = sn - 1 + b.init = true + } + if !latest { + return b.set(sn, pkt) + } + diff := sn - b.headSN + b.headSN = sn + for i := uint16(1); i < diff; i++ { + b.step++ + if b.step >= b.maxSteps { + b.step = 0 + } + } + return b.push(pkt), nil +} + +func (b *Bucket) GetPacket(buf []byte, sn uint16) (i int, err error) { + p := b.get(sn) + if p == nil { + err = errPacketNotFound + return + } + i = len(p) + if cap(buf) < i { + err = errBufferTooSmall + return + } + if len(buf) < i { + buf = buf[:i] + } + copy(buf, p) + return +} + +func (b *Bucket) push(pkt []byte) []byte { + binary.BigEndian.PutUint16(b.buf[b.step*maxPktSize:], uint16(len(pkt))) + off := b.step*maxPktSize + 2 + copy(b.buf[off:], pkt) + b.step++ + if b.step > b.maxSteps { + b.step = 0 + } + return b.buf[off : off+len(pkt)] +} + +func (b *Bucket) get(sn uint16) []byte { + pos := b.step - int(b.headSN-sn+1) + if pos < 0 { + if pos*-1 > b.maxSteps+1 { + return nil + } + pos = b.maxSteps + pos + 1 + } + off := pos * maxPktSize + if off > len(b.buf) { + return nil + } + if binary.BigEndian.Uint16(b.buf[off+4:off+6]) != sn { + return nil + } + sz := int(binary.BigEndian.Uint16(b.buf[off : off+2])) + return b.buf[off+2 : off+2+sz] +} + +func (b *Bucket) set(sn uint16, pkt []byte) ([]byte, error) { + if b.headSN-sn >= uint16(b.maxSteps+1) { + return nil, errPacketTooOld + } + pos := b.step - int(b.headSN-sn+1) + if pos < 0 { + pos = b.maxSteps + pos + 1 + } + off := pos * maxPktSize + if off > len(b.buf) || off < 0 { + return nil, errPacketTooOld + } + // Do not overwrite if packet exist + if binary.BigEndian.Uint16(b.buf[off+4:off+6]) == sn { + return nil, errRTXPacket + } + binary.BigEndian.PutUint16(b.buf[off:], uint16(len(pkt))) + copy(b.buf[off+2:], pkt) + return b.buf[off+2 : off+2+len(pkt)], nil +} diff --git a/examples/b2bua/b2bua/buffer/bucket_test.go b/examples/b2bua/b2bua/buffer/bucket_test.go new file mode 100644 index 0000000..706387f --- /dev/null +++ b/examples/b2bua/b2bua/buffer/bucket_test.go @@ -0,0 +1,139 @@ +package buffer + +import ( + "testing" + + "github.com/pion/rtp" + "github.com/stretchr/testify/assert" +) + +var TestPackets = []*rtp.Packet{ + { + Header: rtp.Header{ + SequenceNumber: 1, + }, + }, + { + Header: rtp.Header{ + SequenceNumber: 3, + }, + }, + { + Header: rtp.Header{ + SequenceNumber: 4, + }, + }, + { + Header: rtp.Header{ + SequenceNumber: 6, + }, + }, + { + Header: rtp.Header{ + SequenceNumber: 7, + }, + }, + { + Header: rtp.Header{ + SequenceNumber: 10, + }, + }, +} + +func Test_queue(t *testing.T) { + b := make([]byte, 25000) + q := NewBucket(&b) + + for _, p := range TestPackets { + p := p + buf, err := p.Marshal() + assert.NoError(t, err) + assert.NotPanics(t, func() { + q.AddPacket(buf, p.SequenceNumber, true) + }) + } + var expectedSN uint16 + expectedSN = 6 + np := rtp.Packet{} + buff := make([]byte, maxPktSize) + i, err := q.GetPacket(buff, 6) + assert.NoError(t, err) + err = np.Unmarshal(buff[:i]) + assert.NoError(t, err) + assert.Equal(t, expectedSN, np.SequenceNumber) + + np2 := &rtp.Packet{ + Header: rtp.Header{ + SequenceNumber: 8, + }, + } + buf, err := np2.Marshal() + assert.NoError(t, err) + expectedSN = 8 + q.AddPacket(buf, 8, false) + i, err = q.GetPacket(buff, expectedSN) + assert.NoError(t, err) + err = np.Unmarshal(buff[:i]) + assert.NoError(t, err) + assert.Equal(t, expectedSN, np.SequenceNumber) + + _, err = q.AddPacket(buf, 8, false) + assert.ErrorIs(t, err, errRTXPacket) +} + +func Test_queue_edges(t *testing.T) { + var TestPackets = []*rtp.Packet{ + { + Header: rtp.Header{ + SequenceNumber: 65533, + }, + }, + { + Header: rtp.Header{ + SequenceNumber: 65534, + }, + }, + { + Header: rtp.Header{ + SequenceNumber: 2, + }, + }, + } + b := make([]byte, 25000) + q := NewBucket(&b) + for _, p := range TestPackets { + p := p + assert.NotNil(t, p) + assert.NotPanics(t, func() { + p := p + buf, err := p.Marshal() + assert.NoError(t, err) + assert.NotPanics(t, func() { + q.AddPacket(buf, p.SequenceNumber, true) + }) + }) + } + var expectedSN uint16 + expectedSN = 65534 + np := rtp.Packet{} + buff := make([]byte, maxPktSize) + i, err := q.GetPacket(buff, expectedSN) + assert.NoError(t, err) + err = np.Unmarshal(buff[:i]) + assert.NoError(t, err) + assert.Equal(t, expectedSN, np.SequenceNumber) + + np2 := rtp.Packet{ + Header: rtp.Header{ + SequenceNumber: 65535, + }, + } + buf, err := np2.Marshal() + assert.NoError(t, err) + q.AddPacket(buf, np2.SequenceNumber, false) + i, err = q.GetPacket(buff, expectedSN+1) + assert.NoError(t, err) + err = np.Unmarshal(buff[:i]) + assert.NoError(t, err) + assert.Equal(t, expectedSN+1, np.SequenceNumber) +} diff --git a/examples/b2bua/b2bua/buffer/buffer.go b/examples/b2bua/b2bua/buffer/buffer.go new file mode 100644 index 0000000..1ad4f4a --- /dev/null +++ b/examples/b2bua/b2bua/buffer/buffer.go @@ -0,0 +1,595 @@ +package buffer + +import ( + "encoding/binary" + "io" + "strings" + "sync" + "sync/atomic" + "time" + + "github.com/gammazero/deque" + "github.com/go-logr/logr" + "github.com/pion/rtcp" + "github.com/pion/rtp" + "github.com/pion/sdp/v3" + "github.com/pion/webrtc/v3" +) + +const ( + maxSN = 1 << 16 + + reportDelta = 1e9 +) + +// Logger is an implementation of logr.Logger. If is not provided - will be turned off. +var Logger logr.Logger = logr.Discard() + +type pendingPackets struct { + arrivalTime int64 + packet []byte +} + +type ExtPacket struct { + Head bool + Cycle uint32 + Arrival int64 + Packet rtp.Packet + Payload interface{} + KeyFrame bool +} + +// Buffer contains all packets +type Buffer struct { + sync.Mutex + bucket *Bucket + nacker *nackQueue + videoPool *sync.Pool + audioPool *sync.Pool + codecType webrtc.RTPCodecType + extPackets deque.Deque + pPackets []pendingPackets + closeOnce sync.Once + mediaSSRC uint32 + clockRate uint32 + maxBitrate uint64 + lastReport int64 + twccExt uint8 + audioExt uint8 + bound bool + closed atomicBool + mime string + + // supported feedbacks + remb bool + nack bool + twcc bool + audioLevel bool + + minPacketProbe int + lastPacketRead int + maxTemporalLayer int32 + bitrate uint64 + bitrateHelper uint64 + lastSRNTPTime uint64 + lastSRRTPTime uint32 + lastSRRecv int64 // Represents wall clock of the most recent sender report arrival + baseSN uint16 + cycles uint32 + lastRtcpPacketTime int64 // Time the last RTCP packet was received. + lastRtcpSrTime int64 // Time the last RTCP SR was received. Required for DLSR computation. + lastTransit uint32 + maxSeqNo uint16 // The highest sequence number received in an RTP data packet + + stats Stats + + latestTimestamp uint32 // latest received RTP timestamp on packet + latestTimestampTime int64 // Time of the latest timestamp (in nanos since unix epoch) + + // callbacks + onClose func() + onAudioLevel func(level uint8) + feedbackCB func([]rtcp.Packet) + feedbackTWCC func(sn uint16, timeNS int64, marker bool) + + // logger + logger logr.Logger +} + +type Stats struct { + LastExpected uint32 + LastReceived uint32 + LostRate float32 + PacketCount uint32 // Number of packets received from this source. + Jitter float64 // An estimate of the statistical variance of the RTP data packet inter-arrival time. + TotalByte uint64 +} + +// BufferOptions provides configuration options for the buffer +type Options struct { + MaxBitRate uint64 +} + +// NewBuffer constructs a new Buffer +func NewBuffer(ssrc uint32, vp, ap *sync.Pool, logger logr.Logger) *Buffer { + b := &Buffer{ + mediaSSRC: ssrc, + videoPool: vp, + audioPool: ap, + logger: logger, + } + b.extPackets.SetMinCapacity(7) + return b +} + +func (b *Buffer) Bind(params webrtc.RTPParameters, o Options) { + b.Lock() + defer b.Unlock() + + codec := params.Codecs[0] + b.clockRate = codec.ClockRate + b.maxBitrate = o.MaxBitRate + b.mime = strings.ToLower(codec.MimeType) + + switch { + case strings.HasPrefix(b.mime, "audio/"): + b.codecType = webrtc.RTPCodecTypeAudio + b.bucket = NewBucket(b.audioPool.Get().(*[]byte)) + case strings.HasPrefix(b.mime, "video/"): + b.codecType = webrtc.RTPCodecTypeVideo + b.bucket = NewBucket(b.videoPool.Get().(*[]byte)) + default: + b.codecType = webrtc.RTPCodecType(0) + } + + for _, ext := range params.HeaderExtensions { + if ext.URI == sdp.TransportCCURI { + b.twccExt = uint8(ext.ID) + break + } + } + + if b.codecType == webrtc.RTPCodecTypeVideo { + for _, fb := range codec.RTCPFeedback { + switch fb.Type { + case webrtc.TypeRTCPFBGoogREMB: + b.logger.V(1).Info("Setting feedback", "type", "webrtc.TypeRTCPFBGoogREMB") + b.remb = true + case webrtc.TypeRTCPFBTransportCC: + b.logger.V(1).Info("Setting feedback", "type", webrtc.TypeRTCPFBTransportCC) + b.twcc = true + case webrtc.TypeRTCPFBNACK: + b.logger.V(1).Info("Setting feedback", "type", webrtc.TypeRTCPFBNACK) + b.nacker = newNACKQueue() + b.nack = true + } + } + } else if b.codecType == webrtc.RTPCodecTypeAudio { + for _, h := range params.HeaderExtensions { + if h.URI == sdp.AudioLevelURI { + b.audioLevel = true + b.audioExt = uint8(h.ID) + } + } + } + + for _, pp := range b.pPackets { + b.calc(pp.packet, pp.arrivalTime) + } + b.pPackets = nil + b.bound = true + + b.logger.V(1).Info("NewBuffer", "MaxBitRate", o.MaxBitRate) +} + +// Write adds a RTP Packet, out of order, new packet may be arrived later +func (b *Buffer) Write(pkt []byte) (n int, err error) { + b.Lock() + defer b.Unlock() + + if b.closed.get() { + err = io.EOF + return + } + + if !b.bound { + packet := make([]byte, len(pkt)) + copy(packet, pkt) + b.pPackets = append(b.pPackets, pendingPackets{ + packet: packet, + arrivalTime: time.Now().UnixNano(), + }) + return + } + + b.calc(pkt, time.Now().UnixNano()) + + return +} + +func (b *Buffer) Read(buff []byte) (n int, err error) { + for { + if b.closed.get() { + err = io.EOF + return + } + b.Lock() + if b.pPackets != nil && len(b.pPackets) > b.lastPacketRead { + if len(buff) < len(b.pPackets[b.lastPacketRead].packet) { + err = errBufferTooSmall + b.Unlock() + return + } + n = len(b.pPackets[b.lastPacketRead].packet) + copy(buff, b.pPackets[b.lastPacketRead].packet) + b.lastPacketRead++ + b.Unlock() + return + } + b.Unlock() + time.Sleep(25 * time.Millisecond) + } +} + +func (b *Buffer) ReadExtended() (*ExtPacket, error) { + for { + if b.closed.get() { + return nil, io.EOF + } + b.Lock() + if b.extPackets.Len() > 0 { + extPkt := b.extPackets.PopFront().(*ExtPacket) + b.Unlock() + return extPkt, nil + } + b.Unlock() + time.Sleep(10 * time.Millisecond) + } +} + +func (b *Buffer) Close() error { + b.Lock() + defer b.Unlock() + + b.closeOnce.Do(func() { + if b.bucket != nil && b.codecType == webrtc.RTPCodecTypeVideo { + b.videoPool.Put(b.bucket.src) + } + if b.bucket != nil && b.codecType == webrtc.RTPCodecTypeAudio { + b.audioPool.Put(b.bucket.src) + } + b.closed.set(true) + b.onClose() + }) + return nil +} + +func (b *Buffer) OnClose(fn func()) { + b.onClose = fn +} + +func (b *Buffer) calc(pkt []byte, arrivalTime int64) { + sn := binary.BigEndian.Uint16(pkt[2:4]) + + if b.stats.PacketCount == 0 { + b.baseSN = sn + b.maxSeqNo = sn + b.lastReport = arrivalTime + } else if (sn-b.maxSeqNo)&0x8000 == 0 { + if sn < b.maxSeqNo { + b.cycles += maxSN + } + if b.nack { + diff := sn - b.maxSeqNo + for i := uint16(1); i < diff; i++ { + var extSN uint32 + msn := sn - i + if msn > b.maxSeqNo && msn&0x8000 > 0 && b.maxSeqNo&0x8000 == 0 { + extSN = (b.cycles - maxSN) | uint32(msn) + } else { + extSN = b.cycles | uint32(msn) + } + b.nacker.push(extSN) + } + } + b.maxSeqNo = sn + } else if b.nack && (sn-b.maxSeqNo)&0x8000 > 0 { + var extSN uint32 + if sn > b.maxSeqNo && sn&0x8000 > 0 && b.maxSeqNo&0x8000 == 0 { + extSN = (b.cycles - maxSN) | uint32(sn) + } else { + extSN = b.cycles | uint32(sn) + } + b.nacker.remove(extSN) + } + + var p rtp.Packet + pb, err := b.bucket.AddPacket(pkt, sn, sn == b.maxSeqNo) + if err != nil { + if err == errRTXPacket { + return + } + return + } + if err = p.Unmarshal(pb); err != nil { + return + } + + b.stats.TotalByte += uint64(len(pkt)) + b.bitrateHelper += uint64(len(pkt)) + b.stats.PacketCount++ + + ep := ExtPacket{ + Head: sn == b.maxSeqNo, + Cycle: b.cycles, + Packet: p, + Arrival: arrivalTime, + } + + switch b.mime { + case "video/vp8": + vp8Packet := VP8{} + if err := vp8Packet.Unmarshal(p.Payload); err != nil { + return + } + ep.Payload = vp8Packet + ep.KeyFrame = vp8Packet.IsKeyFrame + case "video/h264": + ep.KeyFrame = isH264Keyframe(p.Payload) + } + + if b.minPacketProbe < 25 { + if sn < b.baseSN { + b.baseSN = sn + } + + if b.mime == "video/vp8" { + pld := ep.Payload.(VP8) + mtl := atomic.LoadInt32(&b.maxTemporalLayer) + if mtl < int32(pld.TID) { + atomic.StoreInt32(&b.maxTemporalLayer, int32(pld.TID)) + } + } + + b.minPacketProbe++ + } + + b.extPackets.PushBack(&ep) + + // if first time update or the timestamp is later (factoring timestamp wrap around) + latestTimestamp := atomic.LoadUint32(&b.latestTimestamp) + latestTimestampTimeInNanosSinceEpoch := atomic.LoadInt64(&b.latestTimestampTime) + if (latestTimestampTimeInNanosSinceEpoch == 0) || IsLaterTimestamp(p.Timestamp, latestTimestamp) { + atomic.StoreUint32(&b.latestTimestamp, p.Timestamp) + atomic.StoreInt64(&b.latestTimestampTime, arrivalTime) + } + + arrival := uint32(arrivalTime / 1e6 * int64(b.clockRate/1e3)) + transit := arrival - p.Timestamp + if b.lastTransit != 0 { + d := int32(transit - b.lastTransit) + if d < 0 { + d = -d + } + b.stats.Jitter += (float64(d) - b.stats.Jitter) / 16 + } + b.lastTransit = transit + + if b.twcc { + if ext := p.GetExtension(b.twccExt); ext != nil && len(ext) > 1 { + b.feedbackTWCC(binary.BigEndian.Uint16(ext[0:2]), arrivalTime, p.Marker) + } + } + + if b.audioLevel { + if e := p.GetExtension(b.audioExt); e != nil && b.onAudioLevel != nil { + ext := rtp.AudioLevelExtension{} + if err := ext.Unmarshal(e); err == nil { + b.onAudioLevel(ext.Level) + } + } + } + + diff := arrivalTime - b.lastReport + + if b.nacker != nil { + if r := b.buildNACKPacket(); r != nil { + b.feedbackCB(r) + } + } + + if diff >= reportDelta { + br := (8 * b.bitrateHelper * uint64(reportDelta)) / uint64(diff) + atomic.StoreUint64(&b.bitrate, br) + b.feedbackCB(b.getRTCP()) + b.lastReport = arrivalTime + b.bitrateHelper = 0 + } +} + +func (b *Buffer) buildNACKPacket() []rtcp.Packet { + if nacks, askKeyframe := b.nacker.pairs(b.cycles | uint32(b.maxSeqNo)); (nacks != nil && len(nacks) > 0) || askKeyframe { + var pkts []rtcp.Packet + if len(nacks) > 0 { + pkts = []rtcp.Packet{&rtcp.TransportLayerNack{ + MediaSSRC: b.mediaSSRC, + Nacks: nacks, + }} + } + + if askKeyframe { + pkts = append(pkts, &rtcp.PictureLossIndication{ + MediaSSRC: b.mediaSSRC, + }) + } + return pkts + } + return nil +} + +func (b *Buffer) buildREMBPacket() *rtcp.ReceiverEstimatedMaximumBitrate { + br := b.bitrate + if b.stats.LostRate < 0.02 { + br = uint64(float64(br)*1.09) + 2000 + } + if b.stats.LostRate > .1 { + br = uint64(float64(br) * float64(1-0.5*b.stats.LostRate)) + } + if br > b.maxBitrate { + br = b.maxBitrate + } + if br < 100000 { + br = 100000 + } + b.stats.TotalByte = 0 + + return &rtcp.ReceiverEstimatedMaximumBitrate{ + Bitrate: float32(br), + SSRCs: []uint32{b.mediaSSRC}, + } +} + +func (b *Buffer) buildReceptionReport() rtcp.ReceptionReport { + extMaxSeq := b.cycles | uint32(b.maxSeqNo) + expected := extMaxSeq - uint32(b.baseSN) + 1 + lost := uint32(0) + if b.stats.PacketCount < expected && b.stats.PacketCount != 0 { + lost = expected - b.stats.PacketCount + } + expectedInterval := expected - b.stats.LastExpected + b.stats.LastExpected = expected + + receivedInterval := b.stats.PacketCount - b.stats.LastReceived + b.stats.LastReceived = b.stats.PacketCount + + lostInterval := expectedInterval - receivedInterval + + b.stats.LostRate = float32(lostInterval) / float32(expectedInterval) + var fracLost uint8 + if expectedInterval != 0 && lostInterval > 0 { + fracLost = uint8((lostInterval << 8) / expectedInterval) + } + var dlsr uint32 + + lastSRRecv := atomic.LoadInt64(&b.lastSRRecv) + if lastSRRecv != 0 { + delayMS := uint32((time.Now().UnixNano() - lastSRRecv) / 1e6) + dlsr = (delayMS / 1e3) << 16 + dlsr |= (delayMS % 1e3) * 65536 / 1000 + } + + rr := rtcp.ReceptionReport{ + SSRC: b.mediaSSRC, + FractionLost: fracLost, + TotalLost: lost, + LastSequenceNumber: extMaxSeq, + Jitter: uint32(b.stats.Jitter), + LastSenderReport: uint32(atomic.LoadUint64(&b.lastSRNTPTime) >> 16), + Delay: dlsr, + } + return rr +} + +func (b *Buffer) SetSenderReportData(rtpTime uint32, ntpTime uint64) { + atomic.StoreUint64(&b.lastSRNTPTime, ntpTime) + atomic.StoreUint32(&b.lastSRRTPTime, rtpTime) + atomic.StoreInt64(&b.lastSRRecv, time.Now().UnixNano()) +} + +func (b *Buffer) getRTCP() []rtcp.Packet { + var pkts []rtcp.Packet + + pkts = append(pkts, &rtcp.ReceiverReport{ + Reports: []rtcp.ReceptionReport{b.buildReceptionReport()}, + }) + + if b.remb && !b.twcc { + pkts = append(pkts, b.buildREMBPacket()) + } + + return pkts +} + +func (b *Buffer) GetPacket(buff []byte, sn uint16) (int, error) { + b.Lock() + defer b.Unlock() + if b.closed.get() { + return 0, io.EOF + } + return b.bucket.GetPacket(buff, sn) +} + +// Bitrate returns the current publisher stream bitrate. +func (b *Buffer) Bitrate() uint64 { + return atomic.LoadUint64(&b.bitrate) +} + +func (b *Buffer) MaxTemporalLayer() int32 { + return atomic.LoadInt32(&b.maxTemporalLayer) +} + +func (b *Buffer) OnTransportWideCC(fn func(sn uint16, timeNS int64, marker bool)) { + b.feedbackTWCC = fn +} + +func (b *Buffer) OnFeedback(fn func(fb []rtcp.Packet)) { + b.feedbackCB = fn +} + +func (b *Buffer) OnAudioLevel(fn func(level uint8)) { + b.onAudioLevel = fn +} + +// GetMediaSSRC returns the associated SSRC of the RTP stream +func (b *Buffer) GetMediaSSRC() uint32 { + return b.mediaSSRC +} + +// GetClockRate returns the RTP clock rate +func (b *Buffer) GetClockRate() uint32 { + return b.clockRate +} + +// GetSenderReportData returns the rtp, ntp and nanos of the last sender report +func (b *Buffer) GetSenderReportData() (rtpTime uint32, ntpTime uint64, lastReceivedTimeInNanosSinceEpoch int64) { + rtpTime = atomic.LoadUint32(&b.lastSRRTPTime) + ntpTime = atomic.LoadUint64(&b.lastSRNTPTime) + lastReceivedTimeInNanosSinceEpoch = atomic.LoadInt64(&b.lastSRRecv) + + return rtpTime, ntpTime, lastReceivedTimeInNanosSinceEpoch +} + +// GetStats returns the raw statistics about a particular buffer state +func (b *Buffer) GetStats() (stats Stats) { + b.Lock() + stats = b.stats + b.Unlock() + return +} + +// GetLatestTimestamp returns the latest RTP timestamp factoring in potential RTP timestamp wrap-around +func (b *Buffer) GetLatestTimestamp() (latestTimestamp uint32, latestTimestampTimeInNanosSinceEpoch int64) { + latestTimestamp = atomic.LoadUint32(&b.latestTimestamp) + latestTimestampTimeInNanosSinceEpoch = atomic.LoadInt64(&b.latestTimestampTime) + + return latestTimestamp, latestTimestampTimeInNanosSinceEpoch +} + +// IsTimestampWrapAround returns true if wrap around happens from timestamp1 to timestamp2 +func IsTimestampWrapAround(timestamp1 uint32, timestamp2 uint32) bool { + return (timestamp1&0xC000000 == 0) && (timestamp2&0xC000000 == 0xC000000) +} + +// IsLaterTimestamp returns true if timestamp1 is later in time than timestamp2 factoring in timestamp wrap-around +func IsLaterTimestamp(timestamp1 uint32, timestamp2 uint32) bool { + if timestamp1 > timestamp2 { + if IsTimestampWrapAround(timestamp2, timestamp1) { + return false + } + return true + } + if IsTimestampWrapAround(timestamp1, timestamp2) { + return true + } + return false +} diff --git a/examples/b2bua/b2bua/buffer/buffer_test.go b/examples/b2bua/b2bua/buffer/buffer_test.go new file mode 100644 index 0000000..7327aac --- /dev/null +++ b/examples/b2bua/b2bua/buffer/buffer_test.go @@ -0,0 +1,184 @@ +package buffer + +import ( + "sync" + "testing" + + "github.com/pion/ion-sfu/pkg/logger" + "github.com/pion/rtcp" + + "github.com/pion/rtp" + "github.com/pion/webrtc/v3" + "github.com/stretchr/testify/assert" +) + +func CreateTestPacket(pktStamp *SequenceNumberAndTimeStamp) *rtp.Packet { + if pktStamp == nil { + return &rtp.Packet{ + Header: rtp.Header{}, + Payload: []byte{1, 2, 3}, + } + } + + return &rtp.Packet{ + Header: rtp.Header{ + SequenceNumber: pktStamp.SequenceNumber, + Timestamp: pktStamp.Timestamp, + }, + Payload: []byte{1, 2, 3}, + } +} + +type SequenceNumberAndTimeStamp struct { + SequenceNumber uint16 + Timestamp uint32 +} + +func CreateTestListPackets(snsAndTSs []SequenceNumberAndTimeStamp) (packetList []*rtp.Packet) { + for _, item := range snsAndTSs { + item := item + packetList = append(packetList, CreateTestPacket(&item)) + } + + return packetList +} + +func TestNack(t *testing.T) { + pool := &sync.Pool{ + New: func() interface{} { + b := make([]byte, 1500) + return &b + }, + } + logger.SetGlobalOptions(logger.GlobalConfig{V: 1}) // 2 - TRACE + logger := logger.New() + buff := NewBuffer(123, pool, pool, logger) + buff.codecType = webrtc.RTPCodecTypeVideo + assert.NotNil(t, buff) + var wg sync.WaitGroup + // 3 nacks 1 Pli + wg.Add(4) + buff.OnFeedback(func(fb []rtcp.Packet) { + for _, pkt := range fb { + switch p := pkt.(type) { + case *rtcp.TransportLayerNack: + if p.Nacks[0].PacketList()[0] == 2 && p.MediaSSRC == 123 { + wg.Done() + } + case *rtcp.PictureLossIndication: + if p.MediaSSRC == 123 { + wg.Done() + } + } + } + }) + buff.Bind(webrtc.RTPParameters{ + HeaderExtensions: nil, + Codecs: []webrtc.RTPCodecParameters{ + { + RTPCodecCapability: webrtc.RTPCodecCapability{ + MimeType: "video/vp8", + ClockRate: 90000, + RTCPFeedback: []webrtc.RTCPFeedback{{ + Type: "nack", + }}, + }, + PayloadType: 96, + }, + }, + }, Options{}) + for i := 0; i < 15; i++ { + if i == 2 { + continue + } + pkt := rtp.Packet{ + Header: rtp.Header{SequenceNumber: uint16(i), Timestamp: uint32(i)}, + Payload: []byte{0xff, 0xff, 0xff, 0xfd, 0xb4, 0x9f, 0x94, 0x1}, + } + b, err := pkt.Marshal() + assert.NoError(t, err) + _, err = buff.Write(b) + assert.NoError(t, err) + } + wg.Wait() +} + +func TestNewBuffer(t *testing.T) { + type args struct { + options Options + ssrc uint32 + } + tests := []struct { + name string + args args + }{ + { + name: "Must not be nil and add packets in sequence", + args: args{ + options: Options{ + MaxBitRate: 1e6, + }, + }, + }, + } + for _, tt := range tests { + tt := tt + t.Run(tt.name, func(t *testing.T) { + var TestPackets = []*rtp.Packet{ + { + Header: rtp.Header{ + SequenceNumber: 65533, + }, + }, + { + Header: rtp.Header{ + SequenceNumber: 65534, + }, + }, + { + Header: rtp.Header{ + SequenceNumber: 2, + }, + }, + { + Header: rtp.Header{ + SequenceNumber: 65535, + }, + }, + } + pool := &sync.Pool{ + New: func() interface{} { + b := make([]byte, 1500) + return &b + }, + } + logger.SetGlobalOptions(logger.GlobalConfig{V: 2}) // 2 - TRACE + logger := logger.New() + buff := NewBuffer(123, pool, pool, logger) + buff.codecType = webrtc.RTPCodecTypeVideo + assert.NotNil(t, buff) + assert.NotNil(t, TestPackets) + buff.OnFeedback(func(_ []rtcp.Packet) { + }) + buff.Bind(webrtc.RTPParameters{ + HeaderExtensions: nil, + Codecs: []webrtc.RTPCodecParameters{{ + RTPCodecCapability: webrtc.RTPCodecCapability{ + MimeType: "video/vp8", + ClockRate: 9600, + RTCPFeedback: nil, + }, + PayloadType: 0, + }}, + }, Options{}) + + for _, p := range TestPackets { + buf, _ := p.Marshal() + buff.Write(buf) + } + // assert.Equal(t, 6, buff.PacketQueue.size) + assert.Equal(t, uint32(1<<16), buff.cycles) + assert.Equal(t, uint16(2), buff.maxSeqNo) + }) + } +} diff --git a/examples/b2bua/b2bua/buffer/errors.go b/examples/b2bua/b2bua/buffer/errors.go new file mode 100644 index 0000000..8c273fe --- /dev/null +++ b/examples/b2bua/b2bua/buffer/errors.go @@ -0,0 +1,10 @@ +package buffer + +import "errors" + +var ( + errPacketNotFound = errors.New("packet not found in cache") + errBufferTooSmall = errors.New("buffer too small") + errPacketTooOld = errors.New("received packet too old") + errRTXPacket = errors.New("packet already received") +) diff --git a/examples/b2bua/b2bua/buffer/factory.go b/examples/b2bua/b2bua/buffer/factory.go new file mode 100644 index 0000000..627c760 --- /dev/null +++ b/examples/b2bua/b2bua/buffer/factory.go @@ -0,0 +1,97 @@ +package buffer + +import ( + "io" + "sync" + + "github.com/go-logr/logr" + "github.com/pion/transport/packetio" +) + +type Factory struct { + sync.RWMutex + videoPool *sync.Pool + audioPool *sync.Pool + rtpBuffers map[uint32]*Buffer + rtcpReaders map[uint32]*RTCPReader + logger logr.Logger +} + +func NewBufferFactory(trackingPackets int, logger logr.Logger) *Factory { + // Enable package wide logging for non-method functions. + // If logger is empty - use default Logger. + // Logger is a public variable in buffer package. + if logger == (logr.Logger{}) { + logger = Logger + } else { + Logger = logger + } + + return &Factory{ + videoPool: &sync.Pool{ + New: func() interface{} { + b := make([]byte, trackingPackets*maxPktSize) + return &b + }, + }, + audioPool: &sync.Pool{ + New: func() interface{} { + b := make([]byte, maxPktSize*25) + return &b + }, + }, + rtpBuffers: make(map[uint32]*Buffer), + rtcpReaders: make(map[uint32]*RTCPReader), + logger: logger, + } +} + +func (f *Factory) GetOrNew(packetType packetio.BufferPacketType, ssrc uint32) io.ReadWriteCloser { + f.Lock() + defer f.Unlock() + switch packetType { + case packetio.RTCPBufferPacket: + if reader, ok := f.rtcpReaders[ssrc]; ok { + return reader + } + reader := NewRTCPReader(ssrc) + f.rtcpReaders[ssrc] = reader + reader.OnClose(func() { + f.Lock() + delete(f.rtcpReaders, ssrc) + f.Unlock() + }) + return reader + case packetio.RTPBufferPacket: + if reader, ok := f.rtpBuffers[ssrc]; ok { + return reader + } + buffer := NewBuffer(ssrc, f.videoPool, f.audioPool, f.logger) + f.rtpBuffers[ssrc] = buffer + buffer.OnClose(func() { + f.Lock() + delete(f.rtpBuffers, ssrc) + f.Unlock() + }) + return buffer + } + return nil +} + +func (f *Factory) GetBufferPair(ssrc uint32) (*Buffer, *RTCPReader) { + f.RLock() + defer f.RUnlock() + return f.rtpBuffers[ssrc], f.rtcpReaders[ssrc] +} + +func (f *Factory) GetBuffer(ssrc uint32) *Buffer { + f.RLock() + defer f.RUnlock() + return f.rtpBuffers[ssrc] +} + +func (f *Factory) GetRTCPReader(ssrc uint32) *RTCPReader { + f.RLock() + defer f.RUnlock() + return f.rtcpReaders[ssrc] +} diff --git a/examples/b2bua/b2bua/buffer/helpers.go b/examples/b2bua/b2bua/buffer/helpers.go new file mode 100644 index 0000000..308e966 --- /dev/null +++ b/examples/b2bua/b2bua/buffer/helpers.go @@ -0,0 +1,212 @@ +package buffer + +import ( + "encoding/binary" + "errors" + "fmt" + "sync/atomic" +) + +var ( + errShortPacket = errors.New("packet is not large enough") + errNilPacket = errors.New("invalid nil packet") +) + +type atomicBool int32 + +func (a *atomicBool) set(value bool) { + var i int32 + if value { + i = 1 + } + atomic.StoreInt32((*int32)(a), i) +} + +func (a *atomicBool) get() bool { + return atomic.LoadInt32((*int32)(a)) != 0 +} + +// VP8 is a helper to get temporal data from VP8 packet header +/* + VP8 Payload Descriptor + 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 + +-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+ + |X|R|N|S|R| PID | (REQUIRED) |X|R|N|S|R| PID | (REQUIRED) + +-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+ + X: |I|L|T|K| RSV | (OPTIONAL) X: |I|L|T|K| RSV | (OPTIONAL) + +-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+ + I: |M| PictureID | (OPTIONAL) I: |M| PictureID | (OPTIONAL) + +-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+ + L: | TL0PICIDX | (OPTIONAL) | PictureID | + +-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+ + T/K:|TID|Y| KEYIDX | (OPTIONAL) L: | TL0PICIDX | (OPTIONAL) + +-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+ + T/K:|TID|Y| KEYIDX | (OPTIONAL) + +-+-+-+-+-+-+-+-+ +*/ +type VP8 struct { + TemporalSupported bool + // Optional Header + PictureID uint16 /* 8 or 16 bits, picture ID */ + PicIDIdx int + MBit bool + TL0PICIDX uint8 /* 8 bits temporal level zero index */ + TlzIdx int + + // Optional Header If either of the T or K bits are set to 1, + // the TID/Y/KEYIDX extension field MUST be present. + TID uint8 /* 2 bits temporal layer idx*/ + // IsKeyFrame is a helper to detect if current packet is a keyframe + IsKeyFrame bool +} + +// Unmarshal parses the passed byte slice and stores the result in the VP8 this method is called upon +func (p *VP8) Unmarshal(payload []byte) error { + if payload == nil { + return errNilPacket + } + + payloadLen := len(payload) + + if payloadLen < 1 { + return errShortPacket + } + + idx := 0 + S := payload[idx]&0x10 > 0 + // Check for extended bit control + if payload[idx]&0x80 > 0 { + idx++ + if payloadLen < idx+1 { + return errShortPacket + } + // Check if T is present, if not, no temporal layer is available + p.TemporalSupported = payload[idx]&0x20 > 0 + K := payload[idx]&0x10 > 0 + L := payload[idx]&0x40 > 0 + // Check for PictureID + if payload[idx]&0x80 > 0 { + idx++ + if payloadLen < idx+1 { + return errShortPacket + } + p.PicIDIdx = idx + pid := payload[idx] & 0x7f + // Check if m is 1, then Picture ID is 15 bits + if payload[idx]&0x80 > 0 { + idx++ + if payloadLen < idx+1 { + return errShortPacket + } + p.MBit = true + p.PictureID = binary.BigEndian.Uint16([]byte{pid, payload[idx]}) + } else { + p.PictureID = uint16(pid) + } + } + // Check if TL0PICIDX is present + if L { + idx++ + if payloadLen < idx+1 { + return errShortPacket + } + p.TlzIdx = idx + + if int(idx) >= payloadLen { + return errShortPacket + } + p.TL0PICIDX = payload[idx] + } + if p.TemporalSupported || K { + idx++ + if payloadLen < idx+1 { + return errShortPacket + } + p.TID = (payload[idx] & 0xc0) >> 6 + } + if idx >= payloadLen { + return errShortPacket + } + idx++ + if payloadLen < idx+1 { + return errShortPacket + } + // Check is packet is a keyframe by looking at P bit in vp8 payload + p.IsKeyFrame = payload[idx]&0x01 == 0 && S + } else { + idx++ + if payloadLen < idx+1 { + return errShortPacket + } + // Check is packet is a keyframe by looking at P bit in vp8 payload + p.IsKeyFrame = payload[idx]&0x01 == 0 && S + } + return nil +} + +// isH264Keyframe detects if h264 payload is a keyframe +// this code was taken from https://github.com/jech/galene/blob/codecs/rtpconn/rtpreader.go#L45 +// all credits belongs to Juliusz Chroboczek @jech and the awesome Galene SFU +func isH264Keyframe(payload []byte) bool { + if len(payload) < 1 { + return false + } + nalu := payload[0] & 0x1F + if nalu == 0 { + // reserved + return false + } else if nalu <= 23 { + // simple NALU + return nalu == 5 + } else if nalu == 24 || nalu == 25 || nalu == 26 || nalu == 27 { + // STAP-A, STAP-B, MTAP16 or MTAP24 + i := 1 + if nalu == 25 || nalu == 26 || nalu == 27 { + // skip DON + i += 2 + } + for i < len(payload) { + if i+2 > len(payload) { + return false + } + length := uint16(payload[i])<<8 | + uint16(payload[i+1]) + i += 2 + if i+int(length) > len(payload) { + return false + } + offset := 0 + if nalu == 26 { + offset = 3 + } else if nalu == 27 { + offset = 4 + } + if offset >= int(length) { + return false + } + n := payload[i+offset] & 0x1F + if n == 7 { + return true + } else if n >= 24 { + // is this legal? + fmt.Print("Non-simple NALU within a STAP") + } + i += int(length) + } + if i == len(payload) { + return false + } + return false + } else if nalu == 28 || nalu == 29 { + // FU-A or FU-B + if len(payload) < 2 { + return false + } + if (payload[1] & 0x80) == 0 { + // not a starting fragment + return false + } + return payload[1]&0x1F == 7 + } + return false +} diff --git a/examples/b2bua/b2bua/buffer/helpers_test.go b/examples/b2bua/b2bua/buffer/helpers_test.go new file mode 100644 index 0000000..5cdff93 --- /dev/null +++ b/examples/b2bua/b2bua/buffer/helpers_test.go @@ -0,0 +1,94 @@ +package buffer + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestVP8Helper_Unmarshal(t *testing.T) { + type args struct { + payload []byte + } + tests := []struct { + name string + args args + wantErr bool + checkTemporal bool + temporalSupport bool + checkKeyFrame bool + keyFrame bool + checkPictureID bool + pictureID uint16 + checkTlzIdx bool + tlzIdx uint8 + checkTempID bool + temporalID uint8 + }{ + { + name: "Empty or nil payload must return error", + args: args{payload: []byte{}}, + wantErr: true, + }, + { + name: "Temporal must be supported by setting T bit to 1", + args: args{payload: []byte{0xff, 0x20, 0x1, 0x2, 0x3, 0x4}}, + checkTemporal: true, + temporalSupport: true, + }, + { + name: "Picture must be ID 7 bits by setting M bit to 0 and present by I bit set to 1", + args: args{payload: []byte{0xff, 0xff, 0x11, 0x2, 0x3, 0x4}}, + checkPictureID: true, + pictureID: 17, + }, + { + name: "Picture ID must be 15 bits by setting M bit to 1 and present by I bit set to 1", + args: args{payload: []byte{0xff, 0xff, 0x92, 0x67, 0x3, 0x4, 0x5}}, + checkPictureID: true, + pictureID: 4711, + }, + { + name: "Temporal level zero index must be present if L set to 1", + args: args{payload: []byte{0xff, 0xff, 0xff, 0xfd, 0xb4, 0x4, 0x5}}, + checkTlzIdx: true, + tlzIdx: 180, + }, + { + name: "Temporal index must be present and used if T bit set to 1", + args: args{payload: []byte{0xff, 0xff, 0xff, 0xfd, 0xb4, 0x9f, 0x5, 0x6}}, + checkTempID: true, + temporalID: 2, + }, + { + name: "Check if packet is a keyframe by looking at P bit set to 0", + args: args{payload: []byte{0xff, 0xff, 0xff, 0xfd, 0xb4, 0x9f, 0x94, 0x1}}, + checkKeyFrame: true, + keyFrame: true, + }, + } + for _, tt := range tests { + tt := tt + t.Run(tt.name, func(t *testing.T) { + p := &VP8{} + if err := p.Unmarshal(tt.args.payload); (err != nil) != tt.wantErr { + t.Errorf("Unmarshal() error = %v, wantErr %v", err, tt.wantErr) + } + if tt.checkTemporal { + assert.Equal(t, tt.temporalSupport, p.TemporalSupported) + } + if tt.checkKeyFrame { + assert.Equal(t, tt.keyFrame, p.IsKeyFrame) + } + if tt.checkPictureID { + assert.Equal(t, tt.pictureID, p.PictureID) + } + if tt.checkTlzIdx { + assert.Equal(t, tt.tlzIdx, p.TL0PICIDX) + } + if tt.checkTempID { + assert.Equal(t, tt.temporalID, p.TID) + } + }) + } +} diff --git a/examples/b2bua/b2bua/buffer/nack.go b/examples/b2bua/b2bua/buffer/nack.go new file mode 100644 index 0000000..0050ba7 --- /dev/null +++ b/examples/b2bua/b2bua/buffer/nack.go @@ -0,0 +1,100 @@ +package buffer + +import ( + "sort" + + "github.com/pion/rtcp" +) + +const maxNackTimes = 3 // Max number of times a packet will be NACKed +const maxNackCache = 100 // Max NACK sn the sfu will keep reference + +type nack struct { + sn uint32 + nacked uint8 +} + +type nackQueue struct { + nacks []nack + kfSN uint32 +} + +func newNACKQueue() *nackQueue { + return &nackQueue{ + nacks: make([]nack, 0, maxNackCache+1), + } +} + +func (n *nackQueue) remove(extSN uint32) { + i := sort.Search(len(n.nacks), func(i int) bool { return n.nacks[i].sn >= extSN }) + if i >= len(n.nacks) || n.nacks[i].sn != extSN { + return + } + copy(n.nacks[i:], n.nacks[i+1:]) + n.nacks = n.nacks[:len(n.nacks)-1] +} + +func (n *nackQueue) push(extSN uint32) { + i := sort.Search(len(n.nacks), func(i int) bool { return n.nacks[i].sn >= extSN }) + if i < len(n.nacks) && n.nacks[i].sn == extSN { + return + } + + nck := nack{ + sn: extSN, + nacked: 0, + } + if i == len(n.nacks) { + n.nacks = append(n.nacks, nck) + } else { + n.nacks = append(n.nacks[:i+1], n.nacks[i:]...) + n.nacks[i] = nck + } + + if len(n.nacks) >= maxNackCache { + copy(n.nacks, n.nacks[1:]) + } +} + +func (n *nackQueue) pairs(headSN uint32) ([]rtcp.NackPair, bool) { + if len(n.nacks) == 0 { + return nil, false + } + i := 0 + askKF := false + var np rtcp.NackPair + var nps []rtcp.NackPair + for _, nck := range n.nacks { + if nck.nacked >= maxNackTimes { + if nck.sn > n.kfSN { + n.kfSN = nck.sn + askKF = true + } + continue + } + if nck.sn >= headSN-2 { + n.nacks[i] = nck + i++ + continue + } + n.nacks[i] = nack{ + sn: nck.sn, + nacked: nck.nacked + 1, + } + i++ + if np.PacketID == 0 || uint16(nck.sn) > np.PacketID+16 { + if np.PacketID != 0 { + nps = append(nps, np) + } + np.PacketID = uint16(nck.sn) + np.LostPackets = 0 + continue + } + np.LostPackets |= 1 << (uint16(nck.sn) - np.PacketID - 1) + } + if np.PacketID != 0 { + nps = append(nps, np) + } + n.nacks = n.nacks[:i] + return nps, askKF +} diff --git a/examples/b2bua/b2bua/buffer/nack_test.go b/examples/b2bua/b2bua/buffer/nack_test.go new file mode 100644 index 0000000..3c60eab --- /dev/null +++ b/examples/b2bua/b2bua/buffer/nack_test.go @@ -0,0 +1,181 @@ +package buffer + +import ( + "math/rand" + "reflect" + "testing" + "time" + + "github.com/pion/rtcp" + "github.com/stretchr/testify/assert" +) + +func Test_nackQueue_pairs(t *testing.T) { + type fields struct { + nacks []nack + } + tests := []struct { + name string + fields fields + args []uint32 + want []rtcp.NackPair + }{ + { + name: "Must return correct single pairs pair", + fields: fields{ + nacks: nil, + }, + args: []uint32{1, 2, 4, 5}, + want: []rtcp.NackPair{{ + PacketID: 1, + LostPackets: 13, + }}, + }, + { + name: "Must return 2 pairs pair", + fields: fields{ + nacks: nil, + }, + args: []uint32{1, 2, 4, 5, 20, 22, 24, 27}, + want: []rtcp.NackPair{ + { + PacketID: 1, + LostPackets: 13, + }, + { + PacketID: 20, + LostPackets: 74, + }, + }, + }, + } + for _, tt := range tests { + tt := tt + t.Run(tt.name, func(t *testing.T) { + n := &nackQueue{ + nacks: tt.fields.nacks, + } + for _, sn := range tt.args { + n.push(sn) + } + got, _ := n.pairs(30) + if !reflect.DeepEqual(got, tt.want) { + t.Errorf("pairs() = %v, want %v", got, tt.want) + } + }) + } +} + +func Test_nackQueue_push(t *testing.T) { + type fields struct { + nacks []nack + } + type args struct { + sn []uint32 + } + tests := []struct { + name string + fields fields + args args + want []uint32 + }{ + { + name: "Must keep packet order", + fields: fields{ + nacks: make([]nack, 0, 10), + }, + args: args{ + sn: []uint32{3, 4, 1, 5, 8, 7, 5}, + }, + want: []uint32{1, 3, 4, 5, 7, 8}, + }, + } + for _, tt := range tests { + tt := tt + t.Run(tt.name, func(t *testing.T) { + n := &nackQueue{ + nacks: tt.fields.nacks, + } + for _, sn := range tt.args.sn { + n.push(sn) + } + var newSN []uint32 + for _, sn := range n.nacks { + newSN = append(newSN, sn.sn) + } + assert.Equal(t, tt.want, newSN) + }) + } +} + +func Test_nackQueue(t *testing.T) { + type fields struct { + nacks []nack + } + type args struct { + sn []uint32 + } + tests := []struct { + name string + fields fields + args args + }{ + { + name: "Must keep packet order", + fields: fields{ + nacks: make([]nack, 0, 10), + }, + args: args{ + sn: []uint32{3, 4, 1, 5, 8, 7, 5}, + }, + }, + } + for _, tt := range tests { + tt := tt + t.Run(tt.name, func(t *testing.T) { + n := nackQueue{} + r := rand.New(rand.NewSource(time.Now().UnixNano())) + for i := 0; i < 100; i++ { + assert.NotPanics(t, func() { + n.push(uint32(r.Intn(60000))) + n.remove(uint32(r.Intn(60000))) + n.pairs(60001) + }) + } + }) + } +} + +func Test_nackQueue_remove(t *testing.T) { + type args struct { + sn []uint32 + } + tests := []struct { + name string + args args + want []uint32 + }{ + { + name: "Must keep packet order", + args: args{ + sn: []uint32{3, 4, 1, 5, 8, 7, 5}, + }, + want: []uint32{1, 3, 4, 7, 8}, + }, + } + for _, tt := range tests { + tt := tt + t.Run(tt.name, func(t *testing.T) { + n := nackQueue{} + for _, sn := range tt.args.sn { + n.push(sn) + } + n.remove(5) + var newSN []uint32 + for _, sn := range n.nacks { + newSN = append(newSN, sn.sn) + } + assert.Equal(t, tt.want, newSN) + }) + } +} diff --git a/examples/b2bua/b2bua/buffer/rtcpreader.go b/examples/b2bua/b2bua/buffer/rtcpreader.go new file mode 100644 index 0000000..7472a2e --- /dev/null +++ b/examples/b2bua/b2bua/buffer/rtcpreader.go @@ -0,0 +1,44 @@ +package buffer + +import ( + "io" + "sync/atomic" +) + +type RTCPReader struct { + ssrc uint32 + closed atomicBool + onPacket atomic.Value //func([]byte) + onClose func() +} + +func NewRTCPReader(ssrc uint32) *RTCPReader { + return &RTCPReader{ssrc: ssrc} +} + +func (r *RTCPReader) Write(p []byte) (n int, err error) { + if r.closed.get() { + err = io.EOF + return + } + if f, ok := r.onPacket.Load().(func([]byte)); ok { + f(p) + } + return +} + +func (r *RTCPReader) OnClose(fn func()) { + r.onClose = fn +} + +func (r *RTCPReader) Close() error { + r.closed.set(true) + r.onClose() + return nil +} + +func (r *RTCPReader) OnPacket(f func([]byte)) { + r.onPacket.Store(f) +} + +func (r *RTCPReader) Read(_ []byte) (n int, err error) { return } diff --git a/examples/b2bua/b2bua/call.go b/examples/b2bua/b2bua/call.go index 59ff757..f184a26 100644 --- a/examples/b2bua/b2bua/call.go +++ b/examples/b2bua/b2bua/call.go @@ -185,6 +185,12 @@ func (b *B2BCall) BridgeMediaStream() error { logger.Errorf("WriteRTCP[%v] %v error: %v", b.destTrans.Type(), trackType, err) } }) + b.srcTrans.OnRequestKeyFrame(func() { + err := b.destTrans.RequestKeyFrame() + if err != nil { + logger.Errorf("OnRequestKeyFrame[%v] error: %v", b.destTrans.Type(), err) + } + }) b.destTrans.OnRtpPacket(func(trackType TrackType, payload []byte) { _, err := b.srcTrans.WriteRTP(trackType, payload) @@ -198,6 +204,12 @@ func (b *B2BCall) BridgeMediaStream() error { logger.Errorf("WriteRTCP[%v] %v error: %v", b.srcTrans.Type(), trackType, err) } }) + b.destTrans.OnRequestKeyFrame(func() { + err := b.srcTrans.RequestKeyFrame() + if err != nil { + logger.Errorf("OnRequestKeyFrame[%v] error: %v", b.srcTrans.Type(), err) + } + }) return nil } @@ -221,6 +233,10 @@ type Transport interface { OnRtpPacket(rtpHandler func(trackType TrackType, payload []byte)) OnRtcpPacket(rtcpHandler func(trackType TrackType, payload []byte)) + OnRequestKeyFrame(func()) + WriteRTP(trackType TrackType, payload []byte) (int, error) WriteRTCP(trackType TrackType, payload []byte) (int, error) + + RequestKeyFrame() error } diff --git a/examples/b2bua/b2bua/rtc.go b/examples/b2bua/b2bua/rtc.go index 7b660a6..8b5338f 100644 --- a/examples/b2bua/b2bua/rtc.go +++ b/examples/b2bua/b2bua/rtc.go @@ -3,18 +3,24 @@ package b2bua import ( "context" "fmt" + "io" "math/rand" "net" "sync" + "github.com/cloudwebrtc/go-sip-ua/examples/b2bua/b2bua/buffer" "github.com/cloudwebrtc/go-sip-ua/pkg/utils" "github.com/pion/interceptor" "github.com/pion/rtcp" + "github.com/pion/rtp" "github.com/pion/webrtc/v3" ) +const maxPktSize = 1500 + var ( webrtcSettings webrtc.SettingEngine + MaxPacketTrack = 500 ) const ( @@ -56,15 +62,36 @@ type WebRTCTransport struct { cancel context.CancelFunc trackInfos []*TrackInfo - mu sync.RWMutex - rtpHandler func(trackType TrackType, payload []byte) - rtcpHandler func(trackType TrackType, payload []byte) + videoPool *sync.Pool + audioPool *sync.Pool + + sequencer *sequencer + buff *buffer.Buffer + bmu sync.Mutex + mu sync.RWMutex + rtpHandler func(trackType TrackType, payload []byte) + rtcpHandler func(trackType TrackType, payload []byte) + requestKeyFrameHandler func() } func NewWebRTCTransport(trackInfos []*TrackInfo) *WebRTCTransport { c := &WebRTCTransport{ trackInfos: trackInfos, localTracks: make(map[TrackType]*webrtc.TrackLocalStaticRTP), + sequencer: newSequencer(MaxPacketTrack), + videoPool: &sync.Pool{ + New: func() interface{} { + b := make([]byte, MaxPacketTrack*maxPktSize) + return &b + }, + }, + audioPool: &sync.Pool{ + New: func() interface{} { + b := make([]byte, maxPktSize*25) + return &b + }, + }, + buff: nil, } c.ctx, c.cancel = context.WithCancel(context.Background()) c.closed.Set(false) @@ -149,6 +176,18 @@ func (c *WebRTCTransport) Init(callConfig CallConfig) error { }) c.pc.OnTrack(func(track *webrtc.TrackRemote, recevier *webrtc.RTPReceiver) { + if track.Kind() == webrtc.RTPCodecTypeVideo { + c.bmu.Lock() + if c.buff == nil { + c.buff = buffer.NewBuffer(uint32(track.SSRC()), c.videoPool, c.audioPool, buffer.Logger) + c.buff.Bind(recevier.GetParameters(), buffer.Options{ + MaxBitRate: 1500, + }) + + c.buff.OnFeedback(func(fb []rtcp.Packet) {}) + } + c.bmu.Unlock() + } buf := make([]byte, 1500) for { if c.closed.Get() { @@ -185,6 +224,12 @@ func (c *WebRTCTransport) OnRtcpPacket(rtcpHandler func(trackType TrackType, pay c.rtcpHandler = rtcpHandler } +func (c *WebRTCTransport) OnRequestKeyFrame(keyHandler func()) { + c.mu.Lock() + defer c.mu.Unlock() + c.requestKeyFrameHandler = keyHandler +} + func (c *WebRTCTransport) onRtpPacket(trackType TrackType, packet []byte) error { logger.Debugf("WebRTCTransport::OnRtpPacketReceived: %v read %d bytes", trackType, len(packet)) @@ -217,6 +262,22 @@ func (c *WebRTCTransport) WriteRTP(trackType TrackType, packet []byte) (int, err } } else if trackType == TrackTypeVideo { if c.localTracks[TrackTypeVideo] != nil { + + var pkt rtp.Packet + if err := pkt.Unmarshal(packet); err == nil { + c.bmu.Lock() + if c.buff != nil { + c.buff.Write(packet) + //pktExt, err := c.buff.ReadExtended() + if err != io.EOF { + if c.sequencer != nil { + c.sequencer.push(pkt.SequenceNumber, pkt.SequenceNumber, pkt.Timestamp, 0, true) + } + } + } + c.bmu.Unlock() + } + return c.localTracks[TrackTypeVideo].Write(packet) } } @@ -394,15 +455,18 @@ func (c *WebRTCTransport) HandleRtcpFb(rtpSender *webrtc.RTPSender) { if pliOnce { fwdPkts = append(fwdPkts, p) logger.Infof("Picture Loss Indication") - //hi.CameraSendKeyFrame() - buf, _ := p.Marshal() - c.onRtcpPacket(TrackTypeVideo, buf) + if c.requestKeyFrameHandler != nil { + c.requestKeyFrameHandler() + } pliOnce = false } case *rtcp.FullIntraRequest: if firOnce { fwdPkts = append(fwdPkts, p) logger.Infof("FullIntraRequest") + if c.requestKeyFrameHandler != nil { + c.requestKeyFrameHandler() + } firOnce = false } case *rtcp.ReceiverEstimatedMaximumBitrate: @@ -419,14 +483,62 @@ func (c *WebRTCTransport) HandleRtcpFb(rtpSender *webrtc.RTPSender) { } } case *rtcp.TransportLayerNack: - logger.Debugf("Nack") - buf, _ := p.Marshal() - c.onRtcpPacket(TrackTypeVideo, buf) + logger.Infof("Nack %v", p) + if c.sequencer != nil { + var nackedPackets []packetMeta + for _, pair := range p.Nacks { + nackedPackets = append(nackedPackets, c.sequencer.getSeqNoPairs(pair.PacketList())...) + } + if len(nackedPackets) > 0 { + if err = c.RetransmitPackets(nackedPackets); err == nil { + logger.Infof("Nack pair %v", nackedPackets) + } + } else { + buf, _ := p.Marshal() + c.onRtcpPacket(TrackTypeVideo, buf) + } + } } } } }() +} + +func (c *WebRTCTransport) RequestKeyFrame() error { + return nil +} +func (c *WebRTCTransport) RetransmitPackets(nackedPackets []packetMeta) error { + c.bmu.Lock() + defer c.bmu.Unlock() + if c.buff == nil { + return fmt.Errorf("buffer is nil") + } + for _, meta := range nackedPackets { + pktBuff := make([]byte, 1500) + i, err := c.buff.GetPacket(pktBuff, meta.sourceSeqNo) + if err != nil { + if err == io.EOF { + break + } + continue + } + var pkt rtp.Packet + if err = pkt.Unmarshal(pktBuff[:i]); err != nil { + continue + } + pkt.Header.SequenceNumber = meta.targetSeqNo + //pkt.Header.Timestamp = meta.timestamp + //pkt.Header.SSRC = track.ssrc + //pkt.Header.PayloadType = track.payloadType + //if _, err = track.writeStream.WriteRTP(&pkt.Header, pkt.Payload); err != nil { + // logger.Error(err, "Writing rtx packet err") + //} + packet, _ := pkt.Marshal() + c.localTracks[TrackTypeVideo].Write(packet) + + } + return nil } // InitWebRTC init WebRTCTransport setting diff --git a/examples/b2bua/b2bua/sequencer.go b/examples/b2bua/b2bua/sequencer.go new file mode 100644 index 0000000..9a3c60f --- /dev/null +++ b/examples/b2bua/b2bua/sequencer.go @@ -0,0 +1,129 @@ +package b2bua + +import ( + "sync" + "time" +) + +const ( + ignoreRetransmission = 100 // Ignore packet retransmission after ignoreRetransmission milliseconds +) + +type packetMeta struct { + // Original sequence number from stream. + // The original sequence number is used to find the original + // packet from publisher + sourceSeqNo uint16 + // Modified sequence number after offset. + // This sequence number is used for the associated + // down track, is modified according the offsets, and + // must not be shared + targetSeqNo uint16 + // Modified timestamp for current associated + // down track. + timestamp uint32 + // The last time this packet was nack requested. + // Sometimes clients request the same packet more than once, so keep + // track of the requested packets helps to avoid writing multiple times + // the same packet. + // The resolution is 1 ms counting after the sequencer start time. + lastNack uint32 + // Spatial layer of packet + layer uint8 + // Information that differs depending the codec + misc uint32 +} + +func (p *packetMeta) setVP8PayloadMeta(tlz0Idx uint8, picID uint16) { + p.misc = uint32(tlz0Idx)<<16 | uint32(picID) +} + +func (p *packetMeta) getVP8PayloadMeta() (uint8, uint16) { + return uint8(p.misc >> 16), uint16(p.misc) +} + +// Sequencer stores the packet sequence received by the down track +type sequencer struct { + sync.Mutex + init bool + max int + seq []packetMeta + step int + headSN uint16 + startTime int64 +} + +func newSequencer(maxTrack int) *sequencer { + return &sequencer{ + startTime: time.Now().UnixNano() / 1e6, + max: maxTrack, + seq: make([]packetMeta, maxTrack), + } +} + +func (n *sequencer) push(sn, offSn uint16, timeStamp uint32, layer uint8, head bool) *packetMeta { + n.Lock() + defer n.Unlock() + if !n.init { + n.headSN = offSn + n.init = true + } + + step := 0 + if head { + inc := offSn - n.headSN + for i := uint16(1); i < inc; i++ { + n.step++ + if n.step >= n.max { + n.step = 0 + } + } + step = n.step + n.headSN = offSn + } else { + step = n.step - int(n.headSN-offSn) + if step < 0 { + if step*-1 >= n.max { + logger.Info("Old packet received, can not be sequenced", "head", sn, "received", offSn) + return nil + } + step = n.max + step + } + } + n.seq[n.step] = packetMeta{ + sourceSeqNo: sn, + targetSeqNo: offSn, + timestamp: timeStamp, + layer: layer, + } + pm := &n.seq[n.step] + n.step++ + if n.step >= n.max { + n.step = 0 + } + return pm +} + +func (n *sequencer) getSeqNoPairs(seqNo []uint16) []packetMeta { + n.Lock() + meta := make([]packetMeta, 0, 17) + refTime := uint32(time.Now().UnixNano()/1e6 - n.startTime) + for _, sn := range seqNo { + step := n.step - int(n.headSN-sn) - 1 + if step < 0 { + if step*-1 >= n.max { + continue + } + step = n.max + step + } + seq := &n.seq[step] + if seq.targetSeqNo == sn { + if seq.lastNack == 0 || refTime-seq.lastNack > ignoreRetransmission { + seq.lastNack = refTime + meta = append(meta, *seq) + } + } + } + n.Unlock() + return meta +} diff --git a/examples/b2bua/b2bua/sequencer_test.go b/examples/b2bua/b2bua/sequencer_test.go new file mode 100644 index 0000000..60e8162 --- /dev/null +++ b/examples/b2bua/b2bua/sequencer_test.go @@ -0,0 +1,99 @@ +package b2bua + +import ( + "reflect" + "testing" + "time" + + "github.com/stretchr/testify/assert" +) + +func Test_sequencer(t *testing.T) { + seq := newSequencer(500) + off := uint16(15) + + for i := uint16(1); i < 520; i++ { + seq.push(i, i+off, 123, 2, true) + } + + time.Sleep(60 * time.Millisecond) + req := []uint16{57, 58, 62, 63, 513, 514, 515, 516, 517} + res := seq.getSeqNoPairs(req) + assert.Equal(t, len(req), len(res)) + for i, val := range res { + assert.Equal(t, val.targetSeqNo, req[i]) + assert.Equal(t, val.sourceSeqNo, req[i]-off) + assert.Equal(t, val.layer, uint8(2)) + } + res = seq.getSeqNoPairs(req) + assert.Equal(t, 0, len(res)) + time.Sleep(150 * time.Millisecond) + res = seq.getSeqNoPairs(req) + assert.Equal(t, len(req), len(res)) + for i, val := range res { + assert.Equal(t, val.targetSeqNo, req[i]) + assert.Equal(t, val.sourceSeqNo, req[i]-off) + assert.Equal(t, val.layer, uint8(2)) + } + + s := seq.push(521, 521+off, 123, 1, true) + var ( + tlzIdx = uint8(15) + picID = uint16(16) + ) + s.setVP8PayloadMeta(tlzIdx, picID) + s.sourceSeqNo = 12 + m := seq.getSeqNoPairs([]uint16{521 + off}) + assert.Equal(t, 1, len(m)) + tlz0, pID := m[0].getVP8PayloadMeta() + assert.Equal(t, tlzIdx, tlz0) + assert.Equal(t, picID, pID) +} + +func Test_sequencer_getNACKSeqNo(t *testing.T) { + type args struct { + seqNo []uint16 + } + type fields struct { + input []uint16 + offset uint16 + } + + tests := []struct { + name string + fields fields + args args + want []uint16 + }{ + { + name: "Should get correct seq numbers", + fields: fields{ + input: []uint16{2, 3, 4, 7, 8}, + offset: 5, + }, + args: args{ + seqNo: []uint16{4 + 5, 5 + 5, 8 + 5}, + }, + want: []uint16{4, 8}, + }, + } + for _, tt := range tests { + tt := tt + t.Run(tt.name, func(t *testing.T) { + n := newSequencer(500) + + for _, i := range tt.fields.input { + n.push(i, i+tt.fields.offset, 123, 3, true) + } + + g := n.getSeqNoPairs(tt.args.seqNo) + var got []uint16 + for _, sn := range g { + got = append(got, sn.sourceSeqNo) + } + if !reflect.DeepEqual(got, tt.want) { + t.Errorf("getSeqNoPairs() = %v, want %v", got, tt.want) + } + }) + } +} diff --git a/examples/b2bua/b2bua/udp.go b/examples/b2bua/b2bua/udp.go index 61f1bc3..31caf86 100644 --- a/examples/b2bua/b2bua/udp.go +++ b/examples/b2bua/b2bua/udp.go @@ -2,6 +2,7 @@ package b2bua import ( "context" + "fmt" "net" "sync" "time" @@ -19,9 +20,10 @@ type UdpTansport struct { localDescription *sdp.Session remoteDescription *sdp.Session - mu sync.RWMutex - rtpHandler func(trackType TrackType, payload []byte) - rtcpHandler func(trackType TrackType, payload []byte) + mu sync.RWMutex + rtpHandler func(trackType TrackType, payload []byte) + rtcpHandler func(trackType TrackType, payload []byte) + requestKeyFrameHandler func() videoSSRC uint32 closed utils.AtomicBool @@ -82,7 +84,7 @@ func (c *UdpTansport) Init(config CallConfig) error { media.Type = string(trackInfo.TrackType) media.Port = udpPort.LocalPort() media.Proto = "RTP/AVP" - media.Mode = sdp.SendRecv + media.Mode = sdp.RecvOnly media.Connection = []*sdp.Connection{{Address: host}} //Bandwidth: []*sdp.Bandwidth{{Type: "TIAS", Value: 96000}}, @@ -121,9 +123,26 @@ func (c *UdpTansport) OnRtcpPacket(rtcpHandler func(trackType TrackType, payload c.rtcpHandler = rtcpHandler } +func (c *UdpTansport) OnRequestKeyFrame(keyHandler func()) { + c.mu.Lock() + defer c.mu.Unlock() + c.requestKeyFrameHandler = keyHandler +} + func (c *UdpTansport) onRtpPacket(trackType TrackType, packet []byte, raddr net.Addr) error { logger.Debugf("UdpTansport::OnRtpPacketReceived: %v read %d bytes, raddr %v", trackType, len(packet), raddr) + if len(packet) == 8 { + pkts, err := rtcp.Unmarshal(packet) + if err != nil { + logger.Errorf("Unmarshal rtcp receiver packets err %v", err) + } + for _, pkt := range pkts { + logger.Warnf("Unkown packet: %v, pkt %v DestinationSSRC %v", trackType, packet, pkt.DestinationSSRC()) + } + return nil + } + p := &rtp.Packet{} if err := p.Unmarshal(packet); err != nil { logger.Errorf("rtp.Packet Unmarshal: e %v len %v", err, len(packet)) @@ -133,14 +152,21 @@ func (c *UdpTansport) onRtpPacket(trackType TrackType, packet []byte, raddr net. if trackType == TrackTypeVideo && c.videoSSRC == 0 { c.videoSSRC = p.SSRC - c.RequestKeyFrame(c.videoSSRC) + //c.sendPLI(c.videoSSRC) } c.mu.RLock() defer c.mu.RUnlock() - if c.rtpHandler != nil { - c.rtpHandler(trackType, packet) + if len(packet) < 12 { + if c.rtcpHandler != nil { + c.rtcpHandler(trackType, packet) + } + } else { + if c.rtpHandler != nil { + c.rtpHandler(trackType, packet) + } } + return nil } @@ -168,16 +194,14 @@ func (c *UdpTansport) WriteRTP(trackType TrackType, packet []byte) (int, error) p.Padding = false p.PaddingSize = 0 - if trackType == TrackTypeVideo { - p.PayloadType = 98 - } - pktbuf, err := p.Marshal() if err != nil { logger.Errorf("Marshal rtp receiver packets err %v", err) } + return 0, nil + port := c.ports[trackType] raddr := port.GetRemoteRtpAddress() if raddr == nil { @@ -204,7 +228,7 @@ func (c *UdpTansport) WriteRTCP(trackType TrackType, packet []byte) (int, error) logger.Errorf("raddr is nil") raddr = port.GetRemoteRtpAddress() } - logger.Infof("UdpTansport::WriteRTCP: %v read %d packets, raddr %v", trackType, len(pkts), *raddr) + logger.Debugf("UdpTansport::WriteRTCP: %v read %d packets, raddr %v", trackType, len(pkts), *raddr) return port.WriteRtcpPacket(packet, *raddr) } @@ -213,18 +237,6 @@ func (c *UdpTansport) Type() TransportType { } func (c *UdpTansport) Close() error { - - c.mu.Lock() - defer c.mu.Unlock() - - c.rtcpHandler = nil - c.rtpHandler = nil - - if !c.closed.Get() { - c.closed.Set(true) - } - c.cancel() - for _, udpPort := range c.ports { udpPort.Close() } @@ -283,15 +295,34 @@ func (c *UdpTansport) CreateAnswer() (*Desc, error) { }, nil } -func (c *UdpTansport) RequestKeyFrame(ssrc uint32) error { +func (c *UdpTansport) RequestKeyFrame() error { + if c.videoSSRC == 0 { + return fmt.Errorf("video ssrc is 0") + } + pli := rtcp.PictureLossIndication{SenderSSRC: uint32(0), MediaSSRC: uint32(c.videoSSRC)} + buf, err := pli.Marshal() + if err != nil { + logger.Error(err) + return err + } + _, errSend := c.WriteRTCP(TrackTypeVideo, buf) + if errSend != nil { + logger.Error(errSend) + return errSend + } + logger.Infof("RequestKeyFrame: Sent PLI %v", pli) + return nil +} + +func (c *UdpTansport) sendPLI(ssrc uint32) error { go func() { - ticker := time.NewTicker(time.Second * 3) + ticker := time.NewTicker(time.Second * 1) for range ticker.C { if c.closed.Get() { logger.Infof("Terminate: stop pli loop now!") return } - pli := rtcp.PictureLossIndication{MediaSSRC: uint32(ssrc)} + pli := rtcp.PictureLossIndication{SenderSSRC: uint32(0), MediaSSRC: uint32(ssrc)} buf, err := pli.Marshal() if err != nil { logger.Error(err) diff --git a/examples/b2bua/b2bua/udp_port.go b/examples/b2bua/b2bua/udp_port.go index ac0d985..781b206 100644 --- a/examples/b2bua/b2bua/udp_port.go +++ b/examples/b2bua/b2bua/udp_port.go @@ -38,7 +38,7 @@ func (c *UdpPort) Init() error { lAddr := &net.UDPAddr{IP: net.ParseIP("0.0.0.0"), Port: 0} lRtcpAddr := &net.UDPAddr{IP: net.ParseIP("0.0.0.0"), Port: 0} - rtpConns, err := ListenRTPInPortRange(3000, 5000, "udp", lAddr, lRtcpAddr) + rtpConns, err := ListenRTPInPortRange(4000, 5000, "udp", lAddr, lRtcpAddr) if err != nil { logger.Errorf("ListenUDP: err => %v", err) return err diff --git a/examples/b2bua/b2bua/util.go b/examples/b2bua/b2bua/util.go index 2ae3591..41eb937 100644 --- a/examples/b2bua/b2bua/util.go +++ b/examples/b2bua/b2bua/util.go @@ -213,6 +213,8 @@ func ListenRTPInPortRange(portMin, portMax int, network string, lRtpAddr *net.UD *lRtpAddr = net.UDPAddr{IP: lRtpAddr.IP, Port: portCurrent} c, e := net.ListenUDP(network, lRtpAddr) if e == nil { + c.SetReadBuffer(321024) + c.SetWriteBuffer(321024) if conns[0] == nil { conns[0] = c } else { @@ -222,6 +224,8 @@ func ListenRTPInPortRange(portMin, portMax int, network string, lRtpAddr *net.UD *lRtcpAddr = net.UDPAddr{IP: lRtcpAddr.IP, Port: portCurrent + 1} c, e = net.ListenUDP(network, lRtcpAddr) if e == nil { + c.SetReadBuffer(321024) + c.SetWriteBuffer(321024) conns[1] = c return conns, e } diff --git a/go.mod b/go.mod index 24bb50b..6509f34 100644 --- a/go.mod +++ b/go.mod @@ -5,14 +5,20 @@ go 1.13 require ( firebase.google.com/go v3.13.0+incompatible github.com/c-bata/go-prompt v0.2.6 + github.com/gammazero/deque v0.1.0 github.com/ghettovoice/gosip v0.0.0-20230322091832-d77de1c97f89 + github.com/go-logr/logr v1.2.4 github.com/google/uuid v1.3.0 github.com/pion/interceptor v0.1.12 + github.com/pion/ion-sfu v1.11.0 github.com/pion/rtcp v1.2.10 github.com/pion/rtp v1.7.13 + github.com/pion/sdp/v3 v3.0.6 + github.com/pion/transport v0.14.1 github.com/pion/webrtc/v3 v3.1.59 github.com/pixelbender/go-sdp v1.1.0 github.com/sirupsen/logrus v1.9.0 + github.com/stretchr/testify v1.8.2 github.com/tevino/abool v1.2.0 github.com/x-cray/logrus-prefixed-formatter v0.5.2 golang.org/x/crypto v0.7.0 diff --git a/go.sum b/go.sum index e767d73..b25c57f 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,8 @@ +bazil.org/fuse v0.0.0-20180421153158-65cc252bf669/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.39.0/go.mod h1:rVLT6fkc8chs9sfPtFc1SBH6em7n+ZoXaG+87tDISts= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= @@ -238,6 +240,7 @@ cloud.google.com/go/eventarc v1.10.0/go.mod h1:u3R35tmZ9HvswGRBnF48IlYgYeBcPUCjk cloud.google.com/go/filestore v1.3.0/go.mod h1:+qbvHGvXU1HaKX2nD0WEPo92TP/8AQuCVEBXNY9z0+w= cloud.google.com/go/filestore v1.4.0/go.mod h1:PaG5oDfo9r224f8OYXURtAsY+Fbyq/bLYoINEK8XQAI= cloud.google.com/go/filestore v1.5.0/go.mod h1:FqBXDWBp4YLHqRnVGveOkHDf8svj9r5+mUDLupOWEDs= +cloud.google.com/go/firestore v1.6.0/go.mod h1:afJwI0vaXwAG54kI7A//lP/lSPDkQORQuMkv56TxEPU= cloud.google.com/go/firestore v1.9.0 h1:IBlRyxgGySXu5VuW0RgGFlTtLukSnNkpDiEOMkQkmpA= cloud.google.com/go/firestore v1.9.0/go.mod h1:HMkjKHNTtRyZNiMzu7YAsLr9K3X2udY2AMwDaMEQiiE= cloud.google.com/go/functions v1.6.0/go.mod h1:3H1UA3qiIPRWD7PeZKLvHZ9SaQhR26XIJcC0A5GbvAk= @@ -524,27 +527,87 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS cloud.google.com/go/workflows v1.8.0/go.mod h1:ysGhmEajwZxGn1OhGOGKsTXc5PyxOc0vfKf5Af+to4M= cloud.google.com/go/workflows v1.9.0/go.mod h1:ZGkj1aFIOd9c8Gerkjjq7OW7I5+l6cSvT3ujaO/WwSA= cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcPALq2CxzdePw= +code.gitea.io/sdk/gitea v0.11.3/go.mod h1:z3uwDV/b9Ls47NGukYM9XhnHtqPh/J+t40lsUrR6JDY= +contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0/go.mod h1:uu1P0UCM/6RbsMrgPa98ll8ZcHM858i/AD06a9aLRCA= +contrib.go.opencensus.io/exporter/ocagent v0.5.0/go.mod h1:ImxhfLRpxoYiSq891pBrLVhN+qmP8BTVvdH2YLs7Gl0= +contrib.go.opencensus.io/exporter/stackdriver v0.12.1/go.mod h1:iwB6wGarfphGGe/e5CWqyUk/cLzKnWsOKPVW3no6OTw= +contrib.go.opencensus.io/integrations/ocsql v0.1.4/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE= +contrib.go.opencensus.io/resource v0.1.1/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcigGlFvXwEGEnkRLA= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= firebase.google.com/go v3.13.0+incompatible h1:3TdYC3DDi6aHn20qoRkxwGqNgdjtblwVAyRLQwGn/+4= firebase.google.com/go v3.13.0+incompatible/go.mod h1:xlah6XbEyW6tbfSklcfe5FHJIwjt8toICdV5Wh9ptHs= gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8= git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc= +github.com/Azure/azure-amqp-common-go/v2 v2.1.0/go.mod h1:R8rea+gJRuJR6QxTir/XuEd+YuKoUiazDC/N96FiDEU= +github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= +github.com/Azure/azure-sdk-for-go v29.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go v30.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-service-bus-go v0.9.1/go.mod h1:yzBx6/BUGfjfeqbRZny9AQIbIe3AcV9WZbAdpkoXOa0= +github.com/Azure/azure-storage-blob-go v0.8.0/go.mod h1:lPI3aLPpuLTeUwh1sViKXFxwl2B6teiRqI0deQUvsw0= +github.com/Azure/go-autorest v12.0.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20191009163259-e802c2cb94ae/go.mod h1:mjwGPas4yKduTyubHvD1Atl9r1rUq8DfVy+gkVvZ+oo= github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk= +github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= +github.com/Masterminds/semver/v3 v3.0.3/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= +github.com/Masterminds/semver/v3 v3.1.0/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= +github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= +github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9/go.mod h1:JynElWSGnm/4RlzPXRlREEwqTHAN3T56Bv2ITsFT3gY= github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19/go.mod h1:T13YZdzov6OU0A1+RfKZiZN9ca6VeKdBdyDV+BY97Tk= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b/go.mod h1:1KcenG0jGWcpt8ov532z81sp/kMMUG485J2InIOyADM= +github.com/alecthomas/kingpin v2.2.6+incompatible/go.mod h1:59OFYbFVLKQKq+mqrL6Rw5bR0c3ACQaawgXx0QYndlE= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0= +github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= +github.com/apex/log v1.1.4/go.mod h1:AlpoD9aScyQfJDVHmLMEcx4oU6LqzkWp4Mg9GdAcEvQ= +github.com/apex/logs v0.0.4/go.mod h1:XzxuLZ5myVHDy9SAmYpamKKRNApGj54PfYLcFrXqDwo= +github.com/aphistic/golf v0.0.0-20180712155816-02c07f170c5a/go.mod h1:3NqKYiepwy8kCu4PNA+aP7WUV72eXWJeP9/r3/K9aLE= +github.com/aphistic/sweet v0.2.0/go.mod h1:fWDlIh/isSE9n6EPsRmC0det+whmX6dJid3stzu0Xys= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= +github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= +github.com/aws/aws-sdk-go v1.15.27/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= +github.com/aws/aws-sdk-go v1.19.18/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.19.45/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.20.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.25.11/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= +github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bep/debounce v1.2.0/go.mod h1:H8yggRPQKLUhUoqrJC1bO2xNya7vanpDl7xR3ISbCJ0= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb/go.mod h1:PkYb9DJNAwrSvRx5DYA+gUcOIgTGVMNkfSCbZM8cWpI= github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/c-bata/go-prompt v0.2.6 h1:POP+nrHE+DfLYx370bedwNhsqmpCUynWPxuHi0C5vZI= github.com/c-bata/go-prompt v0.2.6/go.mod h1:/LMAke8wD2FsNu9EXNdHxNLbd9MedkPnCdfpU9wwHfY= +github.com/caarlos0/ctrlc v1.0.0/go.mod h1:CdXpj4rmq0q/1Eb44M9zi2nKB0QraNKuRGYGrrHhcQw= +github.com/campoy/unique v0.0.0-20180121183637-88950e537e7e/go.mod h1:9IOqJGCPMSc6E5ydlp5NIonxObaeu/Iub/X03EKPVYo= +github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= +github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e/go.mod h1:oDpT4efm8tSYHXV5tHSdRvBet/b/QzxZ+XyyPehvm3A= +github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= +github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= @@ -554,7 +617,10 @@ github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cloudwebrtc/nats-discovery v0.3.0/go.mod h1:xYZdYTliuLw9F7S9UrH0ygDd3lRm8/zxt+g662cCYXI= +github.com/cloudwebrtc/nats-grpc v1.0.0/go.mod h1:zLT0CZd/ilNE0C92/F+7xwbPPl/Ff3eq+LuedTp9wug= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= @@ -567,14 +633,39 @@ github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= +github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= +github.com/devigned/tab v0.1.1/go.mod h1:XG9mPq0dFghrYvoBF3xdRrJzSTX1b7IQrvaL9mzjeJY= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= github.com/discoviking/fsm v0.0.0-20150126104936-f4a273feecca h1:cTTdXpkQ1aVbOOmHwdwtYuwUZcQtcMrleD1UXLWhAq8= github.com/discoviking/fsm v0.0.0-20150126104936-f4a273feecca/go.mod h1:W+3LQaEkN8qAwwcw0KC546sUEnX86GIT8CcMLZC4mG0= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= +github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= +github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= +github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -588,14 +679,27 @@ github.com/envoyproxy/go-control-plane v0.10.3/go.mod h1:fJJn/j26vwOu972OllsvAgJ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo= github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= +github.com/fortytw2/leaktest v1.2.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= +github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= +github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= +github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= +github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= +github.com/fullstorydev/grpcurl v1.8.0/go.mod h1:Mn2jWbdMrQGJQ8UD62uNyMumT2acsZUCkZIqFxsQf1o= +github.com/gammazero/deque v0.1.0 h1:f9LnNmq66VDeuAlSAapemq/U7hJ2jpIWa4c09q8Dlik= +github.com/gammazero/deque v0.1.0/go.mod h1:KQw7vFau1hHuM8xmI9RbgKFbAsQFWmBpqQ2KenFLk6M= +github.com/gammazero/workerpool v1.1.2/go.mod h1:UelbXcO0zCIGFcufcirHhq2/xtLXJdQ29qZNlXG9OjQ= github.com/ghettovoice/gosip v0.0.0-20230322091832-d77de1c97f89 h1:bUtgAwa7cfrp0bEnlfr+k6fgsfn7/OFQ0pvQvoujOAo= github.com/ghettovoice/gosip v0.0.0-20230322091832-d77de1c97f89/go.mod h1:rlD1yLOErWYohWTryG/2bTTpmzB79p52ntLA/uIFXeI= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g= github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks= github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY= @@ -604,21 +708,54 @@ github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmn github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= +github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2CSIqUrmQPqA0gdRIlnLEY0gK5JGjh37zN5U= github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81/go.mod h1:SX0U8uGpxhq9o2S/CELCSUxEWWAuoCUcVCQWv7G2OCk= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= +github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/zerologr v1.2.0 h1:oS1fjSSEHwpv8Lam3SNmPTLTUw6V4DoB2ZzryqrkMB0= +github.com/go-logr/zerologr v1.2.0/go.mod h1:O82obOiXzyxiBNgAMRT1m+XbOvY8K18Kf6XhT52oqoc= github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= github.com/go-pdf/fpdf v0.6.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= +github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= +github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= +github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= +github.com/go-redis/redis/v7 v7.4.0/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg= +github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= +github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU= github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM= +github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og= github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= +github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= github.com/gobwas/ws v1.1.0-rc.1 h1:VK3aeRXMI8osaS6YCDKNZhU6RKtcP3B2wzqxOogNDz8= github.com/gobwas/ws v1.1.0-rc.1/go.mod h1:nzvNcVha5eUziGrbxFCo6qFIojQHjJV5cLYIbezhfL0= github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= +github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= @@ -650,6 +787,7 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= @@ -672,8 +810,14 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= +github.com/google/go-github/v28 v28.1.1/go.mod h1:bsqJWQX05omyWVmc00nEUql9mhQyv38lDZ8kPZcQVoM= +github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +github.com/google/go-replayers/grpcreplay v0.1.0/go.mod h1:8Ig2Idjpr6gifRd6pNVggX6TC1Zw6Jx74AKp7QNH2QE= +github.com/google/go-replayers/httpreplay v0.1.0/go.mod h1:YKZViNhiGgqdBlUbI2MwGpq4pXxNmhJLPHQ7cv2b5no= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible h1:xmapqc1AyLoB+ddYT6r04bD9lIjlOqGaREovi0SzFaE= +github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= @@ -695,15 +839,22 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/rpmpack v0.0.0-20191226140753-aa36bfddb3a0/go.mod h1:RaTPr0KUf2K7fnZYLNDrr8rxAamWs3iNywJLtQ2AzBg= +github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= +github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/wire v0.3.0/go.mod h1:i1DMg/Lu8Sz5yYl25iOdmc5CT5qusaa+zmRWs16741s= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= github.com/googleapis/enterprise-certificate-proxy v0.2.1/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k= github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= +github.com/googleapis/gax-go v2.0.2+incompatible h1:silFMLAnr330+NRuag/VjIGF7TLp/LBrV2CJKFLWEww= +github.com/googleapis/gax-go v2.0.2+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= @@ -718,28 +869,107 @@ github.com/googleapis/gax-go/v2 v2.7.1 h1:gF4c0zjUP2H/s/hEGyLA3I0fA2ZWjzYiONAD6c github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= +github.com/goreleaser/goreleaser v0.134.0/go.mod h1:ZT6Y2rSYa6NxQzIsdfWWNWAlYGXGbreo66NmE+3X3WQ= +github.com/goreleaser/nfpm v1.2.1/go.mod h1:TtWrABZozuLOttX2uDlYyECfQX7x5XYkVxhjYcR6G9w= +github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= +github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.9.2/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w= +github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= +github.com/hashicorp/consul/api v1.10.1/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= +github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= +github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= +github.com/hashicorp/go-retryablehttp v0.6.4/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= +github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= +github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= +github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/improbable-eng/grpc-web v0.14.1/go.mod h1:zEjGHa8DAlkoOXmswrNvhUGEYQA9UI7DhrGeHR1DMGU= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= +github.com/jarcoal/httpmock v1.0.5/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik= +github.com/jhump/protoreflect v1.6.1/go.mod h1:RZQ/lnuN+zqeRVpQigTwO6o0AJUkxbnSnpuG7toUTG4= +github.com/jhump/protoreflect v1.8.2/go.mod h1:7GcYQDdMU/O/BBrl/cX6PNHpXh6cenjd8pneu5yW7Tg= +github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod h1:2iMrUgbbvHEiQClaW2NsSzMyGHqN+rDFqY705q49KG0= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE= +github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= @@ -747,119 +977,311 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= +github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= +github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= +github.com/lucsky/cuid v1.2.1/go.mod h1:QaaJqckboimOmhRSJXSx/+IT+VTfxfPGSo/6mfgUfmE= github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= +github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= +github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.7 h1:bQGKb3vps/j0E9GfJQ03JyhRuxsvdAanXlT9BTw3mdw= +github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= +github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= +github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.6/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mattn/go-shellwords v1.0.10/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/mattn/go-tty v0.0.3 h1:5OfyWorkyO7xP52Mq7tB36ajHDG5OHrmBGIS/DtakQI= github.com/mattn/go-tty v0.0.3/go.mod h1:ihxohKRERHTVzN+aSVRwACLCeqIoZAWpoICkkvrWyR0= -github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4= +github.com/mattn/go-zglob v0.0.1/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= +github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI= +github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= +github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY= github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/grpc-proxy v0.0.0-20181017164139-0f1106ef9c76/go.mod h1:x5OoJHDHqxHS801UIuhqGl6QdSAEJvtausosHSdazIo= +github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= +github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= +github.com/nats-io/jwt v1.1.0/go.mod h1:n3cvmLfBfnpV4JJRN7lRYCyZnw48ksGsbThGXEk4w9M= +github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= +github.com/nats-io/nats-server/v2 v2.1.9/go.mod h1:9qVyoewoYXzG1ME9ox0HwkkzyYvnlBDugfR4Gg/8uHU= +github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= +github.com/nats-io/nats.go v1.10.0/go.mod h1:AjGArbfyR50+afOUotNX2Xs5SYHf+CoOa5HH1eEl2HE= +github.com/nats-io/nats.go v1.12.0/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w= +github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nkeys v0.1.4/go.mod h1:XdZpAbhgyyODYqjTawOnIOI7VlbKSarI9Gfy1tqEu/s= +github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= +github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= +github.com/nishanths/predeclared v0.0.0-20200524104333-86fad755b4d3/go.mod h1:nt3d53pc1VYcphSCIaYAJtnPYnr3Zyn8fMq2wvPGPso= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.5/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= +github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= +github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/ginkgo v1.16.1/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.4/go.mod h1:g/HbgYopi++010VEqkFgJHKC09uJiW9UkXvMUuKHUCQ= +github.com/onsi/gomega v1.11.0/go.mod h1:azGKhqFUon9Vuj0YmTfLSmx0FUwqXYSTl5re8lQLTUg= +github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= github.com/onsi/gomega v1.17.0 h1:9Luw4uT5HTjHTN8+aNcSThgH1vdXnmdJ8xIfZ4wyTRE= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= +github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= +github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= +github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= +github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= +github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= +github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY= github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI= github.com/phpdave11/gofpdi v1.0.13/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI= +github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= +github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pion/datachannel v1.5.0/go.mod h1:TVbgWP+PVM9TlwL1IkG3JqXXfjGxLvsu9QUeFdpTegI= github.com/pion/datachannel v1.5.5 h1:10ef4kwdjije+M9d7Xm9im2Y3O6A6ccQb0zcqZcJew8= github.com/pion/datachannel v1.5.5/go.mod h1:iMz+lECmfdCMqFRhXhcA/219B0SQlbpoR2V118yimL0= +github.com/pion/dtls/v2 v2.0.9/go.mod h1:O0Wr7si/Zj5/EBFlDzDd6UtVxx25CE1r7XM7BQKYQho= +github.com/pion/dtls/v2 v2.0.10/go.mod h1:00OxfeCRWHShcqT9jx8pKKmBWuTt0NCZoVPCaC4VKvU= github.com/pion/dtls/v2 v2.2.6 h1:yXMxKr0Skd+Ub6A8UqXTRLSywskx93ooMRHsQUtd+Z4= github.com/pion/dtls/v2 v2.2.6/go.mod h1:t8fWJCIquY5rlQZwA2yWxUS1+OCrAdXrhVKXB5oD/wY= +github.com/pion/ice/v2 v2.1.13/go.mod h1:ovgYHUmwYLlRvcCLI67PnQ5YGe+upXZbGgllBDG/ktU= github.com/pion/ice/v2 v2.3.2 h1:vh+fi4RkZ8H5fB4brZ/jm3j4BqFgMmNs+aB3X52Hu7M= github.com/pion/ice/v2 v2.3.2/go.mod h1:AMIpuJqcpe+UwloocNebmTSWhCZM1TUCo9v7nW50jX0= +github.com/pion/interceptor v0.1.0/go.mod h1:j5NIl3tJJPB3u8+Z2Xz8MZs/VV6rc+If9mXEKNuFmEM= github.com/pion/interceptor v0.1.12 h1:CslaNriCFUItiXS5o+hh5lpL0t0ytQkFnUcbbCs2Zq8= github.com/pion/interceptor v0.1.12/go.mod h1:bDtgAD9dRkBZpWHGKaoKb42FhDHTG2rX8Ii9LRALLVA= +github.com/pion/ion v1.10.0/go.mod h1:PiH6J8i3NheVTTOxh1wC/c5aAH68eUMzgmnboxEio3A= +github.com/pion/ion-log v1.2.0/go.mod h1:oUlvCy7LZNPzOxmCZVraaMhcS/hB9XFog4m1A8QpVgM= +github.com/pion/ion-log v1.2.1/go.mod h1:oUlvCy7LZNPzOxmCZVraaMhcS/hB9XFog4m1A8QpVgM= +github.com/pion/ion-log v1.2.2/go.mod h1:oUlvCy7LZNPzOxmCZVraaMhcS/hB9XFog4m1A8QpVgM= +github.com/pion/ion-sfu v1.10.10/go.mod h1:sP+lxPeuzUqabYC6u+YOXZI8YENtqqbnCHnHfOxA/dQ= +github.com/pion/ion-sfu v1.11.0 h1:yZcl09yylFa1iN/7MBvJ99FZhPGkazGGwHiaMINmeEw= +github.com/pion/ion-sfu v1.11.0/go.mod h1:EDq8qb5/wmFfSay2TooWHnzeQo0LGRVdkTRFi8wDCcI= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= +github.com/pion/mdns v0.0.5/go.mod h1:UgssrvdD3mxpi8tMxAXbsppL3vJ4Jipw1mTCW+al01g= github.com/pion/mdns v0.0.7 h1:P0UB4Sr6xDWEox0kTVxF0LmQihtCbSAdW0H2nEgkA3U= github.com/pion/mdns v0.0.7/go.mod h1:4iP2UbeFhLI/vWju/bw6ZfwjJzk0z8DNValjGxR/dD8= github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA= github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8= +github.com/pion/rtcp v1.2.6/go.mod h1:52rMNPWFsjr39z9B9MhnkqhPLoeHTv1aN63o/42bWE0= +github.com/pion/rtcp v1.2.8/go.mod h1:qVPhiCzAm4D/rxb6XzKeyZiQK69yJpbUDJSF7TgrqNo= github.com/pion/rtcp v1.2.10 h1:nkr3uj+8Sp97zyItdN60tE/S6vk4al5CPRR6Gejsdjc= github.com/pion/rtcp v1.2.10/go.mod h1:ztfEwXZNLGyF1oQDttz/ZKIBaeeg/oWbRYqzBM9TL1I= +github.com/pion/rtp v1.7.0/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= +github.com/pion/rtp v1.7.2/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= +github.com/pion/rtp v1.7.4/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= github.com/pion/rtp v1.7.13 h1:qcHwlmtiI50t1XivvoawdCGTP4Uiypzfrsap+bijcoA= github.com/pion/rtp v1.7.13/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= +github.com/pion/sctp v1.7.12/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s= github.com/pion/sctp v1.8.5/go.mod h1:SUFFfDpViyKejTAdwD1d/HQsCu+V/40cCs2nZIvC3s0= github.com/pion/sctp v1.8.6 h1:CUex11Vkt9YS++VhLf8b55O3VqKrWL6W3SDwX4jAqsI= github.com/pion/sctp v1.8.6/go.mod h1:SUFFfDpViyKejTAdwD1d/HQsCu+V/40cCs2nZIvC3s0= +github.com/pion/sdp/v3 v3.0.4/go.mod h1:bNiSknmJE0HYBprTHXKPQ3+JjacTv5uap92ueJZKsRk= github.com/pion/sdp/v3 v3.0.6 h1:WuDLhtuFUUVpTfus9ILC4HRyHsW6TdugjEX/QY9OiUw= github.com/pion/sdp/v3 v3.0.6/go.mod h1:iiFWFpQO8Fy3S5ldclBkpXqmWy02ns78NOKoLLL0YQw= +github.com/pion/srtp/v2 v2.0.5/go.mod h1:8k6AJlal740mrZ6WYxc4Dg6qDqqhxoRG2GSjlUhDF0A= github.com/pion/srtp/v2 v2.0.12 h1:WrmiVCubGMOAObBU1vwWjG0H3VSyQHawKeer2PVA5rY= github.com/pion/srtp/v2 v2.0.12/go.mod h1:C3Ep44hlOo2qEYaq4ddsmK5dL63eLehXFbHaZ9F5V9Y= +github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2UA= github.com/pion/stun v0.4.0 h1:vgRrbBE2htWHy7l3Zsxckk7rkjnjOsSM7PHZnBwo8rk= github.com/pion/stun v0.4.0/go.mod h1:QPsh1/SbXASntw3zkkrIk3ZJVKz4saBY2G7S10P3wCw= +github.com/pion/transport v0.10.1/go.mod h1:PBis1stIILMiis0PewDw91WJeLJkyIMcEk+DwKOzf4A= +github.com/pion/transport v0.12.2/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q= +github.com/pion/transport v0.12.3/go.mod h1:OViWW9SP2peE/HbwBvARicmAVnesphkNkCVZIWJ6q9A= github.com/pion/transport v0.14.1 h1:XSM6olwW+o8J4SCmOBb/BpwZypkHeyM0PGFCxNQBr40= github.com/pion/transport v0.14.1/go.mod h1:4tGmbk00NeYA3rUa9+n+dzCCoKkcy3YlYb99Jn2fNnI= github.com/pion/transport/v2 v2.0.0/go.mod h1:HS2MEBJTwD+1ZI2eSXSvHJx/HnzQqRy2/LXxt6eVMHc= github.com/pion/transport/v2 v2.0.2 h1:St+8o+1PEzPT51O9bv+tH/KYYLMNR5Vwm5Z3Qkjsywg= github.com/pion/transport/v2 v2.0.2/go.mod h1:vrz6bUbFr/cjdwbnxq8OdDDzHf7JJfGsIRkxfpZoTA0= +github.com/pion/turn/v2 v2.0.5/go.mod h1:APg43CFyt/14Uy7heYUOGWdkem/Wu4PhCO/bjyrTqMw= github.com/pion/turn/v2 v2.1.0 h1:5wGHSgGhJhP/RpabkUb/T9PdsAjkGLS6toYz5HNzoSI= github.com/pion/turn/v2 v2.1.0/go.mod h1:yrT5XbXSGX1VFSF31A3c1kCNB5bBZgk/uu5LET162qs= +github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o= +github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M= github.com/pion/udp/v2 v2.0.1 h1:xP0z6WNux1zWEjhC7onRA3EwwSliXqu1ElUZAQhUP54= github.com/pion/udp/v2 v2.0.1/go.mod h1:B7uvTMP00lzWdyMr/1PVZXtV3wpPIxBRd4Wl6AksXn8= +github.com/pion/webrtc/v3 v3.1.7/go.mod h1:SQxttydYlKo2rCQjHzkUCJFAfEO/Oh2efMWbKYXLk98= github.com/pion/webrtc/v3 v3.1.59 h1:B3YFo8q6dwBYKA2LUjWRChP59Qtt+xvv1Ul7UPDp6Zc= github.com/pion/webrtc/v3 v3.1.59/go.mod h1:rJGgStRoFyFOWJULHLayaimsG+jIEoenhJ5MB5gIFqw= github.com/pixelbender/go-sdp v1.1.0 h1:rkm9aFBNKrnB+YGfhLmAkal3pC8XYXb9h+172PlrCBU= github.com/pixelbender/go-sdp v1.1.0/go.mod h1:6IBlz9+BrUHoFTea7gcp4S54khtOhjCW/nVDLhmZBAs= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pkg/term v1.2.0-beta.2 h1:L3y/h2jkuBVFdWiJvNfYfKmzcCnILw7mJWm2JQuMppw= github.com/pkg/term v1.2.0-beta.2/go.mod h1:E25nymQcrSllhX42Ok8MRm1+hyBdHY0dCeiKZ9jpNGw= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= +github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rogpeppe/fastuuid v1.1.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= +github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/zerolog v1.25.0/go.mod h1:7KHcEGe0QZPOm2IE4Kpb5rTh6n1h2hIgS5OOnu1rUaI= +github.com/rs/zerolog v1.26.0 h1:ORM4ibhEZeTeQlCojCK2kPz1ogAY4bGs4tD+SaAdGaE= +github.com/rs/zerolog v1.26.0/go.mod h1:yBiM87lvSqX8h0Ww4sdzNSkVYZ8dL2xjZJG1lAuGZEo= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w= github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245/go.mod h1:pQAZKsJ8yyVxGRWYNEm9oFB8ieLgKFnamEyDmSA0BRk= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/sagikazarmark/crypt v0.1.0/go.mod h1:B/mN0msZuINBtQ1zZLEQcegFJJf9vnYIR88KRMEuODE= +github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= +github.com/sassoftware/go-rpmutils v0.0.0-20190420191620-a8f1baeba37b/go.mod h1:am+Fp8Bt506lA3Rk3QCmSqmYmLMnPDhdDUcosQCAx+I= github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b h1:gQZ0qzfKHQIybLANtM3mBXNUtOfsCFXeTsnBqCsx1KM= github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM= +github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/smartystreets/gunit v1.0.0/go.mod h1:qwPWnhz6pn0NnRBP++URONOVyNkPyr4SauJk4cUOwJs= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= +github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= +github.com/sourcegraph/jsonrpc2 v0.1.0/go.mod h1:ZafdZgk/axhT1cvZAPOhw+95nz2I/Ra5qMlU4gTRwIo= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= +github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= +github.com/spf13/viper v1.9.0/go.mod h1:+i6ajR7OX2XaiBkrcZJFK21htRk7eDeLg7+O6bhUPP4= +github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -869,20 +1291,49 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tevino/abool v0.0.0-20170917061928-9b9efcf221b5/go.mod h1:f1SCnEOt6sc3fOJfPQDRDzHOtSXuTtnz0ImG9kPRDV0= github.com/tevino/abool v1.2.0 h1:heAkClL8H6w+mK5md9dzsuohKeXHUpY7Vw0ZCKW+huA= github.com/tevino/abool v1.2.0/go.mod h1:qc66Pna1RiIsPa7O4Egxxs9OqkuxDX55zznh9K07Tzg= +github.com/tj/assert v0.0.0-20171129193455-018094318fb0/go.mod h1:mZ9/Rh9oLWpLLDRpvE+3b7gP/C2YyLFYxNmcLnPTMe0= +github.com/tj/assert v0.0.3/go.mod h1:Ne6X72Q+TB1AteidzQncjw9PabbMp4PBMZ1k+vd1Pvk= +github.com/tj/go-elastic v0.0.0-20171221160941-36157cbbebc2/go.mod h1:WjeM0Oo1eNAjXGDx2yma7uG2XoyRZTq1uv3M/o7imD0= +github.com/tj/go-kinesis v0.0.0-20171128231115-08b17f58cb1b/go.mod h1:/yhzCV0xPfx6jb1bBgRFjl5lytqVqZXEaeqWP8lTEao= +github.com/tj/go-spin v1.1.0/go.mod h1:Mg1mzmePZm4dva8Qz60H2lHwmJ2loum4VIrLgVnKwh4= +github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= +github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= +github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= +github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/x-cray/logrus-prefixed-formatter v0.5.2 h1:00txxvfBM9muc0jiLIEAkAcIMJzfthRT6usrui8uGmg= github.com/x-cray/logrus-prefixed-formatter v0.5.2/go.mod h1:2duySbKsL6M18s5GU7VPsoEPHyzalCE06qoARUCeBBE= +github.com/xanzy/go-gitlab v0.31.0/go.mod h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug= +github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= +go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= +go.opencensus.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0= +go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -894,13 +1345,36 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= +go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= +gocloud.dev v0.19.0/go.mod h1:SmKwiR8YwIMMJvQBKLsC3fHNyMwXLw3PMDO+VVteJMI= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= +golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210503195802-e9a32991a82e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= +golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= @@ -921,6 +1395,7 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= @@ -966,16 +1441,27 @@ golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -983,6 +1469,7 @@ golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= @@ -994,17 +1481,22 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= +golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211005001312-d4b1ae081e3b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -1025,7 +1517,9 @@ golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1070,8 +1564,14 @@ golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1080,29 +1580,41 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190620070143-6f217b454f45/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1114,6 +1626,7 @@ golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210304124612-50617c2ba197/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1121,20 +1634,24 @@ golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1184,13 +1701,16 @@ golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.1.0 h1:xYY+Bajn2a7VBmTM5GikTmnK8ZuX8YgnQCqZpbBNtmA= golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1198,6 +1718,8 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -1205,9 +1727,12 @@ golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190927191325-030b2cf1153e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -1215,6 +1740,7 @@ golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -1226,10 +1752,14 @@ golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= @@ -1240,6 +1770,7 @@ golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= @@ -1247,6 +1778,7 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k= @@ -1268,7 +1800,10 @@ gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6d gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= gonum.org/v1/plot v0.9.0/go.mod h1:3Pcqqmp6RHvJI72kgb8fThyUnav364FOsdDo2aGW5lY= gonum.org/v1/plot v0.10.1/go.mod h1:VZW5OlhkL1mysU9vaqNHnsy86inf6Ot+jB3r+BczCEo= +google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.5.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.6.0/go.mod h1:btoxGiFvQNVUZQ8W08zLtrVS08CNpINPEfxXxgJL1Q4= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -1327,6 +1862,8 @@ google.golang.org/api v0.111.0/go.mod h1:qtFHvU9mhgTJegR31csQ+rwxyUTHOKFqCKWp1J0 google.golang.org/api v0.114.0 h1:1xQPji6cO2E2vLiI+C/XiFAnsn1WV3mjaEwGLhi3grE= google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= @@ -1334,11 +1871,15 @@ google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190508193815-b515fa19cec8/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= +google.golang.org/genproto v0.0.0-20190620144150-6af8c5fc6601/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= @@ -1355,6 +1896,7 @@ google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= @@ -1370,6 +1912,7 @@ google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210126160654-44e461bb6506/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -1377,6 +1920,7 @@ google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210329143202-679c6ae281ee/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= +google.golang.org/genproto v0.0.0-20210505142820-a42aa055cf76/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= @@ -1462,10 +2006,16 @@ google.golang.org/genproto v0.0.0-20230223222841-637eb2293923/go.mod h1:3Dl5ZL0q google.golang.org/genproto v0.0.0-20230303212802-e74f57abe488/go.mod h1:TvhZT5f700eVlTNwND1xoEZQeWTB2RY/65kplwl/bFA= google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA= google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= +google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= @@ -1475,6 +2025,7 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= @@ -1488,6 +2039,7 @@ google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= @@ -1512,6 +2064,7 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.25.1-0.20200805231151-a709e31e5d12/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= @@ -1519,24 +2072,37 @@ google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.29.1 h1:7QBf+IK2gx70Ap/hDsOmam3GE0v9HicjfEdAxE62UoM= google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= +gopkg.in/ini.v1 v1.63.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -1579,7 +2145,11 @@ modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw modernc.org/tcl v1.13.1/go.mod h1:XOLfOwzhkljL4itZkK6T72ckMgvj0BDsnKNdZVUOecw= modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= modernc.org/z v1.5.1/go.mod h1:eWFB510QWW5Th9YGZT81s+LwvaAs3Q2yr4sP0rmLkv8= +nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= +pack.ag/amqp v0.11.2/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= From a68a6126ca15d5079db2a26db79a18ce1cb37e9f Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Wed, 26 Jun 2024 22:26:21 +0800 Subject: [PATCH 10/36] fix. --- examples/b2bua/b2bua/b2bua.go | 18 ++++++++---------- examples/b2bua/b2bua/call.go | 1 + examples/b2bua/b2bua/udp.go | 2 -- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/examples/b2bua/b2bua/b2bua.go b/examples/b2bua/b2bua/b2bua.go index 464d047..252cb6e 100644 --- a/examples/b2bua/b2bua/b2bua.go +++ b/examples/b2bua/b2bua/b2bua.go @@ -152,16 +152,6 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { b.calls = append(b.calls, call) call.SetState(Connecting) - - aLegAnswer, err := call.CreateALegAnswer() - if err == nil { - call.src.ProvideAnswer(aLegAnswer.SDP) - } - call.SetState(EarlyMedia) - //call.src.Provisional((*resp).StatusCode(), (*resp).Reason()) - call.src.Accept(200) - - call.BridgeMediaStream() } // Try to find online contact records. @@ -222,7 +212,15 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { call.SetBLegAnswer(&Desc{Type: "answer", SDP: answer}) //aLegAnswer, _ := call.CreateALegAnswer() //call.src.ProvideAnswer(aLegAnswer.SDP) + aLegAnswer, err := call.CreateALegAnswer() + if err == nil { + call.src.ProvideAnswer(aLegAnswer.SDP) + } + //call.SetState(EarlyMedia) + //call.src.Provisional((*resp).StatusCode(), (*resp).Reason()) + call.src.Accept(200) + call.BridgeMediaStream() call.SetState(Confirmed) } diff --git a/examples/b2bua/b2bua/call.go b/examples/b2bua/b2bua/call.go index f184a26..d82b556 100644 --- a/examples/b2bua/b2bua/call.go +++ b/examples/b2bua/b2bua/call.go @@ -135,6 +135,7 @@ func (b *B2BCall) SetALegOffer(sdp *Desc) error { func (b *B2BCall) CreateBLegOffer() (*Desc, error) { //TODO: create transport by b.srcOffer trans := NewUdpTansport(b.srcTrackInfos) + //trans := NewWebRTCTransport(b.srcTrackInfos) err := trans.Init(callConfig) diff --git a/examples/b2bua/b2bua/udp.go b/examples/b2bua/b2bua/udp.go index 31caf86..1a9c8b5 100644 --- a/examples/b2bua/b2bua/udp.go +++ b/examples/b2bua/b2bua/udp.go @@ -200,8 +200,6 @@ func (c *UdpTansport) WriteRTP(trackType TrackType, packet []byte) (int, error) logger.Errorf("Marshal rtp receiver packets err %v", err) } - return 0, nil - port := c.ports[trackType] raddr := port.GetRemoteRtpAddress() if raddr == nil { From 03e06ecf6c19ef667246ca8d863e54fe61f0d942 Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Wed, 26 Jun 2024 22:58:15 +0800 Subject: [PATCH 11/36] fix. --- pkg/ua/ua.go | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkg/ua/ua.go b/pkg/ua/ua.go index d1af004..da4dcf0 100644 --- a/pkg/ua/ua.go +++ b/pkg/ua/ua.go @@ -234,18 +234,29 @@ func (ua *UserAgent) handleBye(request sip.Request, tx sip.ServerTransaction) { tx.Respond(response) callID, ok := request.CallID() - toHeader, ok2 := request.To() - if ok && ok2 { - toTag, _ := toHeader.Params.Get("tag") - if v, found := ua.iss.Load(NewSessionKey(*callID, toTag)); found { - is := v.(*session.Session) - ua.iss.Delete(NewSessionKey(*callID, toTag)) + if ok { + if sess, sessKey := ua.findSessionByCallID(*callID); sess != nil { + ua.iss.Delete(sessKey) var transaction sip.Transaction = tx.(sip.Transaction) - ua.handleInviteState(is, &request, &response, session.Terminated, &transaction) + ua.handleInviteState(sess, &request, &response, session.Terminated, &transaction) } } } +func (ua *UserAgent) findSessionByCallID(callID sip.CallID) (*session.Session, SessionKey) { + var ret *session.Session = nil + var sessKey SessionKey + ua.iss.Range(func(key, value interface{}) bool { + if key.(SessionKey).CallID == callID { + ret = value.(*session.Session) + sessKey = key.(SessionKey) + return false + } + return true + }) + return ret, sessKey +} + func (ua *UserAgent) handleCancel(request sip.Request, tx sip.ServerTransaction) { ua.Log().Debugf("handleCancel: Request => %s, body => %s", request.Short(), request.Body()) From 2920b18727e229c91be85e7465edfe95a950c97c Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Wed, 26 Jun 2024 23:55:44 +0800 Subject: [PATCH 12/36] fix. --- examples/b2bua/b2bua/rtc.go | 28 +++++++++++--------- examples/b2bua/b2bua/track.go | 2 ++ examples/b2bua/b2bua/udp.go | 32 ++++++++++++++--------- examples/b2bua/b2bua/udp_port.go | 20 ++++++++++----- examples/b2bua/b2bua/util.go | 44 +++++++++++++++++++++++++++++++- 5 files changed, 95 insertions(+), 31 deletions(-) diff --git a/examples/b2bua/b2bua/rtc.go b/examples/b2bua/b2bua/rtc.go index 8b5338f..41b73b0 100644 --- a/examples/b2bua/b2bua/rtc.go +++ b/examples/b2bua/b2bua/rtc.go @@ -110,27 +110,31 @@ func (c *WebRTCTransport) Init(callConfig CallConfig) error { { RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypePCMU, ClockRate: 8000, Channels: 1, SDPFmtpLine: "", RTCPFeedback: nil}, PayloadType: 0, - }, /* - { - RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypePCMA, ClockRate: 8000, Channels: 1, SDPFmtpLine: "", RTCPFeedback: nil}, - PayloadType: 8, - }, - { - RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeOpus, ClockRate: 48000, Channels: 2, SDPFmtpLine: "minptime=10;useinbandfec=1", RTCPFeedback: nil}, - PayloadType: 111, - },*/ + }, + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypePCMA, ClockRate: 8000, Channels: 1, SDPFmtpLine: "", RTCPFeedback: nil}, + PayloadType: 8, + }, + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeOpus, ClockRate: 48000, Channels: 2, SDPFmtpLine: "minptime=10;useinbandfec=1", RTCPFeedback: nil}, + PayloadType: 111, + }, } { if err := m.RegisterCodec(codec, webrtc.RTPCodecTypeAudio); err != nil { return err } } - videoRTCPFeedback := []webrtc.RTCPFeedback{{"goog-remb", ""}, {"ccm", "fir"}, {"nack", ""}, {"nack", "pli"}} + videoRTCPFeedback := []webrtc.RTCPFeedback{{"goog-remb", ""}, {"transport-cc", ""}, {"ccm", "fir"}, {"nack", ""}, {"nack", "pli"}} for _, codec := range []webrtc.RTPCodecParameters{ { - RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeH264, ClockRate: 90000, SDPFmtpLine: "level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=42001f", RTCPFeedback: videoRTCPFeedback}, - PayloadType: 125, + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeVP8, ClockRate: 90000, RTCPFeedback: videoRTCPFeedback}, + PayloadType: 100, + }, + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeH264, ClockRate: 90000, SDPFmtpLine: "level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=640c33", RTCPFeedback: videoRTCPFeedback}, + PayloadType: 96, }, } { if err := m.RegisterCodec(codec, webrtc.RTPCodecTypeVideo); err != nil { diff --git a/examples/b2bua/b2bua/track.go b/examples/b2bua/b2bua/track.go index 66134af..0e29127 100644 --- a/examples/b2bua/b2bua/track.go +++ b/examples/b2bua/b2bua/track.go @@ -13,6 +13,8 @@ type TrackInfo struct { TrackType TrackType Codecs []*sdp.Format Connection *sdp.Connection + Port int + RtcpPort int } type Track interface { diff --git a/examples/b2bua/b2bua/udp.go b/examples/b2bua/b2bua/udp.go index 1a9c8b5..befce86 100644 --- a/examples/b2bua/b2bua/udp.go +++ b/examples/b2bua/b2bua/udp.go @@ -80,6 +80,20 @@ func (c *UdpTansport) Init(config CallConfig) error { udpPort.OnRtcpPacketReceived(c.onRtcpPacket) c.ports[trackInfo.TrackType] = udpPort + if trackInfo.Connection != nil { + rtpAddr := fmt.Sprintf("%s:%d", trackInfo.Connection.Address, trackInfo.Port) + raddr, err := net.ResolveUDPAddr("udp", rtpAddr) + if err == nil { + udpPort.SetRemoteAddress(raddr) + } + + rtcpAddr := fmt.Sprintf("%s:%d", trackInfo.Connection.Address, trackInfo.RtcpPort) + rtcpRaddr, err := net.ResolveUDPAddr("udp", rtcpAddr) + if err == nil { + udpPort.SetRemoteRtcpAddress(rtcpRaddr) + } + } + media := &sdp.Media{} media.Type = string(trackInfo.TrackType) media.Port = udpPort.LocalPort() @@ -188,34 +202,28 @@ func (c *UdpTansport) WriteRTP(trackType TrackType, packet []byte) (int, error) } logger.Debugf("UdpTansport::WriteRTP: %v, write %d bytes, seq %d, ts %d", trackType, len(packet), p.SequenceNumber, p.Timestamp) - p.Extension = false - p.ExtensionProfile = 0 - p.Extensions = nil - p.Padding = false - p.PaddingSize = 0 - pktbuf, err := p.Marshal() if err != nil { - logger.Errorf("Marshal rtp receiver packets err %v", err) + logger.Errorf("UdpTansport::WriteRTP: Marshal rtp receiver packets err %v", err) } port := c.ports[trackType] raddr := port.GetRemoteRtpAddress() if raddr == nil { - logger.Errorf("raddr is nil") + logger.Errorf("UdpTansport::WriteRTP: raddr is nil") return 0, nil } logger.Debugf("UdpTansport::WriteRTP: %v, raddr %v", trackType, *raddr) - return port.WriteRtpPacket(pktbuf, *raddr) + return port.WriteRtpPacket(pktbuf, raddr) } func (c *UdpTansport) WriteRTCP(trackType TrackType, packet []byte) (int, error) { pkts, err := rtcp.Unmarshal(packet) if err != nil { - logger.Errorf("Unmarshal rtcp receiver packets err %v", err) + logger.Errorf("UdpTansport::WriteRTP: Unmarshal rtcp receiver packets err %v", err) } logger.Debugf("UdpTansport::WriteRTCP: %v read %d packets", trackType, len(pkts)) @@ -223,11 +231,11 @@ func (c *UdpTansport) WriteRTCP(trackType TrackType, packet []byte) (int, error) port := c.ports[trackType] raddr := port.GetRemoteRtcpAddress() if raddr == nil { - logger.Errorf("raddr is nil") + logger.Errorf("UdpTansport::WriteRTP: raddr is nil") raddr = port.GetRemoteRtpAddress() } logger.Debugf("UdpTansport::WriteRTCP: %v read %d packets, raddr %v", trackType, len(pkts), *raddr) - return port.WriteRtcpPacket(packet, *raddr) + return port.WriteRtcpPacket(packet, raddr) } func (c *UdpTansport) Type() TransportType { diff --git a/examples/b2bua/b2bua/udp_port.go b/examples/b2bua/b2bua/udp_port.go index 781b206..a1b79e3 100644 --- a/examples/b2bua/b2bua/udp_port.go +++ b/examples/b2bua/b2bua/udp_port.go @@ -20,8 +20,8 @@ type UdpPort struct { mutex sync.Mutex trackType TrackType externalRtpAddress string - rAddr *net.Addr - rRtcpAddr *net.Addr + rAddr *net.UDPAddr + rRtcpAddr *net.UDPAddr } func NewUdpPort(trackType TrackType, externalRtpAddress string) (*UdpPort, error) { @@ -49,7 +49,7 @@ func (c *UdpPort) Init() error { go c.loop(rtpConns[0], func(packet []byte, raddr net.Addr) { c.mutex.Lock() defer c.mutex.Unlock() - c.rAddr = &raddr + c.rAddr = raddr.(*net.UDPAddr) if c.onRtpPacketCallback != nil { c.onRtpPacketCallback(c.trackType, packet, raddr) } @@ -58,7 +58,7 @@ func (c *UdpPort) Init() error { go c.loop(rtpConns[1], func(packet []byte, raddr net.Addr) { c.mutex.Lock() defer c.mutex.Unlock() - c.rRtcpAddr = &raddr + c.rRtcpAddr = raddr.(*net.UDPAddr) if c.onRtcpPacketCallback != nil { c.onRtcpPacketCallback(c.trackType, packet, raddr) } @@ -76,11 +76,19 @@ func (c *UdpPort) LocalPort() int { return c.udpConns[0].LocalAddr().(*net.UDPAddr).Port } -func (c *UdpPort) GetRemoteRtpAddress() *net.Addr { +func (c *UdpPort) SetRemoteAddress(raddr *net.UDPAddr) { + c.rAddr = raddr +} + +func (c *UdpPort) SetRemoteRtcpAddress(raddr *net.UDPAddr) { + c.rRtcpAddr = raddr +} + +func (c *UdpPort) GetRemoteRtpAddress() *net.UDPAddr { return c.rAddr } -func (c *UdpPort) GetRemoteRtcpAddress() *net.Addr { +func (c *UdpPort) GetRemoteRtcpAddress() *net.UDPAddr { if c.rRtcpAddr == nil { return c.rAddr } diff --git a/examples/b2bua/b2bua/util.go b/examples/b2bua/b2bua/util.go index 41eb937..86005c8 100644 --- a/examples/b2bua/b2bua/util.go +++ b/examples/b2bua/b2bua/util.go @@ -365,6 +365,42 @@ func ParseTransportType(sdp *sdp.Session) TransportType { return TransportTypeSIP } +/* + +rtpmap:111 opus/48000/2 +a=rtcp-fb:111 transport-cc +a=fmtp:111 minptime=10;useinbandfec=1 +a=rtpmap:63 red/48000/2 +a=fmtp:63 111/111 +a=rtpmap:9 G722/8000 +a=rtpmap:102 ILBC/8000 +a=rtpmap:0 PCMU/8000 +a=rtpmap:8 PCMA/8000 +a=rtpmap:13 CN/8000 +a=rtpmap:110 telephone-event/48000 +a=rtpmap:126 telephone-event/8000 +*/ + +var formatMaps = map[uint8]*sdp.Format{ + 0: {Payload: 0, Name: "PCMU", ClockRate: 8000}, + 8: {Payload: 8, Name: "PCMA", ClockRate: 8000}, + 9: {Payload: 9, Name: "G722", ClockRate: 8000}, + 13: {Payload: 13, Name: "CN", ClockRate: 8000}, + 63: {Payload: 63, Name: "red", ClockRate: 8000}, + 110: {Payload: 110, Name: "telephone-event", ClockRate: 48000}, + 111: {Payload: 111, Name: "opus", ClockRate: 48000}, + 126: {Payload: 126, Name: "telephone-event", ClockRate: 8000}, +} + +func fixFormatName(fmts []*sdp.Format) []*sdp.Format { + for _, f := range fmts { + if ff, ok := formatMaps[f.Payload]; ok && f.Name == "" { + f.Name = ff.Name + } + } + return fmts +} + func ParseTrackInfos(sdp *sdp.Session) ([]*TrackInfo, error) { if sdp == nil { return nil, errors.New("sdp is nil") @@ -372,7 +408,13 @@ func ParseTrackInfos(sdp *sdp.Session) ([]*TrackInfo, error) { trackInfos := make([]*TrackInfo, 0) for _, m := range sdp.Media { trackInfo := &TrackInfo{} - trackInfo.Codecs = m.Format + trackInfo.Connection = sdp.Connection + trackInfo.Port = m.Port + if trackInfo.Port > 0 { + trackInfo.RtcpPort = m.Port + 1 + } + + trackInfo.Codecs = fixFormatName(m.Format) if m.Type == "audio" { trackInfo.TrackType = TrackTypeAudio } else if m.Type == "video" { From ecba86f2532f63a232cdccf77000aa3132d587ef Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Fri, 28 Jun 2024 22:54:59 +0800 Subject: [PATCH 13/36] update. --- examples/b2bua/b2bua/b2bua.go | 19 +-- examples/b2bua/b2bua/call.go | 13 +- examples/b2bua/b2bua/rtc.go | 187 ++++++++++++++++++---------- examples/b2bua/b2bua/track.go | 1 + examples/b2bua/b2bua/udp.go | 26 ++-- examples/b2bua/b2bua/util.go | 18 ++- examples/b2bua/registry/registry.go | 4 + 7 files changed, 179 insertions(+), 89 deletions(-) diff --git a/examples/b2bua/b2bua/b2bua.go b/examples/b2bua/b2bua/b2bua.go index 252cb6e..1da3d08 100644 --- a/examples/b2bua/b2bua/b2bua.go +++ b/examples/b2bua/b2bua/b2bua.go @@ -138,8 +138,11 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { if err2 != nil { logger.Error(err2) } - - bLegOffer, _ := call.CreateBLegOffer() + var tpType = TransportTypeSIP + if instance.SupportIce() { + tpType = TransportTypeRTC + } + bLegOffer, _ := call.CreateBLegOffer(tpType) dest, err := ua.Invite(profile, called, recipient, &bLegOffer.SDP) if err != nil { @@ -210,19 +213,19 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { if call != nil && call.dest == sess { answer := call.dest.RemoteSdp() call.SetBLegAnswer(&Desc{Type: "answer", SDP: answer}) - //aLegAnswer, _ := call.CreateALegAnswer() - //call.src.ProvideAnswer(aLegAnswer.SDP) - aLegAnswer, err := call.CreateALegAnswer() - if err == nil { + if aLegAnswer, err := call.CreateALegAnswer(); err != nil { + logger.Errorf("Create A-Leg Answer failed: %v", err) + return + } else { + replaceCodec(aLegAnswer, answer) call.src.ProvideAnswer(aLegAnswer.SDP) } + //call.SetState(EarlyMedia) //call.src.Provisional((*resp).StatusCode(), (*resp).Reason()) call.src.Accept(200) - call.BridgeMediaStream() call.SetState(Confirmed) - } // Handle 4XX+ diff --git a/examples/b2bua/b2bua/call.go b/examples/b2bua/b2bua/call.go index d82b556..e3bf563 100644 --- a/examples/b2bua/b2bua/call.go +++ b/examples/b2bua/b2bua/call.go @@ -132,10 +132,15 @@ func (b *B2BCall) SetALegOffer(sdp *Desc) error { return nil } -func (b *B2BCall) CreateBLegOffer() (*Desc, error) { - //TODO: create transport by b.srcOffer - trans := NewUdpTansport(b.srcTrackInfos) - //trans := NewWebRTCTransport(b.srcTrackInfos) +func (b *B2BCall) CreateBLegOffer(tpType TransportType) (*Desc, error) { + + var trans Transport + + if tpType == TransportTypeRTC { + trans = NewWebRTCTransport(b.srcTrackInfos) + } else { + trans = NewUdpTansport(b.srcTrackInfos) + } err := trans.Init(callConfig) diff --git a/examples/b2bua/b2bua/rtc.go b/examples/b2bua/b2bua/rtc.go index 41b73b0..83237de 100644 --- a/examples/b2bua/b2bua/rtc.go +++ b/examples/b2bua/b2bua/rtc.go @@ -6,6 +6,7 @@ import ( "io" "math/rand" "net" + "strings" "sync" "github.com/cloudwebrtc/go-sip-ua/examples/b2bua/b2bua/buffer" @@ -106,42 +107,95 @@ func (c *WebRTCTransport) Init(callConfig CallConfig) error { // Create a MediaEngine object to configure the supported codec m := &webrtc.MediaEngine{} - for _, codec := range []webrtc.RTPCodecParameters{ - { - RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypePCMU, ClockRate: 8000, Channels: 1, SDPFmtpLine: "", RTCPFeedback: nil}, - PayloadType: 0, - }, - { - RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypePCMA, ClockRate: 8000, Channels: 1, SDPFmtpLine: "", RTCPFeedback: nil}, - PayloadType: 8, - }, - { - RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeOpus, ClockRate: 48000, Channels: 2, SDPFmtpLine: "minptime=10;useinbandfec=1", RTCPFeedback: nil}, - PayloadType: 111, - }, - } { - if err := m.RegisterCodec(codec, webrtc.RTPCodecTypeAudio); err != nil { - return err + for _, trackInfo := range c.trackInfos { + if trackInfo.TrackType == TrackTypeAudio { + for _, codec := range trackInfo.Codecs { + mimeType := fmt.Sprintf("audio/%s", codec.Name) + sdpFmtpLine := strings.Join(codec.Params, ";") + var rtcpFb []webrtc.RTCPFeedback = nil + for _, fb := range codec.Feedback { + vals := strings.Split(fb, " ") + if len(vals) < 2 { + rtcpFb = append(rtcpFb, webrtc.RTCPFeedback{Type: vals[0], Parameter: ""}) + } else { + rtcpFb = append(rtcpFb, webrtc.RTCPFeedback{Type: vals[0], Parameter: vals[1]}) + } + } + if err := m.RegisterCodec(webrtc.RTPCodecParameters{ + RTPCodecCapability: webrtc.RTPCodecCapability{ + MimeType: mimeType, + ClockRate: uint32(codec.ClockRate), + Channels: uint16(codec.Channels), + SDPFmtpLine: sdpFmtpLine, + RTCPFeedback: rtcpFb}, + PayloadType: webrtc.PayloadType(codec.Payload), + }, webrtc.RTPCodecTypeAudio); err != nil { + return err + } + } + } else if trackInfo.TrackType == TrackTypeVideo { + for _, codec := range trackInfo.Codecs { + mimeType := fmt.Sprintf("video/%s", codec.Name) + sdpFmtpLine := strings.Join(codec.Params, ";") + var rtcpFb []webrtc.RTCPFeedback = nil + for _, fb := range codec.Feedback { + vals := strings.Split(fb, " ") + if len(vals) < 2 { + rtcpFb = append(rtcpFb, webrtc.RTCPFeedback{Type: vals[0], Parameter: ""}) + } else { + rtcpFb = append(rtcpFb, webrtc.RTCPFeedback{Type: vals[0], Parameter: vals[1]}) + } + } + if err := m.RegisterCodec(webrtc.RTPCodecParameters{ + RTPCodecCapability: webrtc.RTPCodecCapability{ + MimeType: mimeType, + ClockRate: uint32(codec.ClockRate), + SDPFmtpLine: sdpFmtpLine, + RTCPFeedback: rtcpFb}, + PayloadType: webrtc.PayloadType(codec.Payload), + }, webrtc.RTPCodecTypeVideo); err != nil { + return err + } + } } } + /* + for _, codec := range []webrtc.RTPCodecParameters{ + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypePCMU, ClockRate: 8000, Channels: 1, SDPFmtpLine: "", RTCPFeedback: nil}, + PayloadType: 0, + }, + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypePCMA, ClockRate: 8000, Channels: 1, SDPFmtpLine: "", RTCPFeedback: nil}, + PayloadType: 8, + }, + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeOpus, ClockRate: 48000, Channels: 2, SDPFmtpLine: "minptime=10;useinbandfec=1", RTCPFeedback: nil}, + PayloadType: 111, + }, + } { + if err := m.RegisterCodec(codec, webrtc.RTPCodecTypeAudio); err != nil { + return err + } + } - videoRTCPFeedback := []webrtc.RTCPFeedback{{"goog-remb", ""}, {"transport-cc", ""}, {"ccm", "fir"}, {"nack", ""}, {"nack", "pli"}} + videoRTCPFeedback := []webrtc.RTCPFeedback{{"goog-remb", ""}, {"transport-cc", ""}, {"ccm", "fir"}, {"nack", ""}, {"nack", "pli"}} - for _, codec := range []webrtc.RTPCodecParameters{ - { - RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeVP8, ClockRate: 90000, RTCPFeedback: videoRTCPFeedback}, - PayloadType: 100, - }, - { - RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeH264, ClockRate: 90000, SDPFmtpLine: "level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=640c33", RTCPFeedback: videoRTCPFeedback}, - PayloadType: 96, - }, - } { - if err := m.RegisterCodec(codec, webrtc.RTPCodecTypeVideo); err != nil { - return err + for _, codec := range []webrtc.RTPCodecParameters{ + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeVP8, ClockRate: 90000, RTCPFeedback: videoRTCPFeedback}, + PayloadType: 100, + }, + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeH264, ClockRate: 90000, SDPFmtpLine: "level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=640c33", RTCPFeedback: videoRTCPFeedback}, + PayloadType: 96, + }, + } { + if err := m.RegisterCodec(codec, webrtc.RTPCodecTypeVideo); err != nil { + return err + } } - } - + */ // Create a InterceptorRegistry. This is the user configurable RTP/RTCP Pipeline. // This provides NACKs, RTCP Reports and other features. If you use `webrtc.NewPeerConnection` // this is enabled by default. If you are manually managing You MUST create a InterceptorRegistry @@ -315,43 +369,50 @@ func (c *WebRTCTransport) Close() error { func (c *WebRTCTransport) AddLocalTracks() error { - audioTrack, err := webrtc.NewTrackLocalStaticRTP( - webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypePCMU}, - fmt.Sprintf("audio-%d", rand.Uint32()), - fmt.Sprintf("rtc-%d", rand.Uint32()), - ) + for _, trackInfo := range c.trackInfos { - if err != nil { - logger.Errorf("NewTrack: panic => %v", err) - return err - } + if trackInfo.TrackType == TrackTypeAudio { - if _, err = c.pc.AddTrack(audioTrack); err != nil { - logger.Errorf("AddTrack: panic => %v", err) - return err - } + audioTrack, err := webrtc.NewTrackLocalStaticRTP( + webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypePCMU}, + fmt.Sprintf("audio-%d", rand.Uint32()), + fmt.Sprintf("rtc-%d", rand.Uint32()), + ) - c.localTracks[TrackTypeAudio] = audioTrack + if err != nil { + logger.Errorf("NewTrack: panic => %v", err) + return err + } - videoTrack, err := webrtc.NewTrackLocalStaticRTP( - webrtc.RTPCodecCapability{MimeType: mimeTypeH264}, - fmt.Sprintf("video-%d", rand.Uint32()), - fmt.Sprintf("rtc-%d", rand.Uint32()), - ) + if _, err = c.pc.AddTrack(audioTrack); err != nil { + logger.Errorf("AddTrack: panic => %v", err) + return err + } - if err != nil { - logger.Errorf("NewTrack: panic => %v", err) - return err - } + c.localTracks[TrackTypeAudio] = audioTrack + } else if trackInfo.TrackType == TrackTypeVideo { - if rtpSender, err := c.pc.AddTrack(videoTrack); err == nil { - c.HandleRtcpFb(rtpSender) - } else { - logger.Errorf("AddTrack: panic => %v", err) - return err - } + videoTrack, err := webrtc.NewTrackLocalStaticRTP( + webrtc.RTPCodecCapability{MimeType: mimeTypeH264}, + fmt.Sprintf("video-%d", rand.Uint32()), + fmt.Sprintf("rtc-%d", rand.Uint32()), + ) + + if err != nil { + logger.Errorf("NewTrack: panic => %v", err) + return err + } + + if rtpSender, err := c.pc.AddTrack(videoTrack); err == nil { + c.HandleRtcpFb(rtpSender) + } else { + logger.Errorf("AddTrack: panic => %v", err) + return err + } - c.localTracks[TrackTypeVideo] = videoTrack + c.localTracks[TrackTypeVideo] = videoTrack + } + } return nil } @@ -385,7 +446,7 @@ func (c *WebRTCTransport) OnAnswer(answer *Desc) error { SDP: answer.SDP, } if err := c.pc.SetRemoteDescription(c.answer); err != nil { - logger.Errorf("SetRemoteDescription: panic => %v", err) + logger.Errorf("OnAnswer::WebRTCTransport::SetRemoteDescription: panic => %v", err) return err } return nil @@ -405,7 +466,7 @@ func (c *WebRTCTransport) OnOffer(offer *Desc) error { } if err := c.pc.SetRemoteDescription(desc); err != nil { - logger.Errorf("SetRemoteDescription: panic => %v", err) + logger.Errorf("WebRTCTransport::OnOffer::SetRemoteDescription: panic => %v", err) return err } return nil diff --git a/examples/b2bua/b2bua/track.go b/examples/b2bua/b2bua/track.go index 0e29127..28e373f 100644 --- a/examples/b2bua/b2bua/track.go +++ b/examples/b2bua/b2bua/track.go @@ -13,6 +13,7 @@ type TrackInfo struct { TrackType TrackType Codecs []*sdp.Format Connection *sdp.Connection + Direction string Port int RtcpPort int } diff --git a/examples/b2bua/b2bua/udp.go b/examples/b2bua/b2bua/udp.go index befce86..530af0f 100644 --- a/examples/b2bua/b2bua/udp.go +++ b/examples/b2bua/b2bua/udp.go @@ -98,24 +98,24 @@ func (c *UdpTansport) Init(config CallConfig) error { media.Type = string(trackInfo.TrackType) media.Port = udpPort.LocalPort() media.Proto = "RTP/AVP" - media.Mode = sdp.RecvOnly + media.Mode = trackInfo.Direction media.Connection = []*sdp.Connection{{Address: host}} //Bandwidth: []*sdp.Bandwidth{{Type: "TIAS", Value: 96000}}, var formats []*sdp.Format for _, codec := range trackInfo.Codecs { - for _, enabledCodec := range callConfig.Codecs { - if codec.Name == enabledCodec { - formats = append(formats, &sdp.Format{ - Payload: codec.Payload, - Name: codec.Name, - ClockRate: codec.ClockRate, - Params: codec.Params, - //Feedback: codec.Feedback, - }) - } - } - + //for _, enabledCodec := range callConfig.Codecs { + // if codec.Name == enabledCodec { + formats = append(formats, &sdp.Format{ + Payload: codec.Payload, + Name: codec.Name, + ClockRate: codec.ClockRate, + Params: codec.Params, + Feedback: codec.Feedback, + Channels: codec.Channels, + }) + // } + //} } media.Format = formats medias = append(medias, media) diff --git a/examples/b2bua/b2bua/util.go b/examples/b2bua/b2bua/util.go index 86005c8..082f414 100644 --- a/examples/b2bua/b2bua/util.go +++ b/examples/b2bua/b2bua/util.go @@ -396,11 +396,27 @@ func fixFormatName(fmts []*sdp.Format) []*sdp.Format { for _, f := range fmts { if ff, ok := formatMaps[f.Payload]; ok && f.Name == "" { f.Name = ff.Name + if f.ClockRate == 0 { + f.ClockRate = ff.ClockRate + } + if f.Channels == 0 { + f.Channels = ff.Channels + } } } return fmts } +func replaceCodec(src *Desc, answer string) error { + srcSess, _ := sdp.Parse([]byte(src.SDP)) + sdpSess, _ := sdp.Parse([]byte(answer)) + for idx, m := range sdpSess.Media { + srcSess.Media[idx].Format = fixFormatName(m.Format) + } + src.SDP = srcSess.String() + return nil +} + func ParseTrackInfos(sdp *sdp.Session) ([]*TrackInfo, error) { if sdp == nil { return nil, errors.New("sdp is nil") @@ -409,11 +425,11 @@ func ParseTrackInfos(sdp *sdp.Session) ([]*TrackInfo, error) { for _, m := range sdp.Media { trackInfo := &TrackInfo{} trackInfo.Connection = sdp.Connection + trackInfo.Direction = m.Mode trackInfo.Port = m.Port if trackInfo.Port > 0 { trackInfo.RtcpPort = m.Port + 1 } - trackInfo.Codecs = fixFormatName(m.Format) if m.Type == "audio" { trackInfo.TrackType = TrackTypeAudio diff --git a/examples/b2bua/registry/registry.go b/examples/b2bua/registry/registry.go index 92ce1ee..65da1ff 100644 --- a/examples/b2bua/registry/registry.go +++ b/examples/b2bua/registry/registry.go @@ -14,6 +14,10 @@ type ContactInstance struct { Transport string } +func (c ContactInstance) SupportIce() bool { + return c.Contact.Params.Has("+sip.ice") +} + func (c *ContactInstance) GetPNParams() *PNParams { params := c.Contact.Address.UriParams() if provider, ok := params.Get("pn-provider"); ok { From 9e9e805ac5ece0850bc1454d9412ffce18b83c6a Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Fri, 28 Jun 2024 23:59:53 +0800 Subject: [PATCH 14/36] add PLI for RequestKeyFrame. --- examples/b2bua/b2bua/rtc.go | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/examples/b2bua/b2bua/rtc.go b/examples/b2bua/b2bua/rtc.go index 83237de..c05005e 100644 --- a/examples/b2bua/b2bua/rtc.go +++ b/examples/b2bua/b2bua/rtc.go @@ -54,14 +54,15 @@ var ( ) type WebRTCTransport struct { - pc *webrtc.PeerConnection - answer webrtc.SessionDescription - offer webrtc.SessionDescription - localTracks map[TrackType]*webrtc.TrackLocalStaticRTP - closed utils.AtomicBool - ctx context.Context - cancel context.CancelFunc - trackInfos []*TrackInfo + pc *webrtc.PeerConnection + answer webrtc.SessionDescription + offer webrtc.SessionDescription + localTracks map[TrackType]*webrtc.TrackLocalStaticRTP + remoteTracks map[TrackType]*webrtc.TrackRemote + closed utils.AtomicBool + ctx context.Context + cancel context.CancelFunc + trackInfos []*TrackInfo videoPool *sync.Pool audioPool *sync.Pool @@ -77,9 +78,10 @@ type WebRTCTransport struct { func NewWebRTCTransport(trackInfos []*TrackInfo) *WebRTCTransport { c := &WebRTCTransport{ - trackInfos: trackInfos, - localTracks: make(map[TrackType]*webrtc.TrackLocalStaticRTP), - sequencer: newSequencer(MaxPacketTrack), + trackInfos: trackInfos, + localTracks: make(map[TrackType]*webrtc.TrackLocalStaticRTP), + remoteTracks: make(map[TrackType]*webrtc.TrackRemote), + sequencer: newSequencer(MaxPacketTrack), videoPool: &sync.Pool{ New: func() interface{} { b := make([]byte, MaxPacketTrack*maxPktSize) @@ -245,6 +247,9 @@ func (c *WebRTCTransport) Init(callConfig CallConfig) error { c.buff.OnFeedback(func(fb []rtcp.Packet) {}) } c.bmu.Unlock() + c.remoteTracks[TrackTypeVideo] = track + } else if track.Kind() == webrtc.RTPCodecTypeAudio { + c.remoteTracks[TrackTypeAudio] = track } buf := make([]byte, 1500) for { @@ -538,13 +543,13 @@ func (c *WebRTCTransport) HandleRtcpFb(rtpSender *webrtc.RTPSender) { if expectedMinBitrate == 0 || expectedMinBitrate > uint64(p.Bitrate) { expectedMinBitrate = uint64(p.Bitrate) //hi.CameraUpdateBitrate(uint32(expectedMinBitrate / 1024)) - logger.Debugf("ReceiverEstimatedMaximumBitrate %d", expectedMinBitrate/1024) + logger.Debugf("[%v] ReceiverEstimatedMaximumBitrate %d", rtpSender.Track().Kind(), expectedMinBitrate/1024) } case *rtcp.ReceiverReport: for _, r := range p.Reports { if maxRatePacketLoss == 0 || maxRatePacketLoss < r.FractionLost { maxRatePacketLoss = r.FractionLost - logger.Debugf("maxRatePacketLoss %d", maxRatePacketLoss) + logger.Infof("maxRatePacketLoss %d", maxRatePacketLoss) } } case *rtcp.TransportLayerNack: @@ -570,6 +575,11 @@ func (c *WebRTCTransport) HandleRtcpFb(rtpSender *webrtc.RTPSender) { } func (c *WebRTCTransport) RequestKeyFrame() error { + track := c.remoteTracks[TrackTypeVideo] + if track == nil { + return fmt.Errorf("video track is nil") + } + c.pc.WriteRTCP([]rtcp.Packet{&rtcp.PictureLossIndication{MediaSSRC: uint32(track.SSRC())}}) return nil } From c7f8b7a8011510337bc35d1ab37114216034d407 Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Sat, 29 Jun 2024 23:18:45 +0800 Subject: [PATCH 15/36] update. --- .../b2bua/b2bua/{track.go => trackinfo.go} | 16 ----- examples/b2bua/b2bua/udp.go | 66 ++++++++++++++++++- 2 files changed, 65 insertions(+), 17 deletions(-) rename examples/b2bua/b2bua/{track.go => trackinfo.go} (51%) diff --git a/examples/b2bua/b2bua/track.go b/examples/b2bua/b2bua/trackinfo.go similarity index 51% rename from examples/b2bua/b2bua/track.go rename to examples/b2bua/b2bua/trackinfo.go index 28e373f..d04978f 100644 --- a/examples/b2bua/b2bua/track.go +++ b/examples/b2bua/b2bua/trackinfo.go @@ -17,19 +17,3 @@ type TrackInfo struct { Port int RtcpPort int } - -type Track interface { - Type() TrackType - - Codec() string - - PayloadType() int - - WriteRtpPacket(packet []byte) (int, error) - WriteRtcpPacket(packet []byte) (int, error) - - ReadRtpPacket(func(packet []byte) error) error - ReadRtcpPacket(func(packet []byte) error) error - - RequestKeyFrame() error -} diff --git a/examples/b2bua/b2bua/udp.go b/examples/b2bua/b2bua/udp.go index 530af0f..e8f921f 100644 --- a/examples/b2bua/b2bua/udp.go +++ b/examples/b2bua/b2bua/udp.go @@ -19,6 +19,7 @@ type UdpTansport struct { ports map[TrackType]*UdpPort localDescription *sdp.Session remoteDescription *sdp.Session + sequencer *sequencer mu sync.RWMutex rtpHandler func(trackType TrackType, payload []byte) @@ -186,6 +187,69 @@ func (c *UdpTansport) onRtpPacket(trackType TrackType, packet []byte, raddr net. func (c *UdpTansport) onRtcpPacket(trackType TrackType, packet []byte, raddr net.Addr) error { logger.Debugf("UdpTansport::OnRtcpPacketReceived: %v read %d bytes, raddr %v", trackType, len(packet), raddr) + + pkts, err := rtcp.Unmarshal(packet) + if err != nil { + logger.Errorf("Unmarshal rtcp receiver packets err %v", err) + } + var fwdPkts []rtcp.Packet + pliOnce := true + firOnce := true + var ( + maxRatePacketLoss uint8 + expectedMinBitrate uint64 + ) + for _, pkt := range pkts { + switch p := pkt.(type) { + case *rtcp.PictureLossIndication: + if pliOnce { + fwdPkts = append(fwdPkts, p) + logger.Infof("Picture Loss Indication") + if c.requestKeyFrameHandler != nil { + c.requestKeyFrameHandler() + } + pliOnce = false + } + case *rtcp.FullIntraRequest: + if firOnce { + fwdPkts = append(fwdPkts, p) + logger.Infof("FullIntraRequest") + if c.requestKeyFrameHandler != nil { + c.requestKeyFrameHandler() + } + firOnce = false + } + case *rtcp.ReceiverEstimatedMaximumBitrate: + if expectedMinBitrate == 0 || expectedMinBitrate > uint64(p.Bitrate) { + expectedMinBitrate = uint64(p.Bitrate) + //hi.CameraUpdateBitrate(uint32(expectedMinBitrate / 1024)) + logger.Debugf(" ReceiverEstimatedMaximumBitrate %d", expectedMinBitrate/1024) + } + case *rtcp.ReceiverReport: + for _, r := range p.Reports { + if maxRatePacketLoss == 0 || maxRatePacketLoss < r.FractionLost { + maxRatePacketLoss = r.FractionLost + logger.Infof("maxRatePacketLoss %d", maxRatePacketLoss) + } + } + case *rtcp.TransportLayerNack: + logger.Infof("Nack %v", p) + if c.sequencer != nil { + var nackedPackets []packetMeta + for _, pair := range p.Nacks { + nackedPackets = append(nackedPackets, c.sequencer.getSeqNoPairs(pair.PacketList())...) + } + if len(nackedPackets) > 0 { + //if err = c.RetransmitPackets(nackedPackets); err == nil { + // logger.Infof("Nack pair %v", nackedPackets) + //} + } else { + //buf, _ := p.Marshal() + //c.onRtcpPacket(TrackTypeVideo, packet) + } + } + } + } c.mu.RLock() defer c.mu.RUnlock() if c.rtcpHandler != nil { @@ -305,7 +369,7 @@ func (c *UdpTansport) RequestKeyFrame() error { if c.videoSSRC == 0 { return fmt.Errorf("video ssrc is 0") } - pli := rtcp.PictureLossIndication{SenderSSRC: uint32(0), MediaSSRC: uint32(c.videoSSRC)} + pli := rtcp.PictureLossIndication{MediaSSRC: uint32(c.videoSSRC)} buf, err := pli.Marshal() if err != nil { logger.Error(err) From a26586186ea103dc6c7005ff4a7adab37595e0f8 Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Sun, 30 Jun 2024 12:02:27 +0800 Subject: [PATCH 16/36] update. --- examples/b2bua/b2bua/buffer/buffer.go | 9 +++----- examples/b2bua/b2bua/rtc.go | 1 - examples/b2bua/b2bua/udp.go | 33 ++++++++++++++++++++++++++- 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/examples/b2bua/b2bua/buffer/buffer.go b/examples/b2bua/b2bua/buffer/buffer.go index 1ad4f4a..5f07a42 100644 --- a/examples/b2bua/b2bua/buffer/buffer.go +++ b/examples/b2bua/b2bua/buffer/buffer.go @@ -376,7 +376,7 @@ func (b *Buffer) calc(pkt []byte, arrivalTime int64) { b.lastTransit = transit if b.twcc { - if ext := p.GetExtension(b.twccExt); ext != nil && len(ext) > 1 { + if ext := p.GetExtension(b.twccExt); len(ext) > 1 { b.feedbackTWCC(binary.BigEndian.Uint16(ext[0:2]), arrivalTime, p.Marker) } } @@ -408,7 +408,7 @@ func (b *Buffer) calc(pkt []byte, arrivalTime int64) { } func (b *Buffer) buildNACKPacket() []rtcp.Packet { - if nacks, askKeyframe := b.nacker.pairs(b.cycles | uint32(b.maxSeqNo)); (nacks != nil && len(nacks) > 0) || askKeyframe { + if nacks, askKeyframe := b.nacker.pairs(b.cycles | uint32(b.maxSeqNo)); len(nacks) > 0 || askKeyframe { var pkts []rtcp.Packet if len(nacks) > 0 { pkts = []rtcp.Packet{&rtcp.TransportLayerNack{ @@ -583,10 +583,7 @@ func IsTimestampWrapAround(timestamp1 uint32, timestamp2 uint32) bool { // IsLaterTimestamp returns true if timestamp1 is later in time than timestamp2 factoring in timestamp wrap-around func IsLaterTimestamp(timestamp1 uint32, timestamp2 uint32) bool { if timestamp1 > timestamp2 { - if IsTimestampWrapAround(timestamp2, timestamp1) { - return false - } - return true + return !IsTimestampWrapAround(timestamp2, timestamp1) } if IsTimestampWrapAround(timestamp1, timestamp2) { return true diff --git a/examples/b2bua/b2bua/rtc.go b/examples/b2bua/b2bua/rtc.go index c05005e..8b1087c 100644 --- a/examples/b2bua/b2bua/rtc.go +++ b/examples/b2bua/b2bua/rtc.go @@ -325,7 +325,6 @@ func (c *WebRTCTransport) WriteRTP(trackType TrackType, packet []byte) (int, err } } else if trackType == TrackTypeVideo { if c.localTracks[TrackTypeVideo] != nil { - var pkt rtp.Packet if err := pkt.Unmarshal(packet); err == nil { c.bmu.Lock() diff --git a/examples/b2bua/b2bua/udp.go b/examples/b2bua/b2bua/udp.go index e8f921f..d68b662 100644 --- a/examples/b2bua/b2bua/udp.go +++ b/examples/b2bua/b2bua/udp.go @@ -7,10 +7,12 @@ import ( "sync" "time" + "github.com/cloudwebrtc/go-sip-ua/examples/b2bua/b2bua/buffer" "github.com/cloudwebrtc/go-sip-ua/pkg/utils" "github.com/ghettovoice/gosip/util" "github.com/pion/rtcp" "github.com/pion/rtp" + "github.com/pion/webrtc/v3" "github.com/pixelbender/go-sdp/sdp" ) @@ -19,7 +21,6 @@ type UdpTansport struct { ports map[TrackType]*UdpPort localDescription *sdp.Session remoteDescription *sdp.Session - sequencer *sequencer mu sync.RWMutex rtpHandler func(trackType TrackType, payload []byte) @@ -30,6 +31,12 @@ type UdpTansport struct { closed utils.AtomicBool ctx context.Context cancel context.CancelFunc + + sequencer *sequencer + videoPool *sync.Pool + audioPool *sync.Pool + buff *buffer.Buffer + bmu sync.Mutex } func NewUdpTansport(trackInfos []*TrackInfo) *UdpTansport { @@ -37,6 +44,19 @@ func NewUdpTansport(trackInfos []*TrackInfo) *UdpTansport { trackInfos: trackInfos, ports: make(map[TrackType]*UdpPort), videoSSRC: 0, + sequencer: newSequencer(MaxPacketTrack), + videoPool: &sync.Pool{ + New: func() interface{} { + b := make([]byte, MaxPacketTrack*maxPktSize) + return &b + }, + }, + audioPool: &sync.Pool{ + New: func() interface{} { + b := make([]byte, maxPktSize*25) + return &b + }, + }, } t.ctx, t.cancel = context.WithCancel(context.TODO()) @@ -167,6 +187,17 @@ func (c *UdpTansport) onRtpPacket(trackType TrackType, packet []byte, raddr net. if trackType == TrackTypeVideo && c.videoSSRC == 0 { c.videoSSRC = p.SSRC + + c.bmu.Lock() + if c.buff == nil { + c.buff = buffer.NewBuffer(uint32(p.SSRC), c.videoPool, c.audioPool, buffer.Logger) + c.buff.Bind(webrtc.RTPParameters{}, buffer.Options{ + MaxBitRate: 1500, + }) + + c.buff.OnFeedback(func(fb []rtcp.Packet) {}) + } + c.bmu.Unlock() //c.sendPLI(c.videoSSRC) } From 697ed4f1439d5edbba404cdc2b7d70eae330c947 Mon Sep 17 00:00:00 2001 From: "duanweiwei1982@gmail.com" Date: Sun, 30 Jun 2024 17:38:48 +0800 Subject: [PATCH 17/36] update. --- examples/b2bua/b2bua/call.go | 28 ---------- examples/b2bua/b2bua/transport.go | 28 ++++++++++ examples/b2bua/b2bua/udp.go | 49 ++++++++--------- examples/b2bua/b2bua/udp_port.go | 89 +++++++++++++++++-------------- examples/b2bua/b2bua/util.go | 3 -- 5 files changed, 98 insertions(+), 99 deletions(-) create mode 100644 examples/b2bua/b2bua/transport.go diff --git a/examples/b2bua/b2bua/call.go b/examples/b2bua/b2bua/call.go index e3bf563..e55f677 100644 --- a/examples/b2bua/b2bua/call.go +++ b/examples/b2bua/b2bua/call.go @@ -218,31 +218,3 @@ func (b *B2BCall) BridgeMediaStream() error { }) return nil } - -type TransportType string - -const ( - TransportTypeSIP TransportType = "SIP" - TransportTypeRTC TransportType = "WebRTC" - TransportTypeUnknown TransportType = "Unknown" -) - -type Transport interface { - Init(config CallConfig) error - Close() error - CreateOffer() (*Desc, error) - OnAnswer(desc *Desc) error - OnOffer(sdp *Desc) error - CreateAnswer() (*Desc, error) - Type() TransportType - - OnRtpPacket(rtpHandler func(trackType TrackType, payload []byte)) - OnRtcpPacket(rtcpHandler func(trackType TrackType, payload []byte)) - - OnRequestKeyFrame(func()) - - WriteRTP(trackType TrackType, payload []byte) (int, error) - WriteRTCP(trackType TrackType, payload []byte) (int, error) - - RequestKeyFrame() error -} diff --git a/examples/b2bua/b2bua/transport.go b/examples/b2bua/b2bua/transport.go new file mode 100644 index 0000000..b84c8c6 --- /dev/null +++ b/examples/b2bua/b2bua/transport.go @@ -0,0 +1,28 @@ +package b2bua + +type TransportType string + +const ( + TransportTypeSIP TransportType = "SIP" + TransportTypeRTC TransportType = "WebRTC" +) + +type Transport interface { + Init(config CallConfig) error + Close() error + CreateOffer() (*Desc, error) + OnAnswer(desc *Desc) error + OnOffer(sdp *Desc) error + CreateAnswer() (*Desc, error) + Type() TransportType + + OnRtpPacket(rtpHandler func(trackType TrackType, payload []byte)) + OnRtcpPacket(rtcpHandler func(trackType TrackType, payload []byte)) + + OnRequestKeyFrame(func()) + + WriteRTP(trackType TrackType, payload []byte) (int, error) + WriteRTCP(trackType TrackType, payload []byte) (int, error) + + RequestKeyFrame() error +} diff --git a/examples/b2bua/b2bua/udp.go b/examples/b2bua/b2bua/udp.go index d68b662..026623d 100644 --- a/examples/b2bua/b2bua/udp.go +++ b/examples/b2bua/b2bua/udp.go @@ -92,29 +92,23 @@ func (c *UdpTansport) Init(config CallConfig) error { var medias []*sdp.Media for _, trackInfo := range c.trackInfos { - udpPort, err := NewUdpPort(trackInfo.TrackType, config.ExternalRtpAddress) + + var rAddr *net.UDPAddr = nil + var rRtcpAddr *net.UDPAddr = nil + if trackInfo.Connection != nil { + rAddr, _ = net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", trackInfo.Connection.Address, trackInfo.Port)) + rRtcpAddr, _ = net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", trackInfo.Connection.Address, trackInfo.RtcpPort)) + } + + udpPort, err := NewUdpPort(trackInfo.TrackType, rAddr, rRtcpAddr, config.ExternalRtpAddress) if err != nil { return err } udpPort.Init() - udpPort.OnRtpPacketReceived(c.onRtpPacket) - udpPort.OnRtcpPacketReceived(c.onRtcpPacket) + udpPort.OnRtpPacket(c.onRtpPacket) + udpPort.OnRtcpPacket(c.onRtcpPacket) c.ports[trackInfo.TrackType] = udpPort - if trackInfo.Connection != nil { - rtpAddr := fmt.Sprintf("%s:%d", trackInfo.Connection.Address, trackInfo.Port) - raddr, err := net.ResolveUDPAddr("udp", rtpAddr) - if err == nil { - udpPort.SetRemoteAddress(raddr) - } - - rtcpAddr := fmt.Sprintf("%s:%d", trackInfo.Connection.Address, trackInfo.RtcpPort) - rtcpRaddr, err := net.ResolveUDPAddr("udp", rtcpAddr) - if err == nil { - udpPort.SetRemoteRtcpAddress(rtcpRaddr) - } - } - media := &sdp.Media{} media.Type = string(trackInfo.TrackType) media.Port = udpPort.LocalPort() @@ -304,14 +298,13 @@ func (c *UdpTansport) WriteRTP(trackType TrackType, packet []byte) (int, error) } port := c.ports[trackType] - raddr := port.GetRemoteRtpAddress() - if raddr == nil { - logger.Errorf("UdpTansport::WriteRTP: raddr is nil") + + if port == nil { + logger.Errorf("UdpTansport::WriteRTP: port is nil") return 0, nil } - logger.Debugf("UdpTansport::WriteRTP: %v, raddr %v", trackType, *raddr) - return port.WriteRtpPacket(pktbuf, raddr) + return port.WriteRtp(pktbuf) } func (c *UdpTansport) WriteRTCP(trackType TrackType, packet []byte) (int, error) { @@ -324,13 +317,13 @@ func (c *UdpTansport) WriteRTCP(trackType TrackType, packet []byte) (int, error) logger.Debugf("UdpTansport::WriteRTCP: %v read %d packets", trackType, len(pkts)) port := c.ports[trackType] - raddr := port.GetRemoteRtcpAddress() - if raddr == nil { - logger.Errorf("UdpTansport::WriteRTP: raddr is nil") - raddr = port.GetRemoteRtpAddress() + + if port == nil { + logger.Errorf("UdpTansport::WriteRTCP: port is nil") + return 0, nil } - logger.Debugf("UdpTansport::WriteRTCP: %v read %d packets, raddr %v", trackType, len(pkts), *raddr) - return port.WriteRtcpPacket(packet, raddr) + + return port.WriteRtcp(packet) } func (c *UdpTansport) Type() TransportType { diff --git a/examples/b2bua/b2bua/udp_port.go b/examples/b2bua/b2bua/udp_port.go index a1b79e3..1a4a095 100644 --- a/examples/b2bua/b2bua/udp_port.go +++ b/examples/b2bua/b2bua/udp_port.go @@ -9,25 +9,26 @@ import ( "github.com/cloudwebrtc/go-sip-ua/pkg/utils" ) -// UdpPort . type UdpPort struct { - udpConns []*net.UDPConn - closed utils.AtomicBool - ctx context.Context - cancel context.CancelFunc - onRtpPacketCallback func(trackType TrackType, packet []byte, raddr net.Addr) error - onRtcpPacketCallback func(trackType TrackType, packet []byte, raddr net.Addr) error - mutex sync.Mutex - trackType TrackType - externalRtpAddress string - rAddr *net.UDPAddr - rRtcpAddr *net.UDPAddr + udpConns []*net.UDPConn + closed utils.AtomicBool + ctx context.Context + cancel context.CancelFunc + handleRtpPacket func(trackType TrackType, packet []byte, raddr net.Addr) error + handleRtcpPacket func(trackType TrackType, packet []byte, raddr net.Addr) error + mutex sync.Mutex + trackType TrackType + externalRtpAddress string + rAddr *net.UDPAddr + rRtcpAddr *net.UDPAddr } -func NewUdpPort(trackType TrackType, externalRtpAddress string) (*UdpPort, error) { +func NewUdpPort(trackType TrackType, rAddr, rRtcpAddr *net.UDPAddr, externalRtpAddress string) (*UdpPort, error) { c := &UdpPort{ trackType: trackType, externalRtpAddress: externalRtpAddress, + rAddr: rAddr, + rRtcpAddr: rRtcpAddr, } c.ctx, c.cancel = context.WithCancel(context.TODO()) c.closed.Set(false) @@ -38,6 +39,7 @@ func (c *UdpPort) Init() error { lAddr := &net.UDPAddr{IP: net.ParseIP("0.0.0.0"), Port: 0} lRtcpAddr := &net.UDPAddr{IP: net.ParseIP("0.0.0.0"), Port: 0} + // TODO: set port range from config rtpConns, err := ListenRTPInPortRange(4000, 5000, "udp", lAddr, lRtcpAddr) if err != nil { logger.Errorf("ListenUDP: err => %v", err) @@ -50,8 +52,8 @@ func (c *UdpPort) Init() error { c.mutex.Lock() defer c.mutex.Unlock() c.rAddr = raddr.(*net.UDPAddr) - if c.onRtpPacketCallback != nil { - c.onRtpPacketCallback(c.trackType, packet, raddr) + if c.handleRtpPacket != nil { + c.handleRtpPacket(c.trackType, packet, raddr) } }) @@ -59,8 +61,8 @@ func (c *UdpPort) Init() error { c.mutex.Lock() defer c.mutex.Unlock() c.rRtcpAddr = raddr.(*net.UDPAddr) - if c.onRtcpPacketCallback != nil { - c.onRtcpPacketCallback(c.trackType, packet, raddr) + if c.handleRtcpPacket != nil { + c.handleRtcpPacket(c.trackType, packet, raddr) } }) @@ -84,17 +86,6 @@ func (c *UdpPort) SetRemoteRtcpAddress(raddr *net.UDPAddr) { c.rRtcpAddr = raddr } -func (c *UdpPort) GetRemoteRtpAddress() *net.UDPAddr { - return c.rAddr -} - -func (c *UdpPort) GetRemoteRtcpAddress() *net.UDPAddr { - if c.rRtcpAddr == nil { - return c.rAddr - } - return c.rRtcpAddr -} - func (c *UdpPort) Close() { c.mutex.Lock() defer c.mutex.Unlock() @@ -111,36 +102,54 @@ func (c *UdpPort) Close() { } -func (c *UdpPort) OnRtpPacketReceived(callback func(trackType TrackType, packet []byte, raddr net.Addr) error) { +func (c *UdpPort) OnRtpPacket(callback func(trackType TrackType, packet []byte, raddr net.Addr) error) { c.mutex.Lock() defer c.mutex.Unlock() - c.onRtpPacketCallback = callback + c.handleRtpPacket = callback } -func (c *UdpPort) OnRtcpPacketReceived(callback func(trackType TrackType, packet []byte, raddr net.Addr) error) { +func (c *UdpPort) OnRtcpPacket(callback func(trackType TrackType, packet []byte, raddr net.Addr) error) { c.mutex.Lock() defer c.mutex.Unlock() - c.onRtcpPacketCallback = callback + c.handleRtcpPacket = callback } -func (c *UdpPort) WriteRtpPacket(data []byte, raddr net.Addr) (int, error) { +func (c *UdpPort) WriteRtp(data []byte) (int, error) { if c.closed.Get() { return 0, fmt.Errorf("closed") } - if c.udpConns != nil { - return c.udpConns[0].WriteToUDP(data, raddr.(*net.UDPAddr)) + + if c.rAddr == nil { + return 0, fmt.Errorf("rAddr is nil") + } + + if c.udpConns == nil { + return 0, fmt.Errorf("udpConns is nil") } - return 0, fmt.Errorf("udpConns is nil") + + logger.Debugf("UdpPort::WriteRTP: raddr %v", c.rAddr) + return c.udpConns[0].WriteToUDP(data, c.rAddr) } -func (c *UdpPort) WriteRtcpPacket(data []byte, raddr net.Addr) (int, error) { +func (c *UdpPort) WriteRtcp(data []byte) (int, error) { if c.closed.Get() { return 0, fmt.Errorf("closed") } - if c.udpConns != nil { - return c.udpConns[1].WriteToUDP(data, raddr.(*net.UDPAddr)) + var addr *net.UDPAddr = c.rRtcpAddr + + if addr == nil { + addr = c.rRtcpAddr + if addr == nil { + return 0, fmt.Errorf("rRtcpAddr is nil") + } } - return 0, fmt.Errorf("udpConns is nil") + + if c.udpConns == nil { + return 0, fmt.Errorf("udpConns is nil") + } + + logger.Debugf("UdpPort::WriteRTCP: %d packets, raddr %v", len(data), addr) + return c.udpConns[1].WriteToUDP(data, addr) } func (c *UdpPort) loop(conn *net.UDPConn, onPacketReceived func(data []byte, raddr net.Addr)) { diff --git a/examples/b2bua/b2bua/util.go b/examples/b2bua/b2bua/util.go index 082f414..9b657cc 100644 --- a/examples/b2bua/b2bua/util.go +++ b/examples/b2bua/b2bua/util.go @@ -353,9 +353,6 @@ func HasWebRTCAttributes(attributes []*sdp.Attr) bool { } func ParseTransportType(sdp *sdp.Session) TransportType { - if sdp == nil { - return TransportTypeUnknown - } for _, m := range sdp.Media { // Proto: "UDP/TLS/RTP/SAVPF" if strings.Contains(m.Proto, "SAVPF") && HasWebRTCAttributes(m.Attributes) { From 65eb1a5e26595edb29c71629e818ce31c2bc5af1 Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Mon, 1 Jul 2024 15:44:37 +0800 Subject: [PATCH 18/36] fix crash. --- examples/b2bua/b2bua/buffer/buffer.go | 4 ++++ examples/b2bua/b2bua/udp.go | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/b2bua/b2bua/buffer/buffer.go b/examples/b2bua/b2bua/buffer/buffer.go index 5f07a42..b7bef0e 100644 --- a/examples/b2bua/b2bua/buffer/buffer.go +++ b/examples/b2bua/b2bua/buffer/buffer.go @@ -126,6 +126,10 @@ func (b *Buffer) Bind(params webrtc.RTPParameters, o Options) { b.Lock() defer b.Unlock() + if len(params.Codecs) == 0 { + return + } + codec := params.Codecs[0] b.clockRate = codec.ClockRate b.maxBitrate = o.MaxBitRate diff --git a/examples/b2bua/b2bua/udp.go b/examples/b2bua/b2bua/udp.go index 026623d..f30b35f 100644 --- a/examples/b2bua/b2bua/udp.go +++ b/examples/b2bua/b2bua/udp.go @@ -188,7 +188,6 @@ func (c *UdpTansport) onRtpPacket(trackType TrackType, packet []byte, raddr net. c.buff.Bind(webrtc.RTPParameters{}, buffer.Options{ MaxBitRate: 1500, }) - c.buff.OnFeedback(func(fb []rtcp.Packet) {}) } c.bmu.Unlock() From 913b621bdf60f7e5228a4fabf46c21f4ee5cdc02 Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Mon, 1 Jul 2024 16:06:18 +0800 Subject: [PATCH 19/36] update. --- examples/b2bua/b2bua/call.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/b2bua/b2bua/call.go b/examples/b2bua/b2bua/call.go index e55f677..bd3268e 100644 --- a/examples/b2bua/b2bua/call.go +++ b/examples/b2bua/b2bua/call.go @@ -182,38 +182,38 @@ func (b *B2BCall) BridgeMediaStream() error { b.srcTrans.OnRtpPacket(func(trackType TrackType, payload []byte) { _, err := b.destTrans.WriteRTP(trackType, payload) if err != nil { - logger.Errorf("WriteRTP[%v] %v error: %v", b.destTrans.Type(), trackType, err) + logger.Warnf("WriteRTP[%v] %v error: %v", b.destTrans.Type(), trackType, err) } }) b.srcTrans.OnRtcpPacket(func(trackType TrackType, payload []byte) { _, err := b.destTrans.WriteRTCP(trackType, payload) if err != nil { - logger.Errorf("WriteRTCP[%v] %v error: %v", b.destTrans.Type(), trackType, err) + logger.Warnf("WriteRTCP[%v] %v error: %v", b.destTrans.Type(), trackType, err) } }) b.srcTrans.OnRequestKeyFrame(func() { err := b.destTrans.RequestKeyFrame() if err != nil { - logger.Errorf("OnRequestKeyFrame[%v] error: %v", b.destTrans.Type(), err) + logger.Warnf("OnRequestKeyFrame[%v] error: %v", b.destTrans.Type(), err) } }) b.destTrans.OnRtpPacket(func(trackType TrackType, payload []byte) { _, err := b.srcTrans.WriteRTP(trackType, payload) if err != nil { - logger.Errorf("WriteRTP[%v] %v error: %v", b.srcTrans.Type(), trackType, err) + logger.Warnf("WriteRTP[%v] %v error: %v", b.srcTrans.Type(), trackType, err) } }) b.destTrans.OnRtcpPacket(func(trackType TrackType, payload []byte) { _, err := b.srcTrans.WriteRTCP(trackType, payload) if err != nil { - logger.Errorf("WriteRTCP[%v] %v error: %v", b.srcTrans.Type(), trackType, err) + logger.Warnf("WriteRTCP[%v] %v error: %v", b.srcTrans.Type(), trackType, err) } }) b.destTrans.OnRequestKeyFrame(func() { err := b.srcTrans.RequestKeyFrame() if err != nil { - logger.Errorf("OnRequestKeyFrame[%v] error: %v", b.srcTrans.Type(), err) + logger.Warnf("OnRequestKeyFrame[%v] error: %v", b.srcTrans.Type(), err) } }) return nil From 731cb8682cfab59e15f1872f2c90ac3422cd566d Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Mon, 1 Jul 2024 19:54:22 +0800 Subject: [PATCH 20/36] cleanup. --- examples/b2bua/b2bua/udp.go | 196 ++++++++++++++---------------------- 1 file changed, 78 insertions(+), 118 deletions(-) diff --git a/examples/b2bua/b2bua/udp.go b/examples/b2bua/b2bua/udp.go index f30b35f..63b042e 100644 --- a/examples/b2bua/b2bua/udp.go +++ b/examples/b2bua/b2bua/udp.go @@ -7,12 +7,10 @@ import ( "sync" "time" - "github.com/cloudwebrtc/go-sip-ua/examples/b2bua/b2bua/buffer" "github.com/cloudwebrtc/go-sip-ua/pkg/utils" "github.com/ghettovoice/gosip/util" "github.com/pion/rtcp" "github.com/pion/rtp" - "github.com/pion/webrtc/v3" "github.com/pixelbender/go-sdp/sdp" ) @@ -31,12 +29,6 @@ type UdpTansport struct { closed utils.AtomicBool ctx context.Context cancel context.CancelFunc - - sequencer *sequencer - videoPool *sync.Pool - audioPool *sync.Pool - buff *buffer.Buffer - bmu sync.Mutex } func NewUdpTansport(trackInfos []*TrackInfo) *UdpTansport { @@ -44,19 +36,6 @@ func NewUdpTansport(trackInfos []*TrackInfo) *UdpTansport { trackInfos: trackInfos, ports: make(map[TrackType]*UdpPort), videoSSRC: 0, - sequencer: newSequencer(MaxPacketTrack), - videoPool: &sync.Pool{ - New: func() interface{} { - b := make([]byte, MaxPacketTrack*maxPktSize) - return &b - }, - }, - audioPool: &sync.Pool{ - New: func() interface{} { - b := make([]byte, maxPktSize*25) - return &b - }, - }, } t.ctx, t.cancel = context.WithCancel(context.TODO()) @@ -82,7 +61,7 @@ func (c *UdpTansport) Init(config CallConfig) error { SessionVersion: time.Now().UnixNano() / 1e6, }, Timing: &sdp.Timing{Start: time.Time{}, Stop: time.Time{}}, - //Name: "Example", + //Name: "play", // Session Name ("s=") Connection: &sdp.Connection{ Address: host, }, @@ -181,16 +160,6 @@ func (c *UdpTansport) onRtpPacket(trackType TrackType, packet []byte, raddr net. if trackType == TrackTypeVideo && c.videoSSRC == 0 { c.videoSSRC = p.SSRC - - c.bmu.Lock() - if c.buff == nil { - c.buff = buffer.NewBuffer(uint32(p.SSRC), c.videoPool, c.audioPool, buffer.Logger) - c.buff.Bind(webrtc.RTPParameters{}, buffer.Options{ - MaxBitRate: 1500, - }) - c.buff.OnFeedback(func(fb []rtcp.Packet) {}) - } - c.bmu.Unlock() //c.sendPLI(c.videoSSRC) } @@ -211,69 +180,6 @@ func (c *UdpTansport) onRtpPacket(trackType TrackType, packet []byte, raddr net. func (c *UdpTansport) onRtcpPacket(trackType TrackType, packet []byte, raddr net.Addr) error { logger.Debugf("UdpTansport::OnRtcpPacketReceived: %v read %d bytes, raddr %v", trackType, len(packet), raddr) - - pkts, err := rtcp.Unmarshal(packet) - if err != nil { - logger.Errorf("Unmarshal rtcp receiver packets err %v", err) - } - var fwdPkts []rtcp.Packet - pliOnce := true - firOnce := true - var ( - maxRatePacketLoss uint8 - expectedMinBitrate uint64 - ) - for _, pkt := range pkts { - switch p := pkt.(type) { - case *rtcp.PictureLossIndication: - if pliOnce { - fwdPkts = append(fwdPkts, p) - logger.Infof("Picture Loss Indication") - if c.requestKeyFrameHandler != nil { - c.requestKeyFrameHandler() - } - pliOnce = false - } - case *rtcp.FullIntraRequest: - if firOnce { - fwdPkts = append(fwdPkts, p) - logger.Infof("FullIntraRequest") - if c.requestKeyFrameHandler != nil { - c.requestKeyFrameHandler() - } - firOnce = false - } - case *rtcp.ReceiverEstimatedMaximumBitrate: - if expectedMinBitrate == 0 || expectedMinBitrate > uint64(p.Bitrate) { - expectedMinBitrate = uint64(p.Bitrate) - //hi.CameraUpdateBitrate(uint32(expectedMinBitrate / 1024)) - logger.Debugf(" ReceiverEstimatedMaximumBitrate %d", expectedMinBitrate/1024) - } - case *rtcp.ReceiverReport: - for _, r := range p.Reports { - if maxRatePacketLoss == 0 || maxRatePacketLoss < r.FractionLost { - maxRatePacketLoss = r.FractionLost - logger.Infof("maxRatePacketLoss %d", maxRatePacketLoss) - } - } - case *rtcp.TransportLayerNack: - logger.Infof("Nack %v", p) - if c.sequencer != nil { - var nackedPackets []packetMeta - for _, pair := range p.Nacks { - nackedPackets = append(nackedPackets, c.sequencer.getSeqNoPairs(pair.PacketList())...) - } - if len(nackedPackets) > 0 { - //if err = c.RetransmitPackets(nackedPackets); err == nil { - // logger.Infof("Nack pair %v", nackedPackets) - //} - } else { - //buf, _ := p.Marshal() - //c.onRtcpPacket(TrackTypeVideo, packet) - } - } - } - } c.mu.RLock() defer c.mu.RUnlock() if c.rtcpHandler != nil { @@ -283,18 +189,19 @@ func (c *UdpTansport) onRtcpPacket(trackType TrackType, packet []byte, raddr net } func (c *UdpTansport) WriteRTP(trackType TrackType, packet []byte) (int, error) { + /* + p := &rtp.Packet{} + if err := p.Unmarshal(packet); err != nil { + logger.Errorf("tp.Packet Unmarshal: e %v", err) + } + logger.Debugf("UdpTansport::WriteRTP: %v, write %d bytes, seq %d, ts %d", trackType, len(packet), p.SequenceNumber, p.Timestamp) - p := &rtp.Packet{} - if err := p.Unmarshal(packet); err != nil { - logger.Errorf("tp.Packet Unmarshal: e %v", err) - } - logger.Debugf("UdpTansport::WriteRTP: %v, write %d bytes, seq %d, ts %d", trackType, len(packet), p.SequenceNumber, p.Timestamp) - - pktbuf, err := p.Marshal() + pktbuf, err := p.Marshal() - if err != nil { - logger.Errorf("UdpTansport::WriteRTP: Marshal rtp receiver packets err %v", err) - } + if err != nil { + logger.Errorf("UdpTansport::WriteRTP: Marshal rtp receiver packets err %v", err) + } + */ port := c.ports[trackType] @@ -303,25 +210,24 @@ func (c *UdpTansport) WriteRTP(trackType TrackType, packet []byte) (int, error) return 0, nil } - return port.WriteRtp(pktbuf) + return port.WriteRtp(packet) } func (c *UdpTansport) WriteRTCP(trackType TrackType, packet []byte) (int, error) { + /* + pkts, err := rtcp.Unmarshal(packet) + if err != nil { + logger.Errorf("UdpTansport::WriteRTP: Unmarshal rtcp receiver packets err %v", err) + } - pkts, err := rtcp.Unmarshal(packet) - if err != nil { - logger.Errorf("UdpTansport::WriteRTP: Unmarshal rtcp receiver packets err %v", err) - } - - logger.Debugf("UdpTansport::WriteRTCP: %v read %d packets", trackType, len(pkts)) - + logger.Debugf("UdpTansport::WriteRTCP: %v read %d packets", trackType, len(pkts)) + */ port := c.ports[trackType] if port == nil { logger.Errorf("UdpTansport::WriteRTCP: port is nil") return 0, nil } - return port.WriteRtcp(packet) } @@ -392,7 +298,11 @@ func (c *UdpTansport) RequestKeyFrame() error { if c.videoSSRC == 0 { return fmt.Errorf("video ssrc is 0") } - pli := rtcp.PictureLossIndication{MediaSSRC: uint32(c.videoSSRC)} + return c.sendPLI(c.videoSSRC) +} + +func (c *UdpTansport) sendPLI(ssrc uint32) error { + pli := rtcp.PictureLossIndication{MediaSSRC: uint32(ssrc)} buf, err := pli.Marshal() if err != nil { logger.Error(err) @@ -401,13 +311,13 @@ func (c *UdpTansport) RequestKeyFrame() error { _, errSend := c.WriteRTCP(TrackTypeVideo, buf) if errSend != nil { logger.Error(errSend) - return errSend + return err } - logger.Infof("RequestKeyFrame: Sent PLI %v", pli) + logger.Infof("Sent PLI %v", pli) return nil } -func (c *UdpTansport) sendPLI(ssrc uint32) error { +func (c *UdpTansport) sendTntervalPlic(ssrc uint32) error { go func() { ticker := time.NewTicker(time.Second * 1) for range ticker.C { @@ -431,3 +341,53 @@ func (c *UdpTansport) sendPLI(ssrc uint32) error { }() return nil } + +func (c *UdpTansport) handleRtcpFeedback(packet []byte) { + pkts, err := rtcp.Unmarshal(packet) + if err != nil { + logger.Errorf("Unmarshal rtcp receiver packets err %v", err) + } + var fwdPkts []rtcp.Packet + pliOnce := true + firOnce := true + var ( + maxRatePacketLoss uint8 + expectedMinBitrate uint64 + ) + for _, pkt := range pkts { + switch p := pkt.(type) { + case *rtcp.PictureLossIndication: + if pliOnce { + fwdPkts = append(fwdPkts, p) + logger.Infof("Picture Loss Indication") + if c.requestKeyFrameHandler != nil { + c.requestKeyFrameHandler() + } + pliOnce = false + } + case *rtcp.FullIntraRequest: + if firOnce { + fwdPkts = append(fwdPkts, p) + logger.Infof("FullIntraRequest") + if c.requestKeyFrameHandler != nil { + c.requestKeyFrameHandler() + } + firOnce = false + } + case *rtcp.ReceiverEstimatedMaximumBitrate: + if expectedMinBitrate == 0 || expectedMinBitrate > uint64(p.Bitrate) { + expectedMinBitrate = uint64(p.Bitrate) + logger.Debugf(" ReceiverEstimatedMaximumBitrate %d", expectedMinBitrate/1024) + } + case *rtcp.ReceiverReport: + for _, r := range p.Reports { + if maxRatePacketLoss == 0 || maxRatePacketLoss < r.FractionLost { + maxRatePacketLoss = r.FractionLost + logger.Infof("maxRatePacketLoss %d", maxRatePacketLoss) + } + } + case *rtcp.TransportLayerNack: + logger.Infof("Nack %v", p) + } + } +} From f9508a41dfd3488c57a5a20e607925f121b3457e Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Tue, 2 Jul 2024 23:02:41 +0800 Subject: [PATCH 21/36] update. --- examples/b2bua/b2bua/b2bua.go | 12 +++-- examples/b2bua/b2bua/call.go | 6 +-- examples/b2bua/b2bua/jitterbuffer/buffer.go | 53 +++++++++++++++++++++ examples/b2bua/b2bua/udp.go | 23 +++------ examples/b2bua/b2bua/udp_port.go | 16 +++++-- examples/b2bua/main.go | 24 +++++++++- examples/client/main.go | 2 +- examples/register/main.go | 2 +- pkg/account/profile.go | 8 ++-- pkg/auth/server.go | 2 +- pkg/media/rtp/udp.go | 2 +- pkg/session/session.go | 4 +- pkg/stack/stack.go | 6 +-- pkg/ua/ua.go | 2 +- pkg/utils/log.go | 3 +- 15 files changed, 123 insertions(+), 42 deletions(-) create mode 100644 examples/b2bua/b2bua/jitterbuffer/buffer.go diff --git a/examples/b2bua/b2bua/b2bua.go b/examples/b2bua/b2bua/b2bua.go index 1da3d08..4f7c7dc 100644 --- a/examples/b2bua/b2bua/b2bua.go +++ b/examples/b2bua/b2bua/b2bua.go @@ -48,7 +48,7 @@ var ( ) func init() { - logger = utils.NewLogrusLogger(log.InfoLevel, "B2BUA", nil) + logger = utils.NewLogrusLogger(utils.DefaultLogLevel, "B2BUA", nil) callConfig = CallConfig{ Codecs: []string{"PCMU", "PCMA", "opus", "H264"}, ExternalRtpAddress: "0.0.0.0", @@ -103,7 +103,6 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { } ua := ua.NewUserAgent(&ua.UserAgentConfig{ - SipStack: stack, }) @@ -111,6 +110,9 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { logger.Infof("InviteStateHandler: state => %v, type => %s", state, sess.Direction()) switch state { + // Handle outgoing call. + case session.InviteSent: + // Handle incoming call. case session.InviteReceived: to, _ := (*req).To() @@ -277,6 +279,11 @@ func (b *B2BUA) removeCall(sess *session.Session) { } } +// Originate . +func (b *B2BUA) Originate(source string, destination string) { + logger.Infof("Originate %s => %s", source, destination) +} + // Shutdown . func (b *B2BUA) Shutdown() { b.ua.Shutdown() @@ -363,7 +370,6 @@ func (b *B2BUA) handleRegister(request sip.Request, tx sip.ServerTransaction) { sip.CopyHeaders("Expires", request, resp) utils.BuildContactHeader("Contact", request, resp, &expires) tx.Respond(resp) - } func (b *B2BUA) handleConnectionError(connError *transport.ConnectionError) { diff --git a/examples/b2bua/b2bua/call.go b/examples/b2bua/b2bua/call.go index bd3268e..3f847ed 100644 --- a/examples/b2bua/b2bua/call.go +++ b/examples/b2bua/b2bua/call.go @@ -46,7 +46,7 @@ type B2BCall struct { } func (b *B2BCall) ToString() string { - return b.src.Contact() + " => " + b.dest.Contact() + return (*b.src.CallID()).String() + ", src " + b.src.Contact() + " => dest" + b.dest.Contact() } func (b *B2BCall) Init() { @@ -112,7 +112,7 @@ func (b *B2BCall) SetALegOffer(sdp *Desc) error { if transType == TransportTypeRTC { trans = NewWebRTCTransport(trackInfos) } else { - trans = NewUdpTansport(trackInfos) + trans = NewUdpTansport("inc-"+string(*b.src.CallID()), trackInfos) } err = trans.Init(callConfig) @@ -139,7 +139,7 @@ func (b *B2BCall) CreateBLegOffer(tpType TransportType) (*Desc, error) { if tpType == TransportTypeRTC { trans = NewWebRTCTransport(b.srcTrackInfos) } else { - trans = NewUdpTansport(b.srcTrackInfos) + trans = NewUdpTansport("out-"+string(*b.src.CallID()), b.srcTrackInfos) } err := trans.Init(callConfig) diff --git a/examples/b2bua/b2bua/jitterbuffer/buffer.go b/examples/b2bua/b2bua/jitterbuffer/buffer.go new file mode 100644 index 0000000..e22d833 --- /dev/null +++ b/examples/b2bua/b2bua/jitterbuffer/buffer.go @@ -0,0 +1,53 @@ +package jitterbuffer + +import ( + "github.com/pion/rtp" +) + +type JitterBufferType string + +const ( + JBOFF JitterBufferType = "OFF" + JBUF_FIXED JitterBufferType = "FIXED" + JBUF_ADAPTIVE JitterBufferType = "ADAPTIVE" +) + +var ( + JBUF_RDIFF_EMA_COEFF = 1024 + JBUF_RDIFF_UP_SPEED = 512 + JBUF_PUT_TIMEOUT = 400 +) + +/** Defines a packet frame */ +type packet struct { + hdr rtp.Header /**< RTP Header */ + buf []byte /**< RTP Payload */ +} + +type JitterBuffer struct { + Type JitterBufferType + + min int + max int + + // Wish size for adaptive mode + wish int + + payload int + + packets []packet +} + +/* + * @param min Minimum delay in [frames] + * @param max Maximum delay in [packets] + */ +func NewJitterBuffer(jbType JitterBufferType, min, max int) *JitterBuffer { + return &JitterBuffer{ + Type: jbType, + min: min, + max: max, + wish: min, + packets: make([]packet, max), + } +} diff --git a/examples/b2bua/b2bua/udp.go b/examples/b2bua/b2bua/udp.go index 63b042e..4996463 100644 --- a/examples/b2bua/b2bua/udp.go +++ b/examples/b2bua/b2bua/udp.go @@ -29,13 +29,16 @@ type UdpTansport struct { closed utils.AtomicBool ctx context.Context cancel context.CancelFunc + + id string } -func NewUdpTansport(trackInfos []*TrackInfo) *UdpTansport { +func NewUdpTansport(id string, trackInfos []*TrackInfo) *UdpTansport { t := &UdpTansport{ trackInfos: trackInfos, ports: make(map[TrackType]*UdpPort), videoSSRC: 0, + id: id, } t.ctx, t.cancel = context.WithCancel(context.TODO()) @@ -79,7 +82,7 @@ func (c *UdpTansport) Init(config CallConfig) error { rRtcpAddr, _ = net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", trackInfo.Connection.Address, trackInfo.RtcpPort)) } - udpPort, err := NewUdpPort(trackInfo.TrackType, rAddr, rRtcpAddr, config.ExternalRtpAddress) + udpPort, err := NewUdpPort(c.id, trackInfo.TrackType, rAddr, rRtcpAddr, config.ExternalRtpAddress) if err != nil { return err } @@ -255,23 +258,9 @@ func (c *UdpTansport) OnAnswer(answer *Desc) error { if err != nil { return err } - /* - =0 - o=100 703 1242 IN IP4 192.168.1.154 - s=Talk - c=IN IP4 192.168.1.154 - t=0 0 - m=audio 40063 RTP/AVP 0 8 116 - a=rtpmap:116 telephone-event/8000 - a=rtcp:49374 - m=video 47878 RTP/AVP 96 - a=rtpmap:96 H264/90000 - a=fmtp:96 profile-level-id=42801F; packetization-mode=1 - a=rtcp:37679 - */ conn := sess.Connection if conn != nil { - logger.Infof("remote connection address: %s", conn.Address) + logger.Debugf("remote connection address: %s", conn.Address) } c.remoteDescription = sess return nil diff --git a/examples/b2bua/b2bua/udp_port.go b/examples/b2bua/b2bua/udp_port.go index 1a4a095..7feffa1 100644 --- a/examples/b2bua/b2bua/udp_port.go +++ b/examples/b2bua/b2bua/udp_port.go @@ -7,6 +7,7 @@ import ( "sync" "github.com/cloudwebrtc/go-sip-ua/pkg/utils" + "github.com/ghettovoice/gosip/util" ) type UdpPort struct { @@ -21,14 +22,16 @@ type UdpPort struct { externalRtpAddress string rAddr *net.UDPAddr rRtcpAddr *net.UDPAddr + id string } -func NewUdpPort(trackType TrackType, rAddr, rRtcpAddr *net.UDPAddr, externalRtpAddress string) (*UdpPort, error) { +func NewUdpPort(id string, trackType TrackType, rAddr, rRtcpAddr *net.UDPAddr, externalRtpAddress string) (*UdpPort, error) { c := &UdpPort{ trackType: trackType, externalRtpAddress: externalRtpAddress, rAddr: rAddr, rRtcpAddr: rRtcpAddr, + id: id, } c.ctx, c.cancel = context.WithCancel(context.TODO()) c.closed.Set(false) @@ -46,7 +49,14 @@ func (c *UdpPort) Init() error { return err } - logger.Infof("ListenUDP: rtp %v, rtcp ", rtpConns[0].LocalAddr().String(), rtpConns[1].LocalAddr().String()) + host := callConfig.ExternalRtpAddress + if host == "" || host == "0.0.0.0" { + if v, err := util.ResolveSelfIP(); err == nil { + host = v.String() + } + } + + logger.Infof("[%s-%s] ListenUDP: udp://%s:%v, udp://%s:%v", c.id, c.trackType, host, rtpConns[0].LocalAddr().(*net.UDPAddr).Port, host, rtpConns[1].LocalAddr().(*net.UDPAddr).Port) go c.loop(rtpConns[0], func(packet []byte, raddr net.Addr) { c.mutex.Lock() @@ -161,7 +171,7 @@ func (c *UdpPort) loop(conn *net.UDPConn, onPacketReceived func(data []byte, rad } n, raddr, err := conn.ReadFromUDP(buf) if err != nil { - logger.Infof("RTP Conn [%v] refused, stop now!", raddr) + logger.Debugf("RTP Conn [%v] refused, stop now!", raddr) return } //logger.Infof("raddr: %v, size %d", raddr, n) diff --git a/examples/b2bua/main.go b/examples/b2bua/main.go index 36c0d12..5b20e5f 100644 --- a/examples/b2bua/main.go +++ b/examples/b2bua/main.go @@ -20,6 +20,7 @@ func completer(d prompt.Document) []prompt.Suggest { {Text: "users", Description: "Show sip accounts"}, {Text: "onlines", Description: "Show online sip devices"}, {Text: "calls", Description: "Show active calls"}, + {Text: "originate", Description: "Originate a call and bridge to another call"}, {Text: "set debug on", Description: "Show debug msg in console"}, {Text: "set debug off", Description: "Turn off debug msg in console"}, {Text: "show loggers", Description: "Print Loggers"}, @@ -39,6 +40,21 @@ Options: func consoleLoop(b2bua *b2bua.B2BUA) { + usersCompleter := func(d prompt.Document) []prompt.Suggest { + accounts := b2bua.GetAccounts() + s := make([]prompt.Suggest, 0, len(accounts)) + for user := range accounts { + s = append(s, prompt.Suggest{Text: user, Description: "User"}) + } + aors := b2bua.GetRegistry().GetAllContacts() + for aor := range aors { + for _, instance := range aors[aor] { + s = append(s, prompt.Suggest{Text: instance.Contact.Address.String(), Description: "online device"}) + } + } + return prompt.FilterHasPrefix(s, d.GetWordBeforeCursor(), true) + } + fmt.Println("Please select command.") for { t := prompt.Input("CLI> ", completer, @@ -74,6 +90,12 @@ func consoleLoop(b2bua *b2bua.B2BUA) { } else { fmt.Printf("No users\n") } + case "originate": + fmt.Printf("Please enter the source user: ") + source := prompt.Input("Source> ", usersCompleter) + fmt.Printf("Please enter the destination user: ") + destination := prompt.Input("Destination> ", usersCompleter) + b2bua.Originate(source, destination) case "calls": fallthrough case "cl": /* call list*/ @@ -81,7 +103,7 @@ func consoleLoop(b2bua *b2bua.B2BUA) { if len(calls) > 0 { fmt.Printf("Calls:\n") for _, call := range calls { - fmt.Printf("%v:\n", call.ToString()) + fmt.Printf("%v\n", call.ToString()) } } else { fmt.Printf("No active calls\n") diff --git a/examples/client/main.go b/examples/client/main.go index 81353fa..d08863c 100644 --- a/examples/client/main.go +++ b/examples/client/main.go @@ -25,7 +25,7 @@ var ( ) func init() { - logger = utils.NewLogrusLogger(log.DebugLevel, "Client", nil) + logger = utils.NewLogrusLogger(utils.DefaultLogLevel, "Client", nil) } func createUdp() *rtp.RtpUDPStream { diff --git a/examples/register/main.go b/examples/register/main.go index 503d77a..5942771 100644 --- a/examples/register/main.go +++ b/examples/register/main.go @@ -21,7 +21,7 @@ var ( ) func init() { - logger = utils.NewLogrusLogger(log.DebugLevel, "Register", nil) + logger = utils.NewLogrusLogger(utils.DefaultLogLevel, "Register", nil) } func main() { diff --git a/pkg/account/profile.go b/pkg/account/profile.go index 89cbdb2..df3b95c 100644 --- a/pkg/account/profile.go +++ b/pkg/account/profile.go @@ -16,10 +16,10 @@ var ( ) func init() { - logger = utils.NewLogrusLogger(log.DebugLevel, "UserAgent", nil) + logger = utils.NewLogrusLogger(utils.DefaultLogLevel, "UserAgent", nil) } -//AuthInfo . +// AuthInfo . type AuthInfo struct { AuthUser string Realm string @@ -66,7 +66,7 @@ func (p *Profile) Contact() *sip.Address { return contact } -//NewProfile . +// NewProfile . func NewProfile( uri sip.Uri, displayName string, @@ -104,7 +104,7 @@ func NewProfile( return p } -//RegisterState . +// RegisterState . type RegisterState struct { Account *Profile StatusCode sip.StatusCode diff --git a/pkg/auth/server.go b/pkg/auth/server.go index 1b9c79e..e6198f4 100644 --- a/pkg/auth/server.go +++ b/pkg/auth/server.go @@ -50,7 +50,7 @@ func NewServerAuthorizer(callback RequestCredentialCallback, realm string, authI useAuthInt: authInt, realm: realm, } - auth.log = utils.NewLogrusLogger(log.DebugLevel, "ServerAuthorizer", nil) + auth.log = utils.NewLogrusLogger(utils.DefaultLogLevel, "ServerAuthorizer", nil) go func() { for now := range time.Tick(NonceExpire) { auth.mx.Lock() diff --git a/pkg/media/rtp/udp.go b/pkg/media/rtp/udp.go index ed7c118..cee7257 100644 --- a/pkg/media/rtp/udp.go +++ b/pkg/media/rtp/udp.go @@ -23,7 +23,7 @@ type RtpUDPStream struct { func NewRtpUDPStream(bind string, portMin, portMax int, callback func(pkt []byte, raddr net.Addr)) *RtpUDPStream { - logger := utils.NewLogrusLogger(log.DebugLevel, "Media", nil) + logger := utils.NewLogrusLogger(utils.DefaultLogLevel, "Media", nil) lAddr := &net.UDPAddr{IP: net.ParseIP(bind), Port: 0} var err error diff --git a/pkg/session/session.go b/pkg/session/session.go index a1b2c64..47ee5d1 100644 --- a/pkg/session/session.go +++ b/pkg/session/session.go @@ -46,7 +46,7 @@ func NewInviteSession(reqcb RequestCallback, uaType string, contact: contact, } - s.logger = utils.NewLogrusLogger(log.DebugLevel, "Session", nil) + s.logger = utils.NewLogrusLogger(utils.DefaultLogLevel, "Session", nil) to, _ := req.To() from, _ := req.From() @@ -104,7 +104,7 @@ func (s *Session) RemoteSdp() string { } func (s *Session) Contact() string { - return s.contact.String() + return s.contact.Address.String() } func (s *Session) CallID() *sip.CallID { diff --git a/pkg/stack/stack.go b/pkg/stack/stack.go index 15939dc..3655bd8 100644 --- a/pkg/stack/stack.go +++ b/pkg/stack/stack.go @@ -78,7 +78,7 @@ func NewSipStack(config *SipStackConfig) *SipStack { config = &SipStackConfig{} } - logger := utils.NewLogrusLogger(log.DebugLevel, "SipStack", nil) + logger := utils.NewLogrusLogger(utils.DefaultLogLevel, "SipStack", nil) var host string var ip net.IP @@ -134,12 +134,12 @@ func NewSipStack(config *SipStackConfig) *SipStack { } s.log = logger - s.tp = transport.NewLayer(ip, dnsResolver, config.MsgMapper, utils.NewLogrusLogger(log.DebugLevel, "transport.Layer", nil)) + s.tp = transport.NewLayer(ip, dnsResolver, config.MsgMapper, utils.NewLogrusLogger(utils.DefaultLogLevel, "transport.Layer", nil)) sipTp := &sipTransport{ tpl: s.tp, s: s, } - s.tx = transaction.NewLayer(sipTp, utils.NewLogrusLogger(log.DebugLevel, "transaction.Layer", nil)) + s.tx = transaction.NewLayer(sipTp, utils.NewLogrusLogger(utils.DefaultLogLevel, "transaction.Layer", nil)) s.running.Set() go s.serve() diff --git a/pkg/ua/ua.go b/pkg/ua/ua.go index da4dcf0..6892f0d 100644 --- a/pkg/ua/ua.go +++ b/pkg/ua/ua.go @@ -60,7 +60,7 @@ func NewUserAgent(config *UserAgentConfig) *UserAgent { iss: sync.Map{}, InviteStateHandler: nil, RegisterStateHandler: nil, - log: utils.NewLogrusLogger(log.DebugLevel, "UserAgent", nil), + log: utils.NewLogrusLogger(utils.DefaultLogLevel, "UserAgent", nil), } stack := config.SipStack stack.OnRequest(sip.INVITE, ua.handleInvite) diff --git a/pkg/utils/log.go b/pkg/utils/log.go index d3f6cdb..5920377 100644 --- a/pkg/utils/log.go +++ b/pkg/utils/log.go @@ -34,7 +34,8 @@ func (ml *MyLogger) Level() string { } var ( - loggers map[string]*MyLogger + loggers map[string]*MyLogger + DefaultLogLevel = log.InfoLevel ) func init() { From 3612406b7ee9aeba746877c63594eb128f2b4b4b Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Wed, 3 Jul 2024 01:04:30 +0800 Subject: [PATCH 22/36] update. --- examples/b2bua/b2bua/b2bua.go | 173 ++++++++++----- examples/b2bua/b2bua/call.go | 208 ++++++------------ examples/b2bua/b2bua/call_bridge.go | 53 +++++ .../b2bua/b2bua/{rtc.go => rtc_media_tp.go} | 58 ++--- .../b2bua/b2bua/{udp.go => standard_tp.go} | 83 +++---- .../{transport.go => transport_interface.go} | 16 +- examples/b2bua/b2bua/udp_port.go | 6 +- examples/b2bua/b2bua/util.go | 6 +- examples/b2bua/main.go | 8 +- pkg/session/session.go | 4 +- 10 files changed, 328 insertions(+), 287 deletions(-) create mode 100644 examples/b2bua/b2bua/call_bridge.go rename examples/b2bua/b2bua/{rtc.go => rtc_media_tp.go} (90%) rename examples/b2bua/b2bua/{udp.go => standard_tp.go} (77%) rename examples/b2bua/b2bua/{transport.go => transport_interface.go} (61%) diff --git a/examples/b2bua/b2bua/b2bua.go b/examples/b2bua/b2bua/b2bua.go index 4f7c7dc..6fa1250 100644 --- a/examples/b2bua/b2bua/b2bua.go +++ b/examples/b2bua/b2bua/b2bua.go @@ -34,12 +34,13 @@ func pushCallback(pn *registry.PNParams, payload map[string]string) error { // B2BUA . type B2BUA struct { - stack *stack.SipStack - ua *ua.UserAgent - accounts map[string]string - registry registry.Registry - calls []*B2BCall - rfc8599 *registry.RFC8599 + stack *stack.SipStack + ua *ua.UserAgent + accounts map[string]string + registry registry.Registry + callBridges []*CallBridge + calls map[*session.Session]*Call + rfc8599 *registry.RFC8599 } var ( @@ -62,6 +63,7 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { registry: registry.Registry(registry.NewMemoryRegistry()), accounts: make(map[string]string), rfc8599: registry.NewRFC8599(pushCallback), + calls: make(map[*session.Session]*Call), } var authenticator *auth.ServerAuthorizer = nil @@ -125,12 +127,21 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { if from.DisplayName != nil { displayName = from.DisplayName.String() } - call := &B2BCall{src: sess, ua: ua} - call.Init() + offer := &Desc{Type: "offer", SDP: sess.RemoteSdp()} + sdpSess, _ := offer.Parse() + transType := ParseTransportType(sdpSess) - offer := sess.RemoteSdp() - call.SetALegOffer(&Desc{Type: "offer", SDP: offer}) + trackInfos, err := ParseTrackInfos(sdpSess) + if err != nil { + logger.Errorf("ParseTrackInfos error: %v", err) + return + } + + src := &Call{sess: sess} + src.Init(transType, trackInfos) + src.OnOffer(offer) + b.calls[sess] = src // Create a temporary profile. In the future, it will support reading profiles from files or data // For example: use a specific ip or sip account as outbound trunk @@ -140,23 +151,28 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { if err2 != nil { logger.Error(err2) } - var tpType = TransportTypeSIP + var tpType = TransportTypeStandard if instance.SupportIce() { - tpType = TransportTypeRTC + tpType = TransportTypeWebRTC } - bLegOffer, _ := call.CreateBLegOffer(tpType) - dest, err := ua.Invite(profile, called, recipient, &bLegOffer.SDP) + dest := &Call{} + dest.Init(tpType, trackInfos) + destOffer, _ := dest.CreateOffer() + + dsess, err := ua.Invite(profile, called, recipient, &destOffer.SDP) if err != nil { logger.Errorf("B-Leg session error: %v", err) return } - call.dest = dest - - b.calls = append(b.calls, call) + dest.sess = dsess + b.calls[dsess] = dest - call.SetState(Connecting) + bridge := &CallBridge{src: src, dest: dest, bType: B2BCall} + bridge.Init() + bridge.SetState(Connecting) + b.callBridges = append(b.callBridges, bridge) } // Try to find online contact records. @@ -183,6 +199,7 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { return } + logger.Warnf("Not found any records for %v", called) // Could not found any records sess.Reject(404, fmt.Sprintf("%v Not found", called)) @@ -198,36 +215,28 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { // Handle 1XX case session.EarlyMedia: - fallthrough + //bridge.SetState(EarlyMedia) + //bridge.src.Provisional((*resp).StatusCode(), (*resp).Reason()) case session.Provisional: call := b.findCall(sess) - if call != nil && call.dest == sess { + if call != nil { //answer := call.dest.RemoteSdp() - - //call.SetBLegAnswer(&Desc{Type: "answer", SDP: answer}) - + //call.OnAnswer(&Desc{Type: "answer", SDP: answer}) } - // Handle 200OK or ACK case session.Confirmed: //TODO: Add support for forked calls call := b.findCall(sess) - if call != nil && call.dest == sess { - answer := call.dest.RemoteSdp() - call.SetBLegAnswer(&Desc{Type: "answer", SDP: answer}) - if aLegAnswer, err := call.CreateALegAnswer(); err != nil { - logger.Errorf("Create A-Leg Answer failed: %v", err) - return - } else { - replaceCodec(aLegAnswer, answer) - call.src.ProvideAnswer(aLegAnswer.SDP) + if call != nil && sess.Direction() == session.Outgoing { + answer := call.sess.RemoteSdp() + call.OnAnswer(&Desc{Type: "answer", SDP: answer}) + bridge := b.findBridgedCall(sess) + if bridge != nil && bridge.dest.sess == sess && bridge.bType == B2BCall { + bridge.dest.OnAnswer(&Desc{Type: "answer", SDP: answer}) + bridge.src.Accept(answer) + BridgeMediaStream(bridge.src.mediaTransport, bridge.dest.mediaTransport) + bridge.SetState(Confirmed) } - - //call.SetState(EarlyMedia) - //call.src.Provisional((*resp).StatusCode(), (*resp).Reason()) - call.src.Accept(200) - call.BridgeMediaStream() - call.SetState(Confirmed) } // Handle 4XX+ @@ -237,13 +246,11 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { fallthrough case session.Terminated: //TODO: Add support for forked calls + bridge := b.findBridgedCall(sess) call := b.findCall(sess) - if call != nil { - call.Terminate(sess) + if bridge != nil && call != nil { + bridge.Terminate(call) } - - b.removeCall(sess) - } } @@ -257,23 +264,30 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { return b } -func (b *B2BUA) Calls() []*B2BCall { - return b.calls +func (b *B2BUA) findCall(sess *session.Session) *Call { + if call, found := b.calls[sess]; found { + return call + } + return nil +} + +func (b *B2BUA) BridgedCalls() []*CallBridge { + return b.callBridges } -func (b *B2BUA) findCall(sess *session.Session) *B2BCall { - for _, call := range b.calls { - if call.src == sess || call.dest == sess { +func (b *B2BUA) findBridgedCall(sess *session.Session) *CallBridge { + for _, call := range b.callBridges { + if call.src.sess == sess || call.dest.sess == sess { return call } } return nil } -func (b *B2BUA) removeCall(sess *session.Session) { - for idx, call := range b.calls { - if call.src == sess || call.dest == sess { - b.calls = append(b.calls[:idx], b.calls[idx+1:]...) +func (b *B2BUA) removeCallBridge(sess *session.Session) { + for idx, call := range b.callBridges { + if call.src.sess == sess || call.dest.sess == sess { + b.callBridges = append(b.callBridges[:idx], b.callBridges[idx+1:]...) return } } @@ -282,6 +296,59 @@ func (b *B2BUA) removeCall(sess *session.Session) { // Originate . func (b *B2BUA) Originate(source string, destination string) { logger.Infof("Originate %s => %s", source, destination) + /* + doInvite := func(recipient sip.SipUri, tpType TransportType) { + displayName := "" + caller, _ := parser.ParseUri("sip:" + source) + call := &CallBridge{} + + call.Init() + + offer := sess.RemoteSdp() + call.SetALegOffer(&Desc{Type: "offer", SDP: offer}) + + // Create a temporary profile. In the future, it will support reading profiles from files or data + // For example: use a specific ip or sip account as outbound trunk + profile := account.NewProfile(caller, displayName, nil, 0, b.stack) + + bLegOffer, _ := call.CreateBLegOffer(tpType) + + dest, err := b.ua.Invite(profile, caller, recipient, &bLegOffer.SDP) + if err != nil { + logger.Errorf("Can't send invite, error: %v", err) + return + } + + call.dest = dest + } + + srcUri, err := parser.ParseUri("sip:" + source) + if err != nil { + logger.Error(err) + return + } + + destUri, err := parser.ParseSipUri("sip:" + destination) + if err != nil { + logger.Error(err) + return + } + + // Try to find online contact records. + if contacts, found := b.registry.GetContacts(srcUri); found { + for _, instance := range *contacts { + var tpType = TransportTypeSIP + if instance.SupportIce() { + tpType = TransportTypeRTC + } + recipient, err2 := parser.ParseSipUri("sip:" + instance.Contact.Address.User().String() + "@" + instance.Source + ";transport=" + instance.Transport) + if err2 != nil { + logger.Error(err2) + } + doInvite(recipient, tpType) + } + return + }*/ } // Shutdown . diff --git a/examples/b2bua/b2bua/call.go b/examples/b2bua/b2bua/call.go index 3f847ed..9cbdae7 100644 --- a/examples/b2bua/b2bua/call.go +++ b/examples/b2bua/b2bua/call.go @@ -2,7 +2,6 @@ package b2bua import ( "github.com/cloudwebrtc/go-sip-ua/pkg/session" - "github.com/cloudwebrtc/go-sip-ua/pkg/ua" "github.com/pixelbender/go-sdp/sdp" ) @@ -32,126 +31,104 @@ func (d *Desc) FromSdpSession(sess *sdp.Session) error { return nil } -type B2BCall struct { - ua *ua.UserAgent - src *session.Session - dest *session.Session - - srcTrans Transport - destTrans Transport - - state CallState +type Call struct { + // sip session + sess *session.Session + // media transport + mediaTransport MediaTransport srcTrackInfos []*TrackInfo } -func (b *B2BCall) ToString() string { - return (*b.src.CallID()).String() + ", src " + b.src.Contact() + " => dest" + b.dest.Contact() -} +func (b *Call) Init(transType MediaTransportType, trackInfos []*TrackInfo) { + b.srcTrackInfos = trackInfos -func (b *B2BCall) Init() { - b.state = New -} + if transType == TransportTypeWebRTC { + b.mediaTransport = NewWebRTCMediaTransport(trackInfos) + } else { + b.mediaTransport = NewStandardMediaTransport(trackInfos) + } -func (b *B2BCall) State() CallState { - return b.state + b.mediaTransport.Init(callConfig) } -func (b *B2BCall) SetState(state CallState) { - b.state = state +func (b *Call) Id() string { + return string(b.sess.CallID()) } -func (b *B2BCall) Terminate(sess *session.Session) { - - b.srcTrans.OnRtpPacket(nil) - b.destTrans.OnRtpPacket(nil) - - b.srcTrans.OnRtcpPacket(nil) - b.destTrans.OnRtcpPacket(nil) - - if err := b.srcTrans.Close(); err != nil { - logger.Errorf("Close src transport error: %v", err) - } - - if err := b.destTrans.Close(); err != nil { - logger.Errorf("Close dest transport error: %v", err) - } +func (b *Call) ToString() string { + return (b.sess.CallID()).String() + ", uri: " + b.sess.Contact() +} - if b.src == sess { - if b.state != Confirmed { - b.dest.End() - } else { - b.dest.Bye() - } - } else if b.dest == sess { - if b.state != Confirmed { - b.src.End() - } else { - b.src.Bye() - } +func (b *Call) Accept(answer string) { + if aLegAnswer, err := b.mediaTransport.CreateAnswer(); err != nil { + logger.Errorf("Create A-Leg Answer failed: %v", err) + return + } else { + // for sdp fix + replaceCodec(aLegAnswer, answer) + b.sess.ProvideAnswer(aLegAnswer.SDP) } - b.state = Terminated + b.sess.Accept(200) } -func (b *B2BCall) SetALegOffer(sdp *Desc) error { - - sdpSess, _ := sdp.Parse() - transType := ParseTransportType(sdpSess) - logger.Infof("TransportType: %v", transType) - trackInfos, err := ParseTrackInfos(sdpSess) - if err != nil { - logger.Errorf("ParseTrackInfos error: %v", err) - return err +func (b *Call) Terminate() { + if b.sess.IsEstablished() { + b.sess.Bye() + } else if b.sess.IsInProgress() { + b.sess.End() } - - logger.Infof("TrackInfos: %v", trackInfos) - b.srcTrackInfos = trackInfos - print(sdpSess.String()) - - var trans Transport - if transType == TransportTypeRTC { - trans = NewWebRTCTransport(trackInfos) - } else { - trans = NewUdpTansport("inc-"+string(*b.src.CallID()), trackInfos) + b.mediaTransport.OnRtpPacket(nil) + b.mediaTransport.OnRtcpPacket(nil) + if err := b.mediaTransport.Close(); err != nil { + logger.Errorf("Close media transport error: %v", err) } +} - err = trans.Init(callConfig) +func (b *Call) OnOffer(sdp *Desc) error { + /* + sdpSess, _ := sdp.Parse() + transType := ParseTransportType(sdpSess) + logger.Infof("TransportType: %v", transType) + trackInfos, err := ParseTrackInfos(sdpSess) + if err != nil { + logger.Errorf("ParseTrackInfos error: %v", err) + return err + } - if err != nil { - logger.Errorf("Init transport error: %v", err) - return err - } + logger.Infof("TrackInfos: %v", trackInfos) + b.srcTrackInfos = trackInfos + print(sdpSess.String()) + */ - err = trans.OnOffer(sdp) + err := b.mediaTransport.OnOffer(sdp) if err != nil { logger.Errorf("OnOffer error: %v", err) return err } - - b.srcTrans = trans return nil } -func (b *B2BCall) CreateBLegOffer(tpType TransportType) (*Desc, error) { - - var trans Transport +func (b *Call) CreateOffer() (*Desc, error) { + /* + var trans MediaTransport - if tpType == TransportTypeRTC { - trans = NewWebRTCTransport(b.srcTrackInfos) - } else { - trans = NewUdpTansport("out-"+string(*b.src.CallID()), b.srcTrackInfos) - } - - err := trans.Init(callConfig) + if tpType == TransportTypeWebRTC { + trans = NewWebRTCMediaTransport(b.srcTrackInfos) + } else { + trans = NewStandardMediaTransport("out-"+string(*b.src.CallID()), b.srcTrackInfos) + } - if err != nil { - logger.Errorf("Init transport error: %v", err) - return nil, err - } + err := trans.Init(callConfig) - b.destTrans = trans + if err != nil { + logger.Errorf("Init transport error: %v", err) + return nil, err + } - offer, err := trans.CreateOffer() + b.destTrans = trans + */ + offer, err := b.mediaTransport.CreateOffer() if err != nil { logger.Errorf("Offer error: %v", err) return nil, err @@ -159,8 +136,8 @@ func (b *B2BCall) CreateBLegOffer(tpType TransportType) (*Desc, error) { return offer, nil } -func (b *B2BCall) SetBLegAnswer(sdp *Desc) error { - err := b.destTrans.OnAnswer(sdp) +func (b *Call) OnAnswer(sdp *Desc) error { + err := b.mediaTransport.OnAnswer(sdp) if err != nil { logger.Errorf("OnAnswer error: %v", err) return err @@ -169,52 +146,11 @@ func (b *B2BCall) SetBLegAnswer(sdp *Desc) error { return nil } -func (b *B2BCall) CreateALegAnswer() (*Desc, error) { - answer, err := b.srcTrans.CreateAnswer() +func (b *Call) CreateAnswer() (*Desc, error) { + answer, err := b.mediaTransport.CreateAnswer() if err != nil { logger.Errorf("Answer error: %v", err) return nil, err } return answer, nil } - -func (b *B2BCall) BridgeMediaStream() error { - b.srcTrans.OnRtpPacket(func(trackType TrackType, payload []byte) { - _, err := b.destTrans.WriteRTP(trackType, payload) - if err != nil { - logger.Warnf("WriteRTP[%v] %v error: %v", b.destTrans.Type(), trackType, err) - } - }) - b.srcTrans.OnRtcpPacket(func(trackType TrackType, payload []byte) { - _, err := b.destTrans.WriteRTCP(trackType, payload) - if err != nil { - logger.Warnf("WriteRTCP[%v] %v error: %v", b.destTrans.Type(), trackType, err) - } - }) - b.srcTrans.OnRequestKeyFrame(func() { - err := b.destTrans.RequestKeyFrame() - if err != nil { - logger.Warnf("OnRequestKeyFrame[%v] error: %v", b.destTrans.Type(), err) - } - }) - - b.destTrans.OnRtpPacket(func(trackType TrackType, payload []byte) { - _, err := b.srcTrans.WriteRTP(trackType, payload) - if err != nil { - logger.Warnf("WriteRTP[%v] %v error: %v", b.srcTrans.Type(), trackType, err) - } - }) - b.destTrans.OnRtcpPacket(func(trackType TrackType, payload []byte) { - _, err := b.srcTrans.WriteRTCP(trackType, payload) - if err != nil { - logger.Warnf("WriteRTCP[%v] %v error: %v", b.srcTrans.Type(), trackType, err) - } - }) - b.destTrans.OnRequestKeyFrame(func() { - err := b.srcTrans.RequestKeyFrame() - if err != nil { - logger.Warnf("OnRequestKeyFrame[%v] error: %v", b.srcTrans.Type(), err) - } - }) - return nil -} diff --git a/examples/b2bua/b2bua/call_bridge.go b/examples/b2bua/b2bua/call_bridge.go new file mode 100644 index 0000000..50b3936 --- /dev/null +++ b/examples/b2bua/b2bua/call_bridge.go @@ -0,0 +1,53 @@ +package b2bua + +type BridgeType string + +const ( + B2BCall BridgeType = "B2BCall" + OriginateCall BridgeType = "OriginateCall" + Conference BridgeType = "Conference" +) + +type CallBridge struct { + src *Call + dest *Call + state CallState + bType BridgeType +} + +func (b *CallBridge) Init() { + b.state = New +} + +func (b *CallBridge) State() CallState { + return b.state +} + +func (b *CallBridge) SetState(state CallState) { + b.state = state +} + +func (b *CallBridge) ToString() string { + return b.src.ToString() + " -> " + b.dest.ToString() +} + +func (b *CallBridge) Terminate(call *Call) { + if b.bType == B2BCall || b.bType == OriginateCall { + if b.src == call { + b.dest.Terminate() + } else if b.dest == call { + b.src.Terminate() + } + b.state = Terminated + } +} + +func BridgeMediaStream(src, dest MediaTransport) error { + src.OnRtpPacket(dest.WriteRTP) + src.OnRtcpPacket(dest.WriteRTCP) + src.OnRequestKeyFrame(dest.RequestKeyFrame) + dest.OnRtpPacket(src.WriteRTP) + dest.OnRtcpPacket(src.WriteRTCP) + dest.OnRequestKeyFrame(src.RequestKeyFrame) + return nil +} diff --git a/examples/b2bua/b2bua/rtc.go b/examples/b2bua/b2bua/rtc_media_tp.go similarity index 90% rename from examples/b2bua/b2bua/rtc.go rename to examples/b2bua/b2bua/rtc_media_tp.go index 8b1087c..7617d8e 100644 --- a/examples/b2bua/b2bua/rtc.go +++ b/examples/b2bua/b2bua/rtc_media_tp.go @@ -53,7 +53,7 @@ var ( } ) -type WebRTCTransport struct { +type WebRTCMediaTransport struct { pc *webrtc.PeerConnection answer webrtc.SessionDescription offer webrtc.SessionDescription @@ -71,13 +71,13 @@ type WebRTCTransport struct { buff *buffer.Buffer bmu sync.Mutex mu sync.RWMutex - rtpHandler func(trackType TrackType, payload []byte) - rtcpHandler func(trackType TrackType, payload []byte) - requestKeyFrameHandler func() + rtpHandler func(trackType TrackType, payload []byte) (int, error) + rtcpHandler func(trackType TrackType, payload []byte) (int, error) + requestKeyFrameHandler func() error } -func NewWebRTCTransport(trackInfos []*TrackInfo) *WebRTCTransport { - c := &WebRTCTransport{ +func NewWebRTCMediaTransport(trackInfos []*TrackInfo) *WebRTCMediaTransport { + c := &WebRTCMediaTransport{ trackInfos: trackInfos, localTracks: make(map[TrackType]*webrtc.TrackLocalStaticRTP), remoteTracks: make(map[TrackType]*webrtc.TrackRemote), @@ -101,11 +101,11 @@ func NewWebRTCTransport(trackInfos []*TrackInfo) *WebRTCTransport { return c } -func (c *WebRTCTransport) Type() TransportType { - return TransportTypeRTC +func (c *WebRTCMediaTransport) Type() MediaTransportType { + return TransportTypeWebRTC } -func (c *WebRTCTransport) Init(callConfig CallConfig) error { +func (c *WebRTCMediaTransport) Init(callConfig CallConfig) error { // Create a MediaEngine object to configure the supported codec m := &webrtc.MediaEngine{} @@ -275,47 +275,51 @@ func (c *WebRTCTransport) Init(callConfig CallConfig) error { return nil } -func (c *WebRTCTransport) OnRtpPacket(rtpHandler func(trackType TrackType, payload []byte)) { +func (c *WebRTCMediaTransport) OnRtpPacket(rtpHandler func(trackType TrackType, payload []byte) (int, error)) { c.mu.Lock() defer c.mu.Unlock() c.rtpHandler = rtpHandler } -func (c *WebRTCTransport) OnRtcpPacket(rtcpHandler func(trackType TrackType, payload []byte)) { +func (c *WebRTCMediaTransport) OnRtcpPacket(rtcpHandler func(trackType TrackType, payload []byte) (int, error)) { c.mu.Lock() defer c.mu.Unlock() c.rtcpHandler = rtcpHandler } -func (c *WebRTCTransport) OnRequestKeyFrame(keyHandler func()) { +func (c *WebRTCMediaTransport) OnRequestKeyFrame(keyHandler func() error) { c.mu.Lock() defer c.mu.Unlock() c.requestKeyFrameHandler = keyHandler } -func (c *WebRTCTransport) onRtpPacket(trackType TrackType, packet []byte) error { +func (c *WebRTCMediaTransport) onRtpPacket(trackType TrackType, packet []byte) error { logger.Debugf("WebRTCTransport::OnRtpPacketReceived: %v read %d bytes", trackType, len(packet)) c.mu.RLock() defer c.mu.RUnlock() if c.rtpHandler != nil { - c.rtpHandler(trackType, packet) + if _, err := c.rtpHandler(trackType, packet); err != nil { + logger.Errorf("WebRTCTransport::onRtpPacket: panic => %v", err) + } } return nil } -func (c *WebRTCTransport) onRtcpPacket(trackType TrackType, packet []byte) error { +func (c *WebRTCMediaTransport) onRtcpPacket(trackType TrackType, packet []byte) error { logger.Debugf("WebRTCTransport::OnRtcpPacketReceived: %v read %d bytes", trackType, len(packet)) c.mu.RLock() defer c.mu.RUnlock() if c.rtcpHandler != nil { - c.rtcpHandler(trackType, packet) + if _, err := c.rtcpHandler(trackType, packet); err != nil { + logger.Errorf("WebRTCTransport::onRtcpPacket: panic => %v", err) + } } return nil } -func (c *WebRTCTransport) WriteRTP(trackType TrackType, packet []byte) (int, error) { +func (c *WebRTCMediaTransport) WriteRTP(trackType TrackType, packet []byte) (int, error) { if c.closed.Get() { return 0, fmt.Errorf("WebRTCTransport::SendRtpPacket: closed") } @@ -346,7 +350,7 @@ func (c *WebRTCTransport) WriteRTP(trackType TrackType, packet []byte) (int, err return 0, fmt.Errorf("WebRTCTransport::SendRtpPacket: invalid trackType %v", trackType) } -func (c *WebRTCTransport) WriteRTCP(trackType TrackType, packet []byte) (n int, err error) { +func (c *WebRTCMediaTransport) WriteRTCP(trackType TrackType, packet []byte) (n int, err error) { if c.closed.Get() { return 0, fmt.Errorf("WebRTCTransport::SendRtcpPacket: closed") } @@ -362,7 +366,7 @@ func (c *WebRTCTransport) WriteRTCP(trackType TrackType, packet []byte) (n int, return len(packet), nil } -func (c *WebRTCTransport) Close() error { +func (c *WebRTCMediaTransport) Close() error { if c.closed.Get() { return nil } @@ -371,7 +375,7 @@ func (c *WebRTCTransport) Close() error { return c.pc.Close() } -func (c *WebRTCTransport) AddLocalTracks() error { +func (c *WebRTCMediaTransport) AddLocalTracks() error { for _, trackInfo := range c.trackInfos { @@ -421,7 +425,7 @@ func (c *WebRTCTransport) AddLocalTracks() error { return nil } -func (c *WebRTCTransport) CreateOffer() (*Desc, error) { +func (c *WebRTCMediaTransport) CreateOffer() (*Desc, error) { err := c.AddLocalTracks() if err != nil { @@ -444,7 +448,7 @@ func (c *WebRTCTransport) CreateOffer() (*Desc, error) { return &Desc{SDP: c.offer.SDP, Type: "offer"}, nil } -func (c *WebRTCTransport) OnAnswer(answer *Desc) error { +func (c *WebRTCMediaTransport) OnAnswer(answer *Desc) error { c.answer = webrtc.SessionDescription{ Type: webrtc.SDPTypeAnswer, SDP: answer.SDP, @@ -456,7 +460,7 @@ func (c *WebRTCTransport) OnAnswer(answer *Desc) error { return nil } -func (c *WebRTCTransport) OnOffer(offer *Desc) error { +func (c *WebRTCMediaTransport) OnOffer(offer *Desc) error { err := c.AddLocalTracks() if err != nil { @@ -476,7 +480,7 @@ func (c *WebRTCTransport) OnOffer(offer *Desc) error { return nil } -func (c *WebRTCTransport) CreateAnswer() (*Desc, error) { +func (c *WebRTCMediaTransport) CreateAnswer() (*Desc, error) { var err error = nil c.answer, err = c.pc.CreateAnswer(nil) if err != nil { @@ -495,7 +499,7 @@ func (c *WebRTCTransport) CreateAnswer() (*Desc, error) { return &Desc{SDP: c.answer.SDP, Type: "answer"}, nil } -func (c *WebRTCTransport) HandleRtcpFb(rtpSender *webrtc.RTPSender) { +func (c *WebRTCMediaTransport) HandleRtcpFb(rtpSender *webrtc.RTPSender) { // Read incoming RTCP packets // Before these packets are returned they are processed by interceptors. For things // like NACK this needs to be called. @@ -573,7 +577,7 @@ func (c *WebRTCTransport) HandleRtcpFb(rtpSender *webrtc.RTPSender) { }() } -func (c *WebRTCTransport) RequestKeyFrame() error { +func (c *WebRTCMediaTransport) RequestKeyFrame() error { track := c.remoteTracks[TrackTypeVideo] if track == nil { return fmt.Errorf("video track is nil") @@ -582,7 +586,7 @@ func (c *WebRTCTransport) RequestKeyFrame() error { return nil } -func (c *WebRTCTransport) RetransmitPackets(nackedPackets []packetMeta) error { +func (c *WebRTCMediaTransport) RetransmitPackets(nackedPackets []packetMeta) error { c.bmu.Lock() defer c.bmu.Unlock() if c.buff == nil { diff --git a/examples/b2bua/b2bua/udp.go b/examples/b2bua/b2bua/standard_tp.go similarity index 77% rename from examples/b2bua/b2bua/udp.go rename to examples/b2bua/b2bua/standard_tp.go index 4996463..e1bf0b4 100644 --- a/examples/b2bua/b2bua/udp.go +++ b/examples/b2bua/b2bua/standard_tp.go @@ -14,31 +14,28 @@ import ( "github.com/pixelbender/go-sdp/sdp" ) -type UdpTansport struct { +type StandardMediaTransport struct { trackInfos []*TrackInfo ports map[TrackType]*UdpPort localDescription *sdp.Session remoteDescription *sdp.Session mu sync.RWMutex - rtpHandler func(trackType TrackType, payload []byte) - rtcpHandler func(trackType TrackType, payload []byte) - requestKeyFrameHandler func() + rtpHandler func(trackType TrackType, payload []byte) (int, error) + rtcpHandler func(trackType TrackType, payload []byte) (int, error) + requestKeyFrameHandler func() error videoSSRC uint32 closed utils.AtomicBool ctx context.Context cancel context.CancelFunc - - id string } -func NewUdpTansport(id string, trackInfos []*TrackInfo) *UdpTansport { - t := &UdpTansport{ +func NewStandardMediaTransport(trackInfos []*TrackInfo) *StandardMediaTransport { + t := &StandardMediaTransport{ trackInfos: trackInfos, ports: make(map[TrackType]*UdpPort), videoSSRC: 0, - id: id, } t.ctx, t.cancel = context.WithCancel(context.TODO()) @@ -46,7 +43,7 @@ func NewUdpTansport(id string, trackInfos []*TrackInfo) *UdpTansport { return t } -func (c *UdpTansport) Init(config CallConfig) error { +func (c *StandardMediaTransport) Init(config CallConfig) error { host := callConfig.ExternalRtpAddress @@ -82,7 +79,7 @@ func (c *UdpTansport) Init(config CallConfig) error { rRtcpAddr, _ = net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", trackInfo.Connection.Address, trackInfo.RtcpPort)) } - udpPort, err := NewUdpPort(c.id, trackInfo.TrackType, rAddr, rRtcpAddr, config.ExternalRtpAddress) + udpPort, err := NewUdpPort(trackInfo.TrackType, rAddr, rRtcpAddr, config.ExternalRtpAddress) if err != nil { return err } @@ -122,37 +119,26 @@ func (c *UdpTansport) Init(config CallConfig) error { return nil } -func (c *UdpTansport) OnRtpPacket(rtpHandler func(trackType TrackType, payload []byte)) { +func (c *StandardMediaTransport) OnRtpPacket(rtpHandler func(trackType TrackType, payload []byte) (int, error)) { c.mu.Lock() defer c.mu.Unlock() c.rtpHandler = rtpHandler } -func (c *UdpTansport) OnRtcpPacket(rtcpHandler func(trackType TrackType, payload []byte)) { +func (c *StandardMediaTransport) OnRtcpPacket(rtcpHandler func(trackType TrackType, payload []byte) (int, error)) { c.mu.Lock() defer c.mu.Unlock() c.rtcpHandler = rtcpHandler } -func (c *UdpTansport) OnRequestKeyFrame(keyHandler func()) { +func (c *StandardMediaTransport) OnRequestKeyFrame(keyHandler func() error) { c.mu.Lock() defer c.mu.Unlock() c.requestKeyFrameHandler = keyHandler } -func (c *UdpTansport) onRtpPacket(trackType TrackType, packet []byte, raddr net.Addr) error { - logger.Debugf("UdpTansport::OnRtpPacketReceived: %v read %d bytes, raddr %v", trackType, len(packet), raddr) - - if len(packet) == 8 { - pkts, err := rtcp.Unmarshal(packet) - if err != nil { - logger.Errorf("Unmarshal rtcp receiver packets err %v", err) - } - for _, pkt := range pkts { - logger.Warnf("Unkown packet: %v, pkt %v DestinationSSRC %v", trackType, packet, pkt.DestinationSSRC()) - } - return nil - } +func (c *StandardMediaTransport) onRtpPacket(trackType TrackType, packet []byte, raddr net.Addr) error { + logger.Debugf("UdpTansport::onRtpPacket: %v read %d bytes, raddr %v", trackType, len(packet), raddr) p := &rtp.Packet{} if err := p.Unmarshal(packet); err != nil { @@ -168,30 +154,27 @@ func (c *UdpTansport) onRtpPacket(trackType TrackType, packet []byte, raddr net. c.mu.RLock() defer c.mu.RUnlock() - if len(packet) < 12 { - if c.rtcpHandler != nil { - c.rtcpHandler(trackType, packet) - } - } else { - if c.rtpHandler != nil { - c.rtpHandler(trackType, packet) + if c.rtpHandler != nil { + if _, err := c.rtpHandler(trackType, packet); err != nil { + logger.Errorf("UdpTansport::onRtpPacket: panic => %v", err) } } - return nil } -func (c *UdpTansport) onRtcpPacket(trackType TrackType, packet []byte, raddr net.Addr) error { +func (c *StandardMediaTransport) onRtcpPacket(trackType TrackType, packet []byte, raddr net.Addr) error { logger.Debugf("UdpTansport::OnRtcpPacketReceived: %v read %d bytes, raddr %v", trackType, len(packet), raddr) c.mu.RLock() defer c.mu.RUnlock() if c.rtcpHandler != nil { - c.rtcpHandler(trackType, packet) + if _, err := c.rtcpHandler(trackType, packet); err != nil { + logger.Errorf("UdpTansport::onRtcpPacket: panic => %v", err) + } } return nil } -func (c *UdpTansport) WriteRTP(trackType TrackType, packet []byte) (int, error) { +func (c *StandardMediaTransport) WriteRTP(trackType TrackType, packet []byte) (int, error) { /* p := &rtp.Packet{} if err := p.Unmarshal(packet); err != nil { @@ -216,7 +199,7 @@ func (c *UdpTansport) WriteRTP(trackType TrackType, packet []byte) (int, error) return port.WriteRtp(packet) } -func (c *UdpTansport) WriteRTCP(trackType TrackType, packet []byte) (int, error) { +func (c *StandardMediaTransport) WriteRTCP(trackType TrackType, packet []byte) (int, error) { /* pkts, err := rtcp.Unmarshal(packet) if err != nil { @@ -234,11 +217,11 @@ func (c *UdpTansport) WriteRTCP(trackType TrackType, packet []byte) (int, error) return port.WriteRtcp(packet) } -func (c *UdpTansport) Type() TransportType { - return TransportTypeSIP +func (c *StandardMediaTransport) Type() MediaTransportType { + return TransportTypeStandard } -func (c *UdpTansport) Close() error { +func (c *StandardMediaTransport) Close() error { for _, udpPort := range c.ports { udpPort.Close() } @@ -246,14 +229,14 @@ func (c *UdpTansport) Close() error { return nil } -func (c *UdpTansport) CreateOffer() (*Desc, error) { +func (c *StandardMediaTransport) CreateOffer() (*Desc, error) { return &Desc{ Type: "offer", SDP: c.localDescription.String(), }, nil } -func (c *UdpTansport) OnAnswer(answer *Desc) error { +func (c *StandardMediaTransport) OnAnswer(answer *Desc) error { sess, err := sdp.Parse([]byte(answer.SDP)) if err != nil { return err @@ -266,7 +249,7 @@ func (c *UdpTansport) OnAnswer(answer *Desc) error { return nil } -func (c *UdpTansport) OnOffer(offer *Desc) error { +func (c *StandardMediaTransport) OnOffer(offer *Desc) error { sess, err := sdp.Parse([]byte(offer.SDP)) if err != nil { return err @@ -276,21 +259,21 @@ func (c *UdpTansport) OnOffer(offer *Desc) error { return nil } -func (c *UdpTansport) CreateAnswer() (*Desc, error) { +func (c *StandardMediaTransport) CreateAnswer() (*Desc, error) { return &Desc{ Type: "offer", SDP: c.localDescription.String(), }, nil } -func (c *UdpTansport) RequestKeyFrame() error { +func (c *StandardMediaTransport) RequestKeyFrame() error { if c.videoSSRC == 0 { return fmt.Errorf("video ssrc is 0") } return c.sendPLI(c.videoSSRC) } -func (c *UdpTansport) sendPLI(ssrc uint32) error { +func (c *StandardMediaTransport) sendPLI(ssrc uint32) error { pli := rtcp.PictureLossIndication{MediaSSRC: uint32(ssrc)} buf, err := pli.Marshal() if err != nil { @@ -306,7 +289,7 @@ func (c *UdpTansport) sendPLI(ssrc uint32) error { return nil } -func (c *UdpTansport) sendTntervalPlic(ssrc uint32) error { +func (c *StandardMediaTransport) sendTntervalPlic(ssrc uint32) error { go func() { ticker := time.NewTicker(time.Second * 1) for range ticker.C { @@ -331,7 +314,7 @@ func (c *UdpTansport) sendTntervalPlic(ssrc uint32) error { return nil } -func (c *UdpTansport) handleRtcpFeedback(packet []byte) { +func (c *StandardMediaTransport) handleRtcpFeedback(packet []byte) { pkts, err := rtcp.Unmarshal(packet) if err != nil { logger.Errorf("Unmarshal rtcp receiver packets err %v", err) diff --git a/examples/b2bua/b2bua/transport.go b/examples/b2bua/b2bua/transport_interface.go similarity index 61% rename from examples/b2bua/b2bua/transport.go rename to examples/b2bua/b2bua/transport_interface.go index b84c8c6..5b4a551 100644 --- a/examples/b2bua/b2bua/transport.go +++ b/examples/b2bua/b2bua/transport_interface.go @@ -1,25 +1,25 @@ package b2bua -type TransportType string +type MediaTransportType string const ( - TransportTypeSIP TransportType = "SIP" - TransportTypeRTC TransportType = "WebRTC" + TransportTypeStandard MediaTransportType = "Standard-AVP/RTP/UDP" + TransportTypeWebRTC MediaTransportType = "WebRTC-SAVPF/DTLS/SRTP" ) -type Transport interface { +type MediaTransport interface { Init(config CallConfig) error Close() error CreateOffer() (*Desc, error) OnAnswer(desc *Desc) error OnOffer(sdp *Desc) error CreateAnswer() (*Desc, error) - Type() TransportType + Type() MediaTransportType - OnRtpPacket(rtpHandler func(trackType TrackType, payload []byte)) - OnRtcpPacket(rtcpHandler func(trackType TrackType, payload []byte)) + OnRtpPacket(rtpHandler func(trackType TrackType, payload []byte) (int, error)) + OnRtcpPacket(rtcpHandler func(trackType TrackType, payload []byte) (int, error)) - OnRequestKeyFrame(func()) + OnRequestKeyFrame(func() error) WriteRTP(trackType TrackType, payload []byte) (int, error) WriteRTCP(trackType TrackType, payload []byte) (int, error) diff --git a/examples/b2bua/b2bua/udp_port.go b/examples/b2bua/b2bua/udp_port.go index 7feffa1..d3aee2c 100644 --- a/examples/b2bua/b2bua/udp_port.go +++ b/examples/b2bua/b2bua/udp_port.go @@ -22,16 +22,14 @@ type UdpPort struct { externalRtpAddress string rAddr *net.UDPAddr rRtcpAddr *net.UDPAddr - id string } -func NewUdpPort(id string, trackType TrackType, rAddr, rRtcpAddr *net.UDPAddr, externalRtpAddress string) (*UdpPort, error) { +func NewUdpPort(trackType TrackType, rAddr, rRtcpAddr *net.UDPAddr, externalRtpAddress string) (*UdpPort, error) { c := &UdpPort{ trackType: trackType, externalRtpAddress: externalRtpAddress, rAddr: rAddr, rRtcpAddr: rRtcpAddr, - id: id, } c.ctx, c.cancel = context.WithCancel(context.TODO()) c.closed.Set(false) @@ -56,7 +54,7 @@ func (c *UdpPort) Init() error { } } - logger.Infof("[%s-%s] ListenUDP: udp://%s:%v, udp://%s:%v", c.id, c.trackType, host, rtpConns[0].LocalAddr().(*net.UDPAddr).Port, host, rtpConns[1].LocalAddr().(*net.UDPAddr).Port) + logger.Infof("[%s] ListenUDP: udp://%s:%v, udp://%s:%v", c.trackType, host, rtpConns[0].LocalAddr().(*net.UDPAddr).Port, host, rtpConns[1].LocalAddr().(*net.UDPAddr).Port) go c.loop(rtpConns[0], func(packet []byte, raddr net.Addr) { c.mutex.Lock() diff --git a/examples/b2bua/b2bua/util.go b/examples/b2bua/b2bua/util.go index 9b657cc..4a68ea0 100644 --- a/examples/b2bua/b2bua/util.go +++ b/examples/b2bua/b2bua/util.go @@ -352,14 +352,14 @@ func HasWebRTCAttributes(attributes []*sdp.Attr) bool { return hasIce && hasDtls } -func ParseTransportType(sdp *sdp.Session) TransportType { +func ParseTransportType(sdp *sdp.Session) MediaTransportType { for _, m := range sdp.Media { // Proto: "UDP/TLS/RTP/SAVPF" if strings.Contains(m.Proto, "SAVPF") && HasWebRTCAttributes(m.Attributes) { - return TransportTypeRTC + return TransportTypeWebRTC } } - return TransportTypeSIP + return TransportTypeStandard } /* diff --git a/examples/b2bua/main.go b/examples/b2bua/main.go index 5b20e5f..1c526f1 100644 --- a/examples/b2bua/main.go +++ b/examples/b2bua/main.go @@ -99,10 +99,10 @@ func consoleLoop(b2bua *b2bua.B2BUA) { case "calls": fallthrough case "cl": /* call list*/ - calls := b2bua.Calls() - if len(calls) > 0 { - fmt.Printf("Calls:\n") - for _, call := range calls { + bridges := b2bua.BridgedCalls() + if len(bridges) > 0 { + fmt.Printf("Bridged Calls:\n") + for _, call := range bridges { fmt.Printf("%v\n", call.ToString()) } } else { diff --git a/pkg/session/session.go b/pkg/session/session.go index 47ee5d1..e510c93 100644 --- a/pkg/session/session.go +++ b/pkg/session/session.go @@ -107,8 +107,8 @@ func (s *Session) Contact() string { return s.contact.Address.String() } -func (s *Session) CallID() *sip.CallID { - return &s.callID +func (s *Session) CallID() sip.CallID { + return s.callID } func (s *Session) Request() sip.Request { From 9b00da967fb6ff8a26146451148f681d91fe9547 Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Wed, 3 Jul 2024 01:05:35 +0800 Subject: [PATCH 23/36] cleanup. --- examples/b2bua/b2bua/b2bua.go | 6 +++++ examples/b2bua/b2bua/call.go | 39 +++-------------------------- examples/b2bua/b2bua/call_bridge.go | 2 ++ 3 files changed, 11 insertions(+), 36 deletions(-) diff --git a/examples/b2bua/b2bua/b2bua.go b/examples/b2bua/b2bua/b2bua.go index 6fa1250..bbe41d6 100644 --- a/examples/b2bua/b2bua/b2bua.go +++ b/examples/b2bua/b2bua/b2bua.go @@ -251,6 +251,8 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { if bridge != nil && call != nil { bridge.Terminate(call) } + b.removeCall(sess) + b.removeCallBridge(sess) } } @@ -271,6 +273,10 @@ func (b *B2BUA) findCall(sess *session.Session) *Call { return nil } +func (b *B2BUA) removeCall(sess *session.Session) { + delete(b.calls, sess) +} + func (b *B2BUA) BridgedCalls() []*CallBridge { return b.callBridges } diff --git a/examples/b2bua/b2bua/call.go b/examples/b2bua/b2bua/call.go index 9cbdae7..05133d9 100644 --- a/examples/b2bua/b2bua/call.go +++ b/examples/b2bua/b2bua/call.go @@ -37,11 +37,11 @@ type Call struct { // media transport mediaTransport MediaTransport - srcTrackInfos []*TrackInfo + originalTrackInfos []*TrackInfo } func (b *Call) Init(transType MediaTransportType, trackInfos []*TrackInfo) { - b.srcTrackInfos = trackInfos + b.originalTrackInfos = trackInfos if transType == TransportTypeWebRTC { b.mediaTransport = NewWebRTCMediaTransport(trackInfos) @@ -62,7 +62,7 @@ func (b *Call) ToString() string { func (b *Call) Accept(answer string) { if aLegAnswer, err := b.mediaTransport.CreateAnswer(); err != nil { - logger.Errorf("Create A-Leg Answer failed: %v", err) + logger.Errorf("CreateAnswer failed: %v", err) return } else { // for sdp fix @@ -86,21 +86,6 @@ func (b *Call) Terminate() { } func (b *Call) OnOffer(sdp *Desc) error { - /* - sdpSess, _ := sdp.Parse() - transType := ParseTransportType(sdpSess) - logger.Infof("TransportType: %v", transType) - trackInfos, err := ParseTrackInfos(sdpSess) - if err != nil { - logger.Errorf("ParseTrackInfos error: %v", err) - return err - } - - logger.Infof("TrackInfos: %v", trackInfos) - b.srcTrackInfos = trackInfos - print(sdpSess.String()) - */ - err := b.mediaTransport.OnOffer(sdp) if err != nil { logger.Errorf("OnOffer error: %v", err) @@ -110,24 +95,6 @@ func (b *Call) OnOffer(sdp *Desc) error { } func (b *Call) CreateOffer() (*Desc, error) { - /* - var trans MediaTransport - - if tpType == TransportTypeWebRTC { - trans = NewWebRTCMediaTransport(b.srcTrackInfos) - } else { - trans = NewStandardMediaTransport("out-"+string(*b.src.CallID()), b.srcTrackInfos) - } - - err := trans.Init(callConfig) - - if err != nil { - logger.Errorf("Init transport error: %v", err) - return nil, err - } - - b.destTrans = trans - */ offer, err := b.mediaTransport.CreateOffer() if err != nil { logger.Errorf("Offer error: %v", err) diff --git a/examples/b2bua/b2bua/call_bridge.go b/examples/b2bua/b2bua/call_bridge.go index 50b3936..49c950f 100644 --- a/examples/b2bua/b2bua/call_bridge.go +++ b/examples/b2bua/b2bua/call_bridge.go @@ -6,6 +6,8 @@ const ( B2BCall BridgeType = "B2BCall" OriginateCall BridgeType = "OriginateCall" Conference BridgeType = "Conference" + PlayBack BridgeType = "PlayBack" + Record BridgeType = "Record" ) type CallBridge struct { From 526d01df488ffd9262bb45a84e6f2b2995e979a5 Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Wed, 3 Jul 2024 17:05:56 +0800 Subject: [PATCH 24/36] Suppport Originate Call. --- examples/b2bua/b2bua/b2bua.go | 365 ++++++-------------- examples/b2bua/b2bua/call.go | 23 +- examples/b2bua/b2bua/call_bridge.go | 22 +- examples/b2bua/b2bua/call_service.go | 319 +++++++++++++++++ examples/b2bua/b2bua/conf.go | 2 +- examples/b2bua/b2bua/rtc_media_tp.go | 2 +- examples/b2bua/b2bua/standard_tp.go | 12 +- examples/b2bua/b2bua/trackinfo.go | 14 +- examples/b2bua/b2bua/transport_interface.go | 6 +- examples/b2bua/b2bua/udp_port.go | 17 +- examples/b2bua/b2bua/util.go | 10 +- examples/b2bua/main.go | 43 ++- 12 files changed, 546 insertions(+), 289 deletions(-) create mode 100644 examples/b2bua/b2bua/call_service.go diff --git a/examples/b2bua/b2bua/b2bua.go b/examples/b2bua/b2bua/b2bua.go index bbe41d6..205b845 100644 --- a/examples/b2bua/b2bua/b2bua.go +++ b/examples/b2bua/b2bua/b2bua.go @@ -9,13 +9,11 @@ import ( "github.com/cloudwebrtc/go-sip-ua/pkg/account" "github.com/cloudwebrtc/go-sip-ua/pkg/auth" - "github.com/cloudwebrtc/go-sip-ua/pkg/session" "github.com/cloudwebrtc/go-sip-ua/pkg/stack" "github.com/cloudwebrtc/go-sip-ua/pkg/ua" "github.com/cloudwebrtc/go-sip-ua/pkg/utils" "github.com/ghettovoice/gosip/log" "github.com/ghettovoice/gosip/sip" - "github.com/ghettovoice/gosip/sip/parser" "github.com/ghettovoice/gosip/transport" ) @@ -32,50 +30,95 @@ func pushCallback(pn *registry.PNParams, payload map[string]string) error { return fmt.Errorf("%v provider not found", pn.Provider) } +type B2BUAConfig struct { + UserAgent string + DisableAuth bool + EnableTLS bool + EnableWebSocket bool + EnableRFC8599 bool + Dns string + ListenAddress string + UdpPort int + TcpPort int + TlsPort int + WSPort int + WSSPort int + SSLCert string + SSLKey string + UdpPortRange []int + UaMediaConfig UserAgentMediaConfig +} + // B2BUA . type B2BUA struct { - stack *stack.SipStack - ua *ua.UserAgent - accounts map[string]string - registry registry.Registry - callBridges []*CallBridge - calls map[*session.Session]*Call - rfc8599 *registry.RFC8599 + accounts map[string]string + registry registry.Registry + service *CallService + rfc8599 *registry.RFC8599 } var ( - logger log.Logger - callConfig CallConfig + logger log.Logger + b2buaConfig *B2BUAConfig ) func init() { logger = utils.NewLogrusLogger(utils.DefaultLogLevel, "B2BUA", nil) - callConfig = CallConfig{ - Codecs: []string{"PCMU", "PCMA", "opus", "H264"}, - ExternalRtpAddress: "0.0.0.0", - RtcpFeedback: []string{"nack", "nack pli", "ccm fir", "goog-remb", "transport-cc"}, + b2buaConfig = &B2BUAConfig{ + UserAgent: "Go B2BUA/1.0.0", + DisableAuth: false, + EnableWebSocket: false, + EnableTLS: false, + Dns: "8.8.8.8", + ListenAddress: "0.0.0.0", + UdpPort: 5060, + TcpPort: 5060, + TlsPort: 5061, + WSPort: 8088, + WSSPort: 8089, + SSLCert: "certs/cert.pem", + SSLKey: "certs/key.pem", + UdpPortRange: []int{60000, 65535}, + UaMediaConfig: UserAgentMediaConfig{ + Codecs: []string{"PCMU", "PCMA", "opus", "H264", "VP8", "VP9"}, + ExternalRtpAddress: "0.0.0.0", + RtcpFeedback: []string{"nack", "nack pli", "ccm fir", "goog-remb", "transport-cc"}, + }, } } // NewB2BUA . -func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { +func NewB2BUA(disableAuth bool, enableTLS bool, enableWebSocket bool, enalbeRFC8599 bool) *B2BUA { + + b2buaConfig.DisableAuth = disableAuth + b2buaConfig.EnableTLS = enableTLS + b2buaConfig.EnableWebSocket = enableWebSocket + b2buaConfig.EnableRFC8599 = enalbeRFC8599 + + memRegistry := registry.Registry(registry.NewMemoryRegistry()) + b := &B2BUA{ - registry: registry.Registry(registry.NewMemoryRegistry()), + registry: memRegistry, accounts: make(map[string]string), - rfc8599: registry.NewRFC8599(pushCallback), - calls: make(map[*session.Session]*Call), + } + + if b2buaConfig.EnableRFC8599 { + b.rfc8599 = registry.NewRFC8599(pushCallback) + logger.Infof("RFC8599 enabled") } var authenticator *auth.ServerAuthorizer = nil - if !disableAuth { + if !b2buaConfig.DisableAuth { authenticator = auth.NewServerAuthorizer(b.requestCredential, "b2bua", false) + } else { + logger.Warn("Auth disabled") } stack := stack.NewSipStack(&stack.SipStackConfig{ - UserAgent: "Go B2BUA/1.0.0", + UserAgent: b2buaConfig.UserAgent, Extensions: []string{"replaces", "outbound"}, - Dns: "8.8.8.8", + Dns: b2buaConfig.Dns, ServerAuthManager: stack.ServerAuthManager{ Authenticator: authenticator, RequiresChallenge: b.requiresChallenge, @@ -84,282 +127,76 @@ func NewB2BUA(disableAuth bool, enableTLS bool) *B2BUA { stack.OnConnectionError(b.handleConnectionError) - if err := stack.Listen("udp", "0.0.0.0:5060"); err != nil { + var listenAddress = fmt.Sprintf("%s:%d", b2buaConfig.ListenAddress, b2buaConfig.UdpPort) + + if err := stack.Listen("udp", listenAddress); err != nil { logger.Panic(err) } + logger.Infof("listening on: udp://%s", listenAddress) - if err := stack.Listen("tcp", "0.0.0.0:5060"); err != nil { + listenAddress = fmt.Sprintf("%s:%d", b2buaConfig.ListenAddress, b2buaConfig.TcpPort) + if err := stack.Listen("tcp", listenAddress); err != nil { logger.Panic(err) } - if enableTLS { - tlsOptions := &transport.TLSConfig{Cert: "certs/cert.pem", Key: "certs/key.pem"} + logger.Infof("listening on: tcp://%s", listenAddress) - if err := stack.ListenTLS("tls", "0.0.0.0:5061", tlsOptions); err != nil { - logger.Panic(err) - } - - if err := stack.ListenTLS("wss", "0.0.0.0:8089", tlsOptions); err != nil { + if b2buaConfig.EnableWebSocket { + listenAddress = fmt.Sprintf("%s:%d", b2buaConfig.ListenAddress, b2buaConfig.WSPort) + if err := stack.Listen("ws", listenAddress); err != nil { logger.Panic(err) } + logger.Infof("listening on: ws://%s", listenAddress) } - ua := ua.NewUserAgent(&ua.UserAgentConfig{ - SipStack: stack, - }) - - ua.InviteStateHandler = func(sess *session.Session, req *sip.Request, resp *sip.Response, state session.Status) { - logger.Infof("InviteStateHandler: state => %v, type => %s", state, sess.Direction()) - - switch state { - // Handle outgoing call. - case session.InviteSent: - - // Handle incoming call. - case session.InviteReceived: - to, _ := (*req).To() - from, _ := (*req).From() - caller := from.Address - called := to.Address - - doInvite := func(instance *registry.ContactInstance) { - displayName := "" - if from.DisplayName != nil { - displayName = from.DisplayName.String() - } - - offer := &Desc{Type: "offer", SDP: sess.RemoteSdp()} - sdpSess, _ := offer.Parse() - transType := ParseTransportType(sdpSess) - - trackInfos, err := ParseTrackInfos(sdpSess) - if err != nil { - logger.Errorf("ParseTrackInfos error: %v", err) - return - } - - src := &Call{sess: sess} - src.Init(transType, trackInfos) - src.OnOffer(offer) - b.calls[sess] = src - - // Create a temporary profile. In the future, it will support reading profiles from files or data - // For example: use a specific ip or sip account as outbound trunk - profile := account.NewProfile(caller, displayName, nil, 0, stack) - - recipient, err2 := parser.ParseSipUri("sip:" + called.User().String() + "@" + instance.Source + ";transport=" + instance.Transport) - if err2 != nil { - logger.Error(err2) - } - var tpType = TransportTypeStandard - if instance.SupportIce() { - tpType = TransportTypeWebRTC - } - - dest := &Call{} - dest.Init(tpType, trackInfos) - destOffer, _ := dest.CreateOffer() - - dsess, err := ua.Invite(profile, called, recipient, &destOffer.SDP) - if err != nil { - logger.Errorf("B-Leg session error: %v", err) - return - } - - dest.sess = dsess - b.calls[dsess] = dest - - bridge := &CallBridge{src: src, dest: dest, bType: B2BCall} - bridge.Init() - bridge.SetState(Connecting) - b.callBridges = append(b.callBridges, bridge) - } - - // Try to find online contact records. - if contacts, found := b.registry.GetContacts(called); found { - sess.Provisional(100, "Trying") - for _, instance := range *contacts { - doInvite(instance) - } - return - } - - // Pushable: try to find pn-params in contact records. - // Try to push the UA and wait for it to wake up. - pusher, ok := b.rfc8599.TryPush(called, from) - if ok { - sess.Provisional(100, "Trying") - instance, err := pusher.WaitContactOnline() - if err != nil { - logger.Errorf("Push failed, error: %v", err) - sess.Reject(500, "Push failed") - return - } - doInvite(instance) - return - } + if b2buaConfig.EnableTLS { - logger.Warnf("Not found any records for %v", called) - // Could not found any records - sess.Reject(404, fmt.Sprintf("%v Not found", called)) - - // Handle re-INVITE or UPDATE. - case session.ReInviteReceived: - logger.Infof("re-INVITE") - switch sess.Direction() { - case session.Incoming: - sess.Accept(200) - case session.Outgoing: - //TODO: Need to provide correct answer. - } + logger.Infof("TLS enabled: %s, %s", b2buaConfig.SSLCert, b2buaConfig.SSLKey) + tlsOptions := &transport.TLSConfig{Cert: b2buaConfig.SSLCert, Key: b2buaConfig.SSLKey} - // Handle 1XX - case session.EarlyMedia: - //bridge.SetState(EarlyMedia) - //bridge.src.Provisional((*resp).StatusCode(), (*resp).Reason()) - case session.Provisional: - call := b.findCall(sess) - if call != nil { - //answer := call.dest.RemoteSdp() - //call.OnAnswer(&Desc{Type: "answer", SDP: answer}) - } - // Handle 200OK or ACK - case session.Confirmed: - //TODO: Add support for forked calls - call := b.findCall(sess) - if call != nil && sess.Direction() == session.Outgoing { - answer := call.sess.RemoteSdp() - call.OnAnswer(&Desc{Type: "answer", SDP: answer}) - bridge := b.findBridgedCall(sess) - if bridge != nil && bridge.dest.sess == sess && bridge.bType == B2BCall { - bridge.dest.OnAnswer(&Desc{Type: "answer", SDP: answer}) - bridge.src.Accept(answer) - BridgeMediaStream(bridge.src.mediaTransport, bridge.dest.mediaTransport) - bridge.SetState(Confirmed) - } - } + listenAddress = fmt.Sprintf("%s:%d", b2buaConfig.ListenAddress, b2buaConfig.TlsPort) + if err := stack.ListenTLS("tls", listenAddress, tlsOptions); err != nil { + logger.Panic(err) + } - // Handle 4XX+ - case session.Failure: - fallthrough - case session.Canceled: - fallthrough - case session.Terminated: - //TODO: Add support for forked calls - bridge := b.findBridgedCall(sess) - call := b.findCall(sess) - if bridge != nil && call != nil { - bridge.Terminate(call) + logger.Infof("listening on: tls://%s", listenAddress) + if b2buaConfig.EnableWebSocket { + listenAddress = fmt.Sprintf("%s:%d", b2buaConfig.ListenAddress, b2buaConfig.WSSPort) + if err := stack.ListenTLS("wss", "0.0.0.0:8089", tlsOptions); err != nil { + logger.Panic(err) } - b.removeCall(sess) - b.removeCallBridge(sess) + logger.Infof("listening on: wss://%s", listenAddress) } } - ua.RegisterStateHandler = func(state account.RegisterState) { - logger.Infof("RegisterStateHandler: state => %v", state) - } + ua := ua.NewUserAgent(&ua.UserAgentConfig{ + SipStack: stack, + }) + ua.RegisterStateHandler = b.registerStateHandler stack.OnRequest(sip.REGISTER, b.handleRegister) - b.stack = stack - b.ua = ua - return b -} -func (b *B2BUA) findCall(sess *session.Session) *Call { - if call, found := b.calls[sess]; found { - return call - } - return nil + b.service = NewCallService(stack, ua, memRegistry, b.rfc8599) + ua.InviteStateHandler = b.service.inviteStateHandler + return b } -func (b *B2BUA) removeCall(sess *session.Session) { - delete(b.calls, sess) +func (b *B2BUA) registerStateHandler(state account.RegisterState) { + logger.Infof("RegisterStateHandler: state => %v", state) } func (b *B2BUA) BridgedCalls() []*CallBridge { - return b.callBridges -} - -func (b *B2BUA) findBridgedCall(sess *session.Session) *CallBridge { - for _, call := range b.callBridges { - if call.src.sess == sess || call.dest.sess == sess { - return call - } - } - return nil -} - -func (b *B2BUA) removeCallBridge(sess *session.Session) { - for idx, call := range b.callBridges { - if call.src.sess == sess || call.dest.sess == sess { - b.callBridges = append(b.callBridges[:idx], b.callBridges[idx+1:]...) - return - } - } + return b.service.callBridges } // Originate . func (b *B2BUA) Originate(source string, destination string) { - logger.Infof("Originate %s => %s", source, destination) - /* - doInvite := func(recipient sip.SipUri, tpType TransportType) { - displayName := "" - caller, _ := parser.ParseUri("sip:" + source) - call := &CallBridge{} - - call.Init() - - offer := sess.RemoteSdp() - call.SetALegOffer(&Desc{Type: "offer", SDP: offer}) - - // Create a temporary profile. In the future, it will support reading profiles from files or data - // For example: use a specific ip or sip account as outbound trunk - profile := account.NewProfile(caller, displayName, nil, 0, b.stack) - - bLegOffer, _ := call.CreateBLegOffer(tpType) - - dest, err := b.ua.Invite(profile, caller, recipient, &bLegOffer.SDP) - if err != nil { - logger.Errorf("Can't send invite, error: %v", err) - return - } - - call.dest = dest - } - - srcUri, err := parser.ParseUri("sip:" + source) - if err != nil { - logger.Error(err) - return - } - - destUri, err := parser.ParseSipUri("sip:" + destination) - if err != nil { - logger.Error(err) - return - } - - // Try to find online contact records. - if contacts, found := b.registry.GetContacts(srcUri); found { - for _, instance := range *contacts { - var tpType = TransportTypeSIP - if instance.SupportIce() { - tpType = TransportTypeRTC - } - recipient, err2 := parser.ParseSipUri("sip:" + instance.Contact.Address.User().String() + "@" + instance.Source + ";transport=" + instance.Transport) - if err2 != nil { - logger.Error(err2) - } - doInvite(recipient, tpType) - } - return - }*/ + b.service.Originate(source, destination) } // Shutdown . func (b *B2BUA) Shutdown() { - b.ua.Shutdown() + b.service.Shutdown() } func (b *B2BUA) requiresChallenge(req sip.Request) bool { diff --git a/examples/b2bua/b2bua/call.go b/examples/b2bua/b2bua/call.go index 05133d9..4f7157f 100644 --- a/examples/b2bua/b2bua/call.go +++ b/examples/b2bua/b2bua/call.go @@ -2,6 +2,7 @@ package b2bua import ( "github.com/cloudwebrtc/go-sip-ua/pkg/session" + "github.com/ghettovoice/gosip/sip" "github.com/pixelbender/go-sdp/sdp" ) @@ -17,6 +18,10 @@ const ( Terminated CallState = "Terminated" ) +func (s CallState) String() string { + return string(s) +} + type Desc struct { Type string `json:"type"` SDP string `json:"sdp"` @@ -49,7 +54,7 @@ func (b *Call) Init(transType MediaTransportType, trackInfos []*TrackInfo) { b.mediaTransport = NewStandardMediaTransport(trackInfos) } - b.mediaTransport.Init(callConfig) + b.mediaTransport.Init(b2buaConfig.UaMediaConfig) } func (b *Call) Id() string { @@ -60,6 +65,22 @@ func (b *Call) ToString() string { return (b.sess.CallID()).String() + ", uri: " + b.sess.Contact() } +func (b *Call) MediaInfo() string { + info := "[" + b.mediaTransport.Type().String() + "]" + for _, trackInfo := range b.originalTrackInfos { + info += trackInfo.String() + " " + } + return info +} + +func (b *Call) Provisional(statusCode sip.StatusCode, reason string) { + b.sess.Provisional(statusCode, reason) +} + +func (b *Call) Reject(statusCode sip.StatusCode, reason string) { + b.sess.Reject(statusCode, reason) +} + func (b *Call) Accept(answer string) { if aLegAnswer, err := b.mediaTransport.CreateAnswer(); err != nil { logger.Errorf("CreateAnswer failed: %v", err) diff --git a/examples/b2bua/b2bua/call_bridge.go b/examples/b2bua/b2bua/call_bridge.go index 49c950f..940a4f2 100644 --- a/examples/b2bua/b2bua/call_bridge.go +++ b/examples/b2bua/b2bua/call_bridge.go @@ -10,6 +10,10 @@ const ( Record BridgeType = "Record" ) +func (b BridgeType) String() string { + return string(b) +} + type CallBridge struct { src *Call dest *Call @@ -29,8 +33,24 @@ func (b *CallBridge) SetState(state CallState) { b.state = state } +func (b *CallBridge) Src() *Call { + return b.src +} + +func (b *CallBridge) Dest() *Call { + return b.dest +} + +func (b *CallBridge) Type() BridgeType { + return b.bType +} + func (b *CallBridge) ToString() string { - return b.src.ToString() + " -> " + b.dest.ToString() + str := b.Type().String() + ": [" + b.src.ToString() + " -> " + b.dest.ToString() + "]\n" + str = str + "State: " + b.State().String() + "\n" + str = str + "Src: " + b.src.MediaInfo() + "\n" + str = str + "Dest: " + b.dest.MediaInfo() + return str } func (b *CallBridge) Terminate(call *Call) { diff --git a/examples/b2bua/b2bua/call_service.go b/examples/b2bua/b2bua/call_service.go new file mode 100644 index 0000000..dd76222 --- /dev/null +++ b/examples/b2bua/b2bua/call_service.go @@ -0,0 +1,319 @@ +package b2bua + +import ( + "fmt" + + "github.com/cloudwebrtc/go-sip-ua/examples/b2bua/registry" + "github.com/cloudwebrtc/go-sip-ua/pkg/account" + "github.com/cloudwebrtc/go-sip-ua/pkg/session" + "github.com/cloudwebrtc/go-sip-ua/pkg/stack" + "github.com/cloudwebrtc/go-sip-ua/pkg/ua" + "github.com/ghettovoice/gosip/sip" + "github.com/ghettovoice/gosip/sip/parser" + "github.com/pixelbender/go-sdp/sdp" +) + +type CallService struct { + registry registry.Registry + rfc8599 *registry.RFC8599 + callBridges []*CallBridge + calls map[*session.Session]*Call + stack *stack.SipStack + ua *ua.UserAgent +} + +func NewCallService(stack *stack.SipStack, ua *ua.UserAgent, registry registry.Registry, rfc8599 *registry.RFC8599) *CallService { + return &CallService{ + stack: stack, + ua: ua, + registry: registry, + rfc8599: rfc8599, + calls: make(map[*session.Session]*Call), + } +} + +func (s *CallService) Init() { +} + +func (s *CallService) inviteStateHandler(sess *session.Session, req *sip.Request, resp *sip.Response, state session.Status) { + logger.Infof("InviteStateHandler: sess %v, state => %v, type => %s", sess.CallID().String(), state, sess.Direction()) + + switch state { + // Handle outgoing call. + case session.InviteSent: + call := s.findCall(sess) + if call != nil { + //TODO: Add support for forked calls + } + // Handle incoming call. + case session.InviteReceived: + offer := &Desc{Type: "offer", SDP: sess.RemoteSdp()} + sdpSess, _ := offer.Parse() + transType := ParseTransportType(sdpSess) + + trackInfos, err := ParseTrackInfos(sdpSess) + if err != nil { + logger.Errorf("ParseTrackInfos error: %v", err) + return + } + + src := &Call{sess: sess} + src.Init(transType, trackInfos) + src.OnOffer(offer) + s.calls[sess] = src + + if code, err := s.handleIncomingCall(src, req); err != nil { + logger.Warnf("handleIncomingCall error: %v, code: %s", err, code) + src.Reject(code, fmt.Sprintf("%v", err)) + s.removeCall(sess) + return + } + // Handle re-INVITE or UPDATE. + case session.ReInviteReceived: + logger.Infof("re-INVITE") + switch sess.Direction() { + case session.Incoming: + sess.Accept(200) + case session.Outgoing: + //TODO: Need to provide correct answer. + } + + // Handle 1XX + case session.EarlyMedia: + fallthrough + case session.Provisional: + call := s.findCall(sess) + if call != nil { + //bridge.SetState(EarlyMedia) + //bridge.src.Provisional((*resp).StatusCode(), (*resp).Reason()) + } + // Handle 200OK or ACK + case session.Confirmed: + //TODO: Add support for forked calls + call := s.findCall(sess) + if call != nil && sess.Direction() == session.Outgoing { + answer := call.sess.RemoteSdp() + call.OnAnswer(&Desc{Type: "answer", SDP: answer}) + bridge := s.findBridgedCallByCall(call) + if bridge != nil && bridge.dest.sess == sess && bridge.bType == B2BCall { + bridge.dest.OnAnswer(&Desc{Type: "answer", SDP: answer}) + bridge.src.Accept(answer) + BridgeMediaStream(bridge.src.mediaTransport, bridge.dest.mediaTransport) + bridge.SetState(Confirmed) + } + } + + // Handle 4XX+ + case session.Failure: + fallthrough + case session.Canceled: + fallthrough + case session.Terminated: + //TODO: Add support for forked calls + call := s.findCall(sess) + if call != nil { + bridge := s.findBridgedCallByCall(call) + if bridge != nil { + bridge.Terminate(call) + } + s.removeCallBridgeByCall(call) + } + s.removeCall(sess) + } +} + +func (s *CallService) handleIncomingCall(src *Call, req *sip.Request) (sip.StatusCode, error) { + src.Provisional(100, "Trying") + + to, _ := (*req).To() + from, _ := (*req).From() + + caller := from.Address + called := to.Address + + displayName := "" + if from.DisplayName != nil { + displayName = from.DisplayName.String() + } + + // Try to find online contact records. + if contacts, found := s.registry.GetContacts(called); found { + for _, instance := range *contacts { + dest, err := s.makeOutgoingCall(caller, displayName, called, instance, src.originalTrackInfos) + if err != nil { + logger.Errorf("makeOutgoingCall error: %v", err) + return 500, err + } + s.StoreBridgedCall(src, dest, B2BCall) + return 0, nil + } + } + + if s.rfc8599 != nil { + // Pushable: try to find pn-params in contact records. + // Try to push the UA and wait for it to wake up. + pusher, ok := s.rfc8599.TryPush(called, from) + if ok { + instance, err := pusher.WaitContactOnline() + if err != nil { + logger.Errorf("Push failed, error: %v", err) + src.Reject(500, "Push failed") + return 500, err + } + dest, err := s.makeOutgoingCall(caller, displayName, called, instance, src.originalTrackInfos) + if err != nil { + logger.Errorf("makeOutgoingCall error: %v", err) + return 500, err + } + s.StoreBridgedCall(src, dest, B2BCall) + return 0, err + } + } + + // try make direct call + dest, err := s.makeOutgoingCall(caller, displayName, called, nil, src.originalTrackInfos) + if err != nil { + logger.Errorf("makeOutgoingCall error: %v", err) + return 500, err + } + + s.StoreBridgedCall(src, dest, B2BCall) + return 0, nil +} + +func (s *CallService) StoreBridgedCall(src, dest *Call, bType BridgeType) *CallBridge { + bridge := &CallBridge{src: src, dest: dest, bType: bType} + bridge.Init() + bridge.SetState(Connecting) + s.callBridges = append(s.callBridges, bridge) + return bridge +} + +func (s *CallService) makeOutgoingCall(caller sip.Uri, displayName string, called sip.Uri, instance *registry.ContactInstance, trackInfos []*TrackInfo) (*Call, error) { + + profile := account.NewProfile(caller, displayName, nil, 0, s.stack) + + destUri := "sip:" + called.User().String() + "@" + + if instance != nil { + destUri = destUri + instance.Source + ";transport=" + instance.Transport + } else { + destUri = destUri + called.Host() + ";transport=udp" + } + + recipient, err2 := parser.ParseSipUri(destUri) + if err2 != nil { + logger.Error(err2) + } + var tpType = TransportTypeStandard + + if instance != nil && instance.SupportIce() { + tpType = TransportTypeWebRTC + } + + dest := &Call{} + dest.Init(tpType, trackInfos) + destOffer, _ := dest.CreateOffer() + + sess, err := s.ua.Invite(profile, called, recipient, &destOffer.SDP) + if err != nil { + logger.Errorf("makeOutgoingCall error: %v", err) + return nil, err + } + dest.sess = sess + s.calls[sess] = dest + return dest, nil + +} + +func (s *CallService) findBridgedCallByCall(call *Call) *CallBridge { + for _, bridge := range s.callBridges { + if bridge.src == call || bridge.dest == call { + return bridge + } + } + return nil +} + +func (s *CallService) removeCallBridgeByCall(call *Call) { + for idx, bridge := range s.callBridges { + if bridge.src == call || bridge.dest == call { + s.callBridges = append(s.callBridges[:idx], s.callBridges[idx+1:]...) + return + } + } +} + +func (s *CallService) findCall(sess *session.Session) *Call { + if call, found := s.calls[sess]; found { + return call + } + return nil +} + +func (s *CallService) removeCall(sess *session.Session) { + delete(s.calls, sess) +} + +func (s *CallService) Shutdown() { + s.ua.Shutdown() +} + +func (s *CallService) Originate(source string, destination string) error { + logger.Infof("Originate %s => %s", source, destination) + + displayName := "Originate" + + srcUri, err := parser.ParseUri("sip:" + source + "@127.0.0.1") + if err != nil { + logger.Error(err) + } + + destUri, err := parser.ParseUri("sip:" + destination + "@127.0.0.1") + if err != nil { + logger.Error(err) + } + + var srcCall *Call = nil + var destCall *Call = nil + + var audioCodecs []*sdp.Format + var videoCodecs []*sdp.Format + + for _, codec := range defaultAudioCodecs { + audioCodecs = append(audioCodecs, codec) + } + + for _, codec := range defaultVideoCodecs { + videoCodecs = append(videoCodecs, codec) + } + + originalTrackInfos := []*TrackInfo{ + {TrackType: TrackTypeAudio, Direction: "sendrecv", Codecs: audioCodecs}, + {TrackType: TrackTypeVideo, Direction: "sendrecv", Codecs: videoCodecs}, + } + var err2 error = nil + if contacts, found := s.registry.GetContacts(srcUri); found { + for _, instance := range *contacts { + srcCall, err2 = s.makeOutgoingCall(srcUri, displayName, destUri, instance, originalTrackInfos) + if err != nil { + logger.Errorf("Originate error: %v", err) + return err2 + } + } + } + + if contacts, found := s.registry.GetContacts(destUri); found { + for _, instance := range *contacts { + destCall, err2 = s.makeOutgoingCall(destUri, displayName, srcUri, instance, originalTrackInfos) + if err != nil { + logger.Errorf("Originate error: %v", err) + return err2 + } + } + } + + s.StoreBridgedCall(srcCall, destCall, OriginateCall) + BridgeMediaStream(srcCall.mediaTransport, destCall.mediaTransport) + return nil +} diff --git a/examples/b2bua/b2bua/conf.go b/examples/b2bua/b2bua/conf.go index 443c021..6c79d9b 100644 --- a/examples/b2bua/b2bua/conf.go +++ b/examples/b2bua/b2bua/conf.go @@ -1,6 +1,6 @@ package b2bua -type CallConfig struct { +type UserAgentMediaConfig struct { Codecs []string `json:"codecs"` ExternalRtpAddress string `json:"external_rtp_address"` RtcpFeedback []string `json:"rtcp_feedback"` diff --git a/examples/b2bua/b2bua/rtc_media_tp.go b/examples/b2bua/b2bua/rtc_media_tp.go index 7617d8e..f6fc4fb 100644 --- a/examples/b2bua/b2bua/rtc_media_tp.go +++ b/examples/b2bua/b2bua/rtc_media_tp.go @@ -105,7 +105,7 @@ func (c *WebRTCMediaTransport) Type() MediaTransportType { return TransportTypeWebRTC } -func (c *WebRTCMediaTransport) Init(callConfig CallConfig) error { +func (c *WebRTCMediaTransport) Init(umc UserAgentMediaConfig) error { // Create a MediaEngine object to configure the supported codec m := &webrtc.MediaEngine{} diff --git a/examples/b2bua/b2bua/standard_tp.go b/examples/b2bua/b2bua/standard_tp.go index e1bf0b4..8511614 100644 --- a/examples/b2bua/b2bua/standard_tp.go +++ b/examples/b2bua/b2bua/standard_tp.go @@ -43,9 +43,9 @@ func NewStandardMediaTransport(trackInfos []*TrackInfo) *StandardMediaTransport return t } -func (c *StandardMediaTransport) Init(config CallConfig) error { +func (c *StandardMediaTransport) Init(umc UserAgentMediaConfig) error { - host := callConfig.ExternalRtpAddress + host := b2buaConfig.UaMediaConfig.ExternalRtpAddress if host == "" || host == "0.0.0.0" { if v, err := util.ResolveSelfIP(); err == nil { @@ -79,7 +79,7 @@ func (c *StandardMediaTransport) Init(config CallConfig) error { rRtcpAddr, _ = net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", trackInfo.Connection.Address, trackInfo.RtcpPort)) } - udpPort, err := NewUdpPort(trackInfo.TrackType, rAddr, rRtcpAddr, config.ExternalRtpAddress) + udpPort, err := NewUdpPort(trackInfo.TrackType, rAddr, rRtcpAddr, umc.ExternalRtpAddress) if err != nil { return err } @@ -156,7 +156,7 @@ func (c *StandardMediaTransport) onRtpPacket(trackType TrackType, packet []byte, defer c.mu.RUnlock() if c.rtpHandler != nil { if _, err := c.rtpHandler(trackType, packet); err != nil { - logger.Errorf("UdpTansport::onRtpPacket: panic => %v", err) + logger.Warnf("UdpTansport::onRtpPacket: panic => %v", err) } } return nil @@ -168,13 +168,14 @@ func (c *StandardMediaTransport) onRtcpPacket(trackType TrackType, packet []byte defer c.mu.RUnlock() if c.rtcpHandler != nil { if _, err := c.rtcpHandler(trackType, packet); err != nil { - logger.Errorf("UdpTansport::onRtcpPacket: panic => %v", err) + logger.Warnf("UdpTansport::onRtcpPacket: panic => %v", err) } } return nil } func (c *StandardMediaTransport) WriteRTP(trackType TrackType, packet []byte) (int, error) { + logger.Debugf("UdpTansport::WriteRTP: %v, write %d bytes", trackType, len(packet)) /* p := &rtp.Packet{} if err := p.Unmarshal(packet); err != nil { @@ -200,6 +201,7 @@ func (c *StandardMediaTransport) WriteRTP(trackType TrackType, packet []byte) (i } func (c *StandardMediaTransport) WriteRTCP(trackType TrackType, packet []byte) (int, error) { + logger.Debugf("UdpTansport::WriteRTCP: %v, write %d bytes", trackType, len(packet)) /* pkts, err := rtcp.Unmarshal(packet) if err != nil { diff --git a/examples/b2bua/b2bua/trackinfo.go b/examples/b2bua/b2bua/trackinfo.go index d04978f..fc7cdca 100644 --- a/examples/b2bua/b2bua/trackinfo.go +++ b/examples/b2bua/b2bua/trackinfo.go @@ -1,6 +1,10 @@ package b2bua -import "github.com/pixelbender/go-sdp/sdp" +import ( + "fmt" + + "github.com/pixelbender/go-sdp/sdp" +) type TrackType string @@ -9,6 +13,10 @@ const ( TrackTypeVideo TrackType = "video" ) +func (t TrackType) String() string { + return string(t) +} + type TrackInfo struct { TrackType TrackType Codecs []*sdp.Format @@ -17,3 +25,7 @@ type TrackInfo struct { Port int RtcpPort int } + +func (t *TrackInfo) String() string { + return t.TrackType.String() + ": " + t.Codecs[0].Name + "/" + fmt.Sprintf("%d", t.Codecs[0].ClockRate) + ", pt: " + fmt.Sprintf("%d", t.Codecs[0].Payload) +} diff --git a/examples/b2bua/b2bua/transport_interface.go b/examples/b2bua/b2bua/transport_interface.go index 5b4a551..5b809a5 100644 --- a/examples/b2bua/b2bua/transport_interface.go +++ b/examples/b2bua/b2bua/transport_interface.go @@ -7,8 +7,12 @@ const ( TransportTypeWebRTC MediaTransportType = "WebRTC-SAVPF/DTLS/SRTP" ) +func (t MediaTransportType) String() string { + return string(t) +} + type MediaTransport interface { - Init(config CallConfig) error + Init(umc UserAgentMediaConfig) error Close() error CreateOffer() (*Desc, error) OnAnswer(desc *Desc) error diff --git a/examples/b2bua/b2bua/udp_port.go b/examples/b2bua/b2bua/udp_port.go index d3aee2c..873827f 100644 --- a/examples/b2bua/b2bua/udp_port.go +++ b/examples/b2bua/b2bua/udp_port.go @@ -41,20 +41,31 @@ func (c *UdpPort) Init() error { lRtcpAddr := &net.UDPAddr{IP: net.ParseIP("0.0.0.0"), Port: 0} // TODO: set port range from config - rtpConns, err := ListenRTPInPortRange(4000, 5000, "udp", lAddr, lRtcpAddr) + udpPortRangeMin := 4000 + udpPortRangeMax := 5000 + + if b2buaConfig.UdpPortRange[0] != 0 { + udpPortRangeMin = b2buaConfig.UdpPortRange[0] + } + + if b2buaConfig.UdpPortRange[1] != 0 { + udpPortRangeMax = b2buaConfig.UdpPortRange[1] + } + + rtpConns, err := ListenRTPInPortRange(udpPortRangeMin, udpPortRangeMax, "udp", lAddr, lRtcpAddr) if err != nil { logger.Errorf("ListenUDP: err => %v", err) return err } - host := callConfig.ExternalRtpAddress + host := b2buaConfig.UaMediaConfig.ExternalRtpAddress if host == "" || host == "0.0.0.0" { if v, err := util.ResolveSelfIP(); err == nil { host = v.String() } } - logger.Infof("[%s] ListenUDP: udp://%s:%v, udp://%s:%v", c.trackType, host, rtpConns[0].LocalAddr().(*net.UDPAddr).Port, host, rtpConns[1].LocalAddr().(*net.UDPAddr).Port) + logger.Infof("[%s] ListenUDP: RTP => udp://%s:%v, RTCP => udp://%s:%v", c.trackType, host, rtpConns[0].LocalAddr().(*net.UDPAddr).Port, host, rtpConns[1].LocalAddr().(*net.UDPAddr).Port) go c.loop(rtpConns[0], func(packet []byte, raddr net.Addr) { c.mutex.Lock() diff --git a/examples/b2bua/b2bua/util.go b/examples/b2bua/b2bua/util.go index 4a68ea0..e137d31 100644 --- a/examples/b2bua/b2bua/util.go +++ b/examples/b2bua/b2bua/util.go @@ -378,20 +378,24 @@ a=rtpmap:110 telephone-event/48000 a=rtpmap:126 telephone-event/8000 */ -var formatMaps = map[uint8]*sdp.Format{ +var defaultAudioCodecs = map[uint8]*sdp.Format{ 0: {Payload: 0, Name: "PCMU", ClockRate: 8000}, 8: {Payload: 8, Name: "PCMA", ClockRate: 8000}, 9: {Payload: 9, Name: "G722", ClockRate: 8000}, 13: {Payload: 13, Name: "CN", ClockRate: 8000}, - 63: {Payload: 63, Name: "red", ClockRate: 8000}, 110: {Payload: 110, Name: "telephone-event", ClockRate: 48000}, 111: {Payload: 111, Name: "opus", ClockRate: 48000}, 126: {Payload: 126, Name: "telephone-event", ClockRate: 8000}, } +var defaultVideoCodecs = map[uint8]*sdp.Format{ + 96: {Payload: 96, Name: "VP8", ClockRate: 90000}, + 97: {Payload: 97, Name: "H264", ClockRate: 90000}, +} + func fixFormatName(fmts []*sdp.Format) []*sdp.Format { for _, f := range fmts { - if ff, ok := formatMaps[f.Payload]; ok && f.Name == "" { + if ff, ok := defaultAudioCodecs[f.Payload]; ok && f.Name == "" { f.Name = ff.Name if f.ClockRate == 0 { f.ClockRate = ff.ClockRate diff --git a/examples/b2bua/main.go b/examples/b2bua/main.go index 1c526f1..91eb5bc 100644 --- a/examples/b2bua/main.go +++ b/examples/b2bua/main.go @@ -18,12 +18,12 @@ import ( func completer(d prompt.Document) []prompt.Suggest { s := []prompt.Suggest{ {Text: "users", Description: "Show sip accounts"}, - {Text: "onlines", Description: "Show online sip devices"}, + {Text: "show onlines", Description: "Show online sip devices"}, {Text: "calls", Description: "Show active calls"}, {Text: "originate", Description: "Originate a call and bridge to another call"}, {Text: "set debug on", Description: "Show debug msg in console"}, {Text: "set debug off", Description: "Turn off debug msg in console"}, - {Text: "show loggers", Description: "Print Loggers"}, + {Text: "loggers level", Description: "Print Loggers"}, {Text: "exit", Description: "Exit"}, } return prompt.FilterHasPrefix(s, d.GetWordBeforeCursor(), true) @@ -39,7 +39,6 @@ Options: } func consoleLoop(b2bua *b2bua.B2BUA) { - usersCompleter := func(d prompt.Document) []prompt.Suggest { accounts := b2bua.GetAccounts() s := make([]prompt.Suggest, 0, len(accounts)) @@ -54,8 +53,7 @@ func consoleLoop(b2bua *b2bua.B2BUA) { } return prompt.FilterHasPrefix(s, d.GetWordBeforeCursor(), true) } - - fmt.Println("Please select command.") + fmt.Println("Please select command, type ? or h or help for help") for { t := prompt.Input("CLI> ", completer, prompt.OptionTitle("GO B2BUA 1.0.0"), @@ -136,6 +134,20 @@ func consoleLoop(b2bua *b2bua.B2BUA) { } else { fmt.Printf("No pn records\n") } + case "?": + fallthrough + case "h": + fallthrough + case "help": + fmt.Println("Commands:") + fmt.Println(" users: Show sip accounts") + fmt.Println(" onlines: Show online sip devices") + fmt.Println(" calls: Show active calls") + fmt.Println(" originate: Originate a call and bridge to another call") + fmt.Println(" set debug on: Show debug msg in console") + fmt.Println(" set debug off: Turn off debug msg in console") + fmt.Println(" show loggers: Print Loggers") + fmt.Println(" exit: Exit") case "exit": fmt.Println("Exit now.") b2bua.Shutdown() @@ -144,15 +156,28 @@ func consoleLoop(b2bua *b2bua.B2BUA) { } } +var ( + logger log.Logger +) + +func init() { + logger = utils.NewLogrusLogger(utils.DefaultLogLevel, "main", nil) +} + func main() { noconsole := false disableAuth := false enableTLS := false + enableWebsocket := true + enalbeRFC8599 := false + h := false flag.BoolVar(&h, "h", false, "this help") flag.BoolVar(&noconsole, "nc", false, "no console mode") flag.BoolVar(&disableAuth, "da", false, "disable auth mode") - flag.BoolVar(&enableTLS, "tls", false, "enable TLS") + flag.BoolVar(&enableTLS, "tls", false, "enable tls") + flag.BoolVar(&enableWebsocket, "ws", false, "enable websocket") + flag.BoolVar(&enalbeRFC8599, "rfc8599", false, "enable rfc8599 push notification") flag.Usage = usage flag.Parse() @@ -166,11 +191,11 @@ func main() { signal.Notify(stop, syscall.SIGTERM, syscall.SIGINT) go func() { - fmt.Print("Start pprof on :6658\n") + logger.Info("Start pprof on :6658") http.ListenAndServe(":6658", nil) }() - b2bua := b2bua.NewB2BUA(disableAuth, enableTLS) + b2bua := b2bua.NewB2BUA(disableAuth, enableTLS, enableWebsocket, enalbeRFC8599) // Add sample accounts. b2bua.AddAccount("100", "100") @@ -181,6 +206,8 @@ func main() { if !noconsole { consoleLoop(b2bua) return + } else { + logger.Info("No console mode") } <-stop From 958ba3522f42b0140144dcdb5e4637bdd8a7da00 Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Wed, 3 Jul 2024 17:08:49 +0800 Subject: [PATCH 25/36] update. --- examples/b2bua/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/b2bua/main.go b/examples/b2bua/main.go index 91eb5bc..7321662 100644 --- a/examples/b2bua/main.go +++ b/examples/b2bua/main.go @@ -89,9 +89,9 @@ func consoleLoop(b2bua *b2bua.B2BUA) { fmt.Printf("No users\n") } case "originate": - fmt.Printf("Please enter the source user: ") + fmt.Printf("Enter the source user: ") source := prompt.Input("Source> ", usersCompleter) - fmt.Printf("Please enter the destination user: ") + fmt.Printf("Enter the destination user: ") destination := prompt.Input("Destination> ", usersCompleter) b2bua.Originate(source, destination) case "calls": From 8a84c8f878a885b08078405e8166b44ac19998df Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Wed, 3 Jul 2024 17:54:27 +0800 Subject: [PATCH 26/36] update. --- README.md | 5 +- examples/b2bua/b2bua/call.go | 27 ++------ examples/b2bua/b2bua/call_service.go | 45 +++++++----- examples/b2bua/b2bua/media_desc.go | 100 +++++++++++++++++++++++++++ examples/b2bua/b2bua/rtc_media_tp.go | 10 +-- examples/b2bua/b2bua/standard_tp.go | 46 ++++++------ examples/b2bua/b2bua/trackinfo.go | 31 --------- examples/b2bua/b2bua/util.go | 1 - 8 files changed, 166 insertions(+), 99 deletions(-) create mode 100644 examples/b2bua/b2bua/media_desc.go delete mode 100644 examples/b2bua/b2bua/trackinfo.go diff --git a/README.md b/README.md index 7a385aa..64a6d46 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,9 @@ SIP UA library for client/b2bua using golang - [x] Transports UDP/TCP/TLS/WS/WSS. - [x] Simple pure Go SIP Client. - [x] Simple pure Go B2BUA, support RFC8599, Google FCM/Apple PushKit. -- [ ] RTP relay (UDP<-->UDP, WebRTC/ICE<->UDP) -- [ ] WebRTC2SIP Gateway. +- [x] RTP relay (UDP<-->UDP, WebRTC/ICE<->UDP) +- [x] WebRTC2SIP Gateway. +- [ ] SRTP/SDES for SIP Client. ## Running the examples diff --git a/examples/b2bua/b2bua/call.go b/examples/b2bua/b2bua/call.go index 4f7157f..be7b9e6 100644 --- a/examples/b2bua/b2bua/call.go +++ b/examples/b2bua/b2bua/call.go @@ -3,7 +3,6 @@ package b2bua import ( "github.com/cloudwebrtc/go-sip-ua/pkg/session" "github.com/ghettovoice/gosip/sip" - "github.com/pixelbender/go-sdp/sdp" ) type CallState string @@ -22,36 +21,22 @@ func (s CallState) String() string { return string(s) } -type Desc struct { - Type string `json:"type"` - SDP string `json:"sdp"` -} - -func (d *Desc) Parse() (*sdp.Session, error) { - return sdp.Parse([]byte(d.SDP)) -} - -func (d *Desc) FromSdpSession(sess *sdp.Session) error { - d.SDP = sess.String() - return nil -} - type Call struct { // sip session sess *session.Session // media transport mediaTransport MediaTransport - originalTrackInfos []*TrackInfo + originalMediaDesc *MediaDescription } -func (b *Call) Init(transType MediaTransportType, trackInfos []*TrackInfo) { - b.originalTrackInfos = trackInfos +func (b *Call) Init(transType MediaTransportType, md *MediaDescription) { + b.originalMediaDesc = md if transType == TransportTypeWebRTC { - b.mediaTransport = NewWebRTCMediaTransport(trackInfos) + b.mediaTransport = NewWebRTCMediaTransport(md) } else { - b.mediaTransport = NewStandardMediaTransport(trackInfos) + b.mediaTransport = NewStandardMediaTransport(md) } b.mediaTransport.Init(b2buaConfig.UaMediaConfig) @@ -67,7 +52,7 @@ func (b *Call) ToString() string { func (b *Call) MediaInfo() string { info := "[" + b.mediaTransport.Type().String() + "]" - for _, trackInfo := range b.originalTrackInfos { + for _, trackInfo := range b.originalMediaDesc.Tracks { info += trackInfo.String() + " " } return info diff --git a/examples/b2bua/b2bua/call_service.go b/examples/b2bua/b2bua/call_service.go index dd76222..6dbce7a 100644 --- a/examples/b2bua/b2bua/call_service.go +++ b/examples/b2bua/b2bua/call_service.go @@ -10,6 +10,7 @@ import ( "github.com/cloudwebrtc/go-sip-ua/pkg/ua" "github.com/ghettovoice/gosip/sip" "github.com/ghettovoice/gosip/sip/parser" + "github.com/ghettovoice/gosip/util" "github.com/pixelbender/go-sdp/sdp" ) @@ -39,26 +40,20 @@ func (s *CallService) inviteStateHandler(sess *session.Session, req *sip.Request logger.Infof("InviteStateHandler: sess %v, state => %v, type => %s", sess.CallID().String(), state, sess.Direction()) switch state { - // Handle outgoing call. - case session.InviteSent: - call := s.findCall(sess) - if call != nil { - //TODO: Add support for forked calls - } // Handle incoming call. case session.InviteReceived: offer := &Desc{Type: "offer", SDP: sess.RemoteSdp()} sdpSess, _ := offer.Parse() transType := ParseTransportType(sdpSess) - trackInfos, err := ParseTrackInfos(sdpSess) + md, err := ParseMediaDescription(sdpSess) if err != nil { logger.Errorf("ParseTrackInfos error: %v", err) return } src := &Call{sess: sess} - src.Init(transType, trackInfos) + src.Init(transType, md) src.OnOffer(offer) s.calls[sess] = src @@ -139,7 +134,7 @@ func (s *CallService) handleIncomingCall(src *Call, req *sip.Request) (sip.Statu // Try to find online contact records. if contacts, found := s.registry.GetContacts(called); found { for _, instance := range *contacts { - dest, err := s.makeOutgoingCall(caller, displayName, called, instance, src.originalTrackInfos) + dest, err := s.makeOutgoingCall(caller, displayName, called, instance, src.originalMediaDesc) if err != nil { logger.Errorf("makeOutgoingCall error: %v", err) return 500, err @@ -160,7 +155,7 @@ func (s *CallService) handleIncomingCall(src *Call, req *sip.Request) (sip.Statu src.Reject(500, "Push failed") return 500, err } - dest, err := s.makeOutgoingCall(caller, displayName, called, instance, src.originalTrackInfos) + dest, err := s.makeOutgoingCall(caller, displayName, called, instance, src.originalMediaDesc) if err != nil { logger.Errorf("makeOutgoingCall error: %v", err) return 500, err @@ -171,7 +166,7 @@ func (s *CallService) handleIncomingCall(src *Call, req *sip.Request) (sip.Statu } // try make direct call - dest, err := s.makeOutgoingCall(caller, displayName, called, nil, src.originalTrackInfos) + dest, err := s.makeOutgoingCall(caller, displayName, called, nil, src.originalMediaDesc) if err != nil { logger.Errorf("makeOutgoingCall error: %v", err) return 500, err @@ -189,7 +184,7 @@ func (s *CallService) StoreBridgedCall(src, dest *Call, bType BridgeType) *CallB return bridge } -func (s *CallService) makeOutgoingCall(caller sip.Uri, displayName string, called sip.Uri, instance *registry.ContactInstance, trackInfos []*TrackInfo) (*Call, error) { +func (s *CallService) makeOutgoingCall(caller sip.Uri, displayName string, called sip.Uri, instance *registry.ContactInstance, md *MediaDescription) (*Call, error) { profile := account.NewProfile(caller, displayName, nil, 0, s.stack) @@ -212,7 +207,7 @@ func (s *CallService) makeOutgoingCall(caller sip.Uri, displayName string, calle } dest := &Call{} - dest.Init(tpType, trackInfos) + dest.Init(tpType, md) destOffer, _ := dest.CreateOffer() sess, err := s.ua.Invite(profile, called, recipient, &destOffer.SDP) @@ -288,14 +283,28 @@ func (s *CallService) Originate(source string, destination string) error { videoCodecs = append(videoCodecs, codec) } - originalTrackInfos := []*TrackInfo{ - {TrackType: TrackTypeAudio, Direction: "sendrecv", Codecs: audioCodecs}, - {TrackType: TrackTypeVideo, Direction: "sendrecv", Codecs: videoCodecs}, + originalTrackInfos := map[TrackType]*TrackInfo{ + TrackTypeAudio: {TrackType: TrackTypeAudio, Direction: "sendrecv", Codecs: audioCodecs}, + TrackTypeVideo: {TrackType: TrackTypeVideo, Direction: "sendrecv", Codecs: videoCodecs}, + } + + host := b2buaConfig.UaMediaConfig.ExternalRtpAddress + if host == "" || host == "0.0.0.0" { + if v, err := util.ResolveSelfIP(); err == nil { + host = v.String() + } + } + + md := &MediaDescription{ + Tracks: originalTrackInfos, + Connection: &sdp.Connection{ + Address: host, + }, } var err2 error = nil if contacts, found := s.registry.GetContacts(srcUri); found { for _, instance := range *contacts { - srcCall, err2 = s.makeOutgoingCall(srcUri, displayName, destUri, instance, originalTrackInfos) + srcCall, err2 = s.makeOutgoingCall(srcUri, displayName, destUri, instance, md) if err != nil { logger.Errorf("Originate error: %v", err) return err2 @@ -305,7 +314,7 @@ func (s *CallService) Originate(source string, destination string) error { if contacts, found := s.registry.GetContacts(destUri); found { for _, instance := range *contacts { - destCall, err2 = s.makeOutgoingCall(destUri, displayName, srcUri, instance, originalTrackInfos) + destCall, err2 = s.makeOutgoingCall(destUri, displayName, srcUri, instance, md) if err != nil { logger.Errorf("Originate error: %v", err) return err2 diff --git a/examples/b2bua/b2bua/media_desc.go b/examples/b2bua/b2bua/media_desc.go new file mode 100644 index 0000000..9896c48 --- /dev/null +++ b/examples/b2bua/b2bua/media_desc.go @@ -0,0 +1,100 @@ +package b2bua + +import ( + "errors" + "fmt" + + "github.com/pixelbender/go-sdp/sdp" +) + +type Desc struct { + Type string `json:"type"` + SDP string `json:"sdp"` +} + +func (d *Desc) Parse() (*sdp.Session, error) { + return sdp.Parse([]byte(d.SDP)) +} + +func (d *Desc) FromSdpSession(sess *sdp.Session) error { + d.SDP = sess.String() + return nil +} + +type TrackType string + +const ( + TrackTypeAudio TrackType = "audio" + TrackTypeVideo TrackType = "video" +) + +func (t TrackType) String() string { + return string(t) +} + +type TrackInfo struct { + TrackType TrackType + Codecs []*sdp.Format + Direction string + Port int + RtcpPort int + Ssrc uint32 +} + +func (t *TrackInfo) String() string { + return t.TrackType.String() + ": " + t.Codecs[0].Name + "/" + fmt.Sprintf("%d", t.Codecs[0].ClockRate) + ", pt: " + fmt.Sprintf("%d", t.Codecs[0].Payload) +} + +type MediaDescription struct { + Tracks map[TrackType]*TrackInfo + Connection *sdp.Connection +} + +func MediaDescriptionFrom(sdp *Desc) (*MediaDescription, error) { + sess, err := sdp.Parse() + if err != nil { + return nil, err + } + md, err := ParseMediaDescription(sess) + if err != nil { + return nil, err + } + return md, nil +} + +func ParseMediaDescription(sdp *sdp.Session) (*MediaDescription, error) { + if sdp == nil { + return nil, errors.New("sdp is nil") + } + mediaDesc := &MediaDescription{ + Connection: sdp.Connection, + Tracks: make(map[TrackType]*TrackInfo), + } + for _, m := range sdp.Media { + trackInfo := &TrackInfo{ + Ssrc: 0, + Direction: m.Mode, + Port: m.Port, + } + + if trackInfo.Port > 0 { + trackInfo.RtcpPort = m.Port + 1 + } + trackInfo.Codecs = fixFormatName(m.Format) + if m.Type == "audio" { + trackInfo.TrackType = TrackTypeAudio + } else if m.Type == "video" { + trackInfo.TrackType = TrackTypeVideo + } else { + continue + } + mediaDesc.Tracks[trackInfo.TrackType] = trackInfo + } + + return mediaDesc, nil +} + +func Negotiation(local *MediaDescription, remote *MediaDescription) (*MediaDescription, error) { + + return nil, nil +} diff --git a/examples/b2bua/b2bua/rtc_media_tp.go b/examples/b2bua/b2bua/rtc_media_tp.go index f6fc4fb..9be45a5 100644 --- a/examples/b2bua/b2bua/rtc_media_tp.go +++ b/examples/b2bua/b2bua/rtc_media_tp.go @@ -62,7 +62,7 @@ type WebRTCMediaTransport struct { closed utils.AtomicBool ctx context.Context cancel context.CancelFunc - trackInfos []*TrackInfo + md *MediaDescription videoPool *sync.Pool audioPool *sync.Pool @@ -76,9 +76,9 @@ type WebRTCMediaTransport struct { requestKeyFrameHandler func() error } -func NewWebRTCMediaTransport(trackInfos []*TrackInfo) *WebRTCMediaTransport { +func NewWebRTCMediaTransport(md *MediaDescription) *WebRTCMediaTransport { c := &WebRTCMediaTransport{ - trackInfos: trackInfos, + md: md, localTracks: make(map[TrackType]*webrtc.TrackLocalStaticRTP), remoteTracks: make(map[TrackType]*webrtc.TrackRemote), sequencer: newSequencer(MaxPacketTrack), @@ -109,7 +109,7 @@ func (c *WebRTCMediaTransport) Init(umc UserAgentMediaConfig) error { // Create a MediaEngine object to configure the supported codec m := &webrtc.MediaEngine{} - for _, trackInfo := range c.trackInfos { + for _, trackInfo := range c.md.Tracks { if trackInfo.TrackType == TrackTypeAudio { for _, codec := range trackInfo.Codecs { mimeType := fmt.Sprintf("audio/%s", codec.Name) @@ -377,7 +377,7 @@ func (c *WebRTCMediaTransport) Close() error { func (c *WebRTCMediaTransport) AddLocalTracks() error { - for _, trackInfo := range c.trackInfos { + for _, trackInfo := range c.md.Tracks { if trackInfo.TrackType == TrackTypeAudio { diff --git a/examples/b2bua/b2bua/standard_tp.go b/examples/b2bua/b2bua/standard_tp.go index 8511614..37b8d58 100644 --- a/examples/b2bua/b2bua/standard_tp.go +++ b/examples/b2bua/b2bua/standard_tp.go @@ -15,7 +15,7 @@ import ( ) type StandardMediaTransport struct { - trackInfos []*TrackInfo + md *MediaDescription ports map[TrackType]*UdpPort localDescription *sdp.Session remoteDescription *sdp.Session @@ -31,11 +31,11 @@ type StandardMediaTransport struct { cancel context.CancelFunc } -func NewStandardMediaTransport(trackInfos []*TrackInfo) *StandardMediaTransport { +func NewStandardMediaTransport(md *MediaDescription) *StandardMediaTransport { t := &StandardMediaTransport{ - trackInfos: trackInfos, - ports: make(map[TrackType]*UdpPort), - videoSSRC: 0, + md: md, + ports: make(map[TrackType]*UdpPort), + videoSSRC: 0, } t.ctx, t.cancel = context.WithCancel(context.TODO()) @@ -70,13 +70,13 @@ func (c *StandardMediaTransport) Init(umc UserAgentMediaConfig) error { var medias []*sdp.Media - for _, trackInfo := range c.trackInfos { + for _, trackInfo := range c.md.Tracks { var rAddr *net.UDPAddr = nil var rRtcpAddr *net.UDPAddr = nil - if trackInfo.Connection != nil { - rAddr, _ = net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", trackInfo.Connection.Address, trackInfo.Port)) - rRtcpAddr, _ = net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", trackInfo.Connection.Address, trackInfo.RtcpPort)) + if c.md.Connection != nil { + rAddr, _ = net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", c.md.Connection.Address, trackInfo.Port)) + rRtcpAddr, _ = net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", c.md.Connection.Address, trackInfo.RtcpPort)) } udpPort, err := NewUdpPort(trackInfo.TrackType, rAddr, rRtcpAddr, umc.ExternalRtpAddress) @@ -176,19 +176,22 @@ func (c *StandardMediaTransport) onRtcpPacket(trackType TrackType, packet []byte func (c *StandardMediaTransport) WriteRTP(trackType TrackType, packet []byte) (int, error) { logger.Debugf("UdpTansport::WriteRTP: %v, write %d bytes", trackType, len(packet)) - /* - p := &rtp.Packet{} - if err := p.Unmarshal(packet); err != nil { - logger.Errorf("tp.Packet Unmarshal: e %v", err) - } - logger.Debugf("UdpTansport::WriteRTP: %v, write %d bytes, seq %d, ts %d", trackType, len(packet), p.SequenceNumber, p.Timestamp) - pktbuf, err := p.Marshal() + p := &rtp.Packet{} + if err := p.Unmarshal(packet); err != nil { + logger.Errorf("tp.Packet Unmarshal: e %v", err) + } + logger.Debugf("UdpTansport::WriteRTP: %v, write %d bytes, seq %d, ts %d", trackType, len(packet), p.SequenceNumber, p.Timestamp) - if err != nil { - logger.Errorf("UdpTansport::WriteRTP: Marshal rtp receiver packets err %v", err) - } - */ + payload := c.md.Tracks[trackType].Codecs[0].Payload + + //re-write payload type + p.PayloadType = payload + pktbuf, err := p.Marshal() + + if err != nil { + logger.Errorf("UdpTansport::WriteRTP: Marshal rtp receiver packets err %v", err) + } port := c.ports[trackType] @@ -197,7 +200,7 @@ func (c *StandardMediaTransport) WriteRTP(trackType TrackType, packet []byte) (i return 0, nil } - return port.WriteRtp(packet) + return port.WriteRtp(pktbuf) } func (c *StandardMediaTransport) WriteRTCP(trackType TrackType, packet []byte) (int, error) { @@ -247,6 +250,7 @@ func (c *StandardMediaTransport) OnAnswer(answer *Desc) error { if conn != nil { logger.Debugf("remote connection address: %s", conn.Address) } + c.md, _ = MediaDescriptionFrom(answer) c.remoteDescription = sess return nil } diff --git a/examples/b2bua/b2bua/trackinfo.go b/examples/b2bua/b2bua/trackinfo.go deleted file mode 100644 index fc7cdca..0000000 --- a/examples/b2bua/b2bua/trackinfo.go +++ /dev/null @@ -1,31 +0,0 @@ -package b2bua - -import ( - "fmt" - - "github.com/pixelbender/go-sdp/sdp" -) - -type TrackType string - -const ( - TrackTypeAudio TrackType = "audio" - TrackTypeVideo TrackType = "video" -) - -func (t TrackType) String() string { - return string(t) -} - -type TrackInfo struct { - TrackType TrackType - Codecs []*sdp.Format - Connection *sdp.Connection - Direction string - Port int - RtcpPort int -} - -func (t *TrackInfo) String() string { - return t.TrackType.String() + ": " + t.Codecs[0].Name + "/" + fmt.Sprintf("%d", t.Codecs[0].ClockRate) + ", pt: " + fmt.Sprintf("%d", t.Codecs[0].Payload) -} diff --git a/examples/b2bua/b2bua/util.go b/examples/b2bua/b2bua/util.go index e137d31..81fac8c 100644 --- a/examples/b2bua/b2bua/util.go +++ b/examples/b2bua/b2bua/util.go @@ -425,7 +425,6 @@ func ParseTrackInfos(sdp *sdp.Session) ([]*TrackInfo, error) { trackInfos := make([]*TrackInfo, 0) for _, m := range sdp.Media { trackInfo := &TrackInfo{} - trackInfo.Connection = sdp.Connection trackInfo.Direction = m.Mode trackInfo.Port = m.Port if trackInfo.Port > 0 { From a05ed79ebe2d7e6f06da431117d851cf458d9932 Mon Sep 17 00:00:00 2001 From: "duanweiwei1982@gmail.com" Date: Thu, 4 Jul 2024 13:51:37 +0800 Subject: [PATCH 27/36] bump version for go-sdp. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6509f34..abd5ecf 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/pion/sdp/v3 v3.0.6 github.com/pion/transport v0.14.1 github.com/pion/webrtc/v3 v3.1.59 - github.com/pixelbender/go-sdp v1.1.0 + github.com/pixelbender/go-sdp v1.1.1-0.20240403132153-9683c2a0405f github.com/sirupsen/logrus v1.9.0 github.com/stretchr/testify v1.8.2 github.com/tevino/abool v1.2.0 diff --git a/go.sum b/go.sum index b25c57f..71d791b 100644 --- a/go.sum +++ b/go.sum @@ -1168,8 +1168,8 @@ github.com/pion/udp/v2 v2.0.1/go.mod h1:B7uvTMP00lzWdyMr/1PVZXtV3wpPIxBRd4Wl6Aks github.com/pion/webrtc/v3 v3.1.7/go.mod h1:SQxttydYlKo2rCQjHzkUCJFAfEO/Oh2efMWbKYXLk98= github.com/pion/webrtc/v3 v3.1.59 h1:B3YFo8q6dwBYKA2LUjWRChP59Qtt+xvv1Ul7UPDp6Zc= github.com/pion/webrtc/v3 v3.1.59/go.mod h1:rJGgStRoFyFOWJULHLayaimsG+jIEoenhJ5MB5gIFqw= -github.com/pixelbender/go-sdp v1.1.0 h1:rkm9aFBNKrnB+YGfhLmAkal3pC8XYXb9h+172PlrCBU= -github.com/pixelbender/go-sdp v1.1.0/go.mod h1:6IBlz9+BrUHoFTea7gcp4S54khtOhjCW/nVDLhmZBAs= +github.com/pixelbender/go-sdp v1.1.1-0.20240403132153-9683c2a0405f h1:2olHyEeX4G9ZN6LZ8Y6jvDn7uHJQUbsEgCwsZEh7K30= +github.com/pixelbender/go-sdp v1.1.1-0.20240403132153-9683c2a0405f/go.mod h1:6IBlz9+BrUHoFTea7gcp4S54khtOhjCW/nVDLhmZBAs= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= From deac488b7509ff9d0aed885382aaf8326a0bb4aa Mon Sep 17 00:00:00 2001 From: "duanweiwei1982@gmail.com" Date: Thu, 4 Jul 2024 13:53:04 +0800 Subject: [PATCH 28/36] bump version for gosip. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index abd5ecf..1f6f054 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( firebase.google.com/go v3.13.0+incompatible github.com/c-bata/go-prompt v0.2.6 github.com/gammazero/deque v0.1.0 - github.com/ghettovoice/gosip v0.0.0-20230322091832-d77de1c97f89 + github.com/ghettovoice/gosip v0.0.0-20240619135023-afc3f006312f github.com/go-logr/logr v1.2.4 github.com/google/uuid v1.3.0 github.com/pion/interceptor v0.1.12 diff --git a/go.sum b/go.sum index 71d791b..a96ffbb 100644 --- a/go.sum +++ b/go.sum @@ -695,8 +695,8 @@ github.com/fullstorydev/grpcurl v1.8.0/go.mod h1:Mn2jWbdMrQGJQ8UD62uNyMumT2acsZU github.com/gammazero/deque v0.1.0 h1:f9LnNmq66VDeuAlSAapemq/U7hJ2jpIWa4c09q8Dlik= github.com/gammazero/deque v0.1.0/go.mod h1:KQw7vFau1hHuM8xmI9RbgKFbAsQFWmBpqQ2KenFLk6M= github.com/gammazero/workerpool v1.1.2/go.mod h1:UelbXcO0zCIGFcufcirHhq2/xtLXJdQ29qZNlXG9OjQ= -github.com/ghettovoice/gosip v0.0.0-20230322091832-d77de1c97f89 h1:bUtgAwa7cfrp0bEnlfr+k6fgsfn7/OFQ0pvQvoujOAo= -github.com/ghettovoice/gosip v0.0.0-20230322091832-d77de1c97f89/go.mod h1:rlD1yLOErWYohWTryG/2bTTpmzB79p52ntLA/uIFXeI= +github.com/ghettovoice/gosip v0.0.0-20240619135023-afc3f006312f h1:U7o+nojFRcazerHWksrQ584QCA5DEqv0Pls4/cMFzuA= +github.com/ghettovoice/gosip v0.0.0-20240619135023-afc3f006312f/go.mod h1:rlD1yLOErWYohWTryG/2bTTpmzB79p52ntLA/uIFXeI= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= From d3719a78bfea0f0e40bcf1b5b519445ddcf9cd83 Mon Sep 17 00:00:00 2001 From: "duanweiwei1982@gmail.com" Date: Sat, 6 Jul 2024 21:55:36 +0800 Subject: [PATCH 29/36] fix crash. --- examples/b2bua/b2bua/standard_tp.go | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/examples/b2bua/b2bua/standard_tp.go b/examples/b2bua/b2bua/standard_tp.go index 37b8d58..b8fa85e 100644 --- a/examples/b2bua/b2bua/standard_tp.go +++ b/examples/b2bua/b2bua/standard_tp.go @@ -183,23 +183,26 @@ func (c *StandardMediaTransport) WriteRTP(trackType TrackType, packet []byte) (i } logger.Debugf("UdpTansport::WriteRTP: %v, write %d bytes, seq %d, ts %d", trackType, len(packet), p.SequenceNumber, p.Timestamp) - payload := c.md.Tracks[trackType].Codecs[0].Payload + port := c.ports[trackType] + + if port == nil { + logger.Errorf("UdpTansport::WriteRTP: port is nil") + return 0, nil + } + + track, found := c.md.Tracks[trackType] + if !found { + return 0, fmt.Errorf("track %v not found", trackType) + } //re-write payload type - p.PayloadType = payload + p.PayloadType = track.Codecs[0].Payload pktbuf, err := p.Marshal() if err != nil { logger.Errorf("UdpTansport::WriteRTP: Marshal rtp receiver packets err %v", err) } - port := c.ports[trackType] - - if port == nil { - logger.Errorf("UdpTansport::WriteRTP: port is nil") - return 0, nil - } - return port.WriteRtp(pktbuf) } From b75683d296ea8df3dd68b6962f77e29a58209da9 Mon Sep 17 00:00:00 2001 From: "duanweiwei1982@gmail.com" Date: Sat, 6 Jul 2024 21:57:15 +0800 Subject: [PATCH 30/36] update. --- examples/b2bua/b2bua/call_service.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/examples/b2bua/b2bua/call_service.go b/examples/b2bua/b2bua/call_service.go index 6dbce7a..c9db26c 100644 --- a/examples/b2bua/b2bua/call_service.go +++ b/examples/b2bua/b2bua/call_service.go @@ -259,12 +259,20 @@ func (s *CallService) Originate(source string, destination string) error { displayName := "Originate" - srcUri, err := parser.ParseUri("sip:" + source + "@127.0.0.1") + host := b2buaConfig.UaMediaConfig.ExternalRtpAddress + + if host == "" || host == "0.0.0.0" { + if v, err := util.ResolveSelfIP(); err == nil { + host = v.String() + } + } + + srcUri, err := parser.ParseUri("sip:" + source + "@" + host) if err != nil { logger.Error(err) } - destUri, err := parser.ParseUri("sip:" + destination + "@127.0.0.1") + destUri, err := parser.ParseUri("sip:" + destination + "@" + host) if err != nil { logger.Error(err) } From 65abba19c7f558f2bd8cd27c527d4128648f71ad Mon Sep 17 00:00:00 2001 From: "duanweiwei1982@gmail.com" Date: Sat, 6 Jul 2024 22:00:16 +0800 Subject: [PATCH 31/36] update. --- examples/b2bua/b2bua/call_service.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/examples/b2bua/b2bua/call_service.go b/examples/b2bua/b2bua/call_service.go index c9db26c..2bc0ba2 100644 --- a/examples/b2bua/b2bua/call_service.go +++ b/examples/b2bua/b2bua/call_service.go @@ -296,13 +296,6 @@ func (s *CallService) Originate(source string, destination string) error { TrackTypeVideo: {TrackType: TrackTypeVideo, Direction: "sendrecv", Codecs: videoCodecs}, } - host := b2buaConfig.UaMediaConfig.ExternalRtpAddress - if host == "" || host == "0.0.0.0" { - if v, err := util.ResolveSelfIP(); err == nil { - host = v.String() - } - } - md := &MediaDescription{ Tracks: originalTrackInfos, Connection: &sdp.Connection{ From 92994e47add57bae8aba084c331a0b961411d343 Mon Sep 17 00:00:00 2001 From: "duanweiwei1982@gmail.com" Date: Sat, 6 Jul 2024 22:00:49 +0800 Subject: [PATCH 32/36] update. --- examples/b2bua/b2bua/media_desc.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/examples/b2bua/b2bua/media_desc.go b/examples/b2bua/b2bua/media_desc.go index 9896c48..a073f65 100644 --- a/examples/b2bua/b2bua/media_desc.go +++ b/examples/b2bua/b2bua/media_desc.go @@ -21,6 +21,24 @@ func (d *Desc) FromSdpSession(sess *sdp.Session) error { return nil } +type TransportType string + +const ( + MediaTransportUDP TransportType = "UDP" + MediaTransportTCP TransportType = "TCP" + MediaTransportTLS TransportType = "TLS" + MediaTransportDTLS TransportType = "DTLS" +) + +type MediaStreamDir string + +const ( + MediaStreamSendRecv MediaStreamDir = "sendrecv" + MediaStreamSendOnly MediaStreamDir = "sendonly" + MediaStreamRecvOnly MediaStreamDir = "recvonly" + MediaStreamInactive MediaStreamDir = "inactive" +) + type TrackType string const ( From b1d679ca685e99aa4d43820b08b5cc38046dc013 Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Sun, 21 Jul 2024 22:48:20 +0800 Subject: [PATCH 33/36] update. --- examples/b2bua/b2bua/b2bua.go | 5 +- examples/b2bua/b2bua/call_bridge.go | 1 + examples/b2bua/b2bua/conf.go | 8 +- examples/b2bua/b2bua/rtc_media_tp.go | 245 +++++++++++--------- examples/b2bua/b2bua/standard_tp.go | 103 ++++---- examples/b2bua/b2bua/transport_interface.go | 13 +- examples/b2bua/b2bua/udp_port.go | 4 +- examples/b2bua/b2bua/util.go | 14 +- pkg/utils/log.go | 6 +- 9 files changed, 214 insertions(+), 185 deletions(-) diff --git a/examples/b2bua/b2bua/b2bua.go b/examples/b2bua/b2bua/b2bua.go index 205b845..55ae1ac 100644 --- a/examples/b2bua/b2bua/b2bua.go +++ b/examples/b2bua/b2bua/b2bua.go @@ -6,6 +6,7 @@ import ( "github.com/cloudwebrtc/go-sip-ua/examples/b2bua/fcm" "github.com/cloudwebrtc/go-sip-ua/examples/b2bua/pushkit" "github.com/cloudwebrtc/go-sip-ua/examples/b2bua/registry" + "github.com/pion/webrtc/v3" "github.com/cloudwebrtc/go-sip-ua/pkg/account" "github.com/cloudwebrtc/go-sip-ua/pkg/auth" @@ -80,9 +81,9 @@ func init() { SSLKey: "certs/key.pem", UdpPortRange: []int{60000, 65535}, UaMediaConfig: UserAgentMediaConfig{ - Codecs: []string{"PCMU", "PCMA", "opus", "H264", "VP8", "VP9"}, + Codecs: []string{"PCMU", "PCMA", "H264"}, ExternalRtpAddress: "0.0.0.0", - RtcpFeedback: []string{"nack", "nack pli", "ccm fir", "goog-remb", "transport-cc"}, + RtcpFeedback: []webrtc.RTCPFeedback{{"goog-remb", ""}, {"transport-cc", ""}, {"ccm", "fir"}, {"nack", ""}, {"nack", "pli"}}, }, } } diff --git a/examples/b2bua/b2bua/call_bridge.go b/examples/b2bua/b2bua/call_bridge.go index 940a4f2..5bafd56 100644 --- a/examples/b2bua/b2bua/call_bridge.go +++ b/examples/b2bua/b2bua/call_bridge.go @@ -65,6 +65,7 @@ func (b *CallBridge) Terminate(call *Call) { } func BridgeMediaStream(src, dest MediaTransport) error { + // 这里 src.OnRtpPacket(dest.WriteRTP) src.OnRtcpPacket(dest.WriteRTCP) src.OnRequestKeyFrame(dest.RequestKeyFrame) diff --git a/examples/b2bua/b2bua/conf.go b/examples/b2bua/b2bua/conf.go index 6c79d9b..4768e10 100644 --- a/examples/b2bua/b2bua/conf.go +++ b/examples/b2bua/b2bua/conf.go @@ -1,7 +1,9 @@ package b2bua +import "github.com/pion/webrtc/v3" + type UserAgentMediaConfig struct { - Codecs []string `json:"codecs"` - ExternalRtpAddress string `json:"external_rtp_address"` - RtcpFeedback []string `json:"rtcp_feedback"` + Codecs []string `json:"codecs"` + ExternalRtpAddress string `json:"external_rtp_address"` + RtcpFeedback []webrtc.RTCPFeedback `json:"rtcp_feedback"` } diff --git a/examples/b2bua/b2bua/rtc_media_tp.go b/examples/b2bua/b2bua/rtc_media_tp.go index 9be45a5..52feedc 100644 --- a/examples/b2bua/b2bua/rtc_media_tp.go +++ b/examples/b2bua/b2bua/rtc_media_tp.go @@ -71,8 +71,8 @@ type WebRTCMediaTransport struct { buff *buffer.Buffer bmu sync.Mutex mu sync.RWMutex - rtpHandler func(trackType TrackType, payload []byte) (int, error) - rtcpHandler func(trackType TrackType, payload []byte) (int, error) + rtpHandler func(trackType TrackType, pkt rtp.Packet) (int, error) + rtcpHandler func(trackType TrackType, pkt rtcp.Packet) (int, error) requestKeyFrameHandler func() error } @@ -108,96 +108,114 @@ func (c *WebRTCMediaTransport) Type() MediaTransportType { func (c *WebRTCMediaTransport) Init(umc UserAgentMediaConfig) error { // Create a MediaEngine object to configure the supported codec m := &webrtc.MediaEngine{} - - for _, trackInfo := range c.md.Tracks { - if trackInfo.TrackType == TrackTypeAudio { - for _, codec := range trackInfo.Codecs { - mimeType := fmt.Sprintf("audio/%s", codec.Name) - sdpFmtpLine := strings.Join(codec.Params, ";") - var rtcpFb []webrtc.RTCPFeedback = nil - for _, fb := range codec.Feedback { - vals := strings.Split(fb, " ") - if len(vals) < 2 { - rtcpFb = append(rtcpFb, webrtc.RTCPFeedback{Type: vals[0], Parameter: ""}) - } else { - rtcpFb = append(rtcpFb, webrtc.RTCPFeedback{Type: vals[0], Parameter: vals[1]}) + /* + for _, trackInfo := range c.md.Tracks { + if trackInfo.TrackType == TrackTypeAudio { + for _, codec := range trackInfo.Codecs { + mimeType := fmt.Sprintf("audio/%s", codec.Name) + sdpFmtpLine := strings.Join(codec.Params, ";") + var rtcpFb []webrtc.RTCPFeedback = nil + for _, fb := range codec.Feedback { + vals := strings.Split(fb, " ") + if len(vals) < 2 { + rtcpFb = append(rtcpFb, webrtc.RTCPFeedback{Type: vals[0], Parameter: ""}) + } else { + rtcpFb = append(rtcpFb, webrtc.RTCPFeedback{Type: vals[0], Parameter: vals[1]}) + } + } + if err := m.RegisterCodec(webrtc.RTPCodecParameters{ + RTPCodecCapability: webrtc.RTPCodecCapability{ + MimeType: mimeType, + ClockRate: uint32(codec.ClockRate), + Channels: uint16(codec.Channels), + SDPFmtpLine: sdpFmtpLine, + RTCPFeedback: rtcpFb}, + PayloadType: webrtc.PayloadType(codec.Payload), + }, webrtc.RTPCodecTypeAudio); err != nil { + return err } } - if err := m.RegisterCodec(webrtc.RTPCodecParameters{ - RTPCodecCapability: webrtc.RTPCodecCapability{ - MimeType: mimeType, - ClockRate: uint32(codec.ClockRate), - Channels: uint16(codec.Channels), - SDPFmtpLine: sdpFmtpLine, - RTCPFeedback: rtcpFb}, - PayloadType: webrtc.PayloadType(codec.Payload), - }, webrtc.RTPCodecTypeAudio); err != nil { - return err + } else if trackInfo.TrackType == TrackTypeVideo { + for _, codec := range trackInfo.Codecs { + mimeType := fmt.Sprintf("video/%s", codec.Name) + sdpFmtpLine := strings.Join(codec.Params, ";") + var rtcpFb []webrtc.RTCPFeedback = nil + for _, fb := range codec.Feedback { + vals := strings.Split(fb, " ") + if len(vals) < 2 { + rtcpFb = append(rtcpFb, webrtc.RTCPFeedback{Type: vals[0], Parameter: ""}) + } else { + rtcpFb = append(rtcpFb, webrtc.RTCPFeedback{Type: vals[0], Parameter: vals[1]}) + } + } + if err := m.RegisterCodec(webrtc.RTPCodecParameters{ + RTPCodecCapability: webrtc.RTPCodecCapability{ + MimeType: mimeType, + ClockRate: uint32(codec.ClockRate), + SDPFmtpLine: sdpFmtpLine, + RTCPFeedback: rtcpFb}, + PayloadType: webrtc.PayloadType(codec.Payload), + }, webrtc.RTPCodecTypeVideo); err != nil { + return err + } } } - } else if trackInfo.TrackType == TrackTypeVideo { - for _, codec := range trackInfo.Codecs { - mimeType := fmt.Sprintf("video/%s", codec.Name) - sdpFmtpLine := strings.Join(codec.Params, ";") - var rtcpFb []webrtc.RTCPFeedback = nil - for _, fb := range codec.Feedback { - vals := strings.Split(fb, " ") - if len(vals) < 2 { - rtcpFb = append(rtcpFb, webrtc.RTCPFeedback{Type: vals[0], Parameter: ""}) - } else { - rtcpFb = append(rtcpFb, webrtc.RTCPFeedback{Type: vals[0], Parameter: vals[1]}) + } + */ + + for _, codec := range []webrtc.RTPCodecParameters{ + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypePCMU, ClockRate: 8000, Channels: 1, SDPFmtpLine: "", RTCPFeedback: nil}, + PayloadType: 0, + }, + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypePCMA, ClockRate: 8000, Channels: 1, SDPFmtpLine: "", RTCPFeedback: nil}, + PayloadType: 8, + }, + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeOpus, ClockRate: 48000, Channels: 2, SDPFmtpLine: "minptime=10;useinbandfec=1", RTCPFeedback: nil}, + PayloadType: 111, + }, + } { + for _, trackInfo := range c.md.Tracks { + if trackInfo.TrackType == TrackTypeAudio { + for _, c := range trackInfo.Codecs { + if strings.Contains(strings.ToLower(codec.RTPCodecCapability.MimeType), strings.ToLower(c.Name)) { + codec.PayloadType = webrtc.PayloadType(c.Payload) + if err := m.RegisterCodec(codec, webrtc.RTPCodecTypeAudio); err != nil { + return err + } } } - if err := m.RegisterCodec(webrtc.RTPCodecParameters{ - RTPCodecCapability: webrtc.RTPCodecCapability{ - MimeType: mimeType, - ClockRate: uint32(codec.ClockRate), - SDPFmtpLine: sdpFmtpLine, - RTCPFeedback: rtcpFb}, - PayloadType: webrtc.PayloadType(codec.Payload), - }, webrtc.RTPCodecTypeVideo); err != nil { - return err - } } } } - /* - for _, codec := range []webrtc.RTPCodecParameters{ - { - RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypePCMU, ClockRate: 8000, Channels: 1, SDPFmtpLine: "", RTCPFeedback: nil}, - PayloadType: 0, - }, - { - RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypePCMA, ClockRate: 8000, Channels: 1, SDPFmtpLine: "", RTCPFeedback: nil}, - PayloadType: 8, - }, - { - RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeOpus, ClockRate: 48000, Channels: 2, SDPFmtpLine: "minptime=10;useinbandfec=1", RTCPFeedback: nil}, - PayloadType: 111, - }, - } { - if err := m.RegisterCodec(codec, webrtc.RTPCodecTypeAudio); err != nil { - return err - } - } - videoRTCPFeedback := []webrtc.RTCPFeedback{{"goog-remb", ""}, {"transport-cc", ""}, {"ccm", "fir"}, {"nack", ""}, {"nack", "pli"}} + videoRTCPFeedback := b2buaConfig.UaMediaConfig.RtcpFeedback - for _, codec := range []webrtc.RTPCodecParameters{ - { - RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeVP8, ClockRate: 90000, RTCPFeedback: videoRTCPFeedback}, - PayloadType: 100, - }, - { - RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeH264, ClockRate: 90000, SDPFmtpLine: "level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=640c33", RTCPFeedback: videoRTCPFeedback}, - PayloadType: 96, - }, - } { - if err := m.RegisterCodec(codec, webrtc.RTPCodecTypeVideo); err != nil { - return err + for _, codec := range []webrtc.RTPCodecParameters{ + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeVP8, ClockRate: 90000, RTCPFeedback: videoRTCPFeedback}, + PayloadType: 100, + }, + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeH264, ClockRate: 90000, SDPFmtpLine: "level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=640c33", RTCPFeedback: videoRTCPFeedback}, + PayloadType: 96, + }, + } { + for _, trackInfo := range c.md.Tracks { + if trackInfo.TrackType == TrackTypeVideo { + for _, c := range trackInfo.Codecs { + if strings.Contains(strings.ToLower(codec.RTPCodecCapability.MimeType), strings.ToLower(c.Name)) { + codec.PayloadType = webrtc.PayloadType(c.Payload) + if err := m.RegisterCodec(codec, webrtc.RTPCodecTypeVideo); err != nil { + return err + } + } + } } } - */ + } // Create a InterceptorRegistry. This is the user configurable RTP/RTCP Pipeline. // This provides NACKs, RTCP Reports and other features. If you use `webrtc.NewPeerConnection` // this is enabled by default. If you are manually managing You MUST create a InterceptorRegistry @@ -275,13 +293,13 @@ func (c *WebRTCMediaTransport) Init(umc UserAgentMediaConfig) error { return nil } -func (c *WebRTCMediaTransport) OnRtpPacket(rtpHandler func(trackType TrackType, payload []byte) (int, error)) { +func (c *WebRTCMediaTransport) OnRtpPacket(rtpHandler func(trackType TrackType, pkt rtp.Packet) (int, error)) { c.mu.Lock() defer c.mu.Unlock() c.rtpHandler = rtpHandler } -func (c *WebRTCMediaTransport) OnRtcpPacket(rtcpHandler func(trackType TrackType, payload []byte) (int, error)) { +func (c *WebRTCMediaTransport) OnRtcpPacket(rtcpHandler func(trackType TrackType, pkt rtcp.Packet) (int, error)) { c.mu.Lock() defer c.mu.Unlock() c.rtcpHandler = rtcpHandler @@ -294,13 +312,18 @@ func (c *WebRTCMediaTransport) OnRequestKeyFrame(keyHandler func() error) { } func (c *WebRTCMediaTransport) onRtpPacket(trackType TrackType, packet []byte) error { - logger.Debugf("WebRTCTransport::OnRtpPacketReceived: %v read %d bytes", trackType, len(packet)) - + logger.Tracef("WebRTCTransport::OnRtpPacketReceived: %v read %d bytes", trackType, len(packet)) c.mu.RLock() defer c.mu.RUnlock() + + p := rtp.Packet{} + if err := p.Unmarshal(packet); err != nil { + return err + } + if c.rtpHandler != nil { - if _, err := c.rtpHandler(trackType, packet); err != nil { - logger.Errorf("WebRTCTransport::onRtpPacket: panic => %v", err) + if _, err := c.rtpHandler(trackType, p); err != nil { + return err } } return nil @@ -308,33 +331,42 @@ func (c *WebRTCMediaTransport) onRtpPacket(trackType TrackType, packet []byte) e func (c *WebRTCMediaTransport) onRtcpPacket(trackType TrackType, packet []byte) error { logger.Debugf("WebRTCTransport::OnRtcpPacketReceived: %v read %d bytes", trackType, len(packet)) - c.mu.RLock() defer c.mu.RUnlock() + + pkts, err := rtcp.Unmarshal(packet) + if err != nil { + return err + } + if c.rtcpHandler != nil { - if _, err := c.rtcpHandler(trackType, packet); err != nil { - logger.Errorf("WebRTCTransport::onRtcpPacket: panic => %v", err) + for _, pkt := range pkts { + if _, err := c.rtcpHandler(trackType, pkt); err != nil { + return err + } } } return nil } -func (c *WebRTCMediaTransport) WriteRTP(trackType TrackType, packet []byte) (int, error) { +func (c *WebRTCMediaTransport) WriteRTP(trackType TrackType, pkt rtp.Packet) (int, error) { if c.closed.Get() { return 0, fmt.Errorf("WebRTCTransport::SendRtpPacket: closed") } if trackType == TrackTypeAudio { if c.localTracks[TrackTypeAudio] != nil { - return c.localTracks[TrackTypeAudio].Write(packet) + err := c.localTracks[TrackTypeAudio].WriteRTP(&pkt) + if err != nil { + return 0, fmt.Errorf("WebRTCTransport::SendRtpPacket: %v", err) + } + return len(pkt.Payload), nil } } else if trackType == TrackTypeVideo { if c.localTracks[TrackTypeVideo] != nil { - var pkt rtp.Packet - if err := pkt.Unmarshal(packet); err == nil { + if buf, err := pkt.Marshal(); err == nil { c.bmu.Lock() if c.buff != nil { - c.buff.Write(packet) - //pktExt, err := c.buff.ReadExtended() + c.buff.Write(buf) if err != io.EOF { if c.sequencer != nil { c.sequencer.push(pkt.SequenceNumber, pkt.SequenceNumber, pkt.Timestamp, 0, true) @@ -344,26 +376,27 @@ func (c *WebRTCMediaTransport) WriteRTP(trackType TrackType, packet []byte) (int c.bmu.Unlock() } - return c.localTracks[TrackTypeVideo].Write(packet) + err := c.localTracks[TrackTypeVideo].WriteRTP(&pkt) + if err != nil { + return 0, fmt.Errorf("WebRTCTransport::SendRtpPacket: %v", err) + } + return len(pkt.Payload), nil } } return 0, fmt.Errorf("WebRTCTransport::SendRtpPacket: invalid trackType %v", trackType) } -func (c *WebRTCMediaTransport) WriteRTCP(trackType TrackType, packet []byte) (n int, err error) { +func (c *WebRTCMediaTransport) WriteRTCP(trackType TrackType, pkt rtcp.Packet) (n int, err error) { if c.closed.Get() { return 0, fmt.Errorf("WebRTCTransport::SendRtcpPacket: closed") } - rtcpPacket, err := rtcp.Unmarshal(packet) - if err != nil { - return 0, fmt.Errorf("WebRTCTransport::SendRtcpPacket: rtcp.Unmarshal err => %v", err) - } - err = c.pc.WriteRTCP(rtcpPacket) + + err = c.pc.WriteRTCP([]rtcp.Packet{pkt}) if err != nil { return 0, fmt.Errorf("WebRTCTransport::SendRtcpPacket: pc.WriteRTCP err => %v", err) } - return len(packet), nil + return 0, nil } func (c *WebRTCMediaTransport) Close() error { @@ -527,7 +560,7 @@ func (c *WebRTCMediaTransport) HandleRtcpFb(rtpSender *webrtc.RTPSender) { case *rtcp.PictureLossIndication: if pliOnce { fwdPkts = append(fwdPkts, p) - logger.Infof("Picture Loss Indication") + logger.Tracef("Picture Loss Indication") if c.requestKeyFrameHandler != nil { c.requestKeyFrameHandler() } @@ -536,7 +569,7 @@ func (c *WebRTCMediaTransport) HandleRtcpFb(rtpSender *webrtc.RTPSender) { case *rtcp.FullIntraRequest: if firOnce { fwdPkts = append(fwdPkts, p) - logger.Infof("FullIntraRequest") + logger.Tracef("FullIntraRequest") if c.requestKeyFrameHandler != nil { c.requestKeyFrameHandler() } @@ -546,13 +579,13 @@ func (c *WebRTCMediaTransport) HandleRtcpFb(rtpSender *webrtc.RTPSender) { if expectedMinBitrate == 0 || expectedMinBitrate > uint64(p.Bitrate) { expectedMinBitrate = uint64(p.Bitrate) //hi.CameraUpdateBitrate(uint32(expectedMinBitrate / 1024)) - logger.Debugf("[%v] ReceiverEstimatedMaximumBitrate %d", rtpSender.Track().Kind(), expectedMinBitrate/1024) + logger.Tracef("[%v] ReceiverEstimatedMaximumBitrate %d", rtpSender.Track().Kind(), expectedMinBitrate/1024) } case *rtcp.ReceiverReport: for _, r := range p.Reports { if maxRatePacketLoss == 0 || maxRatePacketLoss < r.FractionLost { maxRatePacketLoss = r.FractionLost - logger.Infof("maxRatePacketLoss %d", maxRatePacketLoss) + logger.Tracef("maxRatePacketLoss %d", maxRatePacketLoss) } } case *rtcp.TransportLayerNack: diff --git a/examples/b2bua/b2bua/standard_tp.go b/examples/b2bua/b2bua/standard_tp.go index b8fa85e..d85c93d 100644 --- a/examples/b2bua/b2bua/standard_tp.go +++ b/examples/b2bua/b2bua/standard_tp.go @@ -21,8 +21,8 @@ type StandardMediaTransport struct { remoteDescription *sdp.Session mu sync.RWMutex - rtpHandler func(trackType TrackType, payload []byte) (int, error) - rtcpHandler func(trackType TrackType, payload []byte) (int, error) + rtpHandler func(trackType TrackType, pkt rtp.Packet) (int, error) + rtcpHandler func(trackType TrackType, pkt rtcp.Packet) (int, error) requestKeyFrameHandler func() error videoSSRC uint32 @@ -98,18 +98,11 @@ func (c *StandardMediaTransport) Init(umc UserAgentMediaConfig) error { var formats []*sdp.Format for _, codec := range trackInfo.Codecs { - //for _, enabledCodec := range callConfig.Codecs { - // if codec.Name == enabledCodec { - formats = append(formats, &sdp.Format{ - Payload: codec.Payload, - Name: codec.Name, - ClockRate: codec.ClockRate, - Params: codec.Params, - Feedback: codec.Feedback, - Channels: codec.Channels, - }) - // } - //} + for _, enabledCodec := range b2buaConfig.UaMediaConfig.Codecs { + if codec.Name == enabledCodec { + formats = append(formats, codec) + } + } } media.Format = formats medias = append(medias, media) @@ -119,13 +112,13 @@ func (c *StandardMediaTransport) Init(umc UserAgentMediaConfig) error { return nil } -func (c *StandardMediaTransport) OnRtpPacket(rtpHandler func(trackType TrackType, payload []byte) (int, error)) { +func (c *StandardMediaTransport) OnRtpPacket(rtpHandler func(trackType TrackType, pkt rtp.Packet) (int, error)) { c.mu.Lock() defer c.mu.Unlock() c.rtpHandler = rtpHandler } -func (c *StandardMediaTransport) OnRtcpPacket(rtcpHandler func(trackType TrackType, payload []byte) (int, error)) { +func (c *StandardMediaTransport) OnRtcpPacket(rtcpHandler func(trackType TrackType, pkt rtcp.Packet) (int, error)) { c.mu.Lock() defer c.mu.Unlock() c.rtcpHandler = rtcpHandler @@ -138,14 +131,14 @@ func (c *StandardMediaTransport) OnRequestKeyFrame(keyHandler func() error) { } func (c *StandardMediaTransport) onRtpPacket(trackType TrackType, packet []byte, raddr net.Addr) error { - logger.Debugf("UdpTansport::onRtpPacket: %v read %d bytes, raddr %v", trackType, len(packet), raddr) + logger.Tracef("UdpTansport::onRtpPacket: %v read %d bytes, raddr %v", trackType, len(packet), raddr) - p := &rtp.Packet{} + p := rtp.Packet{} if err := p.Unmarshal(packet); err != nil { logger.Errorf("rtp.Packet Unmarshal: e %v len %v", err, len(packet)) } - logger.Debugf("UdpTansport::onRtpPacket: [%v] read %d bytes, seq %d, ts %d, ssrc %v, payload %v", trackType, len(packet), p.SequenceNumber, p.Timestamp, p.SSRC, p.PayloadType) + logger.Tracef("UdpTansport::onRtpPacket: [%v] read %d bytes, seq %d, ts %d, ssrc %v, payload %v", trackType, len(packet), p.SequenceNumber, p.Timestamp, p.SSRC, p.PayloadType) if trackType == TrackTypeVideo && c.videoSSRC == 0 { c.videoSSRC = p.SSRC @@ -155,33 +148,37 @@ func (c *StandardMediaTransport) onRtpPacket(trackType TrackType, packet []byte, c.mu.RLock() defer c.mu.RUnlock() if c.rtpHandler != nil { - if _, err := c.rtpHandler(trackType, packet); err != nil { + if _, err := c.rtpHandler(trackType, p); err != nil { logger.Warnf("UdpTansport::onRtpPacket: panic => %v", err) } } return nil } -func (c *StandardMediaTransport) onRtcpPacket(trackType TrackType, packet []byte, raddr net.Addr) error { - logger.Debugf("UdpTansport::OnRtcpPacketReceived: %v read %d bytes, raddr %v", trackType, len(packet), raddr) +func (c *StandardMediaTransport) onRtcpPacket(trackType TrackType, buf []byte, raddr net.Addr) error { + logger.Tracef("UdpTansport::OnRtcpPacketReceived: %v read %d bytes, raddr %v", trackType, len(buf), raddr) c.mu.RLock() defer c.mu.RUnlock() + + pkts, err := rtcp.Unmarshal(buf) + + if err != nil { + //logger.Warnf("UdpTansport::OnRtcpPacketReceived: Unmarshal rtcp receiver packets err %v", err) + return err + } + if c.rtcpHandler != nil { - if _, err := c.rtcpHandler(trackType, packet); err != nil { - logger.Warnf("UdpTansport::onRtcpPacket: panic => %v", err) + for _, pkt := range pkts { + if _, err := c.rtcpHandler(trackType, pkt); err != nil { + logger.Warnf("UdpTansport::onRtcpPacket: panic => %v", err) + } } } return nil } -func (c *StandardMediaTransport) WriteRTP(trackType TrackType, packet []byte) (int, error) { - logger.Debugf("UdpTansport::WriteRTP: %v, write %d bytes", trackType, len(packet)) - - p := &rtp.Packet{} - if err := p.Unmarshal(packet); err != nil { - logger.Errorf("tp.Packet Unmarshal: e %v", err) - } - logger.Debugf("UdpTansport::WriteRTP: %v, write %d bytes, seq %d, ts %d", trackType, len(packet), p.SequenceNumber, p.Timestamp) +func (c *StandardMediaTransport) WriteRTP(trackType TrackType, pkt rtp.Packet) (int, error) { + logger.Tracef("UdpTansport::WriteRTP: %v, write %d bytes", trackType, len(pkt.Payload)) port := c.ports[trackType] @@ -196,8 +193,8 @@ func (c *StandardMediaTransport) WriteRTP(trackType TrackType, packet []byte) (i } //re-write payload type - p.PayloadType = track.Codecs[0].Payload - pktbuf, err := p.Marshal() + pkt.PayloadType = track.Codecs[0].Payload + pktbuf, err := pkt.Marshal() if err != nil { logger.Errorf("UdpTansport::WriteRTP: Marshal rtp receiver packets err %v", err) @@ -206,23 +203,22 @@ func (c *StandardMediaTransport) WriteRTP(trackType TrackType, packet []byte) (i return port.WriteRtp(pktbuf) } -func (c *StandardMediaTransport) WriteRTCP(trackType TrackType, packet []byte) (int, error) { - logger.Debugf("UdpTansport::WriteRTCP: %v, write %d bytes", trackType, len(packet)) - /* - pkts, err := rtcp.Unmarshal(packet) - if err != nil { - logger.Errorf("UdpTansport::WriteRTP: Unmarshal rtcp receiver packets err %v", err) - } - - logger.Debugf("UdpTansport::WriteRTCP: %v read %d packets", trackType, len(pkts)) - */ +func (c *StandardMediaTransport) WriteRTCP(trackType TrackType, pkt rtcp.Packet) (int, error) { port := c.ports[trackType] if port == nil { logger.Errorf("UdpTansport::WriteRTCP: port is nil") return 0, nil } - return port.WriteRtcp(packet) + + buf, err := pkt.Marshal() + if err != nil { + logger.Errorf("UdpTansport::WriteRTCP: Marshal rtcp receiver packets err %v", err) + return 0, err + } + + logger.Tracef("UdpTansport::WriteRTCP: %v, write %d bytes", trackType, len(buf)) + return port.WriteRtcp(buf) } func (c *StandardMediaTransport) Type() MediaTransportType { @@ -284,15 +280,11 @@ func (c *StandardMediaTransport) RequestKeyFrame() error { func (c *StandardMediaTransport) sendPLI(ssrc uint32) error { pli := rtcp.PictureLossIndication{MediaSSRC: uint32(ssrc)} - buf, err := pli.Marshal() - if err != nil { - logger.Error(err) - return err - } - _, errSend := c.WriteRTCP(TrackTypeVideo, buf) + + _, errSend := c.WriteRTCP(TrackTypeVideo, &pli) if errSend != nil { logger.Error(errSend) - return err + return errSend } logger.Infof("Sent PLI %v", pli) return nil @@ -307,12 +299,7 @@ func (c *StandardMediaTransport) sendTntervalPlic(ssrc uint32) error { return } pli := rtcp.PictureLossIndication{SenderSSRC: uint32(0), MediaSSRC: uint32(ssrc)} - buf, err := pli.Marshal() - if err != nil { - logger.Error(err) - return - } - _, errSend := c.WriteRTCP(TrackTypeVideo, buf) + _, errSend := c.WriteRTCP(TrackTypeVideo, &pli) if errSend != nil { logger.Error(errSend) return diff --git a/examples/b2bua/b2bua/transport_interface.go b/examples/b2bua/b2bua/transport_interface.go index 5b809a5..5d5199c 100644 --- a/examples/b2bua/b2bua/transport_interface.go +++ b/examples/b2bua/b2bua/transport_interface.go @@ -1,5 +1,10 @@ package b2bua +import ( + "github.com/pion/rtcp" + "github.com/pion/rtp" +) + type MediaTransportType string const ( @@ -20,13 +25,13 @@ type MediaTransport interface { CreateAnswer() (*Desc, error) Type() MediaTransportType - OnRtpPacket(rtpHandler func(trackType TrackType, payload []byte) (int, error)) - OnRtcpPacket(rtcpHandler func(trackType TrackType, payload []byte) (int, error)) + OnRtpPacket(rtpHandler func(trackType TrackType, pkt rtp.Packet) (int, error)) + OnRtcpPacket(rtcpHandler func(trackType TrackType, pkt rtcp.Packet) (int, error)) OnRequestKeyFrame(func() error) - WriteRTP(trackType TrackType, payload []byte) (int, error) - WriteRTCP(trackType TrackType, payload []byte) (int, error) + WriteRTP(trackType TrackType, pkt rtp.Packet) (int, error) + WriteRTCP(trackType TrackType, pkt rtcp.Packet) (int, error) RequestKeyFrame() error } diff --git a/examples/b2bua/b2bua/udp_port.go b/examples/b2bua/b2bua/udp_port.go index 873827f..3351e40 100644 --- a/examples/b2bua/b2bua/udp_port.go +++ b/examples/b2bua/b2bua/udp_port.go @@ -146,7 +146,7 @@ func (c *UdpPort) WriteRtp(data []byte) (int, error) { return 0, fmt.Errorf("udpConns is nil") } - logger.Debugf("UdpPort::WriteRTP: raddr %v", c.rAddr) + logger.Tracef("UdpPort::WriteRTP: raddr %v", c.rAddr) return c.udpConns[0].WriteToUDP(data, c.rAddr) } @@ -167,7 +167,7 @@ func (c *UdpPort) WriteRtcp(data []byte) (int, error) { return 0, fmt.Errorf("udpConns is nil") } - logger.Debugf("UdpPort::WriteRTCP: %d packets, raddr %v", len(data), addr) + logger.Tracef("UdpPort::WriteRTCP: %d packets, raddr %v", len(data), addr) return c.udpConns[1].WriteToUDP(data, addr) } diff --git a/examples/b2bua/b2bua/util.go b/examples/b2bua/b2bua/util.go index 81fac8c..ca3259c 100644 --- a/examples/b2bua/b2bua/util.go +++ b/examples/b2bua/b2bua/util.go @@ -379,13 +379,13 @@ a=rtpmap:126 telephone-event/8000 */ var defaultAudioCodecs = map[uint8]*sdp.Format{ - 0: {Payload: 0, Name: "PCMU", ClockRate: 8000}, - 8: {Payload: 8, Name: "PCMA", ClockRate: 8000}, - 9: {Payload: 9, Name: "G722", ClockRate: 8000}, - 13: {Payload: 13, Name: "CN", ClockRate: 8000}, - 110: {Payload: 110, Name: "telephone-event", ClockRate: 48000}, - 111: {Payload: 111, Name: "opus", ClockRate: 48000}, - 126: {Payload: 126, Name: "telephone-event", ClockRate: 8000}, + 0: {Payload: 0, Name: "PCMU", ClockRate: 8000, Channels: 1}, + 8: {Payload: 8, Name: "PCMA", ClockRate: 8000, Channels: 1}, + 9: {Payload: 9, Name: "G722", ClockRate: 8000, Channels: 1}, + 13: {Payload: 13, Name: "CN", ClockRate: 8000, Channels: 1}, + 110: {Payload: 110, Name: "telephone-event", ClockRate: 48000, Channels: 1}, + 111: {Payload: 111, Name: "opus", ClockRate: 48000, Channels: 1}, + 126: {Payload: 126, Name: "telephone-event", ClockRate: 8000, Channels: 1}, } var defaultVideoCodecs = map[uint8]*sdp.Format{ diff --git a/pkg/utils/log.go b/pkg/utils/log.go index 5920377..3fd1eeb 100644 --- a/pkg/utils/log.go +++ b/pkg/utils/log.go @@ -35,7 +35,7 @@ func (ml *MyLogger) Level() string { var ( loggers map[string]*MyLogger - DefaultLogLevel = log.InfoLevel + DefaultLogLevel = log.DebugLevel ) func init() { @@ -60,14 +60,14 @@ func NewLogrusLogger(level log.Level, prefix string, fields log.Fields) log.Logg Logger: logger, level: level, } - logger.SetLevel(level) + logger.SetLevel(uint32(level)) return logger.WithPrefix(prefix) } func SetLogLevel(prefix string, level log.Level) error { if logger, found := loggers[prefix]; found { logger.level = level - logger.Logger.SetLevel(level) + logger.Logger.SetLevel(uint32(level)) return nil } return fmt.Errorf("logger [%v] not found", prefix) From b17b9b20d40d67f3f0b4dc7e013a224e48e12b39 Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Sun, 21 Jul 2024 23:14:59 +0800 Subject: [PATCH 34/36] fix. --- examples/b2bua/b2bua/rtc_media_tp.go | 89 +++++++++------------------- 1 file changed, 27 insertions(+), 62 deletions(-) diff --git a/examples/b2bua/b2bua/rtc_media_tp.go b/examples/b2bua/b2bua/rtc_media_tp.go index 52feedc..4d5a2dd 100644 --- a/examples/b2bua/b2bua/rtc_media_tp.go +++ b/examples/b2bua/b2bua/rtc_media_tp.go @@ -25,11 +25,15 @@ var ( ) const ( - mimeTypeH264 = "video/h264" + mimeTypeH264 = "video/H264" mimeTypeOpus = "audio/opus" - mimeTypeVP8 = "video/vp8" - mimeTypeVP9 = "video/vp9" + mimeTypeVP8 = "video/VP8" + mimeTypeVP9 = "video/VP9" + mimeTypeAV1 = "audio/AV1" mineTypePCMA = "audio/PCMA" + mineTypePCMU = "audio/PCMU" + mimeTypeG722 = "audio/G722" + mimeTypeILBC = "audio/ILBC" ) func init() { @@ -108,70 +112,23 @@ func (c *WebRTCMediaTransport) Type() MediaTransportType { func (c *WebRTCMediaTransport) Init(umc UserAgentMediaConfig) error { // Create a MediaEngine object to configure the supported codec m := &webrtc.MediaEngine{} - /* - for _, trackInfo := range c.md.Tracks { - if trackInfo.TrackType == TrackTypeAudio { - for _, codec := range trackInfo.Codecs { - mimeType := fmt.Sprintf("audio/%s", codec.Name) - sdpFmtpLine := strings.Join(codec.Params, ";") - var rtcpFb []webrtc.RTCPFeedback = nil - for _, fb := range codec.Feedback { - vals := strings.Split(fb, " ") - if len(vals) < 2 { - rtcpFb = append(rtcpFb, webrtc.RTCPFeedback{Type: vals[0], Parameter: ""}) - } else { - rtcpFb = append(rtcpFb, webrtc.RTCPFeedback{Type: vals[0], Parameter: vals[1]}) - } - } - if err := m.RegisterCodec(webrtc.RTPCodecParameters{ - RTPCodecCapability: webrtc.RTPCodecCapability{ - MimeType: mimeType, - ClockRate: uint32(codec.ClockRate), - Channels: uint16(codec.Channels), - SDPFmtpLine: sdpFmtpLine, - RTCPFeedback: rtcpFb}, - PayloadType: webrtc.PayloadType(codec.Payload), - }, webrtc.RTPCodecTypeAudio); err != nil { - return err - } - } - } else if trackInfo.TrackType == TrackTypeVideo { - for _, codec := range trackInfo.Codecs { - mimeType := fmt.Sprintf("video/%s", codec.Name) - sdpFmtpLine := strings.Join(codec.Params, ";") - var rtcpFb []webrtc.RTCPFeedback = nil - for _, fb := range codec.Feedback { - vals := strings.Split(fb, " ") - if len(vals) < 2 { - rtcpFb = append(rtcpFb, webrtc.RTCPFeedback{Type: vals[0], Parameter: ""}) - } else { - rtcpFb = append(rtcpFb, webrtc.RTCPFeedback{Type: vals[0], Parameter: vals[1]}) - } - } - if err := m.RegisterCodec(webrtc.RTPCodecParameters{ - RTPCodecCapability: webrtc.RTPCodecCapability{ - MimeType: mimeType, - ClockRate: uint32(codec.ClockRate), - SDPFmtpLine: sdpFmtpLine, - RTCPFeedback: rtcpFb}, - PayloadType: webrtc.PayloadType(codec.Payload), - }, webrtc.RTPCodecTypeVideo); err != nil { - return err - } - } - } - } - */ - for _, codec := range []webrtc.RTPCodecParameters{ { - RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypePCMU, ClockRate: 8000, Channels: 1, SDPFmtpLine: "", RTCPFeedback: nil}, + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mineTypePCMU, ClockRate: 8000, Channels: 1, SDPFmtpLine: "", RTCPFeedback: nil}, PayloadType: 0, }, { - RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypePCMA, ClockRate: 8000, Channels: 1, SDPFmtpLine: "", RTCPFeedback: nil}, + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mineTypePCMA, ClockRate: 8000, Channels: 1, SDPFmtpLine: "", RTCPFeedback: nil}, PayloadType: 8, }, + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeG722, ClockRate: 8000, Channels: 1, SDPFmtpLine: "", RTCPFeedback: nil}, + PayloadType: 9, + }, + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeILBC, ClockRate: 8000, Channels: 1, SDPFmtpLine: "", RTCPFeedback: nil}, + PayloadType: 103, + }, { RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeOpus, ClockRate: 48000, Channels: 2, SDPFmtpLine: "minptime=10;useinbandfec=1", RTCPFeedback: nil}, PayloadType: 111, @@ -181,7 +138,7 @@ func (c *WebRTCMediaTransport) Init(umc UserAgentMediaConfig) error { if trackInfo.TrackType == TrackTypeAudio { for _, c := range trackInfo.Codecs { if strings.Contains(strings.ToLower(codec.RTPCodecCapability.MimeType), strings.ToLower(c.Name)) { - codec.PayloadType = webrtc.PayloadType(c.Payload) + //codec.PayloadType = webrtc.PayloadType(c.Payload) if err := m.RegisterCodec(codec, webrtc.RTPCodecTypeAudio); err != nil { return err } @@ -198,6 +155,14 @@ func (c *WebRTCMediaTransport) Init(umc UserAgentMediaConfig) error { RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeVP8, ClockRate: 90000, RTCPFeedback: videoRTCPFeedback}, PayloadType: 100, }, + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeVP9, ClockRate: 90000, RTCPFeedback: videoRTCPFeedback}, + PayloadType: 127, + }, + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeAV1, ClockRate: 90000, RTCPFeedback: videoRTCPFeedback}, + PayloadType: 35, + }, { RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeH264, ClockRate: 90000, SDPFmtpLine: "level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=640c33", RTCPFeedback: videoRTCPFeedback}, PayloadType: 96, @@ -207,7 +172,7 @@ func (c *WebRTCMediaTransport) Init(umc UserAgentMediaConfig) error { if trackInfo.TrackType == TrackTypeVideo { for _, c := range trackInfo.Codecs { if strings.Contains(strings.ToLower(codec.RTPCodecCapability.MimeType), strings.ToLower(c.Name)) { - codec.PayloadType = webrtc.PayloadType(c.Payload) + //codec.PayloadType = webrtc.PayloadType(c.Payload) if err := m.RegisterCodec(codec, webrtc.RTPCodecTypeVideo); err != nil { return err } From fbca5b5828c6180ab109fe7c4dda84c6adcc2403 Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Sun, 21 Jul 2024 23:54:03 +0800 Subject: [PATCH 35/36] update. --- examples/b2bua/b2bua/standard_tp.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/examples/b2bua/b2bua/standard_tp.go b/examples/b2bua/b2bua/standard_tp.go index d85c93d..d064b03 100644 --- a/examples/b2bua/b2bua/standard_tp.go +++ b/examples/b2bua/b2bua/standard_tp.go @@ -145,6 +145,14 @@ func (c *StandardMediaTransport) onRtpPacket(trackType TrackType, packet []byte, //c.sendPLI(c.videoSSRC) } + /* + track, found := c.md.Tracks[TrackTypeVideo] + if found && len(track.Codecs) > 0 && strings.ToUpper(track.Codecs[0].Name) == "PS" { + + return nil + } + */ + c.mu.RLock() defer c.mu.RUnlock() if c.rtpHandler != nil { From 730f50ede2d254a541acbf827722e5fffad745fd Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Mon, 22 Jul 2024 00:10:42 +0800 Subject: [PATCH 36/36] update. --- examples/b2bua/b2bua/rtc_media_tp.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/b2bua/b2bua/rtc_media_tp.go b/examples/b2bua/b2bua/rtc_media_tp.go index 4d5a2dd..a811ef9 100644 --- a/examples/b2bua/b2bua/rtc_media_tp.go +++ b/examples/b2bua/b2bua/rtc_media_tp.go @@ -26,7 +26,7 @@ var ( const ( mimeTypeH264 = "video/H264" - mimeTypeOpus = "audio/opus" + mimeTypeOpus = "audio/OPUS" mimeTypeVP8 = "video/VP8" mimeTypeVP9 = "video/VP9" mimeTypeAV1 = "audio/AV1"