* tunnel endpoints. It has less protocol overhead than IPSec in Tunnel
* mode and allows tunneling of every ETHER TYPE protocol (e.g.
* ethernet, ip, arp ...). satp directly includes cryptography and
- * message authentication based on the methodes used by SRTP. It is
+ * message authentication based on the methods used by SRTP. It is
* intended to deliver a generic, scaleable and secure solution for
* tunneling and relaying of packets of any protocol.
*
*
- * Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl,
+ * Copyright (C) 2007-2014 Markus Grüneis, Othmar Gsenger, Erwin Nindl,
* Christian Pointner <satp@wirdorange.org>
*
* This file is part of Anytun.
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with anytun. If not, see <http://www.gnu.org/licenses/>.
+ * along with Anytun. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL. If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so. If you
+ * do not wish to do so, delete this exception statement from your
+ * version. If you delete this exception statement from all source
+ * files in the program, then also delete it here.
*/
#include <iostream>
#include <fstream>
-#include <poll.h>
-#include <fcntl.h>
-#include <pwd.h>
-#include <grp.h>
#include <string>
#include "datatypes.h"
#include "resolver.h"
#include "syncServer.h"
-#include "daemon.hpp"
+#if !defined(_MSC_VER) && !defined(MINGW)
+# include "daemonService.h"
+#else
+# include "nullDaemon.h"
+#endif
+#include <vector>
+
+std::list<std::string> config_;
-void syncOnConnect(SyncTcpConnection * connptr)
+void syncOnConnect(SyncTcpConnection* connptr)
{
- std::ifstream file(gOpt.getFileName().c_str());
- if(file.is_open()) {
- std::string line;
- while (!file.eof()) {
- getline (file,line);
- connptr->Send(line);
- }
- file.close();
+ for(std::list<std::string>::const_iterator it=config_.begin(); it!=config_.end(); ++it) {
+ connptr->Send(*it);
}
}
void syncListener()
{
- boost::asio::io_service io_service;
- try
- {
+ boost::asio::io_service io_service;
+ try {
SyncServer server(gOpt.getBindToAddr(), gOpt.getBindToPort(), boost::bind(syncOnConnect, _1));
server.run();
- }
- catch(std::runtime_error& e) {
+ } catch(std::runtime_error& e) {
cLog.msg(Log::PRIO_ERROR) << "sync listener thread died due to an uncaught runtime_error: " << e.what();
- }
- catch(std::exception& e) {
+ } catch(std::exception& e) {
cLog.msg(Log::PRIO_ERROR) << "sync listener thread died due to an uncaught exception: " << e.what();
}
}
int main(int argc, char* argv[])
{
- bool daemonized=false;
- try
- {
- try
- {
- bool result = gOpt.parse(argc, argv);
- if(!result) {
- gOpt.printUsage();
+ DaemonService service;
+ try {
+ try {
+ if(!gOpt.parse(argc, argv)) {
exit(0);
}
+
StringList targets = gOpt.getLogTargets();
- if(targets.empty()) {
- cLog.addTarget("syslog:3,anytun-controld,daemon");
- }
- else {
- StringList::const_iterator it;
- for(it = targets.begin();it != targets.end(); ++it)
- cLog.addTarget(*it);
+ for(StringList::const_iterator it = targets.begin(); it != targets.end(); ++it) {
+ cLog.addTarget(*it);
}
- }
- catch(syntax_error& e)
- {
+ } catch(syntax_error& e) {
std::cerr << e << std::endl;
gOpt.printUsage();
exit(-1);
}
-
- cLog.msg(Log::PRIO_NOTICE) << "anytun-controld started...";
+
+ cLog.msg(Log::PRIO_NOTICE) << "anytun-controld started...";
gOpt.parse_post(); // print warnings
- std::ifstream file( gOpt.getFileName().c_str() );
- if( file.is_open() )
+ std::ifstream file(gOpt.getFileName().c_str());
+ if(file.is_open()) {
+ std::string line;
+ while(!file.eof()) {
+ getline(file,line);
+ config_.push_back(line);
+ }
file.close();
- else {
+ } else {
std::cout << "ERROR: unable to open file!" << std::endl;
exit(-1);
}
-
- PrivInfo privs(gOpt.getUsername(), gOpt.getGroupname());
+
+ service.initPrivs(gOpt.getUsername(), gOpt.getGroupname());
if(gOpt.getDaemonize()) {
- daemonize();
- daemonized = true;
+ service.daemonize();
+ }
+
+ if(gOpt.getChrootDir() != "") {
+ service.chroot(gOpt.getChrootDir());
}
+ service.dropPrivs();
- gSignalController.init();
+ gSignalController.init(service);
gResolver.init();
-
- if(gOpt.getChrootDir() != "")
- do_chroot(gOpt.getChrootDir());
-
- privs.drop();
- boost::thread * syncListenerThread;
+ boost::thread* syncListenerThread;
syncListenerThread = new boost::thread(boost::bind(syncListener));
-
+ if(syncListenerThread) syncListenerThread->detach();
+
int ret = gSignalController.run();
-
+
return ret;
- }
- catch(std::runtime_error& e)
- {
- if(daemonized)
+ } catch(std::runtime_error& e) {
+ if(service.isDaemonized()) {
cLog.msg(Log::PRIO_ERROR) << "uncaught runtime error, exiting: " << e.what();
- else
+ } else {
std::cout << "uncaught runtime error, exiting: " << e.what() << std::endl;
- }
- catch(std::exception& e)
- {
- if(daemonized)
+ }
+ } catch(std::exception& e) {
+ if(service.isDaemonized()) {
cLog.msg(Log::PRIO_ERROR) << "uncaught exception, exiting: " << e.what();
- else
+ } else {
std::cout << "uncaught exception, exiting: " << e.what() << std::endl;
+ }
}
}
projects / anytun.git / blobdiff