X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/641204dfbdb9fc870cdd2e7f9e3169a44693e7bf..b6dc7c53f5374b1798d74fe752e962266645cca0:/projects/sgauth/main.cpp?ds=sidebyside diff --git a/projects/sgauth/main.cpp b/projects/sgauth/main.cpp index 1aae7aa6..cdda3cb9 100644 --- a/projects/sgauth/main.cpp +++ b/projects/sgauth/main.cpp @@ -105,6 +105,14 @@ private: }; //----------------------------------------------------------------------------- SETTINGS::SETTINGS() + : port(0), + localPort(0), + listenWebIP(0), + refreshPeriod(0), + daemon(false), + noWeb(false), + reconnect(false), + showPid(false) { confFile = "/etc/sgauth.conf"; } @@ -303,12 +311,6 @@ void Usage() printf("sgauth \n"); //TODO change to correct } //----------------------------------------------------------------------------- -void EventsFn(int) -{ -LOADSTAT ls; -clnp->GetStat(&ls); -} -//----------------------------------------------------------------------------- void SetDirName(const vector & dn, void *) { for (int j = 0; j < DIR_NUM; j++) @@ -358,7 +360,7 @@ if (clnp->GetAuthorized()) { cout << "Connect" << endl; clnp->Connect(); - } + } } //----------------------------------------------------------------------------- void CatchUSR2(int) @@ -414,9 +416,6 @@ return; //----------------------------------------------------------------------------- int main(int argc, char *argv[]) { -//int port; -//char *endptr; - SETTINGS settings; #ifndef WIN32 @@ -426,13 +425,6 @@ if(0) #endif { settings.SetConfFile(argv[1]); - if (settings.ReadSettings()) - { - printf("ReadSettingsError\n"); - printf("%s\n", settings.GetStrError().c_str()); - exit(-1); - } - settings.Print(); } else { @@ -455,7 +447,13 @@ else }*/ } -//settings.Print(); +if (settings.ReadSettings()) + { + printf("ReadSettingsError\n"); + printf("%s\n", settings.GetStrError().c_str()); + exit(-1); + } +settings.Print(); #ifndef WIN32 if (settings.GetDaemon()) @@ -466,22 +464,19 @@ if (settings.GetDaemon()) switch (fork()) { - case -1: // ìÁÖÁ + case -1: exit(1); break; - case 0: // ðÏÔÏÍÏË + case 0: setsid(); break; - default: // ïÓÎÏ×ÎÏÊ ÐÒÏÃÅÓÓ + default: exit(0); break; } } - - - #endif clnp = new IA_CLIENT_PROT(settings.GetServerName(), settings.GetServerPort(), settings.GetLocalPort()); @@ -504,7 +499,6 @@ clnp->SetDirNameCb(SetDirName, NULL); clnp->SetStatChangedCb(StatUpdate, NULL); clnp->SetReconnect(settings.GetReconnect()); - clnp->Start(); SetSignalHandlers(); @@ -566,5 +560,3 @@ while (1) return 0; } //----------------------------------------------------------------------------- - -