DistRen Changeset - b95115259ec9 · protofusion repositories

Changeset - b95115259ec9

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

ethanzonca - 16 years ago 2009-07-25 01:18:31

Conf files are now parsed!

2 files changed with 25 insertions and 3 deletions:

src/common/options.c

src/server/slave.c

0 comments (0 inline, 0 general)

src/common/options.c

➞

Show inline comments

@@ @@ -88,12 +88,13 @@ int options_init(int argc, char *argv[], @@
   (*allopts)->remoteio->ssh_command = strdup("ssh");
   /** @TODO: check for NULL return above */
   cfg_opt_t common_opts[] =
+    {
       CFG_SIMPLE_STR("ssh-command", &(*allopts)->remoteio->ssh_command),
       CF
       CFG_END()
     };
   /*
     In these arrays, I should replace NULL with a pointer to a string in the struct which should hold the result of confuse processing an option. This is partially because confuse will not free the values it parses.
    */

src/server/slave.c

➞

Show inline comments

@@ @@ -26,12 +26,13 @@ @@
  * We need if's for returns... ==> watchdog
  * **********************************************************************************
 */
 // Provides DISTREN_REQUEST* which is in reality, DISTREN_SEND(signal) in the minds of your average joe
 #include "protocol.h"
 #include "options.h" // Confuse, etc.
 #include <string.h>
 int slavestatus = 0; // Ugh global vars
 int main(int argc, char *argv[])
+{
@@ @@ -42,13 +43,13 @@ int main(int argc, char *argv[]) @@
+	{
 		char *username;
 		char *email;
 		if(argc != 4)
+		{
 			fprintf(stderr, "I need more arguments!\n%d is not enough!\n Invoke 'slave -c <username> <emailaddr> to register'", argc - 1);
+			fprintf(stderr, "I need more arguments!\n%d is not enough!\n Invoke 'slave -c <username> <emailaddr> to register. \n Already registered? Edit your distrend.conf file!'", argc - 1);
 			return 234;
+		}
 		username = argv[2];
 		email = argv[3];
@@ @@ -61,17 +62,37 @@ int main(int argc, char *argv[]) @@
 		get("http://protofusion.org/distren/key/%s",key);
 		fprintf(stderr, "you registered, hopefully successfully. Invoke distrend with no args now.");
 		exec('echo %s >> distrend.conf',key);
+	}
 /* End arg parser */
 char *username;
 char *key;
 username = NULL;
 key = NULL;
 	if('username and the user\'s key filename are in conf file'){
 		loginuser(username);
 cfg_t * my_cfg;
 cfg_opt_t myopts = {
 		CFG_SIMPLE_STR("username"), &username),
 		CFG_SIMPLE_STR("key"), &key),
 		CFG_END()
 		};
 struct options_common *commonopts
 options_init(argc,argv,&my_cfg, &myopts, "slave", &commonopts);
 	if(key == NULL || username == NULL){
 		fprintf(stderr,"You didn't register! Please register or add your username to distrend.conf");
+	}
 	else if(key != NULL || username != NULL){
 		loginuser(username); // Logs in user to the server
+	}
 	else{
 		fprintf(stderr,"Something is terribly wrong!!!");
+	}
 	if('slave recieves "start frame#, job#"'){
 		fprintf(stderr, "Got frame %d in job %d, preparing to render...",frame,job);
 		get('http://distren.protofusion.org/srv/job#.tgz');
 		exec('tar -xvf job#.tgz /tmp/distren/job#'); // somehow
 		exec_blender(jobname.blendfile, jobnum.framenum.JPG, jobnum); // (check the args, we'll need to adjust for different output formats, include this in the blendjob struct later)

0 comments (0 inline, 0 general)