@@ -1,3 +1,4 @@

 src/*.o

 src/webkernel_test

 src/*~

+src/*.workingnote

@@ -26,7 +26,20 @@

 #define BUFSIZE 8192

 #define BUFBLOCK 128

 #define BUFBLOCKBLOCK 256

+#define POSTBLOCK 16

+typedef struct wk_post {

+        char *name;

+        char *value;

+        int isfile;

+        int filewritten;

+} wk_post;

+

+typedef enum wkc_status {

+        wkc_header=0,

+        wkc_post,

+        wkc_none,

+} wkc_status;

 typedef struct wk_client {

         wk *web;

@@ -36,12 +49,16 @@ typedef struct wk_client {

         int sizeoutbufids;

         int usedoutbufids;

         int outbufids[MAXOUTBUF];

+        wkc_status status;

         int serviced;

         int continuationactive;

         int fdtoserve;

         wk_uri uri;

         int headerbufid;

         int keepalive;

+        int sizepost;

+        int usedpost;

+        wk_post *post;

 } wk_client;

 typedef struct wk_clientblock {

@@ -75,6 +92,7 @@ typedef struct _wk {

         wk_bufblock *bufblocks;

         void (*callback_event)(/*wk *web,int connid, wk_event event, void *userptr*/);

         wk_action (*callback_http)(/*wk *web,int connid, wk_uri *uri, void *userptr*/);

+        wk_action (*callback_post)(/*wk *web,int connid, wk_uri *uri, void *userptr*/);

         wk_action (*callback_continuation)(/*wk *web,int connid, wk_uri *uri, void *userptr*/);

         void *userptr;

 } _wk;

@@ -83,10 +101,14 @@ static wk_client *wk_accept(_wk *web);

 static wk_client *wk_clientacquire(_wk *web);

 static int wk_clientrelease(_wk *web, int connid);

 static wk_client *wk_clientget(_wk *web, int connid);

-static int wk_clientserviceread(_wk *web, wk_client *client);

+static int wk_clientservicereadheader(_wk *web, wk_client *client);

+static int wk_postadd(_wk *web, wk_client *client,char *varname, char *tofile);

+static int wk_postset(_wk *web, wk_client *client,char *varname, char *value);

+static char *wk_postget(_wk *web, wk_client *client,char *varname, int *isfile);

+static int wk_postfree(_wk *web, wk_client *client);

 wk *

-wk_init(int port, sselect *ssel, void (*callback_event)(/*wk *web,int connid, wk_event event, void *userptr*/), wk_action (*callback_http)(/*wk *web,int connid, wk_uri *uri, void *userptr*/), wk_action (*callback_continuation)(/*wk *web,int connid, wk_uri *uri, void *userptr*/), void *userptr)

+wk_init(int port, sselect *ssel, void (*callback_event)(/*wk *web,int connid, wk_event event, void *userptr*/), wk_action (*callback_http)(/*wk *web,int connid, wk_uri *uri, void *userptr*/), wk_action (*callback_post)(/*wk *web,int connid, wk_uri *uri, void *userptr*/), wk_action (*callback_continuation)(/*wk *web,int connid, wk_uri *uri, void *userptr*/), void *userptr)

 {

         _wk *web;

         if(ssel==NULL || callback_http==NULL)

@@ -97,6 +119,7 @@ wk_init(int port, sselect *ssel, void (*callback_event)(/*wk *web,int connid, wk

         web->serverfd=-1;

         web->callback_event=callback_event;

         web->callback_http=callback_http;

+        web->callback_post=callback_post;

         web->callback_continuation=callback_continuation;

         web->userptr=userptr;

         web->ssel=ssel;

@@ -151,6 +174,7 @@ wk_free(wk *paramweb)

                                 }

                                 if(client->fdtoserve!=-1)

                                         close(client->fdtoserve),client->fdtoserve=-1;

+                                wk_postfree(web,client);

                         }

                 }

                 cb->usedclients=0;

@@ -231,10 +255,14 @@ wk_service(wk *paramweb)

                                 wk_close((wk *) web, client->connid);

                                 continue;

                         }

-                        if(wk_clientserviceread(web,client)==-1) {

-                                /* internal error, protocol error or no enough memory */

-                                wk_close((wk *) web, client->connid);

-                                continue;

+                        if(client->status==wkc_header) {

+                                if(wk_clientservicereadheader(web,client)==-1) {

+                                        /* internal error, protocol error or no enough memory */

+                                        wk_close((wk *) web, client->connid);

+                                        continue;

+                                }

+                        } else if(client->status==wkc_post) {

+#warning TODO

                         }

                 }

         }

@@ -482,6 +510,57 @@ wk_uri_getheaderbynum(wk_uri *uri, int num)

         return(NULL);

 }

+char *

