tom/doorlockd-mirror
1
0
Fork 0
mirror of https://github.com/binary-kitchen/doorlockd synced 2024-12-22 18:34:25 +01:00
Code Issues Releases Wiki Activity

Removed using of std namespace

Browse Source
This commit is contained in:
Ralf Ramsauer 2015-09-22 17:47:42 +02:00
parent 09a1c613cc
commit 4581e4da20
1 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
doorlockd/main.cpp
View File

@ -12,8 +12,6 @@
#include "config.h" #include "config.h"
#include "logic.h" #include "logic.h"
using namespace std;
namespace po = boost::program_options; namespace po = boost::program_options;
using boost::asio::ip::tcp; using boost::asio::ip::tcp;
@ -22,7 +20,7 @@ const int constexpr SOCKET_BUFFERLENGTH = 2048;
const static Logger &l = Logger::get(); const static Logger &l = Logger::get();
static unique_ptr<Logic> logic = nullptr; static std::unique_ptr<Logic> logic = nullptr;
static boost::asio::io_service io_service; static boost::asio::io_service io_service;
static void signal_handler(int signum) static void signal_handler(int signum)
@ -40,15 +38,17 @@ static void session(tcp::socket &&sock)
data.resize(SOCKET_BUFFERLENGTH); data.resize(SOCKET_BUFFERLENGTH);
try { try {
size_t length = sock.read_some(boost::asio::buffer(data), error); size_t length = sock.read_some(boost::asio::buffer(data),
error);
if (error == boost::asio::error::eof) if (error == boost::asio::error::eof)
return; return;
else if (error) else if (error)
throw boost::system::system_error(error); throw boost::system::system_error(error);
string request(data.begin(), data.begin()+length); std::string request(data.begin(), data.begin()+length);
const auto rc = logic->parseRequest(request); const auto rc = logic->parseRequest(request);
sock.write_some(boost::asio::buffer(to_string(rc) + "\n"), error); sock.write_some(boost::asio::buffer(std::to_string(rc) + "\n"),
error);
if (error == boost::asio::error::eof) if (error == boost::asio::error::eof)
return; return;
@ -92,11 +92,11 @@ int main(int argc, char** argv)
int retval = -1; int retval = -1;
short port; short port;
std::chrono::seconds tokenTimeout; std::chrono::seconds tokenTimeout;
string ldapUri; std::string ldapUri;
string bindDN; std::string bindDN;
string lockPagePrefix; std::string lockPagePrefix;
string logfile; std::string logfile;
string serDev; std::string serDev;
l(LogLevel::notice, "Starting doorlockd"); l(LogLevel::notice, "Starting doorlockd");
@ -104,14 +104,29 @@ int main(int argc, char** argv)
unsigned int timeout; unsigned int timeout;
po::options_description desc("usage: doorlockd"); po::options_description desc("usage: doorlockd");
desc.add_options() desc.add_options()
("help,h", "print help") ("help,h",
("tokentimeout,t", po::value<unsigned int>(&timeout)->default_value(DEFAULT_TOKEN_TIMEOUT), "Token timeout in seconds") "print help")
("port,p", po::value<short>(&port)->default_value(DEFAULT_PORT), "Port") ("tokentimeout,t",
("ldap,s", po::value<string>(&ldapUri)->default_value(DEFAULT_LDAP_URI), "Ldap Server") po::value<unsigned int>(&timeout)->default_value(DEFAULT_TOKEN_TIMEOUT),
("bidndn,b", po::value<string>(&bindDN)->default_value(DEFAULT_BINDDN), "Bind DN, %s means username") "Token timeout in seconds")
("web,w", po::value<string>(&lockPagePrefix)->default_value(DEFAULT_WEB_PREFIX), "Prefix of the webpage") ("port,p",
("logfile,l", po::value<string>(&logfile)->default_value(DEFAULT_LOG_FILE), "Log file") po::value<short>(&port)->default_value(DEFAULT_PORT),
("serial,i", po::value<string>(&serDev)->default_value(DEFAULT_SERIAL_DEVICE), "Serial port"); "Port")
("ldap,s",
po::value<std::string>(&ldapUri)->default_value(DEFAULT_LDAP_URI),
"Ldap Server")
("bidndn,b",
po::value<std::string>(&bindDN)->default_value(DEFAULT_BINDDN),
"Bind DN, %s means username")
("web,w",
po::value<std::string>(&lockPagePrefix)->default_value(DEFAULT_WEB_PREFIX),
"Prefix of the webpage")
("logfile,l",
po::value<std::string>(&logfile)->default_value(DEFAULT_LOG_FILE),
"Log file")
("serial,i",
po::value<std::string>(&serDev)->default_value(DEFAULT_SERIAL_DEVICE),
"Serial port");
po::variables_map vm; po::variables_map vm;
po::store(po::command_line_parser(argc, argv).options(desc).run(), vm); po::store(po::command_line_parser(argc, argv).options(desc).run(), vm);
@ -147,7 +162,7 @@ int main(int argc, char** argv)
l(LogLevel::info, "Starting Doorlock Logic"); l(LogLevel::info, "Starting Doorlock Logic");
try { try {
logic = unique_ptr<Logic>(new Logic(tokenTimeout, logic = std::unique_ptr<Logic>(new Logic(tokenTimeout,
ldapUri, ldapUri,
bindDN, bindDN,
lockPagePrefix, lockPagePrefix,