public
/
openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Digest fix for doorbird. (#12399) 

Signed-off-by: Matthew Skinner <matt@pcmus.com>
This commit is contained in:
Matthew Skinner 2022-03-02 23:21:40 +11:00 committed by GitHub
parent d7d6798a97
commit 7da00f1d68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/handler/IpCameraHandler.java
View File

@ -213,7 +213,7 @@ public class IpCameraHandler extends BaseThingHandler {
try { try {
if (msg instanceof HttpResponse) { if (msg instanceof HttpResponse) {
HttpResponse response = (HttpResponse) msg; HttpResponse response = (HttpResponse) msg;
if (response.status().code() != 401) { if (response.status().code() == 200) {
if (!response.headers().isEmpty()) { if (!response.headers().isEmpty()) {
for (String name : response.headers().names()) { for (String name : response.headers().names()) {
// Some cameras use first letter uppercase and others dont. // Some cameras use first letter uppercase and others dont.
@ -253,7 +253,7 @@ public class IpCameraHandler extends BaseThingHandler {
} }
} }
} else { } else {
// 401 errors already handled in pipeline by MyNettyAuthHandler.java // Non 200 OK replies are logged and handled in pipeline by MyNettyAuthHandler.java
return; return;
} }
} }
@ -570,7 +570,7 @@ public class IpCameraHandler extends BaseThingHandler {
if (!"PUT".equals(httpMethod) || (useDigestAuth && digestString == null)) { if (!"PUT".equals(httpMethod) || (useDigestAuth && digestString == null)) {
request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, new HttpMethod(httpMethod), httpRequestURL); request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, new HttpMethod(httpMethod), httpRequestURL);
request.headers().set("Host", cameraConfig.getIp() + ":" + port); request.headers().set("Host", cameraConfig.getIp() + ":" + port);
request.headers().set("Connection", HttpHeaderValues.KEEP_ALIVE); request.headers().set("Connection", HttpHeaderValues.CLOSE);
} else { } else {
request = putRequestWithBody; request = putRequestWithBody;
} }
@ -1648,7 +1648,8 @@ public class IpCameraHandler extends BaseThingHandler {
} }
private void tryConnecting() { private void tryConnecting() {
if (!thing.getThingTypeUID().getId().equals(GENERIC_THING)) { if (!thing.getThingTypeUID().getId().equals(GENERIC_THING)
&& !thing.getThingTypeUID().getId().equals(DOORBIRD_THING)) {
onvifCamera = new OnvifConnection(this, cameraConfig.getIp() + ":" + cameraConfig.getOnvifPort(), onvifCamera = new OnvifConnection(this, cameraConfig.getIp() + ":" + cameraConfig.getOnvifPort(),
cameraConfig.getUser(), cameraConfig.getPassword()); cameraConfig.getUser(), cameraConfig.getPassword());
onvifCamera.setSelectedMediaProfile(cameraConfig.getOnvifMediaProfile()); onvifCamera.setSelectedMediaProfile(cameraConfig.getOnvifMediaProfile());