-
-
Notifications
You must be signed in to change notification settings - Fork 3.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[ipcamera] Fix Hikvision digest stopping ipcamera.mjpeg #11457
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Matthew Skinner <matt@pcmus.com>
Signed-off-by: Matthew Skinner <matt@pcmus.com>
Signed-off-by: Matthew Skinner <matt@pcmus.com>
Signed-off-by: Matthew Skinner <matt@pcmus.com>
Signed-off-by: Matthew Skinner <matt@pcmus.com>
Signed-off-by: Matthew Skinner <matt@pcmus.com>
Signed-off-by: Matthew Skinner <matt@pcmus.com>
Signed-off-by: Matthew Skinner <matt@pcmus.com>
Signed-off-by: Matthew Skinner <matt@pcmus.com>
Signed-off-by: Matthew Skinner <matt@pcmus.com>
Signed-off-by: Matthew Skinner <matt@pcmus.com>
Signed-off-by: Matthew Skinner <matt@pcmus.com>
Signed-off-by: Matthew Skinner <matt@pcmus.com>
fwolter
approved these changes
Oct 30, 2021
dschoepel
pushed a commit
to dschoepel/openhab-addons
that referenced
this pull request
Nov 9, 2021
* Stop hik logging 401 with digest. Signed-off-by: Matthew Skinner <matt@pcmus.com> * Improve and fix generic cams Signed-off-by: Matthew Skinner <matt@pcmus.com> * Stop dahua IntelliFrame logging Signed-off-by: Matthew Skinner <matt@pcmus.com> * Catch IllegalStateException Signed-off-by: Matthew Skinner <matt@pcmus.com> * Trial reusing channels. Signed-off-by: Matthew Skinner <matt@pcmus.com> * Tidy up Signed-off-by: Matthew Skinner <matt@pcmus.com> * cleanup 2 Signed-off-by: Matthew Skinner <matt@pcmus.com> * Cleanup 3 Signed-off-by: Matthew Skinner <matt@pcmus.com> * Disable checking connection with event stream. Signed-off-by: Matthew Skinner <matt@pcmus.com> * Bug fix Signed-off-by: Matthew Skinner <matt@pcmus.com> * more cleanup Signed-off-by: Matthew Skinner <matt@pcmus.com> * more cleanup Signed-off-by: Matthew Skinner <matt@pcmus.com> * Reduce logging to only whats needed. Signed-off-by: Matthew Skinner <matt@pcmus.com> * fix offline detection. Signed-off-by: Matthew Skinner <matt@pcmus.com> * fixes to ipcamera.mjpeg Signed-off-by: Matthew Skinner <matt@pcmus.com> * reverse some connection checks Signed-off-by: Matthew Skinner <matt@pcmus.com> * Fix Hikvision Digest stops ipcamera.mjpeg Signed-off-by: Matthew Skinner <matt@pcmus.com> Signed-off-by: Dave J Schoepel <dave@theschoepels.com>
jpg0
pushed a commit
to jpg0/openhab-addons
that referenced
this pull request
Nov 10, 2021
* Stop hik logging 401 with digest. Signed-off-by: Matthew Skinner <matt@pcmus.com> * Improve and fix generic cams Signed-off-by: Matthew Skinner <matt@pcmus.com> * Stop dahua IntelliFrame logging Signed-off-by: Matthew Skinner <matt@pcmus.com> * Catch IllegalStateException Signed-off-by: Matthew Skinner <matt@pcmus.com> * Trial reusing channels. Signed-off-by: Matthew Skinner <matt@pcmus.com> * Tidy up Signed-off-by: Matthew Skinner <matt@pcmus.com> * cleanup 2 Signed-off-by: Matthew Skinner <matt@pcmus.com> * Cleanup 3 Signed-off-by: Matthew Skinner <matt@pcmus.com> * Disable checking connection with event stream. Signed-off-by: Matthew Skinner <matt@pcmus.com> * Bug fix Signed-off-by: Matthew Skinner <matt@pcmus.com> * more cleanup Signed-off-by: Matthew Skinner <matt@pcmus.com> * more cleanup Signed-off-by: Matthew Skinner <matt@pcmus.com> * Reduce logging to only whats needed. Signed-off-by: Matthew Skinner <matt@pcmus.com> * fix offline detection. Signed-off-by: Matthew Skinner <matt@pcmus.com> * fixes to ipcamera.mjpeg Signed-off-by: Matthew Skinner <matt@pcmus.com> * reverse some connection checks Signed-off-by: Matthew Skinner <matt@pcmus.com> * Fix Hikvision Digest stops ipcamera.mjpeg Signed-off-by: Matthew Skinner <matt@pcmus.com>
NickWaterton
pushed a commit
to NickWaterton/openhab-addons
that referenced
this pull request
Dec 30, 2021
* Stop hik logging 401 with digest. Signed-off-by: Matthew Skinner <matt@pcmus.com> * Improve and fix generic cams Signed-off-by: Matthew Skinner <matt@pcmus.com> * Stop dahua IntelliFrame logging Signed-off-by: Matthew Skinner <matt@pcmus.com> * Catch IllegalStateException Signed-off-by: Matthew Skinner <matt@pcmus.com> * Trial reusing channels. Signed-off-by: Matthew Skinner <matt@pcmus.com> * Tidy up Signed-off-by: Matthew Skinner <matt@pcmus.com> * cleanup 2 Signed-off-by: Matthew Skinner <matt@pcmus.com> * Cleanup 3 Signed-off-by: Matthew Skinner <matt@pcmus.com> * Disable checking connection with event stream. Signed-off-by: Matthew Skinner <matt@pcmus.com> * Bug fix Signed-off-by: Matthew Skinner <matt@pcmus.com> * more cleanup Signed-off-by: Matthew Skinner <matt@pcmus.com> * more cleanup Signed-off-by: Matthew Skinner <matt@pcmus.com> * Reduce logging to only whats needed. Signed-off-by: Matthew Skinner <matt@pcmus.com> * fix offline detection. Signed-off-by: Matthew Skinner <matt@pcmus.com> * fixes to ipcamera.mjpeg Signed-off-by: Matthew Skinner <matt@pcmus.com> * reverse some connection checks Signed-off-by: Matthew Skinner <matt@pcmus.com> * Fix Hikvision Digest stops ipcamera.mjpeg Signed-off-by: Matthew Skinner <matt@pcmus.com> Signed-off-by: Nick Waterton <n.waterton@outlook.com>
nemerdaud
pushed a commit
to nemerdaud/openhab-addons
that referenced
this pull request
Jan 28, 2022
* Stop hik logging 401 with digest. Signed-off-by: Matthew Skinner <matt@pcmus.com> * Improve and fix generic cams Signed-off-by: Matthew Skinner <matt@pcmus.com> * Stop dahua IntelliFrame logging Signed-off-by: Matthew Skinner <matt@pcmus.com> * Catch IllegalStateException Signed-off-by: Matthew Skinner <matt@pcmus.com> * Trial reusing channels. Signed-off-by: Matthew Skinner <matt@pcmus.com> * Tidy up Signed-off-by: Matthew Skinner <matt@pcmus.com> * cleanup 2 Signed-off-by: Matthew Skinner <matt@pcmus.com> * Cleanup 3 Signed-off-by: Matthew Skinner <matt@pcmus.com> * Disable checking connection with event stream. Signed-off-by: Matthew Skinner <matt@pcmus.com> * Bug fix Signed-off-by: Matthew Skinner <matt@pcmus.com> * more cleanup Signed-off-by: Matthew Skinner <matt@pcmus.com> * more cleanup Signed-off-by: Matthew Skinner <matt@pcmus.com> * Reduce logging to only whats needed. Signed-off-by: Matthew Skinner <matt@pcmus.com> * fix offline detection. Signed-off-by: Matthew Skinner <matt@pcmus.com> * fixes to ipcamera.mjpeg Signed-off-by: Matthew Skinner <matt@pcmus.com> * reverse some connection checks Signed-off-by: Matthew Skinner <matt@pcmus.com> * Fix Hikvision Digest stops ipcamera.mjpeg Signed-off-by: Matthew Skinner <matt@pcmus.com>
volkmarnissen
pushed a commit
to volkmarnissen/openhab-addons
that referenced
this pull request
Mar 3, 2022
* Stop hik logging 401 with digest. Signed-off-by: Matthew Skinner <matt@pcmus.com> * Improve and fix generic cams Signed-off-by: Matthew Skinner <matt@pcmus.com> * Stop dahua IntelliFrame logging Signed-off-by: Matthew Skinner <matt@pcmus.com> * Catch IllegalStateException Signed-off-by: Matthew Skinner <matt@pcmus.com> * Trial reusing channels. Signed-off-by: Matthew Skinner <matt@pcmus.com> * Tidy up Signed-off-by: Matthew Skinner <matt@pcmus.com> * cleanup 2 Signed-off-by: Matthew Skinner <matt@pcmus.com> * Cleanup 3 Signed-off-by: Matthew Skinner <matt@pcmus.com> * Disable checking connection with event stream. Signed-off-by: Matthew Skinner <matt@pcmus.com> * Bug fix Signed-off-by: Matthew Skinner <matt@pcmus.com> * more cleanup Signed-off-by: Matthew Skinner <matt@pcmus.com> * more cleanup Signed-off-by: Matthew Skinner <matt@pcmus.com> * Reduce logging to only whats needed. Signed-off-by: Matthew Skinner <matt@pcmus.com> * fix offline detection. Signed-off-by: Matthew Skinner <matt@pcmus.com> * fixes to ipcamera.mjpeg Signed-off-by: Matthew Skinner <matt@pcmus.com> * reverse some connection checks Signed-off-by: Matthew Skinner <matt@pcmus.com> * Fix Hikvision Digest stops ipcamera.mjpeg Signed-off-by: Matthew Skinner <matt@pcmus.com>
marcfischerboschio
pushed a commit
to bosch-io/openhab-addons
that referenced
this pull request
May 5, 2022
* Stop hik logging 401 with digest. Signed-off-by: Matthew Skinner <matt@pcmus.com> * Improve and fix generic cams Signed-off-by: Matthew Skinner <matt@pcmus.com> * Stop dahua IntelliFrame logging Signed-off-by: Matthew Skinner <matt@pcmus.com> * Catch IllegalStateException Signed-off-by: Matthew Skinner <matt@pcmus.com> * Trial reusing channels. Signed-off-by: Matthew Skinner <matt@pcmus.com> * Tidy up Signed-off-by: Matthew Skinner <matt@pcmus.com> * cleanup 2 Signed-off-by: Matthew Skinner <matt@pcmus.com> * Cleanup 3 Signed-off-by: Matthew Skinner <matt@pcmus.com> * Disable checking connection with event stream. Signed-off-by: Matthew Skinner <matt@pcmus.com> * Bug fix Signed-off-by: Matthew Skinner <matt@pcmus.com> * more cleanup Signed-off-by: Matthew Skinner <matt@pcmus.com> * more cleanup Signed-off-by: Matthew Skinner <matt@pcmus.com> * Reduce logging to only whats needed. Signed-off-by: Matthew Skinner <matt@pcmus.com> * fix offline detection. Signed-off-by: Matthew Skinner <matt@pcmus.com> * fixes to ipcamera.mjpeg Signed-off-by: Matthew Skinner <matt@pcmus.com> * reverse some connection checks Signed-off-by: Matthew Skinner <matt@pcmus.com> * Fix Hikvision Digest stops ipcamera.mjpeg Signed-off-by: Matthew Skinner <matt@pcmus.com>
andan67
pushed a commit
to andan67/openhab-addons
that referenced
this pull request
Nov 6, 2022
* Stop hik logging 401 with digest. Signed-off-by: Matthew Skinner <matt@pcmus.com> * Improve and fix generic cams Signed-off-by: Matthew Skinner <matt@pcmus.com> * Stop dahua IntelliFrame logging Signed-off-by: Matthew Skinner <matt@pcmus.com> * Catch IllegalStateException Signed-off-by: Matthew Skinner <matt@pcmus.com> * Trial reusing channels. Signed-off-by: Matthew Skinner <matt@pcmus.com> * Tidy up Signed-off-by: Matthew Skinner <matt@pcmus.com> * cleanup 2 Signed-off-by: Matthew Skinner <matt@pcmus.com> * Cleanup 3 Signed-off-by: Matthew Skinner <matt@pcmus.com> * Disable checking connection with event stream. Signed-off-by: Matthew Skinner <matt@pcmus.com> * Bug fix Signed-off-by: Matthew Skinner <matt@pcmus.com> * more cleanup Signed-off-by: Matthew Skinner <matt@pcmus.com> * more cleanup Signed-off-by: Matthew Skinner <matt@pcmus.com> * Reduce logging to only whats needed. Signed-off-by: Matthew Skinner <matt@pcmus.com> * fix offline detection. Signed-off-by: Matthew Skinner <matt@pcmus.com> * fixes to ipcamera.mjpeg Signed-off-by: Matthew Skinner <matt@pcmus.com> * reverse some connection checks Signed-off-by: Matthew Skinner <matt@pcmus.com> * Fix Hikvision Digest stops ipcamera.mjpeg Signed-off-by: Matthew Skinner <matt@pcmus.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A fix that appears to be caused by the 401 message from digest auth getting sent out as the first jpg frame and hence stops the stream from working if Digest is on a Hikvision. Other brands don't seem effected.
Signed-off-by: Matthew Skinner matt@pcmus.com