+wk_uri_getvar(wk_uri *uri, char *varname, int *len)

+{

+        char *ptr,*end;

+        int varlen;

+        if(uri==NULL || uri->path==NULL || (ptr=strchr(uri->path,'?'))==NULL)

+                return(NULL);

+        varlen=strlen(varname);

+        ptr++;

+        while(*ptr!='\0' && ptr!=NULL) {

+                if(memcmp(ptr,varname,varlen)==0 && ptr[varlen]=='=') {

+                        ptr+=varlen+1;

+                        if((end=strchr(ptr,'&'))==NULL)

+                                end=ptr+strlen(ptr);

+                        if(len!=NULL)

+                                *len=end-ptr;

+                        return(ptr);

+                }

+                if((end=strchr(ptr,'&'))==NULL)

+                        break;

+                ptr=end+1;

+        }

+        return(NULL);

+}

+

+

+int

+wk_post_addvalid(wk *paramweb, int connid, char *varname, char *tofile)

+{

+        _wk *web=(_wk *)paramweb;

+        wk_client *client;

+        if(web==NULL || varname==NULL)

+                return(-1);

+        if((client=wk_clientget(web,connid))==NULL)

+                return(-1);

+        return(wk_postadd(web,client,varname,tofile));

+}

+

+char *

+wk_post_get(wk *paramweb, int connid, char *varname, int *isfile)

+{

+        _wk *web=(_wk *)paramweb;

+        wk_client *client;

+        if(web==NULL || varname==NULL)

+                return(NULL);

+        if((client=wk_clientget(web,connid))==NULL)

+                return(NULL);

+        return(wk_postget(web,client,varname,isfile));

+}

+

+

 const char *

 mime_getdefault(const char *filename, const char *defaultmime)

 {

@@ -739,6 +818,7 @@ wk_clientrelease(_wk *web, int connid)

                 wk_sbufrelease((wk *)web,client->outbufids[w]),client->outbufids[w]=-1;

         if(client->headerbufid!=-1)

                 wk_sbufrelease((wk *)web,client->headerbufid),client->headerbufid=-1;

+        wk_postfree(web,client);

         memset(client,0,sizeof(wk_client));

         return(0);

 }

@@ -771,7 +851,7 @@ str_findfirstempty(char *ptr, int size)

 }

 static int

-wk_clientserviceread(_wk *web, wk_client *client)

+wk_clientservicereadheader(_wk *web, wk_client *client)

 {

         sbuf *in,*hbuf;

         char *end;

@@ -850,7 +930,109 @@ wk_clientserviceread(_wk *web, wk_client *client)

         /* call the http method */

         client->serviced=1;

         client->continuationactive=0;

+#warning TODO: wkc_post

         client->continuationactive=web->callback_http((wk *)web, client->connid, uri, web->userptr);

         return(0);

 }

+static int

+wk_postadd(_wk *web, wk_client *client,char *varname, char *tofile)

+{

+        wk_post *post;

+        if(client->post==NULL || client->sizepost==client->usedpost) {

+                wk_post *newpost;

+                if((newpost=(wk_post *)realloc(client->post,(client->sizepost+POSTBLOCK)*sizeof(wk_post)))==NULL)

+                        return(-1); /* insufficient memory */

+                client->post=newpost;

+                memset(client->post+client->sizepost,0,POSTBLOCK*sizeof(wk_post));

+                client->sizepost+=POSTBLOCK;

+        }

+        post=client->post+client->usedpost;

+        if((post->name=strdup(varname))==NULL)

+                return(-1); /* insufficient memory */

+        if(tofile!=NULL) {

+                if((post->value=strdup(tofile))==NULL) {

+                        free(post->name),post->name=NULL;

+                        return(-1); /* insufficient memory */

+                }

+        } else

+                post->isfile=0;

+        return(0);

+}

+

+static int

+wk_postset(_wk *web, wk_client *client,char *varname, char *value)

+{

+        int i;

+        wk_post *post;

+        int fd;

+        int len;

+        if(varname==NULL || value==NULL)

+                return(-1);

+        for(i=0;i<client->usedpost;i++) {

+                if(strcmp(client->post[i].name,varname)==0)

+                        break;

+        }

+        if(i>=client->usedpost)

+                return(-1); /* var not found */

+        post=client->post+i;

+        if(post->isfile) {

+                if((fd=open(post->value,O_CREAT|O_APPEND,0600))==-1)

+                        return(-1); /* couldn't open file */

+                len=strlen(value);

+                if(write(fd,value,len)!=len) {

+                        close(fd),fd=-1;

+                        return(-1); /* couldn't open file */

+                }

+                close(fd),fd=-1;

+                post->filewritten=1;

+        } else {

+                if(post->value!=NULL)

+                        free(post->value),post->value=NULL;

+                if((post->value=strdup(value))==NULL)

+                        return(-1);

+        }

+        return(0);

+}

