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

Fix nmap package detection

Browse Source
This commit is contained in:
Brendan LE GLAUNEC
2016-08-31 09:39:08 +02:00
committed by Brendan Le Glaunec
parent 6247656a63
commit d9945f5e26
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -1
View File
@@ -23,7 +23,7 @@ message ("Here")
set (${PROJECT_NAME}_VERSION_MAJOR 1) set (${PROJECT_NAME}_VERSION_MAJOR 1)
set (${PROJECT_NAME}_VERSION_MINOR 0) set (${PROJECT_NAME}_VERSION_MINOR 0)
set (${PROJECT_NAME}_VERSION_PATCH 3) set (${PROJECT_NAME}_VERSION_PATCH 4)
set (${PROJECT_NAME}_SUFFIX "-beta") set (${PROJECT_NAME}_SUFFIX "-beta")
set (${PROJECT_NAME}_VERSION "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH}${${PROJECT_NAME}_SUFFIX}") set (${PROJECT_NAME}_VERSION "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH}${${PROJECT_NAME}_SUFFIX}")
README.md
+1 -1
View File
@@ -3,7 +3,7 @@
## An RTSP surveillance camera access multitool ## An RTSP surveillance camera access multitool
[![cameradar License](https://img.shields.io/badge/license-Apache-blue.svg)](#license) [![cameradar License](https://img.shields.io/badge/license-Apache-blue.svg)](#license)
[![Latest release](https://img.shields.io/badge/release-1.0.3-green.svg)](https://github.com/EtixLabs/cameradar/releases/latest) [![Latest release](https://img.shields.io/badge/release-1.0.4-green.svg)](https://github.com/EtixLabs/cameradar/releases/latest)
#### Cameradar allows you to: #### Cameradar allows you to:
cameradar_standalone/include/dispatcher.h
+1 -1
View File
@@ -64,7 +64,7 @@ public:
const std::pair<bool, etix::tool::opt_parse>& opts) const std::pair<bool, etix::tool::opt_parse>& opts)
: busy(false) : busy(false)
, current(task::init) , current(task::init)
, nmap_output("scans/scan" + std::to_string(std::chrono::system_clock::to_time_t( , nmap_output("/tmp/scans/scan" + std::to_string(std::chrono::system_clock::to_time_t(
std::chrono::system_clock::now())) + std::chrono::system_clock::now())) +
".xml") ".xml")
, conf(conf) , conf(conf)
cameradar_standalone/src/tasks/mapping.cpp
+2 -5
View File
@@ -29,11 +29,8 @@ namespace cameradar {
bool bool
nmap_is_ok() { nmap_is_ok() {
return ( return (
launch_command("test `dpkg -l | cut -c 5-9 | grep nmap` = nmap") (system("dpkg -l | cut -c 5-9 | grep nmap") == 0)
// && launch_command("test `nmap --version | cut -c 14-18 | head -n2 | tail -n1` = 6.47") && launch_command("mkdir -p /tmp/scans")); // Creates the directory in which the scans will be stored
&&
launch_command(
"mkdir -p scans")); // Creates the directory in which the scans will be stored
} }
//! Launches and checks the return of the nmap command //! Launches and checks the return of the nmap command