changed to buildin webserver

server/Makefile

@@ -16,7 +16,7 @@ LDFLAGS_CGI= -lm -lc -lpthread -L/usr/local/lib -g -ggdb
 DEPENDFILE=.depend
 TARGET=modelbahn-server
 
-SERVEROBJ=server.o network.o session.o server-loadsave.o \
+SERVEROBJ=server.o network.o webserver.o session.o server-loadsave.o \
  main.o sensor.o turnout.o railway.o interfaces.o locomotive.o \
  block.o interface.o interface-z21.o
  

server/main.cc

@@ -9,6 +9,7 @@
 #include <signal.h>
 
 #include "modelbahn.h"
+#include "webserver.h"
 
 void uprintf (UNIX *u, char *fmt,...);
 static void sig_int(int);			// signal handler
@@ -16,6 +17,7 @@ int running = 1;
 
 Server *server = NULL;
 Network *network = NULL;
+
 int simulation = 0;
 
 int main (int argc, char **argv) {

server/modelbahn.h

@@ -20,8 +20,9 @@
 using namespace std;
 
 #define DEBUG_FILE "/tmp/modelbahn-server.log"
-#include "UDPTCPNetwork.h"
+#include <UDPTCPNetwork.h>
 
+#include "webserver.h"
 #include "server.h"
 #include "turnout.h"
 #include "sensor.h"

server/network.cc

@@ -49,8 +49,6 @@ Network::~Network() {
 
 
 void Network::ThreadProcess() {
-	list<UNIX*>::iterator iteru;
-	UNIX *u;
 	int i = 0;
 
 	int timeout10s;
@@ -65,21 +63,7 @@ void Network::ThreadProcess() {
 	while (running) {
 		//
 		// check network
-
+		webserver.Loop();
-		//
-		// server socket
-		ServerLoop();
-
-		//
-		// client socket
-		for (iteru = clients.begin(); iteru != clients.end(); iteru++) {
-			if (ClientLoop((UNIX*) *iteru) < 0) {
-				u = *iteru;
-				clients.remove(u);
-				delete u;
-				iteru = clients.begin();
-			}
-		}
 
 		gettimeofday (&tv, NULL);
 		i = (tv.tv_sec-tv_loop.tv_sec) * 1000 + (tv.tv_usec - tv_loop.tv_usec) / 1000;
@@ -108,12 +92,11 @@ int Network::Start() {
 	mtx = PTHREAD_MUTEX_INITIALIZER;
 
 	//
-	// start socket server
+	// start the webserver
 	//
-	if (sockserver.Listen(UNIX_SOCKET_FILE) != 1) {
+	webserver.SetupDocumentRoot("webinterface");
-		return 0;
+	webserver.SetupPorts(1080, 1081);
-	}
+	webserver.Start();
-	chmod(UNIX_SOCKET_FILE, 00666);
 
 	thread_running = 1;
 	pthread_attr_init (&attr);
@@ -129,8 +112,7 @@ int Network::Start() {
 
 
 void Network::Stop() {
-	sockserver.Close();
+	webserver.Stop();
-	unlink(UNIX_SOCKET_FILE);
 }
 
 
@@ -146,17 +128,6 @@ void Network::ChangeListPushToAll(string changes) {
 
 
 
-int Network::ServerLoop() {
-	UNIX *u = NULL;
-	if (sockserver.IsData(10)) {
-		u = sockserver.Accept();
-		clients.push_back(u);
-	}
-
-	return 1;
-};
-
-
 Session *Network::GetSession(int sid) {
 	Session *s = NULL;
 	list<Session*>::iterator iter;
@@ -174,9 +145,8 @@ Session *Network::GetSession(int sid) {
 };
 
 
-int Network::ClientLoop(UNIX *client) {
+int Network::ClientLoop(JSONParse *jpin, JSONParse *jpout) {
-	char bufferin[BUFFERSIZE];
+	int rid, sid;
-	int len, rid, sid;
 	list<Session*>::iterator siter;
 	Session *session = NULL;
 	string value;
@@ -187,23 +157,18 @@ int Network::ClientLoop(UNIX *client) {
 	struct timeval timer;
 
 	timer_start(&timer);
-
-	len = client->ReadTimeout(bufferin, BUFFERSIZE, 20);
-	if (len > 0 && len < BUFFERSIZE) {
-		JSONParse json;
-		JSONParse jsonout;
 	JSONParse jelement;
 
-		bufferin[len] = 0;	// prevent reading behind the data
+	if (jpin == NULL || jpout == NULL) return 0;
+	jpout->Clear();
 
-		json.Set(bufferin);
+	if (!jpin->GetValue("sid", &ssid)) {
-		if (!json.GetValue("sid", &ssid)) {
+		debug ("jpin->GetValue error --> sid");
-			debug ("json.GetValue error --> sid");
 		return 0;
 	}
 
-		if (!json.GetValue("rid", &srid)) {
+	if (!jpin->GetValue("rid", &srid)) {
-			debug ("json.GetValue error --> rid");
+		debug ("jpin->GetValue error --> rid");
 		return 0;
 	}
 
@@ -250,40 +215,33 @@ int Network::ClientLoop(UNIX *client) {
 		JSONElement je;
 		int retval;
 
-			retval = session->ProcessData(&json, &jsonout);
+		retval = session->ProcessData(jpin, jpout);
 
-			len = BUFFERSIZE;
 		if (retval) {
 			je.Clear();
 			je.Set("success", 1);
-				jsonout.AddObject(je);
+			jpout->AddObject(je);
 			je.Clear();
 			je.Set("serverstatus", server->GetStatus());
-				jsonout.AddObject(je);
+			jpout->AddObject(je);
 			je.Clear();
 			je.Set("simulation", simulation);
-				jsonout.AddObject(je);
+			jpout->AddObject(je);
 		}
 		else {
 			je.Clear();
 			je.Set("success", 0);
-				jsonout.AddObject(je);
+			jpout->AddObject(je);
 			je.Clear();
 			je.Set("serverstatus", "ERROR");
-				jsonout.AddObject(je);
+			jpout->AddObject(je);
 		}
-			s = jsonout.ToString();
-			client->Write((char*)s.c_str(), strlen(s.c_str()));
 		result = 1;
 	}
 	else {
 		// no session found
 		result = 0;
 	}
-	}
-	else if (len == 0) {
-		result = 0;
-	}
 
 	return result;
 };

server/network.h

@@ -27,6 +27,7 @@
 
 using namespace std;
 
+#include "webserver.h"
 #include "modelbahn.h"
 
 extern int next_sessionID;
@@ -99,17 +100,13 @@ private:
 	void ThreadProcess();
 	pthread_mutex_t mtx;
 	pthread_mutex_t mtxsessions;
+	SimpleWebServer webserver;
 
 	pthread_t thread;
 	int thread_running;
 
 	list<Session*> sessions;
-	list<UNIX*> clients;
-
 	Session *GetSession(int Sid);
-	int ServerLoop(); 					// loop for network connection and call clientloop if needed
-	int ClientLoop(UNIX *u);
-	UNIX sockserver;
 
 	friend class Session;
 public:
@@ -126,6 +123,7 @@ public:
 	void ChangeListPushToAll (string changes); 		// adds JSON compat. change string too all clients
 
 	int isRunning() { return thread_running; }
+	int ClientLoop(JSONParse *jpin, JSONParse *jpout);
 protected:
 	static void *ThreadEntry (void *This) { ((Network*)This)->ThreadProcess(); return NULL;};
 };