| 10 |
|
#include "Daemon.hpp" |
| 11 |
|
#include "Redirector.hpp" |
| 12 |
|
|
| 13 |
+ |
#include <menes-api/exename.hpp> |
| 14 |
+ |
#include <menes-app/application.hpp> |
| 15 |
+ |
|
| 16 |
|
string program; |
| 17 |
|
bool debug(false); |
| 18 |
|
|
| 19 |
< |
int main(int argc, char* argv[]) |
| 19 |
> |
struct SmershCommand : public app::Application |
| 20 |
|
{ |
| 21 |
< |
program = argv[0]; |
| 19 |
< |
|
| 20 |
< |
int port(8080); |
| 21 |
< |
bool fork(false), daemon(false), redirector(false); |
| 22 |
< |
string redirect; |
| 23 |
< |
|
| 24 |
< |
for (int index(1); index < argc; ++index) |
| 21 |
> |
virtual int Run(const app::ArgumentList& args) |
| 22 |
|
{ |
| 23 |
< |
string arg(argv[index]); |
| 27 |
< |
Matcher matcher; |
| 23 |
> |
program = api::GetExecutableName(); |
| 24 |
|
|
| 25 |
< |
if (arg == "-daemon") |
| 26 |
< |
{ |
| 27 |
< |
if (!daemon) daemon = true; |
| 32 |
< |
} |
| 33 |
< |
else if (arg == matcher("^-redirector=(.+)$")) |
| 34 |
< |
{ |
| 35 |
< |
if (!redirector) redirector = true; |
| 25 |
> |
int port(54321); |
| 26 |
> |
bool fork(false), daemon(false), redirector(false); |
| 27 |
> |
string redirect, log("smersh.log"); |
| 28 |
|
|
| 29 |
< |
redirect = matcher[1]; |
| 38 |
< |
} |
| 39 |
< |
else if (arg == matcher("^-port=([0-9]+)$")) |
| 29 |
> |
for (size_t index(0); index < args.GetSize(); ++index) |
| 30 |
|
{ |
| 31 |
< |
port = lexical_cast<int>(matcher[1]); |
| 31 |
> |
string arg(args[index]); |
| 32 |
> |
Matcher matcher; |
| 33 |
> |
|
| 34 |
> |
if (arg == "-daemon") |
| 35 |
> |
{ |
| 36 |
> |
if (!daemon) daemon = true; |
| 37 |
> |
} |
| 38 |
> |
else if (arg == matcher("^-redirector=(.+)$")) |
| 39 |
> |
{ |
| 40 |
> |
if (!redirector) redirector = true; |
| 41 |
> |
|
| 42 |
> |
redirect = matcher[1]; |
| 43 |
> |
} |
| 44 |
> |
else if (arg == matcher("^-port=([0-9]+)$")) |
| 45 |
> |
{ |
| 46 |
> |
port = lexical_cast<int>(matcher[1]); |
| 47 |
> |
} |
| 48 |
> |
else if (arg == "-fork") |
| 49 |
> |
{ |
| 50 |
> |
if (!fork) fork = true; |
| 51 |
> |
} |
| 52 |
> |
else if (arg == matcher("^-log=(.+)$")) |
| 53 |
> |
{ |
| 54 |
> |
log = matcher[1]; |
| 55 |
> |
} |
| 56 |
> |
else if (arg == "-D") |
| 57 |
> |
{ |
| 58 |
> |
if (!debug) debug = true; |
| 59 |
> |
} |
| 60 |
> |
else |
| 61 |
> |
{ |
| 62 |
> |
cout << "Usage: " << program |
| 63 |
> |
<< " [-daemon|-redirector=redirect] [-port=port] [-fork] " |
| 64 |
> |
<< "[-log=log] [-D]\n"; |
| 65 |
> |
|
| 66 |
> |
return 1; |
| 67 |
> |
} |
| 68 |
|
} |
| 69 |
< |
else if (arg == "-fork") |
| 69 |
> |
|
| 70 |
> |
if (daemon) |
| 71 |
|
{ |
| 72 |
< |
if (!fork) fork = true; |
| 72 |
> |
Daemon daemon(port, fork, log); |
| 73 |
|
} |
| 74 |
< |
else if (arg == "-D") |
| 74 |
> |
else if (redirector) |
| 75 |
|
{ |
| 76 |
< |
if (!debug) debug = true; |
| 76 |
> |
Redirector redirector(port, fork, log, redirect); |
| 77 |
|
} |
| 78 |
|
else |
| 79 |
|
{ |
| 80 |
< |
cout << "Usage: " << program << " [-daemon|-redirector=redirect] [" |
| 54 |
< |
<< "-port=port] [-fork] [-D]\n"; |
| 55 |
< |
|
| 56 |
< |
return 1; |
| 80 |
> |
Smersh smersh; |
| 81 |
|
} |
| 58 |
– |
} |
| 82 |
|
|
| 83 |
< |
if (daemon) |
| 61 |
< |
{ |
| 62 |
< |
Daemon daemon(port, fork); |
| 63 |
< |
} |
| 64 |
< |
else if (redirector) |
| 65 |
< |
{ |
| 66 |
< |
Redirector redirector(port, fork, redirect); |
| 67 |
< |
} |
| 68 |
< |
else |
| 69 |
< |
{ |
| 70 |
< |
Smersh smersh; |
| 83 |
> |
return 0; |
| 84 |
|
} |
| 85 |
+ |
} smersh; |
| 86 |
|
|
| 87 |
< |
return 0; |
| 74 |
< |
} |
| 75 |
< |
|
| 76 |
< |
Smersh::Smersh(istream& sin, ostream& sout) |
| 87 |
> |
Smersh::Smersh(istream& sin, ostream& sout, const Environment& env) |
| 88 |
|
{ |
| 89 |
< |
parse(sin); |
| 90 |
< |
smersh(sout); |
| 89 |
> |
parse(sin, env); |
| 90 |
> |
smersh(sout, env); |
| 91 |
|
} |
| 92 |
|
|
| 93 |
< |
void Smersh::parse(istream& sin) |
| 93 |
> |
Environment Smersh::env; |
| 94 |
> |
|
| 95 |
> |
void Smersh::parse(istream& sin, const Environment& env) |
| 96 |
|
{ |
| 97 |
< |
stringstream query(sgetenv("QUERY_STRING")); |
| 97 |
> |
stringstream query(env.get("QUERY_STRING")); |
| 98 |
|
|
| 99 |
< |
if (sgetenv("REQUEST_METHOD") == "POST") |
| 99 |
> |
if (env.get("REQUEST_METHOD") == "POST") |
| 100 |
|
{ |
| 101 |
< |
streamsize length(lexical_cast<streamsize>(sgetenv("CONTENT_LENGTH"))); |
| 102 |
< |
char* content = new char[length]; |
| 101 |
> |
streamsize length(lexical_cast<streamsize>(env.get("CONTENT_LENGTH"))); |
| 102 |
> |
char* content(new char[length]); |
| 103 |
|
|
| 104 |
|
sin.read(content, length); |
| 105 |
|
query.write(content, length); |
| 120 |
|
while (query.good()); |
| 121 |
|
} |
| 122 |
|
|
| 123 |
< |
void Smersh::smersh(ostream& sout) |
| 123 |
> |
void Smersh::smersh(ostream& sout, const Environment& env) |
| 124 |
|
{ |
| 125 |
< |
sout << "Content-Type: text/html\n\n"; |
| 125 |
> |
if (&env == &Smersh::env) sout << "Content-Type: text/html; charset=UTF-8\r" |
| 126 |
> |
<< "\n\r\n"; |
| 127 |
|
|
| 128 |
|
vector<Person> people(1); |
| 129 |
|
|
| 186 |
|
|
| 187 |
|
output(sout, people); |
| 188 |
|
|
| 189 |
< |
sout << "!</font></strong></p></body></html>\n"; |
| 189 |
> |
sout << "!</font></strong></p></body></html>\r\n"; |
| 190 |
|
} |
| 191 |
|
|
| 192 |
|
void Smersh::output(ostream& sout, const vector<Person>& people) |
