new file mode 100644

@@ -0,0 +1,28 @@

+CC=gcc

+CFLAGS=-g -Wall

+LDFLAGS=

+

+all: webkernel_test

+

+clean:

+	rm -f *.o webkernel_test

+

+webkernel_test: webkernel_test.o iobuf.o loglib.o parselib.o sbuf.o \

+		socklib.o webkernel.o

+	$(CC) $(LDFLAGS) webkernel_test.o iobuf.o loglib.o parselib.o sbuf.o \

+		socklib.o webkernel.o -o webkernel_test

+

+webkernel_test.o:

+

+iobuf.o:

+

+loglib.o:

+

+parselib.o:

+

+sbuf.o:

+

+socklib.o:

+

+webkernel.o:

+

@@ -5,12 +5,14 @@

  *

  * History:

  *      12/03/2014 Creation.

+ *      14/03/2014 Compilation fixes.

  *

  * Author: Dario Rodriguez dario@softhome.net

  * This library is licensed on the terms of the GNU LGPL v2+

  */

 #include <stdlib.h>

+#include <string.h>

 #include "iobuf.h"

 /* exported funcions */

@@ -37,9 +39,9 @@ siobuf *

 iobuf_staticinit(siobuf *uninitiobuf, sbuf *uninitinbuf, sbuf *uninitoutbuf,int insize, int outsize, char *inbuf, char *outbuf)

 {

         memset(uninitiobuf,0,sizeof(siobuf));

-        if((siobuf->in=sbuf_staticinit(uninitinbuf,insize,inbuf))==NULL)

+        if((uninitiobuf->in=sbuf_staticinit(uninitinbuf,insize,inbuf))==NULL)

                 return(NULL);

-        if((siobuf->out=sbuf_staticinit(uninitoutbuf,outsize,outbuf))==NULL)

+        if((uninitiobuf->out=sbuf_staticinit(uninitoutbuf,outsize,outbuf))==NULL)

                 return(NULL);

         return(uninitiobuf);

 }

@@ -66,5 +68,4 @@ iobuf_staticfree(siobuf *iobuf)

         return;

 }

-#endif

new file mode 100644

@@ -0,0 +1,139 @@

+/*

+ * loglib.h

+ *

+ * A non-intrusive minimal log framework.

+ *

+ * History:

+ *      14/03/2014 Creation

+ *

+ * Author: Dario Rodriguez dario@softhome.net

+ * This file is licensed under the terms of the GNU LGPL v2+

+ */

+

+#include <stdio.h>

+#include <stdlib.h>

+#include <unistd.h>

+#include <string.h>

+#include <time.h>

+#include <stdarg.h>

+#include <sys/types.h>

+#include <sys/stat.h>

+#include <fcntl.h>

+

+#include "loglib.h"

+

+#define MAXLOGFILENAME 1024

+#define LOGWRITEBUFSIZE 4096

+#define LOGWRITEHEXDUMPSIZE 4096

+

+#define DEFAULTFD 2

+

+void

+log_write(char *type, char *format, ...)

