klassenhierarchie aufräumung

This commit is contained in:
john stone 2014-01-18 14:48:52 +01:00
parent 67f49d96eb
commit 959c8b134c
7 changed files with 132 additions and 128 deletions

View File

View File

@ -0,0 +1,20 @@
#include "MediocreSimpleStaticFileHandler.H"
//#include "InputMemmoryFile.H"
class MediocreSimpleStaticFileHandler :StaticFileHandler
{
private:
std::string cleanpath (const char * const path){
//adds no security at all
return std::string(path);
}
public:
int answer_pathreq(const char * const path,
struct mg_connection *conn)
{
mg_send_file(conn,cleanpath(path).to_cstring());
return 0;
}
}

View File

@ -6,8 +6,8 @@
class Routerin class Routerin
{ {
public: public:
Routerin()=delete; Routerin();
Routerin(StaticFileHandler &sfh); //Routerin(StaticFileHandler &sfh);
int event_route(struct mg_event *event); int event_route(struct mg_event *event);

View File

@ -9,15 +9,14 @@ using std::strcmp;
using std::cout; using std::cout;
using std::endl; using std::endl;
class Routerin {
Routerin(): Routerin::Routerin():
sfh(new UltraSimpleStaticFileHandler()) sfh(new UltraSimpleStaticFileHandler())
{ {
cout << "Konstr Routering" << std::endl; cout << "Konstr Routering" << std::endl;
} }
int event_route(struct mg_event *event) int Routerin::event_route(struct mg_event *event)
{ {
// Foohash fh; // Foohash fh;
switch(event->type){ switch(event->type){
@ -35,7 +34,7 @@ class Routerin {
} }
} }
int 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;
@ -90,18 +89,17 @@ class Routerin {
int rq_static(char const * const reststr , struct mg_event *event) int Routerin::rq_static(char const * const reststr , struct mg_event *event)
{ {
std::cerr << " a static file is reqested!" << endl; std::cerr << " a static file is reqested!" << endl;
std::cerr << " path: " << reststr << endl; std::cerr << " path: " << reststr << endl;
sfh->answer_pathreq(reststr,event->conn);
return 1; return 1;
} }
int rq_file(char const * const reststr , struct mg_event *event) int Routerin::rq_file(char const * const reststr , struct mg_event *event)
{ {
std::cerr << " a dynamic file is reqested!" << endl; std::cerr << " a dynamic file is reqested!" << endl;
std::cerr << " path: " << reststr << endl; std::cerr << " path: " << reststr << endl;
@ -110,24 +108,24 @@ class Routerin {
} }
int 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 ;
return 1; return 1;
} }
int rq_upload(char const * const reststr, struct mg_event *event) int Routerin::rq_upload(char const * const reststr, struct mg_event *event)
{ {
std::cerr << "here we will get uploadish!" << endl ; std::cerr << "here we will get uploadish!" << endl ;
return 1; return 1;
} }
int event_requend_route(struct mg_event *event){ int Routerin::event_requend_route(struct mg_event *event){
std::cerr << "ended request" <<endl; std::cerr << "ended request" <<endl;
return 1; return 1;
} }
int event_fallback_route(struct mg_event *event){ int Routerin::event_fallback_route(struct mg_event *event){
//DEBUG CODE //DEBUG CODE
std::cerr << "Got an unhandled mg_event" << endl; std::cerr << "Got an unhandled mg_event" << endl;
std::cerr << "Its type is: " << event->type << endl; std::cerr << "Its type is: " << event->type << endl;
@ -135,7 +133,7 @@ class Routerin {
} }
int event_newthread_route(struct mg_event *event){ int Routerin::event_newthread_route(struct mg_event *event){
//DEBUG CODE //DEBUG CODE
std::cerr << "Started new thread!" <<endl; std::cerr << "Started new thread!" <<endl;
return 1; return 1;
@ -193,9 +191,6 @@ class Routerin {
*/ */
}; //end of class Routerin
//REST API Documentation //REST API Documentation
///files/<zahl> (index in vector<Sicccobjst>) ///files/<zahl> (index in vector<Sicccobjst>)

View File

@ -8,7 +8,3 @@ class StaticFileHandler
virtual int answer_pathreq(const char * const path,struct mg_connection *conn); virtual int answer_pathreq(const char * const path,struct mg_connection *conn);
}; };
class UltraSimpleStaticFileHandler;

View File

@ -0,0 +1,10 @@
#include "SimpleStaticFileHandler.h"
class UltraSimpleStaticFileHandler : StaticFileHandler
{
public:
int answer_pathreq(const char * const path, struct mg_connection *conn);
};

View File

@ -1,7 +1,7 @@
#include "StaticFileHandler.H"
//#include "InputMemmoryFile.H"
#include <string>
#include "UltraSimpleStaticFileHandler.H"
#include <mongoose.h>
static const char * hello_world_html = u8R"HERE( static const char * hello_world_html = u8R"HERE(
<!DOCTYPE html> <!DOCTYPE html>
@ -38,21 +38,4 @@ class UltraSimpleStaticFileHandler : StaticFileHandler
}; };
class MediocreSimpleStaticFileHandler :StaticFileHandler
{
private:
std::string cleanpath (const char * const path){
//adds no security at all
return std::string(path);
}
public:
int answer_pathreq(const char * const path,
struct mg_connection *conn)
{
mg_send_file(conn,cleanpath(path).to_cstring());
return 0;
}
}