@@ -15,6 +15,7 @@

 #include <sys/types.h>

 #include <sys/stat.h>

 #include <unistd.h>

+#include <mhash.h>

 #include "gen_res.h"

 #include "socklib.h"

 #include "loglib.h"

@@ -32,12 +33,15 @@

 #define CFBANNERPATH "default.png"

 #define CFSSLPROXY 0

+#define DEBUG_HEADERS

+

 static int signal_init(int signum, void (*fn)(int));

 static void sigint(int signum);

 volatile int sigint_flag=0;

 int kakumei_inviteexists(kakumei *ka, char *invite);

 int kakumei_invitedel(kakumei *ka, char *invite);

+int kakumei_etag(kakumei *ka, char *filename, char *etag, int etagsize);

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

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

@@ -177,6 +181,38 @@ kakumei_invitedel(kakumei *ka, char *invite)

         return(0);

 }

+int

+kakumei_etag(kakumei *ka, char *filename, char *etag, int etagsize)

+{

+        struct stat st;

+        MHASH td;

+        char binhash[20];

+        char hash[40];

+        int i;

+        char c;

+        if(filename==NULL || etag==NULL || etagsize<1)

+                return(-1);

+        if(stat(filename,&st)!=0 || !S_ISREG(st.st_mode))

+                return(-1);

+        if((td=mhash_init(MHASH_SHA1))==MHASH_FAILED)

+                return(-1);

+        mhash(td,&(st.st_mtime),sizeof(st.st_mtime));

+        mhash(td,&(st.st_size),sizeof(st.st_size));

+        mhash_deinit(td,&binhash);

+        for(i=0;i<sizeof(binhash);i++) {

+                c=(((unsigned char *)binhash)[i]>>4);

+                c=(c>=10)?(c-10+'a'):c+'0';

+                hash[i<<1]=c;

+                c=(((unsigned char *)binhash)[i]&0xf);

+                c=(c>=10)?(c-10+'a'):c+'0';

+                hash[(i<<1)+1]=c;

+        }

+        memcpy(etag,hash,(etagsize>sizeof(hash))?sizeof(hash):(etagsize-1));

+        etag[(etagsize>sizeof(hash))?sizeof(hash):(etagsize-1)]='\0';

+        return(0);

+}

+

+

 wk_action

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

@@ -185,6 +221,7 @@ callback_http(wk *web, int connid, wk_uri *uri, void *userptr)

         resindex *res;

         char partialpath[1024];

         char *ptr;

+        char etag[ETAGSIZE+1];

         struct {

                 char *name;

         } whitelist[]={{"/index.html"},

@@ -207,6 +244,14 @@ callback_http(wk *web, int connid, wk_uri *uri, void *userptr)

                 log_write("HTTP","Request: /newuser?...");

         else

                 log_write("HTTP","Request: %s",uri->path);

+#ifdef DEBUG_HEADERS

+        {

+                int j;

+                char *h;

+                for(j=0;(h=wk_uri_getheaderbynum(uri,j))!=NULL;j++)

+                        log_write("HDR","%s",h);

+        }

+#endif

         /* extract the name */

         strncpy(partialpath,uri->path,sizeof(partialpath)-1);

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

@@ -238,6 +283,7 @@ callback_http(wk *web, int connid, wk_uri *uri, void *userptr)

         if(partialpath[0]=='/' && (res=res_find(resindexdata,partialpath+1))!=NULL) {

                 if(whitelisted || validsession) {

                         log_write("HTTP","Serving in-memory file %s",partialpath+1);

+                        wk_serve_etagset(web,connid,res->etag);

                         wk_serve_buffer_as_file(web,connid,res->data,res->len,mime_getdefault(res->name,"application/octet-stream"));

                         return(wkact_finished);

                 } else if((res=res_find(resindexdata,"index.html"))!=NULL) {

@@ -251,6 +297,8 @@ callback_http(wk *web, int connid, wk_uri *uri, void *userptr)

                 }

         } else if(strcmp(uri->path,"/banner.png")==0) {

                 log_write("HTTP","Serving banner from disk, file %s",partialpath);

+                if(kakumei_etag(ka,partialpath,etag,sizeof(etag))==0)

+                        wk_serve_etagset(web,connid,etag);

                 if(wk_serve_file(web,connid,partialpath,mime_getdefault(partialpath,"image/png"))!=0) {

                         log_write("HTTP","File not found, file %s",partialpath);

                         wk_serve_error(web,connid,wkerr_notfound);