+{

+        static void (*writefunc)(int fd, char *buf, long bufsize, void *usrptr)=NULL;

+        static void *usrptr=NULL;

+        static int fd=DEFAULTFD;

+        static char logfilename[MAXLOGFILENAME]={""};

+        static char writebuf[LOGWRITEBUFSIZE];

+        char *ptr;

+        time_t t;

+        struct tm stm;

+        va_list arglist;

+        /* if it is a special action, perform it */

+        if(type==((char *)log_setlogfile)) {

+                if(fd!=DEFAULTFD)

+                        close(fd),fd=DEFAULTFD;

+                strncpy(logfilename,format,sizeof(logfilename)-1);

+                logfilename[sizeof(logfilename)-1]='\0';

+                return;

+        } else if(type==((char *)log_closelogfile)) {

+                if(fd!=DEFAULTFD)

+                        close(fd),fd=DEFAULTFD;

+                return;

+        } else if(type==((char *)log_setwritefunc)) {

+                writefunc=(void (*)(int /*fd*/, char * /*buf*/, long /*bufsize*/, void */*usrptr*/)) format;

+                va_start(arglist,format);

+                usrptr=va_arg(arglist,void *);

+                va_end(arglist);

+                return;

+        }

+        /* it is a new log entry */

+        /* make sure the file is open */

+        if(fd==DEFAULTFD && logfilename[0]!='\0') {

+                if((fd=open(logfilename,O_WRONLY|O_CREAT|O_APPEND,0640))==-1) {

+                        fd=DEFAULTFD;

+                        return;

+                }

+        }

+        /* prepare the string */

+        t=time(NULL);

+        localtime_r(&t,&stm);

+        ptr=writebuf;

+        strftime(ptr,writebuf+LOGWRITEBUFSIZE-ptr-1,"%b %e %H:%M:%S ",&stm);

+        writebuf[LOGWRITEBUFSIZE-1]='\0';

+        ptr+=strlen(ptr);

+        snprintf(ptr,writebuf+LOGWRITEBUFSIZE-ptr-1,"%s: ",type);

+        writebuf[LOGWRITEBUFSIZE-1]='\0';

+        ptr+=strlen(ptr);

+        va_start(arglist,format);

+        vsnprintf(ptr,writebuf+LOGWRITEBUFSIZE-ptr-1,format,arglist);

+        va_end(arglist);

+        writebuf[LOGWRITEBUFSIZE-1]='\0';

+        ptr+=strlen(ptr);

+        /* if the string is not terminated with a '\n', add the '\n' */

+        if(ptr>writebuf && ptr[-1]!='\n') {

+                if(ptr<(writebuf+LOGWRITEBUFSIZE-1)) {

+                        *(ptr++)='\n';

+                        *ptr='\0';

+                } else

+                        ptr[-1]='\n';

+        }

+        /* commit the data */

+        if(writefunc!=NULL)

+                writefunc(fd,writebuf,ptr-writebuf,usrptr);

+        else

+                write(fd,writebuf,ptr-writebuf);

+}

+

+char *

+log_hexdumpstr(char *data, long datasize)

+{

+        static char hexdumpbuf[LOGWRITEHEXDUMPSIZE];

+        char c,*ptr;

+        long i,l;

+        l=(datasize>(LOGWRITEHEXDUMPSIZE/3))?(LOGWRITEHEXDUMPSIZE/3):datasize;

+        for(i=0,ptr=hexdumpbuf;i<l;i++) {

+                c=data[i]&0xf;

+                *(ptr++)=(c<0xa)?c+'0':c+'a'-10;

+                c=(data[i]>>4)&0xf;

+                *(ptr++)=(c<0xa)?c+'0':c+'a'-10;

+                *(ptr++)=' ';

+        }

+        ptr[(i>0)?i-1:0]='\0';

+        return(hexdumpbuf);

+}

+

+void

+log_setlogfile(char *filename)

+{

+        log_write((char *)log_setlogfile,(char *)filename);

+}

+

+void

+log_closelogfile(void)

+{

+        void *dummy=NULL;

+        log_write((char *)log_closelogfile,(char *)dummy);

+}

+

+

+void

+log_setwritefunc(void (*newwritefunc)(int fd, char *buf, long bufsize, void *usrptr),void *usrptr)

+{

+        log_write((char *)log_setwritefunc,(char *)newwritefunc,usrptr);

+}

+

+

+

+

@@ -5,6 +5,7 @@

  *

  * History:

  *      27/01/2014 Creation

+ *      14/03/2014 Add log_setlogfile(), log_closelogfile.

  *

  * Author: Dario Rodriguez dario@softhome.net

  * This file is licensed under the terms of the GNU LGPL v2+

