gilles/go2rtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modified func Close in pkg/isapi/client.go to call '/ISAPI/System/TwoWayAudio/channels/<channel id>/close' instead of '/ISAPI/System/TwoWayAudio/channels/<channel id/close/open'

Browse Source 
Modified pkg/isapi/client.go to call 'close' before 'open' to prevent channel left open from prior connection blocking with 401 or 403 errors.
This commit is contained in:
f1d094
2024-02-24 15:45:43 -08:00
parent 5fa31fe4d6
commit 3fa481bdfc
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/isapi/client.go
+19 -3
View File
@@ -86,12 +86,28 @@ func (c *Client) Dial() (err error) {
func (c *Client) Open() (err error) {
link := c.url + "/ISAPI/System/TwoWayAudio/channels/" + c.channel
req, err := http.NewRequest("PUT", link+"/open", nil)
// Hikvision ISAPI may not accept a new open request if the previous one was not closed (e.g.
// using the test button on-camera or via curl command) but a close request can be sent even if
// the audio is already closed. So, we send a close request first and then open it again. Seems
// janky but it works.
req, err := http.NewRequest("PUT", link+"/close", nil)
if err != nil {
return err
}
res, err := tcp.Do(req)
if err != nil {
return err
}
tcp.Close(res)
req, err = http.NewRequest("PUT", link+"/open", nil)
if err != nil {
return err
}
res, err = tcp.Do(req)
if err != nil {
return
}
@@ -124,8 +140,8 @@ func (c *Client) Open() (err error) {
}
func (c *Client) Close() (err error) {
link := c.url + "/ISAPI/System/TwoWayAudio/channels/" + c.channel + "/close"
req, err := http.NewRequest("PUT", link+"/open", nil)
link := c.url + "/ISAPI/System/TwoWayAudio/channels/" + c.channel
req, err := http.NewRequest("PUT", link+"/close", nil)
if err != nil {
return err
}