DistRen Changeset - 8ee4266bf89b · protofusion repositories

Changeset - 8ee4266bf89b

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Ethan Zonca (ethanzonca) - 15 years ago 2010-03-18 23:57:41
e@ethanzonca.com

Fixed segfault on no work available

1 file changed with 6 insertions and 2 deletions:

src/server/slavefuncs.c

0 comments (0 inline, 0 general)

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -724,35 +724,39 @@ int _web_getwork(int slavekey, char *sla @@
   struct _web_memorystruct data = _web_getrequest(url);
   free(url);
   if(!data.memory || !strcmp(data.memory,",")){
     fprintf(stderr,"No work available on server!\n");
     return 0;
+  }
   else if(!strcmp(data.memory, "ERROR_BADKEY")){
     fprintf(stderr,"*** Slave %d does not exist!\n",slavekey);
     free(data.memory);
     return 0;
+  }
-  // Compare to PACKAGE_VERSIOn
+  // Compare to PACKAGE_VERSION
   else{
     char *tmp;
     char *serverversion;
     tmp = strtok (data.memory,",");
+    tmp = strtok (data.memory,",,");
     if(tmp != NULL){ // make sure work is available
       *jobnum = atoi(tmp);
       tmp = strtok (NULL, ",");
       if(tmp == NULL)
         return 0; // no work
       *framenum = atoi(tmp);
       tmp = strtok (NULL, ",");
       if(tmp == NULL)
         return 0; // no work
       serverversion = tmp;
       if(strcmp(PACKAGE_VERSION,serverversion)){
         fprintf(stderr,"Your distren package is out of date! Please acquire a newer version. (%s local vs %s remote)\n", PACKAGE_VERSION, serverversion);
         return 0;
+      }
       free(data.memory);
       return 1;
+    }
     else
       return 0; // error
+  }
+}

0 comments (0 inline, 0 general)