+

+static char *

+wk_postget(_wk *web, wk_client *client,char *varname, int *isfile)

+{

+        int i;

+        wk_post *post;

+        if(varname==NULL)

+                return(NULL);

+        for(i=0;i<client->usedpost;i++) {

+                if(strcmp(client->post[i].name,varname)==0)

+                        break;

+        }

+        if(i>=client->usedpost)

+                return(NULL); /* var not found */

+        post=client->post+i;

+        if(isfile!=NULL)

+                *isfile=post->isfile;

+        if(post->isfile && !post->filewritten)

+                return(NULL);

+        return(post->value);

+}

+

+static int

+wk_postfree(_wk *web, wk_client *client)

+{

+        int i;

+        for(i=0;i<client->usedpost;i++) {

+                if(client->post[i].name!=NULL)

+                        free(client->post[i].name),client->post[i].name=NULL;

+                if(client->post[i].value!=NULL)

+                        free(client->post[i].value),client->post[i].value=NULL;

+                client->post[i].isfile=0;

+        }

+        if(client->post!=NULL) {

+                client->usedpost=0;

+                client->sizepost=0;

+                free(client->post),client->post=NULL;

+        }

+        return(0);

+}

+

+

@@ -40,10 +40,11 @@ typedef enum wk_error {

 typedef enum wk_action {

         wkact_finished=0,

+        wkact_post,

         wkact_continuation,

 } wk_action;

-wk *wk_init(int port, sselect *ssel, void (*callback_event)(/*wk *web,int connid, wk_event event, void *userptr*/), wk_action (*callback_http)(/*wk *web,int connid, wk_uri *uri, void *userptr*/), wk_action (*callback_continuation)(/*wk *web,int connid, wk_uri *uri, void *userptr*/), void *userptr);

+wk *wk_init(int port, sselect *ssel, void (*callback_event)(/*wk *web,int connid, wk_event event, void *userptr*/), wk_action (*callback_http)(/*wk *web,int connid, wk_uri *uri, void *userptr*/),wk_action (*callback_post)(/*wk *web,int connid, wk_uri *uri, void *userptr*/), wk_action (*callback_continuation)(/*wk *web,int connid, wk_uri *uri, void *userptr*/), void *userptr);

 void wk_free(wk *web);

 wk_uri *wk_geturi(wk *web, int connid); /* for use in callback_event() when wke_closed */

@@ -60,6 +61,11 @@ int wk_close(wk *web, int connid);

 char *wk_uri_getheader(wk_uri *wkuri, char *header, char *defaultvalue);

 char *wk_uri_getheaderbynum(wk_uri *wkuri, int num);

+char *wk_uri_getvar(wk_uri *wkuri, char *varname, int *len);

+

+int wk_post_addvalid(wk *web, int connid, char *varname, char *tofile);

+char *wk_post_get(wk *web, int connid, char *varname, int *isfile);

+

 const char *mime_getdefault(const char *filename, const char *defaultmime);

@@ -388,7 +388,8 @@ webkernel_basic(test_action action)

         long hostsize;

         int timeout;

         int fds[2];

-        char buf;

+        char buf[128];

+        int usedbuf;

         char test_request[]={"\

 GET /test.cgi HTTP/1.0\r\n\

 Host: localhost\r\n\

@@ -407,7 +408,7 @@ Connection: keep-alive\r\n\

         check=0;

         if((ssel=sselect_init())==NULL)

                 return(STRING_FAIL ": couln't alloc a sselect structure");

-        for(port=19747,off=0,check=0;(web=wk_init(port,ssel,NULL,webkernel_basichttp,NULL,&check))==NULL;off++,port++)

+        for(port=19747,off=0,check=0;(web=wk_init(port,ssel,NULL,webkernel_basichttp,NULL,NULL,&check))==NULL;off++,port++)

                 ;

         if(web==NULL) {

                 webkernel_basicclose(&client,&ssel,&host,&web);

@@ -466,7 +467,12 @@ Connection: keep-alive\r\n\

                 return(STRING_FAIL ": client read not detected\n");

         }

         /* read data */

-        if(read(client,buf,2)!=2 || memcmp(buf,"Ok",2)!=0) {

+        if((usedbuf=read(client,buf,sizeof(buf)-1))<0) {

+                webkernel_basicclose(&client,&ssel,&host,&web);

+                return(STRING_FAIL ": couldn't read reply\n");

+        }

+        buf[usedbuf]='\0';

+        if(usedbuf<2 || memcmp(buf+usedbuf-2,"Ok",2)!=0) {

                 webkernel_basicclose(&client,&ssel,&host,&web);

                 return(STRING_FAIL ": corrupted data in read on client\n");

         }