DistRen Changeset - 5b11cfeabe1c · protofusion repositories

Changeset - 5b11cfeabe1c

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

ethanzonca - 16 years ago 2009-07-28 00:59:56

Added returns, error messages.

3 files changed with 22 insertions and 9 deletions:

src/server/slave.c

src/server/slavefuncs.c

src/server/slavefuncs.h

0 comments (0 inline, 0 general)

src/server/slave.c

➞

Show inline comments

@@ @@ -68,14 +68,19 @@ for(counter=0; counter<argc; counter++){ @@
 		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 */
 		fprintf(stderr, "You registered, hopefully successfully. Invoke distrenslave with no args now.");
 		if( register_user(username, email) == 1){
 			// register_user generates a key, too */
 			fprintf(stderr,"Registration successfull. You may now invoke distrenslave with no arguments.");
+		}
 		else{
 			fprintf(stderr,"Registration failed. Sorry!");
+		}
+	}
 /* End arg parser */
 /* Option getter: Creates vars to grab stuff from conf, uses the options include to grab this data */
@@ @@ -97,13 +102,20 @@ options_init(argc,argv,&my_cfg, myopts, @@
 /* 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);
 		login_user(username); // Logs in user to the server
 		// Logs ya in:
 		if(login_user(username) == 1){
 			fprintf(stderr,"You should now be logged into distren.\n");
+		}
 		else{
 			fprintf(stderr,"Login failed. I have no clue why. Goodbye.\n");
 			return 0;
+		}
+	}
 	else{
 	  fprintf(stderr,"Something is terribly wrong!!!");
+	}

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -26,13 +26,13 @@ @@
 void ssh_keygen(){
 	// Give me some args!
+}
-void register_user(char *username, char *email)
+int register_user(char *username, char *email)
+{
   /*
    * Logs into sandboxed user on zserver2 and registers a user. Should eventually generate a key on the server and return it to the user.
    * All created user accounts should be sandboxed accordingly, requiring a different skel, and the default shell to be rbash. Also,
    * a custom path defined in the .bash_profile of the skel is needed.
    */
@@ @@ -71,27 +71,27 @@ void register_user(char *username, char @@
+    }
   execio_close(testrem);
   ssh_keygen(); // Should return relative path to keyfile, or jus the keyname
   /* TODO: Scan distrenslave.conf for !username and !key and replace them with "keyname" and the "username" */
+  return 1;
+}
-void login_user(char *username){
+int login_user(char *username){
 	// TODO: Why does this segfault???
   fprintf(stderr, "Logging you in...");
   char *userhost = strcpy(userhost, username);
   char *userkey = strcpy(userkey, username);
   strcat(userhost, "@protofusion.org"); // Throws @protofusion.org after the username
   strcat(userkey,".rsa");
   fprintf(stderr, "i'm here");
   if(fopen(userkey, "r") == NULL){
 	  fprintf(stderr,"Your key, %s, has not been found! Re-register or somehow regenerate your key! We need a way to regenerate keys coded in, but we don't have the facilities yet!",userkey);
-	  return; // Maybe return something?
+	  return 0;
+  }
   char buf[10];
   struct execio *testrem;
   char *execargv[] =
+    {
   "ssh",
@@ @@ -113,12 +113,13 @@ void login_user(char *username){ @@
 	fprintf(stderr, "!!!! Something is terribly wrong!\n");
+      }
     buf[readlen] = '\0'; // Null-terminating the end of it again based on how large the data is?
     fprintf(stderr, "read \"%s\"\n", buf);
+    }
   execio_close(testrem);
   return 1; // 1 can be like... error-free login...
+}
 /* Replaces username and key in the slave's conf file, currently pseudo */
 void conf_replace(char *username, char *key){
 	// Doesn't delete anything! :D

src/server/slavefuncs.h

➞

Show inline comments

@@ @@ -19,13 +19,13 @@ @@
 #ifndef _DISTREN_SLAVEFUNCS_H
 #define _DISTREN_SLAVEFUNCS_H
 #include "blendjob.h"
 void ssh_keygen();
 void register_user(char *username, char *email);
 void login_user(char *username);
 int register_user(char *username, char *email);
 int login_user(char *username);
 void conf_replace(char *username, char *key);
 void exec_blender(struct blendjob* blendjob, char *input, char *output, int frame);
 #endif

0 comments (0 inline, 0 general)