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

@@ @@ -62,26 +62,31 @@ for(counter=0; counter<argc; counter++){ @@
 			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 */
 		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 */
 char *username;
 char *key;
 username = NULL;
 key = NULL;
 cfg_t * my_cfg;
 cfg_opt_t myopts[] = {
@@ @@ -91,25 +96,32 @@ cfg_opt_t myopts[] = { @@
 		};
 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);
 		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!!!");
+	}
 /* 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

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -20,25 +20,25 @@ @@
  /*
   * Registration on server. Needs attention. Prevent account spamming.
   * distrenslave -c username email@example.com
  */
 #include <stdio.h>
 #include <string.h>
 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.
    */
   char *keyname; // Url to the key
   char buf[10];
   struct execio *testrem;
   char *execargv[] =
+    {
       "ssh",
@@ @@ -65,39 +65,39 @@ void register_user(char *username, char @@
+    {
       if(readlen > 9) {
 	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);
   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",
   userhost, // username and hostname
   "-i",
   userkey, // Key created from registeruser()
   "-p",
   "23",
   "echo",
@@ @@ -107,24 +107,25 @@ void login_user(char *username){ @@
   size_t readlen;
   fprintf(stderr, "Opening stream:\n", execio_open(&testrem, "ssh", execargv));
   buf[9] = '\0'; // null-terminating the array...
   while(!execio_read(testrem, buf, 9, &readlen)) // What's with the readlen stuff?
+    {
       if(readlen > 9) {
 	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
 /*
 	mktemp(); // Gets a new file to put data into
 	fopen('w'); // Open the file we created in write mode
 	fopen('r'); // Open the conf file in read-only mode
 	read(); // Read the created file, scanning for and replacing strings, whie
 	writ(); // writing out to the newly created file

src/server/slavefuncs.h

➞

Show inline comments

@@ @@ -13,19 +13,19 @@ @@
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #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)