apps/monibuca
1
0
Fork 0
mirror of https://github.com/langhuihui/monibuca.git synced 2025-12-24 13:48:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: gb28181 DeviceKeepaliveTickTask Optimize the keepalive timeout judgment logic.

Browse Source
This commit is contained in:
pggiroro
2025-12-14 17:08:18 +08:00
parent 7cbfd28d8b
commit 4543dec868
2 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
plugin/gb28181/device.go
View File

@@ -44,6 +44,8 @@ func (d *DeviceKeepaliveTickTask) GetTickInterval() time.Duration {
}
func (d *DeviceKeepaliveTickTask) Tick(any) {
d.SetDescription("deviceid", d.device.DeviceId)
d.SetDescription("tick seconds", d.seconds)
keepaliveSeconds := 60
if d.device.KeepaliveInterval >= 5 {
keepaliveSeconds = d.device.KeepaliveInterval
@@ -58,6 +60,8 @@ func (d *DeviceKeepaliveTickTask) Tick(any) {
channel.Status = "OFF"
return true
})
d.seconds = time.Minute * 1440
//d.Stop(fmt.Errorf("device keeplive time out,deviceid is " + d.device.DeviceId))
}
}
@@ -99,24 +103,25 @@ type Device struct {
// channels []gb28181.DeviceChannel `gorm:"foreignKey:DeviceDBID;references:ID"` // 设备通道列表
// 保留原有字段
Status DeviceStatus
SN int
Recipient sip.Uri `gorm:"-:all"`
channels util.Collection[string, *Channel] `gorm:"-:all"`
catalogReqs util.Collection[int, *CatalogRequest] `gorm:"-:all"`
MediaIp string `desc:"收流IP"`
Longitude, Latitude string // 经度,纬度
eventChan chan any `gorm:"-:all"`
client *sipgo.Client
contactHDR sip.ContactHeader
fromHDR sip.FromHeader
toHDR sip.ToHeader
plugin *GB28181Plugin `gorm:"-:all"`
LocalPort int
CatalogSubscribeTask *CatalogSubscribeTask `gorm:"-:all"`
PositionSubscribeTask *PositionSubscribeTask `gorm:"-:all"`
AlarmSubscribeTask *AlarmSubscribeTask `gorm:"-:all"`
Cataloging bool `gorm:"-:all" default:"false"`
Status DeviceStatus
SN int
Recipient sip.Uri `gorm:"-:all"`
channels util.Collection[string, *Channel] `gorm:"-:all"`
catalogReqs util.Collection[int, *CatalogRequest] `gorm:"-:all"`
MediaIp string `desc:"收流IP"`
Longitude, Latitude string // 经度,纬度
eventChan chan any `gorm:"-:all"`
client *sipgo.Client
contactHDR sip.ContactHeader
fromHDR sip.FromHeader
toHDR sip.ToHeader
plugin *GB28181Plugin `gorm:"-:all"`
LocalPort int
CatalogSubscribeTask *CatalogSubscribeTask `gorm:"-:all"`
PositionSubscribeTask *PositionSubscribeTask `gorm:"-:all"`
AlarmSubscribeTask *AlarmSubscribeTask `gorm:"-:all"`
Cataloging bool `gorm:"-:all" default:"false"`
DeviceKeepaliveTickTask *DeviceKeepaliveTickTask `gorm:"-:all" default:"false"`
}
func (d *Device) TableName() string {
@@ -514,6 +519,7 @@ func (d *Device) Go() (err error) {
seconds: time.Second * 30,
device: d,
}
d.DeviceKeepaliveTickTask = deviceKeepaliveTickTask
d.AddTask(deviceKeepaliveTickTask)
return deviceKeepaliveTickTask.WaitStopped()
}

8
plugin/gb28181/registerhandler.go
View File

@@ -217,6 +217,8 @@ func (task *registerHandlerTask) Run() (err error) {
channel.Status = "OFF"
return true
})
d.DeviceKeepaliveTickTask.seconds = time.Minute * 1440
d.DeviceKeepaliveTickTask.Tick(nil)
//d.Stop(errors.New("unregister"))
}
} else {
@@ -264,7 +266,7 @@ func (task *registerHandlerTask) RecoverDevice(d *Device, req *sip.Request) {
if sourceIPParse.IsPrivate() { // 源IP是内网IP
myWanIP = myLanIP // 使用内网IP作为外网IP
}
} else { // 目标地址是IP
} else { // 目标地址是IP
if sourceIPParse.IsPrivate() { // 源IP是内网IP
myLanIP, myWanIP = myIP, myIP // 使用目标IP作为内外网IP
}
@@ -325,6 +327,8 @@ func (task *registerHandlerTask) RecoverDevice(d *Device, req *sip.Request) {
//}
task.gb.DB.Save(d)
}
d.DeviceKeepaliveTickTask.seconds = time.Second * 30
d.DeviceKeepaliveTickTask.Tick(nil)
go d.catalog()
return
}
@@ -380,7 +384,7 @@ func (task *registerHandlerTask) StoreDevice(deviceid string, req *sip.Request,
if sourceIPParse.IsPrivate() { // 源IP是内网IP
myWanIP = myLanIP // 使用内网IP作为外网IP
}
} else { // 目标地址是IP
} else { // 目标地址是IP
if sourceIPParse.IsPrivate() { // 源IP是内网IP
myLanIP, myWanIP = myIP, myIP // 使用目标IP作为内外网IP
}