Changeset 291

Timestamp:

Aug 3, 2011, 3:17:10 PM (13 years ago)

Author:

djay

Message:

Update cache to use md5 as described in #51.

Location:

trunk/zoo-kernel

Files:

• service_internal.c (modified) (6 diffs)
• service_internal.h (modified) (1 diff)

trunk/zoo-kernel/service_internal.c

@@ -2299 +2299 @@
 
 
+unsigned char* getMd5(char* url){
+  EVP_MD_CTX md5ctx;
+  unsigned char* fresult=(char*)malloc((EVP_MAX_MD_SIZE+1)*sizeof(char));
+  unsigned char result[EVP_MAX_MD_SIZE];
+  unsigned int len;
+  EVP_DigestInit(&md5ctx, EVP_md5());
+  EVP_DigestUpdate(&md5ctx, url, strlen(url));
+  EVP_DigestFinal_ex(&md5ctx,result,&len);
+  EVP_MD_CTX_cleanup(&md5ctx);
+  int i;
+  for(i = 0; i < len; i++){
+    if(i>0){
+      char *tmp=strdup(fresult);
+      sprintf(fresult,"%s%02x", tmp,result[i]);
+      free(tmp);
+    }
+    else
+      sprintf(fresult,"%02x",result[i]);
+  }
+  return fresult;
+}
+
 /**
  * Cache a file for a given request
@@ -2307 +2329 @@
     char* fname=(char*)malloc(sizeof(char)*(strlen(tmp->value)+6));
     sprintf(fname,"%s/list",tmp->value);
+#ifdef DEBUG
     fprintf(stderr,"Cache list : %s\n",fname);
     fflush(stderr);
+#endif
     struct stat f_status;
     int s=stat(fname, &f_status);
@@ -2322 +2346 @@
     if(f_status.st_size>=0){
       FILE* f=fopen(fname,"a+");
-      char* foname=(char*)malloc(sizeof(char)*(strlen(tmp->value)+64));
-      sprintf(foname,"%s/%d.zca",tmp->value,f_status.st_size);
+      char* foname=(char*)malloc(sizeof(char)*65);
+      char* fonames=(char*)malloc(sizeof(char)*(strlen(tmp->value)+70));
+      sprintf(foname,"%d",f_status.st_size);
+      sprintf(fonames,"%s/%s.zca",tmp->value,foname);
+#ifdef DEBUG
       fprintf(stderr,"Cache file : %s\n",foname);
       fflush(stderr);
-      FILE* fo=fopen(foname,"w+");
+#endif
+      FILE* fo=fopen(fonames,"w+");
       char *fcontent=(char*)malloc(sizeof(char)*(strlen(foname)+strlen(request)+3));
-      sprintf(fcontent,"%s|%s\n",request,foname);
-
+      unsigned char* md5str=getMd5(request);
+      sprintf(fcontent,"%s|%s\n",md5str,foname);
+      free(md5str);
+      free(foname);
+      free(fonames);      
       fwrite(fcontent,sizeof(char),strlen(fcontent),f);
       fwrite(content,sizeof(char),length,fo);
@@ -2339 +2370 @@
 
 char* isInCache(maps* conf,char* request){
-  map* tmp=getMapFromMaps(conf,"main","cacheDir");
-  if(tmp!=NULL){
-    char* fname=(char*)malloc(sizeof(char)*(strlen(tmp->value)+6));
-    sprintf(fname,"%s/list",tmp->value);
+  map* tmpM=getMapFromMaps(conf,"main","cacheDir");
+  if(tmpM!=NULL){
+    unsigned char* md5str=getMd5(request);
+#ifdef DEBUG
+    fprintf(stderr,"MD5STR : (%s)\n\n",md5str);
+#endif
+    char* fname=(char*)malloc(sizeof(char)*(strlen(tmpM->value)+6));
+    sprintf(fname,"%s/list",tmpM->value);
     struct stat f_status;
     int s=stat(fname, &f_status);
@@ -2358 +2393 @@
         while(tmp1!=NULL){
           fprintf(stderr,"%s %s\n",tmp1,request);
-          if(hv>0)
-            return tmp1;
-          if(strcasecmp(tmp1,request)==0)
+          if(hv>0){
+            char* foname=(char*)malloc(sizeof(char)*(strlen(tmpM->value)+68));
+            sprintf(foname,"%s/%s.zca",tmpM->value,tmp1);
+            free(md5str);
+            free(fname);
+            free(fcontent);
+#ifdef DEBUG
+            fprintf(stderr,"Cache file : %s\n",foname);
+#endif
+            return foname;
+          }
+          if(strcasecmp(tmp1,md5str)==0)
             hv=1;
           tmp1=strtok_r(NULL,"|",&svt1);
@@ -2368 +2412 @@
       }
       fclose(f);
-    }
+      free(fcontent);
+    } 
+    free(md5str);
+    free(fname);
   }
   return NULL;

trunk/zoo-kernel/service_internal.h

@@ -53 +53 @@
 #include "service.h"
 #include <openssl/sha.h>
+#include <openssl/md5.h>
 #include <openssl/hmac.h>
 #include <openssl/evp.h>