nonoo/kappanhang
1
0
Fork 0
mirror of https://github.com/nonoo/kappanhang.git synced 2026-01-30 12:24:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use stream name in common logging

Browse source
This commit is contained in:
Nonoo 2020-10-18 11:17:40 +02:00
parent 385d96c7d1
commit bfb7789996
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
audiostream.go
View file

@ -11,7 +11,7 @@ type audioStream struct {
}
func (s *audioStream) Start() {
s.common.open(50003)
s.common.open("audio", 50003)
s.common.sendPkt3()

2
controlstream.go
View file

@ -236,7 +236,7 @@ func (s *controlStream) handleRead(r []byte) {
}
func (s *controlStream) Start() {
s.common.open(50001)
s.common.open("control", 50001)
s.common.sendPkt3()
s.common.sendSeq = 1

12
streamcommon.go
View file

@ -10,6 +10,7 @@ import (
)
type streamCommon struct {
name string
conn *net.UDPConn
localSID uint32
remoteSID uint32
@ -46,9 +47,9 @@ func (s *streamCommon) reader(c chan []byte) {
} else {
errCount++
if errCount > 5 {
log.Fatal("timeout")
log.Fatal(s.name + "/timeout")
}
log.Error("stream break detected")
log.Error(s.name + "/stream break detected")
}
errCount = 0
}
@ -69,9 +70,10 @@ func (s *streamCommon) expect(packetLength int, b []byte) []byte {
return r
}
func (s *streamCommon) open(portNumber int) {
func (s *streamCommon) open(name string, portNumber int) {
s.name = name
hostPort := fmt.Sprint(connectAddress, ":", portNumber)
log.Print("connecting to ", hostPort)
log.Print(s.name+"/connecting to ", hostPort)
raddr, err := net.ResolveUDPAddr("udp", hostPort)
if err != nil {
log.Fatal(err)
@ -85,7 +87,7 @@ func (s *streamCommon) open(portNumber int) {
}
s.localSID = uint32(time.Now().Unix())
log.Debugf("using session id %.8x", s.localSID)
log.Debugf(s.name+"/using session id %.8x", s.localSID)
}
func (p *streamCommon) sendPkt3() {