Changeset - c72bb4bd0892
[Not reviewed]
default
0 1 0
ethanzonca - 16 years ago 2009-07-27 17:45:34

Uncommented the register_user call, which breaks the slave binary, why is it an undefined reference?
1 file changed with 1 insertions and 1 deletions:
0 comments (0 inline, 0 general)
src/server/slave.c
Show inline comments
 
@@ -26,97 +26,97 @@
 
 * 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 "slavefuncs.h" // Slave functions
 
#include <string.h>
 
#include <stdio.h>
 

	
 
int slavestatus = 0; // Ugh global vars
 

	
 
int main(int argc, char *argv[])
 
{
 

	
 
int jobnum;
 
char *jobname;
 
int framenum;
 
int counter;
 

	
 
/* Parses arguments, skips if there are no args */
 
for(counter=0; counter<argc; counter++){
 
	if(strcmp(argv[counter], "-h") == 0) {
 
		fprintf(stderr, "Usage: distrenslave [option] <username> <emailaddr>\nStarts a distren slave\n\t-h\tshow this help\n\t-c\tregisters a user with [username] and [emailaddr] \n");
 
		return 2;
 
	}
 
}
 
	if(argc>1
 
		&& (strcmp("-c", argv[1]) == 0))
 
	{
 
		char *username;
 
		char *email;
 

	
 
		if(argc != 4)
 
		{
 
			fprintf(stderr, "I need more arguments!\n%d is not enough!\n Invoke 'distrenslave -c <username> <emailaddr> to register. \n Already registered? Edit your distrenslave.conf file!\n'", argc - 1);
 
			return 234;
 
		}
 

	
 
		username = argv[2];
 
		email = argv[3];
 

	
 
		if(!strchr(email, '@'))
 
		{
 
			fprintf(stderr, "I want to see an '@' in your email address!\n%s may be good enough for you, but I need more!\n", email);
 
			return 235;
 
		}
 
		// register_user(username, email); // register_user returns a uniquely random url to a key */
 
		register_user(username, email); // register_user returns a uniquely random url to a key */
 
		fprintf(stderr, "You registered, hopefully successfully. Invoke distrenslave with no args now.");
 
	}
 
/* End arg parser */
 

	
 

	
 

	
 
/* Option getter: Creates vars to grab stuff from conf, uses the options include to grab this data */
 
char *username;
 
char *key;
 
username = NULL;
 
key = NULL;
 
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);
 
/* End option getter */
 

	
 

	
 
/* If there's no key or username in the conf, or if they're at the default (!key/!username) let the user know! */
 
	if(key == NULL || username == NULL || strcmp(key, "!key") == 0 || strcmp(username, "!username") == 0 ){
 
	  fprintf(stderr, "\nYou didn't register!\nPlease register or edit your config. (see -h)\nIf this error persists, check distrenslave.conf to ensure all items are filled.\n", argv[0]);
 
	}
 
	else if(key != NULL && username != NULL || key != "!key" && username != "username" ){
 
		fprintf(stderr, "Your username is %s, and your key is %s.\n",username, key);
 
		loginuser(username); // Logs in user to the server
 
	}
 
	else{
 
	  fprintf(stderr,"Something is terribly wrong!!!");
 
	}
 

	
 

	
 

	
 
/* Somewhat pseudo Rendering code */
 
/*
 
	if('slave recieves "start frame#, job#"'){
 
		fprintf(stderr, "Got frame %d in job %d, preparing to render...",framenum,jobnum);
 
		get('http://distren.protofusion.org/srv/job%d.tgz', jobnum); // use curl
 
		exec('tar -xvf job%d.tgz /tmp/distren/job%d',jobnum,jobnum); // somehow
 
		exec_blender("GIVE ME SOME ARGS!"); // (check the args, we'll need to adjust for different output formats, include this in the blendjob struct later)
 
			while('blender is running'){
 
				slavestatus=1; // really quite pointless now, but why not. Could be nice for logging.
 
				tell_the_server(DISTREN_REQUEST_PROGRESS);
 
				fprintf(stderr, "Rendering frame %d in job %d...",framenum,jobnum);
 
				delay(1000); // or not... this should be more event-driven, but should still give a heartbeat to the server
0 comments (0 inline, 0 general)