瀏覽代碼

now loading configuration from config namespace

marius.rescheleit 4 年之前
父節點
當前提交
f20eb052b5
共有 2 個文件被更改,包括 6 次插入6 次删除
  1. 2 1
      daemon/src/Server.cpp
  2. 4 5
      daemon/src/main.cpp

+ 2 - 1
daemon/src/Server.cpp

@@ -1,5 +1,6 @@
 #include "../include/Server.h"
 #include "../include/base64.h"
+#include "../include/config.h"
 
 #include <iostream>
 
@@ -395,7 +396,7 @@ void Server::start_accept() {
 }
 
 Server::Server(io_service &io_service)
-    : acceptor_(io_service, tcp::endpoint(tcp::v4(), 1234)) {
+    : acceptor_(io_service, tcp::endpoint(tcp::v4(), std::stoi(Config::getValue("port")))) {
   start_accept();
 }
 

+ 4 - 5
daemon/src/main.cpp

@@ -3,16 +3,15 @@
 
 #include "../include/Server.h"
 #include "../include/Sniffer.h"
+#include "../include/config.h"
 
 using namespace std;
 
 int main(int argc, char *argv[]) {
-  if (argc < 2) {
-    cout << "Usage: " << argv[0] << " <interface>" << endl << endl;
-    return 0;
-  }
+  // load config int namespace
+  Config::init("config.txt");
 
-  const string interface = argv[1];
+  const string interface = Config::getValue("interface");
   Sniffer *sniffer = new Sniffer(interface);
   thread snifferThread(&Sniffer::startSniffing, sniffer);