gitolite/sic
gitolite
/
sic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make static things static

This commit is contained in:
blastmaster 2014-01-23 02:22:06 +01:00
parent 55fb0d0b0f
commit 7f5e571dfb
2 changed files with 86 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Routerin.H
View File

@ -5,15 +5,41 @@
class Routerin class Routerin
{ {
public: public:
Routerin();
//Routerin(StaticFileHandler &sfh); //Routerin(StaticFileHandler &sfh);
int event_route(struct mg_event *event); ~Routerin();
// const ???
static Routerin * get_instance()
{
static Routerin * me;
if ( ! me->hasInstance )
return me = new Routerin();
return me;
}
static int event_route(struct mg_event *event)
{
// Foohash fh;
Routerin *rouri = Routerin::get_instance();
switch (event->type) {
case MG_REQUEST_BEGIN:
return rouri->event_request_route(event);
case MG_THREAD_BEGIN:
return rouri->event_newthread_route(event);
case MG_REQUEST_END:
return rouri->event_requend_route(event);
case MG_HTTP_ERROR:
case MG_EVENT_LOG:
case MG_THREAD_END:
default:
return rouri->event_fallback_route(event);
}
}
private: private:
explicit Routerin();
StaticFileHandler sfh; StaticFileHandler sfh;
bool hasInstance = false;
int event_request_route ( struct mg_event *event); int event_request_route ( struct mg_event *event);
int event_newthread_route ( struct mg_event *event); int event_newthread_route ( struct mg_event *event);

124
src/Routerin.cc
View File

@ -16,78 +16,67 @@ Routerin::Routerin():
sfh( UltraSimpleStaticFileHandler()) sfh( UltraSimpleStaticFileHandler())
{ {
cout << "Konstr Routering" << std::endl; cout << "Konstr Routering" << std::endl;
Routerin::hasInstance = true;
} }
int Routerin::event_route(struct mg_event *event) Routerin::~Routerin()
{ {
// Foohash fh; Routerin::hasInstance = false;
switch(event->type){
case MG_REQUEST_BEGIN:
return event_request_route(event);
case MG_THREAD_BEGIN :
return event_newthread_route(event);
case MG_REQUEST_END:
return event_requend_route(event);
case MG_HTTP_ERROR:
case MG_EVENT_LOG :
case MG_THREAD_END:
default:
return event_fallback_route(event);
}
} }
int Routerin::event_request_route(struct mg_event *event){ int Routerin::event_request_route(struct mg_event *event){
const RouterOp *blub=0; const RouterOp *blub=0;
Foohash fh; Foohash fh;
const char *reqstr=0; const char *reqstr=0;
char *tmpstr = 0,*pntrstr=0; char *tmpstr = 0,*pntrstr=0;
int retval=-1; int retval=-1;
reqstr=event->request_info->uri; reqstr=event->request_info->uri;
if (reqstr){ if (reqstr){
tmpstr = strdup(reqstr); tmpstr = strdup(reqstr);
std::cerr << "starting with str as " std::cerr << "starting with str as "
<< tmpstr << endl; //DEBUG CODE << tmpstr << endl; //DEBUG CODE
pntrstr = strchrnul((tmpstr+1),'/'); pntrstr = strchrnul((tmpstr+1),'/');
if (pntrstr) { if (pntrstr) {
*pntrstr = 0; *pntrstr = 0;
std::cerr <<" having reqstr as " << tmpstr std::cerr <<" having reqstr as " << tmpstr
<< " now. " << endl; << " now. " << endl;
std::cerr <<"len of reqstr is " << std::cerr <<"len of reqstr is " <<
( pntrstr - tmpstr) << endl; ( pntrstr - tmpstr) << endl;
blub = fh.in_word_set(tmpstr,((pntrstr++)-tmpstr) ); blub = fh.in_word_set(tmpstr,((pntrstr++)-tmpstr) );
if (blub){ if (blub){
std::cerr << "me has blub!!" <<endl; std::cerr << "me has blub!!" <<endl;
switch(blub->op){ switch(blub->op){
case RouterOpCode::FILES: case RouterOpCode::FILES:
retval = rq_file(pntrstr ,event); retval = rq_file(pntrstr ,event);
break; break;
case RouterOpCode::DATE: case RouterOpCode::DATE:
retval = rq_date(pntrstr, event); retval = rq_date(pntrstr, event);
break; break;
case RouterOpCode::UPLOAD: case RouterOpCode::UPLOAD:
retval = rq_upload(pntrstr, event); retval = rq_upload(pntrstr, event);
break; break;
case RouterOpCode::STATIC: case RouterOpCode::STATIC:
std::cerr << "(/static/ given)"; std::cerr << "(/static/ given)";
retval = rq_static((pntrstr),event); retval = rq_static((pntrstr),event);
break; break;
default: default:
std::cerr << "fallback "; std::cerr << "fallback ";
retval = rq_static((pntrstr),event); retval = rq_static((pntrstr),event);
}; };
}else{ }else{
std::cerr << "no blub! in " << __LINE__ << endl; std::cerr << "no blub! in " << __LINE__ << endl;
} }
} }
std::free(tmpstr); std::free(tmpstr);
tmpstr=0; tmpstr=0;
return retval; return retval;
} else { } else {
std::cerr << "event request without uri? ?? hu? [" << std::cerr << "event request without uri? ?? hu? [" <<
event->request_info->uri << "]" << endl; event->request_info->uri << "]" << endl;
} }
return 0; return 0;
} }
@ -109,7 +98,6 @@ int Routerin::rq_file(char const * const reststr , struct mg_event *event)
return 1; return 1;
} }
int Routerin::rq_date(char const * const reststr , struct mg_event *event) int Routerin::rq_date(char const * const reststr , struct mg_event *event)
{ {
std::cerr << "requested filelist ordered by date!" << endl ; std::cerr << "requested filelist ordered by date!" << endl ;