remove webserver stuff

Makefile

@@ -8,7 +8,7 @@ DEFAULT_TCPPORT=6131
 DEFAULT_UDPPORT=6131
 DEFAULT_SERVER=localhost
 
-OBJLIB=network.o udp.o tcp.o unix.o ssl.o webserver.o json.o
+OBJLIB=network.o udp.o tcp.o unix.o ssl.o json.o
 INCLIB=UDPTCPNetwork.h
 DISTNAME=libUDPTCPNetwork-$(VERSION)
 

UDPTCPNetwork.h

@@ -40,7 +40,6 @@
 
 #endif
 
-#include "UDPTCPNetwork-json.h"
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 
@@ -74,6 +73,12 @@ std::string string_to_lower(std::string s);
 std::string string_to_upper(std::string s);
 int file_is_readable (const char *fname);
 
+void _debug (char *srcfile, int srcline, char *srcfunc, char *fmt,...);
+void _errorexit (char *srcfile, int srcline, char *srcfunc, char *fmt,...);
+
+#define debug(...) _debug ((char*)__FILE__, __LINE__, (char*)__FUNCTION__, (char*)__VA_ARGS__)
+#define errorexit(...) _errorexit ((char*)__FILE__, __LINE__, (char*)__FUNCTION__, (char*)__VA_ARGS__)
+
 /************************************************************************
  *
  * udp related functions
@@ -223,6 +228,7 @@ public:
 };
 #endif
 
+#include "UDPTCPNetwork-json.h"
 
 #endif
 

network.cc

@@ -95,4 +95,56 @@ std::string string_to_lower(std::string s) {
 };
 
 
+#define LEN_TEXT 128
+#define DEBUG_TEXT1LEN 2048
+#define DEBUG_TEXT2LEN (DEBUG_TEXT1LEN+LEN_TEXT)
+void _debug (char *srcfile, int srcline, char *srcfunc, char *fmt,...) {
+	va_list args;
+	char texttime[LEN_TEXT];
+	char text1[DEBUG_TEXT1LEN];
+	char text2[DEBUG_TEXT2LEN];
+	pid_t pid = gettid();
+	int tms;
+	struct timeval tv;
+	struct tm tmp;
+	struct tm *tmptr = NULL;
+
+	va_start (args, fmt);
+		vsnprintf (text1, (DEBUG_TEXT1LEN-1), fmt, args);
+	va_end (args);
+	texttime[0] = 0;
+	text1[DEBUG_TEXT1LEN-1] = 0;
+	text2[DEBUG_TEXT2LEN-1] = 0;
+
+	gettimeofday (&tv, NULL);
+	tmptr = localtime_r(&tv.tv_sec, &tmp);
+	if (tmptr != NULL)
+		strftime(texttime, LEN_TEXT, "%H:%M:%S", &tmp);
+
+	snprintf (text2, DEBUG_TEXT2LEN-1, "%s.%03d %d %s:%d %s %s", texttime, tv.tv_usec/1000, pid, 
+              srcfile, srcline, srcfunc, text1);
+	printf ("%s", text2);
+/*
+	if (type == 0 || (type & _debuglevel) != 0) {
+		FILE *f;
+		printf ("%s\n", text2);
+		f= fopen(DEBUG_FILE, "a");
+		if (f) {
+			fprintf (f, "%s\n", text2);
+			fclose (f);
+		}
+	}
+*/
+};
+
+
+void _errorexit (char *srcfile, int srcline, char *srcfunc, char *fmt,...) {
+	va_list args;
+
+	va_start (args, fmt);
+    _debug (srcfile, srcline, srcfunc, fmt, args);
+	va_end (args);
+
+    exit (1);
+}
 

test-ssl.cc

@@ -19,7 +19,7 @@ int test_sha256() {
         printf ("test for sha256 hash failed. please fix function getsha256sum()\n");
         exit (1);
     }
-    else printf ("ok\n");
+    else printf ("test for sha256 hash - ok\n");
     return 0;
 };