Emacs/cc-ide: More robust function movement

[mediaserv.git] / main.cc

diff --git a/main.cc b/main.cc
index 36b0946..b5f01c6 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -24,13 +24,13 @@
 #include "Utils/DaemonTools.hh"
 #include "Server/HTTPLogger.hh"
 #include "Server/SimpleHTTPServer.hh"
-#include "Socket/TCPSocketHandle.hh"
+#include "Socket/Protocols/INet/TCPSocketHandle.hh"
 
 //#include "main.mpp"
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-#define THROW_SYSERR(cmd,e) if (e) throw satcom::lib::SystemException(#cmd,errno)
+#define THROW_SYSERR(cmd,e) if (e) throw senf::SystemException(#cmd,errno)
 
 int main(int argc, char** argv)
 {
@@ -45,19 +45,19 @@ int main(int argc, char** argv)
        try {
            // We have to make sure not to access any sytem files after the chroot
            // (initgroups accesses /etc/group, redirect_stdio accesses /dev/null)
-           satcom::lib::redirect_stdio();
+           senf::redirect_stdio();
            THROW_SYSERR( initgroups, ::initgroups("media",gr->gr_gid) < 0 );
            THROW_SYSERR( chdir, chdir("wwwroot") < 0 );
            THROW_SYSERR( chroot, chroot(".") < 0 );
-           satcom::lib::TCPv4ServerSocketHandle socket (argv[1]);
+           senf::TCPv4ServerSocketHandle socket (argv[1]);
            THROW_SYSERR( setregid, ::setregid(gr->gr_gid,gr->gr_gid) < 0 );
            THROW_SYSERR( setreuid, ::setreuid(pw->pw_uid,pw->pw_uid) < 0 );
-           satcom::lib::daemonize();
+           senf::daemonize();
            socket.blocking(false);
            socket.protocol().reuseaddr(true);
            g0dil::mediaserv::SimpleHTTPServer server (socket,logger);
            
-           satcom::lib::Scheduler::instance().process();
+           senf::Scheduler::instance().process();
        }
        catch (std::exception const & ex) {
            logger.failedRequest(ex.what());