@@ -20,6 +21,9 @@ void log_write(char *type, char *format, ...) __attribute__ ((format (printf, 2,

 #endif

 char *log_hexdumpstr(char *data, long datasize);

+

+void log_setlogfile(char *filename);

+void log_closelogfile(void);

 void log_setwritefunc(void (*newwritefunc)(int fd, char *buf, long bufsize, void *usrptr),void *usrptr);

 #endif

new file mode 100644

@@ -0,0 +1,101 @@

+/*

+ * parselib.c

+ *

+ * Convenience functions for parsing config-file lines.

+ *

+ * History:

+ *      14/03/2014 Creation

+ *

+ * Author: Dario Rodriguez dario@softhome.net

+ * This file is licensed under the terms of the GNU LGPL v2+

+ */

+

+#include <string.h>

+#include "parselib.h"

+

+char *

+field_int(char *ptr, int *value)

+{

+        *value=0;

+        while(strchr(" \t",*ptr)!=NULL)

+                ptr++;

+        for(;*ptr>='0' && *ptr<='9';ptr++)

+                *value=(*value)*10+(*ptr-'0');

+        return(ptr);

+}

+

+char *

+field_long(char *ptr, long *value)

+{

+        *value=0;

+        while(strchr(" \t",*ptr)!=NULL)

+                ptr++;

+        for(;*ptr>='0' && *ptr<='9';ptr++)

+                *value=(*value)*10+(*ptr-'0');

+        return(ptr);

+}

+

+char *

+field_quotedstr(char *ptr, char *str, long strsize)

+{

+        char *dest;

+        int flaglit;

+        while(strchr(" \t",*ptr)!=NULL)

+                ptr++;

+        if(*ptr!='\"')

+                return(ptr);

+        /* skip initial '\"' */

+        ptr++;

+        /* read the string unescaping as we go */

+        for(dest=str,flaglit=0;*ptr!='\0' && !(!flaglit && *ptr=='\"');ptr++) {

+                if(flaglit==0 && *ptr=='\\') {

+                        flaglit=1;

+                        continue;

+                }

+                flaglit=0;

+                if(str!=NULL && (dest-str)<strsize)

+                        *(dest++)=*ptr;

+        }

+        if((dest-str)<strsize)

+                *(dest++)='\0';

+        else if(str!=NULL && strsize>0)

+                str[strsize-1]='\0';

+        /* skip the final '\"' */

+        if(*ptr=='\"')

+                ptr++;

+        return(ptr);

+}

+

+char *

+field_unquotedstr(char *ptr, char *str, long strsize, char *separators)

+{

+        char *dest;

+        while(strchr(" \t",*ptr)!=NULL)

+                ptr++;

+        /* read the string */

+        for(dest=str;*ptr!='\0' && strchr(separators,*ptr)==NULL;ptr++) {

+                if(str!=NULL && (dest-str)<strsize)

+                        *(dest++)=*ptr;

+        }

+        if((dest-str)<strsize)

+                *(dest++)='\0';

+        else if(str!=NULL && strsize>0)

+                str[strsize-1]='\0';

+        return(ptr);

+}

+

+char *

+field_hexint(char *ptr, int *value)

+{

+        *value=0;

+        while(strchr(" \t",*ptr)!=NULL)

+                ptr++;

+        for(;(*ptr>='0' && *ptr<='9')||(*ptr>='a' && *ptr<='f')||(*ptr>='A' && *ptr<='F');ptr++) {

+                *value=((*value)*16)+

+                (*ptr>='a' && *ptr<='f')?*ptr-'a'+10:

+                (*ptr>='A' && *ptr<='F')?*ptr-'A'+10:

+                *ptr-'0';

+        }

+        return(ptr);

+}

+

@@ -1,10 +1,13 @@

 /*

  * parselib.h

  *

- * Convenienct functions to parse config file lines.

+ * Convenience functions for parsing config-file lines.

+ *

+ * Header file.

  *

  * History:

- *      27/01/2014 Creation

+ *      27/01/2014 Creation.

+ *      14/03/2014 Add separators param to _unquotedstr().

  *

  * Author: Dario Rodriguez dario@softhome.net

  * This file is licensed under the terms of the GNU LGPL v2+

@@ -16,7 +19,7 @@

 char *field_int(char *ptr, int *value);

 char *field_long(char *ptr, long *value);

 char *field_quotedstr(char *ptr, char *str, long strsize);

-char *field_unquotedstr(char *ptr, char *str, long strsize);

+char *field_unquotedstr(char *ptr, char *str, long strsize, char *separators);

 char *field_hexint(char *ptr, int *value);

 #endif

@@ -5,6 +5,7 @@

  *

  * History:

  *      13/03/2014 Creation.

+ *      14/03/2014 Compilation fixes.

  *

  * Author: Dario Rodriguez dario@softhome.net

  * This library is licensed on the terms of the GNU LGPL v2+

@@ -20,7 +21,7 @@ sbuf *

 sbuf_init(long bufsize)

 {

         sbuf *buf;

-        if(bufsize<=0 || (buf=malloc(sizeof sbuf))==NULL)

+        if(bufsize<=0 || (buf=malloc(sizeof(sbuf)))==NULL)

                 return(NULL);

         memset(buf,0,sizeof(sbuf));

         if((buf->buf=malloc(bufsize))==NULL) {

@@ -50,7 +51,7 @@ sbuf_free(sbuf *buf)

         if(buf->buf!=NULL)

                 free(buf->buf),buf->buf=NULL;

         buf->size=0;

-        free(buf)

+        free(buf);

 }

 void

@@ -65,14 +66,14 @@ int

 sbuf_fill(sbuf *buf, int fd, long numbytes)

 {

         long n;

-        int read;

+        int nread;

         if(buf==NULL || fd==-1 || numbytes<0)

                 return(-1);

         n=(numbytes>(buf->size-buf->used))?buf->size-buf->used:numbytes;

-        read=read(fd,buf->buf+buf->used,n);

-        if(read>=0)

-                buf->used+=read;

-        return(read);

+        nread=read(fd,buf->buf+buf->used,n);

+        if(nread>=0)

+                buf->used+=nread;

+        return(nread);

 }

 char *

@@ -140,7 +141,7 @@ sbuf_add(sbuf *buf, char *data, long datasize)

         long added;

         if(buf==NULL || data==NULL || buf->used==buf->size)

                 return(0);

-        added=(datasize>(buf->size-buf->used))?(buf->size-buf->used)):datasize;

+        added=(datasize>(buf->size-buf->used))?(buf->size-buf->used):datasize;

         memcpy(buf->buf+buf->used,data,added);

         buf->used+=added;

         return(added);

@@ -188,8 +189,8 @@ sbuf_send(sbuf *buf, int fd, long numbytes)

         int written;

         if(buf==NULL || fd==-1 || numbytes<=0)

                 return(0);

-        n=(numbytes>(sbuf->used-sbuf->got))?(sbuf->used-sbuf->got):numbytes;

-        written=write(fd,buf->buf+buf->got,written);

+        n=(numbytes>(buf->used-buf->got))?(buf->used-buf->got):numbytes;

+        written=write(fd,buf->buf+buf->got,n);

         if(written>0)

                 buf->got+=written;

         return(written);

@@ -8,8 +8,9 @@

  * History:

  *      21/01/2014 Creation.

  *      27/01/2014 Finish initial API.

- *      13/03/2014 removed the low-level API, as it is redundant with

+ *      13/03/2014 Removed the low-level API, as it is redundant with

  *                 _staticinit()/_staticfree().

+ *      14/03/2014 Compilation fixes.

  *

  * Author: Dario Rodriguez dario@softhome.net

  * This library is licensed on the terms of the GNU LGPL v2+

@@ -22,7 +23,7 @@ typedef struct {

         long used;

         long got;

         long size;

-        char *buf

+        char *buf;

 } sbuf;

 /* sbuf, high level api */