diff --git a/src/server/slavefuncs.c b/src/server/slavefuncs.c --- a/src/server/slavefuncs.c +++ b/src/server/slavefuncs.c @@ -422,7 +422,7 @@ void prepareJobPaths(int jobnum, int fra _distren_asprintf(pathtoJob, "%s/%s/", datadir, jobdatapath); _distren_asprintf(pathtoJobfile, "%s/%s/job.blend", datadir, jobdatapath ); // Prepares the path to the jobfile - _distren_asprintf(urltoOutput, "http://dev.distren.org/slaveUpload.php?jobkey=%d&framekey=%d",jobnum,framenum); // Prepares the URL where output is posted + _distren_asprintf(urltoOutput, "http://distren.org/slaveUpload.php?jobkey=%d&framekey=%d",jobnum,framenum); // Prepares the URL where output is posted _distren_asprintf(pathtoRenderOutput, "%s/%s/output/job%d-frame#.%s", datadir, jobdatapath, jobnum, outputExt ); // Note: the # is for blender to put in framenum in output file _distren_asprintf(pathtoOutput, "%s/%s/output/job%d-frame%d.%s", datadir, jobdatapath, jobnum, framenum, outputExt ); // Note: the # is for blender to put in framenum in output file @@ -435,7 +435,7 @@ int checkUsername(char *username) { if(username == NULL || strcmp(username, "!username") == 0 ) { - fprintf(stderr, "\nPlease ensure that your username is present in distrenslave.conf, or use the -u flag to set a username.\n"); + fprintf(stderr, "\nPlease ensure that your slave ID is present in distrenslave.conf, or use the -u flag to set a slave ID.\n"); return 1; } else @@ -610,7 +610,7 @@ struct _web_memorystruct _web_getrequest void _web_finishframe(int slavekey, char *slavepass, int jobnum, int framenum){ char *url; - _distren_asprintf(&url,"http://dev.distren.org/slave/act.php?mode=finishframe&slavekey=%d&slavepass=%s&jobnum=%d&framenum=%d", slavekey, slavepass, jobnum, framenum); + _distren_asprintf(&url,"http://distren.org/slave/act.php?mode=finishframe&slavekey=%d&slavepass=%s&jobnum=%d&framenum=%d", slavekey, slavepass, jobnum, framenum); struct _web_memorystruct data = _web_getrequest(url); free(url); @@ -622,7 +622,7 @@ void _web_finishframe(int slavekey, char void _web_resetframe(int slavekey, char *slavepass, int jobnum, int framenum){ fprintf(stderr,"Resetting frame %d in job %d on server... ",framenum,jobnum); char *url; - _distren_asprintf(&url,"http://dev.distren.org/slave/act.php?mode=resetframe&slavekey=%d&slavepass=%s&jobnum=%d&framenum=%d", slavekey, slavepass, jobnum, framenum); + _distren_asprintf(&url,"http://distren.org/slave/act.php?mode=resetframe&slavekey=%d&slavepass=%s&jobnum=%d&framenum=%d", slavekey, slavepass, jobnum, framenum); struct _web_memorystruct data = _web_getrequest(url); free(url); @@ -635,7 +635,7 @@ void _web_startframe(int slavekey, char if(DEBUG) fprintf(stderr,"Marking frame %d started on server... ",framenum); char *url; - _distren_asprintf(&url,"http://dev.distren.org/slave/act.php?mode=startframe&slavekey=%d&slavepass=%s&jobnum=%d&framenum=%d", slavekey, slavepass, jobnum, framenum); + _distren_asprintf(&url,"http://distren.org/slave/act.php?mode=startframe&slavekey=%d&slavepass=%s&jobnum=%d&framenum=%d", slavekey, slavepass, jobnum, framenum); struct _web_memorystruct data = _web_getrequest(url); free(url); @@ -646,7 +646,7 @@ void _web_startframe(int slavekey, char int _web_getwork(int slavekey, char *slavepass, int *jobnum, int *framenum){ char *url; - _distren_asprintf(&url,"http://dev.distren.org/slave/act.php?mode=getwork&slavekey=%d&slavepass=%s", slavekey, slavepass); + _distren_asprintf(&url,"http://distren.org/slave/act.php?mode=getwork&slavekey=%d&slavepass=%s", slavekey, slavepass); struct _web_memorystruct data = _web_getrequest(url); free(url); @@ -696,7 +696,7 @@ int _web_getwork(int slavekey, char *sla void _web_setrenderpower(int slavekey, char *slavepass, int renderpower){ fprintf(stderr,"Setting render power on server... "); char *url; - _distren_asprintf(&url,"http://dev.distren.org/slave/act.php?mode=setrenderpower&slavekey=%d&slavepass=%s&renderpower=%d", slavekey, slavepass, renderpower); + _distren_asprintf(&url,"http://distren.org/slave/act.php?mode=setrenderpower&slavekey=%d&slavepass=%s&renderpower=%d", slavekey, slavepass, renderpower); struct _web_memorystruct data = _web_getrequest(url); free(url);