theater/tendrils
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix dante flow count and zero-pad rx channel numbers

Browse Source
This commit is contained in:
Ian Gulliver
2026-01-23 16:30:53 -08:00
parent c694efade5
commit c16146f2d8
1 changed files with 48 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
dante_control.go
View File

@@ -115,57 +115,62 @@ func (d *DanteFlows) LogAll() {
return sortorder.NaturalLess(flows[i].SourceName, flows[j].SourceName)
})
log.Printf("[sigusr1] ================ %d dante flows ================", len(flows))
for _, flow := range flows {
type channelFlow struct {
sourceName string
txCh string
rxName string
rxCh string
}
var channelFlows []channelFlow
var noChannelSubs []string
for _, sub := range flow.Subscribers {
if len(sub.Channels) == 0 {
noChannelSubs = append(noChannelSubs, sub.Name)
} else {
for _, ch := range sub.Channels {
parts := strings.Split(ch, "->")
if len(parts) == 2 {
channelFlows = append(channelFlows, channelFlow{
txCh: parts[0],
rxName: sub.Name,
rxCh: parts[1],
})
} else {
noChannelSubs = append(noChannelSubs, fmt.Sprintf("%s[%s]", sub.Name, ch))
}
}
}
}
sort.Slice(channelFlows, func(i, j int) bool {
if channelFlows[i].txCh != channelFlows[j].txCh {
return sortorder.NaturalLess(channelFlows[i].txCh, channelFlows[j].txCh)
}
return sortorder.NaturalLess(channelFlows[i].rxName, channelFlows[j].rxName)
})
sort.Slice(noChannelSubs, func(i, j int) bool {
return sortorder.NaturalLess(noChannelSubs[i], noChannelSubs[j])
})
var allChannelFlows []channelFlow
var allNoChannelFlows []string
for _, flow := range flows {
sourceName := flow.SourceName
if strings.HasPrefix(sourceName, "dante-av:") || strings.HasPrefix(sourceName, "dante-mcast:") {
sourceName = "?? (" + sourceName + ")"
}
for _, cf := range channelFlows {
log.Printf("[sigusr1] %s[%s] -> %s[%s]", sourceName, cf.txCh, cf.rxName, cf.rxCh)
for _, sub := range flow.Subscribers {
if len(sub.Channels) == 0 {
allNoChannelFlows = append(allNoChannelFlows, fmt.Sprintf("%s -> %s", sourceName, sub.Name))
} else {
for _, ch := range sub.Channels {
parts := strings.Split(ch, "->")
if len(parts) == 2 {
allChannelFlows = append(allChannelFlows, channelFlow{
sourceName: sourceName,
txCh: parts[0],
rxName: sub.Name,
rxCh: parts[1],
})
} else {
allNoChannelFlows = append(allNoChannelFlows, fmt.Sprintf("%s -> %s[%s]", sourceName, sub.Name, ch))
}
if len(noChannelSubs) > 0 {
log.Printf("[sigusr1] %s -> %s", sourceName, strings.Join(noChannelSubs, ", "))
}
}
}
}
totalFlows := len(allChannelFlows) + len(allNoChannelFlows)
log.Printf("[sigusr1] ================ %d dante flows ================", totalFlows)
sort.Slice(allChannelFlows, func(i, j int) bool {
if allChannelFlows[i].sourceName != allChannelFlows[j].sourceName {
return sortorder.NaturalLess(allChannelFlows[i].sourceName, allChannelFlows[j].sourceName)
}
if allChannelFlows[i].txCh != allChannelFlows[j].txCh {
return sortorder.NaturalLess(allChannelFlows[i].txCh, allChannelFlows[j].txCh)
}
return sortorder.NaturalLess(allChannelFlows[i].rxName, allChannelFlows[j].rxName)
})
sort.Strings(allNoChannelFlows)
for _, cf := range allChannelFlows {
log.Printf("[sigusr1] %s[%s] -> %s[%s]", cf.sourceName, cf.txCh, cf.rxName, cf.rxCh)
}
for _, flow := range allNoChannelFlows {
log.Printf("[sigusr1] %s", flow)
}
}
func nextDanteSeq() uint16 {
@@ -477,7 +482,7 @@ func (t *Tendrils) probeDanteDeviceWithPort(ip net.IP, port int) {
if sub.TxDeviceName != "" && info.Name != "" {
channelInfo := ""
if sub.TxChannelName != "" {
channelInfo = fmt.Sprintf("%s->%d", sub.TxChannelName, sub.RxChannel)
channelInfo = fmt.Sprintf("%s->%02d", sub.TxChannelName, sub.RxChannel)
}
t.danteFlows.Update(sub.TxDeviceName, info.Name, channelInfo)
needIGMPFallback = false