diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a2cdb7..ca82f2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ project (${PROJECT_NAME}) set (${PROJECT_NAME}_VERSION_MAJOR 0) set (${PROJECT_NAME}_VERSION_MINOR 2) -set (${PROJECT_NAME}_VERSION_PATCH 0) +set (${PROJECT_NAME}_VERSION_PATCH 2) set (${PROJECT_NAME}_SUFFIX "-beta") set (${PROJECT_NAME}_VERSION "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH}${${PROJECT_NAME}_SUFFIX}") @@ -122,8 +122,8 @@ set (CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}_${${PROJECT_NAME}_VERSION}_${CMAKE set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md") set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") set (CPACK_PACKAGE_VERSION_MAJOR "0") -set (CPACK_PACKAGE_VERSION_MINOR "1") -set (CPACK_PACKAGE_VERSION_PATCH "0") +set (CPACK_PACKAGE_VERSION_MINOR "2") +set (CPACK_PACKAGE_VERSION_PATCH "2") set (CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}_${${PROJECT_NAME}_VERSION}") set (CPACK_GENERATOR "TGZ") set (CPACK_SOURCE_GENERATOR "TGZ") diff --git a/cache_managers/dumb_cache_manager/src/dumb_cache_manager.cpp b/cache_managers/dumb_cache_manager/src/dumb_cache_manager.cpp index 1008d40..da7e07d 100644 --- a/cache_managers/dumb_cache_manager/src/dumb_cache_manager.cpp +++ b/cache_managers/dumb_cache_manager/src/dumb_cache_manager.cpp @@ -53,8 +53,10 @@ dumb_cache_manager::set_streams(std::vector model //! Inserts a single stream to the cache void dumb_cache_manager::update_stream(const etix::cameradar::stream_model& newmodel) { - for (auto& it : this->streams) { - if (it.address == newmodel.address && it.port == newmodel.port) { it = newmodel; } + for (auto& stream : this->streams) { + if (stream.address == newmodel.address && stream.port == newmodel.port) { + stream = newmodel; + } } } @@ -62,8 +64,9 @@ dumb_cache_manager::update_stream(const etix::cameradar::stream_model& newmodel) std::vector dumb_cache_manager::get_streams() { std::vector ret; - for (const auto& it : this->streams) { - if (not it.service_name.compare("rtsp") && not it.state.compare("open")) ret.push_back(it); + for (const auto& stream : this->streams) { + if (not stream.service_name.compare("rtsp") && not stream.state.compare("open")) + ret.push_back(stream); } return ret; } @@ -72,10 +75,10 @@ dumb_cache_manager::get_streams() { std::vector dumb_cache_manager::get_valid_streams() { std::vector ret; - for (const auto& it : this->streams) { - if ((not it.service_name.compare("rtsp") && not it.state.compare("open")) && it.ids_found && - it.path_found) - ret.push_back(it); + for (const auto& stream : this->streams) { + if ((not stream.service_name.compare("rtsp") && not stream.state.compare("open")) && + stream.ids_found && stream.path_found) + ret.push_back(stream); } return ret; } diff --git a/cameradar_standalone/src/describe.cpp b/cameradar_standalone/src/describe.cpp index 88992b9..9215bd8 100644 --- a/cameradar_standalone/src/describe.cpp +++ b/cameradar_standalone/src/describe.cpp @@ -71,12 +71,15 @@ curl_describe(const std::string& path, bool logs) { curl_easy_cleanup(csession); fclose(protofile); curl_global_cleanup(); + LOG_DEBUG_("Response code : " + std::to_string(rc), "describe"); if (logs) { - if (rc != 401 && pos == std::string::npos) + // Some cameras return 400 instead of 401, don't know why. + // Some cameras timeout and then curl considers the status as 0 + if (rc != 401 && rc != 400 && rc && pos == std::string::npos) LOG_INFO_("Unprotected camera discovered.", "brutelogs"); - return ((res == CURLE_OK) && rc != 401); + return ((res == CURLE_OK) && rc != 401 && rc != 400 && rc); } - return ((res == CURLE_OK) && rc != 404); + return ((res == CURLE_OK) && rc != 404 && rc != 400 && rc); } } } diff --git a/deployment/cameradar_0.2.1-beta_Release_Linux.tar.gz b/deployment/cameradar_0.2.1-beta_Release_Linux.tar.gz deleted file mode 100644 index 890974e..0000000 Binary files a/deployment/cameradar_0.2.1-beta_Release_Linux.tar.gz and /dev/null differ diff --git a/deployment/cameradar_0.2.2-beta_Release_Linux.tar.gz b/deployment/cameradar_0.2.2-beta_Release_Linux.tar.gz new file mode 100644 index 0000000..cedb522 Binary files /dev/null and b/deployment/cameradar_0.2.2-beta_Release_Linux.tar.gz differ