Skip to content

Commit 7b63c3d

Browse files
committed
fix message
1 parent b07e98f commit 7b63c3d

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

srt.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ func openSrtStream(addr string) (io.ReadCloser, error) {
297297
}
298298

299299
func openUDPWriter(addr string) (io.WriteCloser, error) {
300-
u, err := url.Parse(addr)
300+
u, err := url.Parse(addr)
301301
if err != nil {
302302
return nil, err
303303
}

srtla.go

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func randomBytes(n int) []byte {
6161
if _, err := io.ReadFull(rand.Reader, b); err != nil {
6262
// crypto/rand should never fail on *nix, fall back to math/rand if it
6363
// ever does.
64-
log.Printf("warning: crypto/rand failed (%v); falling back to pseudo-rand", err)
64+
log.Printf("Warning: crypto/rand failed (%v); falling back to pseudo-rand", err)
6565
for i := range b {
6666
b[i] = byte(mathrand.Intn(256))
6767
}
@@ -161,14 +161,14 @@ func sendRegErr(addr *net.UDPAddr) {
161161

162162
func registerGroup(addr *net.UDPAddr, pkt []byte) {
163163
if len(groups) >= MaxGroups {
164-
log.Printf("[%s] registration failed: max groups reached", addr)
164+
log.Printf("[%s] Registration failed: Max groups reached", addr)
165165
sendRegErr(addr)
166166
return
167167
}
168168

169169
// Prevent duplicate registration from same remote addr
170170
if g, _ := findByAddr(addr); g != nil {
171-
log.Printf("[%s] registration failed: addr already in group", addr)
171+
log.Printf("[%s] Registration failed: Addr already in group", addr)
172172
sendRegErr(addr)
173173
return
174174
}
@@ -186,15 +186,15 @@ func registerGroup(addr *net.UDPAddr, pkt []byte) {
186186
copy(out[2:], g.id[:])
187187

188188
if _, err := srtlaSock.WriteToUDP(out, addr); err != nil {
189-
log.Printf("[%s] registration failed: %v", addr, err)
189+
log.Printf("[%s] Registration failed: %v", addr, err)
190190
return
191191
}
192192

193193
groupsMu.Lock()
194194
groups = append(groups, g)
195195
groupsMu.Unlock()
196196

197-
log.Printf("[%s] [group %p] registered", addr, g)
197+
log.Printf("[%s] [group %p] Registered", addr, g)
198198
}
199199

200200
func registerConn(addr *net.UDPAddr, pkt []byte) {
@@ -204,14 +204,14 @@ func registerConn(addr *net.UDPAddr, pkt []byte) {
204204
var hdr [2]byte
205205
binary.BigEndian.PutUint16(hdr[:], SRTLATypeRegNGP)
206206
srtlaSock.WriteToUDP(hdr[:], addr)
207-
log.Printf("[%s] conn registration failed: no group", addr)
207+
log.Printf("[%s] Conn registration failed: no group", addr)
208208
return
209209
}
210210

211211
// Reject if this addr is already tied to another group
212212
if tmp, _ := findByAddr(addr); tmp != nil && tmp != g {
213213
sendRegErr(addr)
214-
log.Printf("[%s] [group %p] conn reg failed: addr in other group", addr, g)
214+
log.Printf("[%s] [group %p] Conn registration failed: Addr in other group", addr, g)
215215
return
216216
}
217217

@@ -231,7 +231,7 @@ func registerConn(addr *net.UDPAddr, pkt []byte) {
231231
if len(g.conns) >= MaxConnsPerGroup {
232232
g.mu.Unlock()
233233
sendRegErr(addr)
234-
log.Printf("[%s] [group %p] conn reg failed: too many conns", addr, g)
234+
log.Printf("[%s] [group %p] Conn registration failed: Too many conns", addr, g)
235235
return
236236
}
237237
g.conns = append(g.conns, &Conn{addr: addr, lastRcvd: time.Now()})
@@ -246,7 +246,7 @@ func registerConn(addr *net.UDPAddr, pkt []byte) {
246246
binary.BigEndian.PutUint16(hdr[:], SRTLATypeReg3)
247247
_, _ = srtlaSock.WriteToUDP(hdr[:], addr)
248248

249-
log.Printf("[%s] [group %p] conn registered", addr, g)
249+
log.Printf("[%s] [group %p] Conn Registered", addr, g)
250250
}
251251

252252
func startSRTReader(g *Group) {
@@ -281,7 +281,7 @@ func handleSRTData(g *Group, pkt []byte) {
281281
defer g.mu.Unlock()
282282
for _, c := range g.conns {
283283
if _, err := srtlaSock.WriteToUDP(pkt, c.addr); err != nil {
284-
log.Printf("[%s] [group %p] failed to fwd SRT ACK: %v", c.addr, g, err)
284+
log.Printf("[%s] [group %p] Failed to fwd SRT ACK: %v", c.addr, g, err)
285285
}
286286
}
287287
} else {
@@ -291,7 +291,7 @@ func handleSRTData(g *Group, pkt []byte) {
291291
g.mu.Unlock()
292292
if dst != nil {
293293
if _, err := srtlaSock.WriteToUDP(pkt, dst); err != nil {
294-
log.Printf("[%s] [group %p] failed to fwd SRT pkt: %v", dst, g, err)
294+
log.Printf("[%s] [group %p] Failed to fwd SRT pkt: %v", dst, g, err)
295295
}
296296
}
297297
}
@@ -329,7 +329,7 @@ func handleSRTLAIncoming(pkt []byte, addr *net.UDPAddr) {
329329
conn, err := net.DialUDP("udp", nil, srtAddr)
330330
if err != nil {
331331
g.mu.Unlock()
332-
log.Printf("[group %p] failed to dial SRT server: %v", g, err)
332+
log.Printf("[group %p] Failed to dial SRT server: %v", g, err)
333333
removeGroup(g)
334334
return
335335
}
@@ -339,7 +339,7 @@ func handleSRTLAIncoming(pkt []byte, addr *net.UDPAddr) {
339339
g.srtSock = conn
340340
g.mu.Unlock()
341341
startSRTReader(g)
342-
log.Printf("[group %p] created SRT socket (local %s)", g, conn.LocalAddr())
342+
log.Printf("[group %p] Created SRT socket (local %s)", g, conn.LocalAddr())
343343
} else {
344344
g.mu.Unlock()
345345
}
@@ -353,7 +353,7 @@ func handleSRTLAIncoming(pkt []byte, addr *net.UDPAddr) {
353353

354354
_, err := srtConn.Write(pkt)
355355
if err != nil {
356-
log.Printf("[group %p] failed to fwd SRTLA pkt: %v", g, err)
356+
log.Printf("[group %p] Failed to fwd SRTLA pkt: %v", g, err)
357357
g.close()
358358
removeGroup(g)
359359
}
@@ -374,7 +374,7 @@ func cleanup() {
374374
if now.Sub(c.lastRcvd) < ConnTimeout {
375375
newConns = append(newConns, c)
376376
} else {
377-
log.Printf("[%s] [group %p] connection timed out", c.addr, g)
377+
log.Printf("[%s] [group %p] Connection timed out", c.addr, g)
378378
}
379379
}
380380
if len(newConns) != len(g.conns) {
@@ -391,7 +391,7 @@ func cleanup() {
391391
if keep {
392392
newGroups = append(newGroups, g)
393393
} else {
394-
log.Printf("[group %p] removed (no connections)", g)
394+
log.Printf("[group %p] Removed (No connections)", g)
395395
g.close()
396396
}
397397
}
@@ -430,7 +430,7 @@ func resolveSRTAddr(host string, port uint16) (*net.UDPAddr, error) {
430430
}
431431
// Fallback to first IP even if handshake failed
432432
if len(addrs) == 0 {
433-
return nil, fmt.Errorf("no IPs for host %s", host)
433+
return nil, fmt.Errorf("No IPs for host %s", host)
434434
}
435435
return &net.UDPAddr{IP: addrs[0], Port: int(port)}, nil
436436
}
@@ -445,20 +445,20 @@ func runSrtla(srtlaPort uint, srtHost string, srtPort uint, verbose bool) {
445445
var err error
446446
srtAddr, err = resolveSRTAddr(srtHost, uint16(srtPort))
447447
if err != nil {
448-
log.Fatalf("could not resolve downstream SRT server: %v", err)
448+
log.Fatalf("Could not resolve downstream SRT server: %v", err)
449449
}
450-
log.Printf("downstream SRT server %s", srtAddr)
450+
log.Printf("Downstream SRT server %s", srtAddr)
451451

452452
// Listen UDP (dual-stack) for SRT-LA
453453
laddr := &net.UDPAddr{IP: net.IPv6unspecified, Port: int(srtlaPort)}
454454
srtlaSock, err = net.ListenUDP("udp", laddr)
455455
if err != nil {
456-
log.Fatalf("failed to listen on UDP port %d: %v", srtlaPort, err)
456+
log.Fatalf("Failed to listen on UDP port %d: %v", srtlaPort, err)
457457
}
458458
_ = srtlaSock.SetReadBuffer(RecvBufSize)
459459
_ = srtlaSock.SetWriteBuffer(SendBufSize)
460460

461-
log.Printf("listening on %s", srtlaSock.LocalAddr())
461+
log.Printf("Listening on %s", srtlaSock.LocalAddr())
462462

463463
// Reader goroutine for SRT-LA socket
464464
go func() {

0 commit comments

Comments
 (0)