DistRen Changeset - 178f8413971b · protofusion repositories

Changeset - 178f8413971b

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

ethanzonca - 16 years ago 2009-07-28 00:51:10

Changed loginuser() to login_user() to mimic register_user()'s format.

3 files changed with 3 insertions and 3 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

 /*
   Copyright 2009 Nathan Phillip Brink, Ethan Zonca, Matthew Orlando
   This file is a part of DistRen.
   DistRen is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   DistRen is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   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/>.
  */
 /*
  * **********************************************************************************
  * Slave functions / etc resides below. Wouldn't a separate file make this easier??
+ *
  * Slave listens on server for a command in the format of each function...
  * 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 */
 		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
+		login_user(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
+			}
 		slavestatus=2; // When done rendering, set this.
+	}
 	if(slavestatus==2){
 		fprintf(stderr, "Finished frame %d in job %d, uploading...",framenum,jobnum);
 		curl_POST("/path/to/output.jpg", "http://protofusion.org/distren/output/job%d",jobnum);
 		tell_the_server(DISTREN_REQUEST_DONEFRAME); // AKA "I'm done rendering that frame you sent me"
 		// Slave now becomes idle, doesn't need to tell the server anything, ssh handles this.
+	}
 */
   return 0;
+}

src/server/slavefuncs.c

➞

Show inline comments

 /*
   Copyright 2009 Nathan Phillip Brink, Ethan Zonca, Matthew Orlando
   This file is a part of DistRen.
   DistRen is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   DistRen is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   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/>.
 */
  /*
   * 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)
+{
   /*
    * 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",
       "distren_setup@protofusion.org",
       "-i",
       "setup.rsa", // default distributed key, account can only create users.
       "-p",
       "23",
       "sudo /usr/sbin/useradd",
       "-M",
       "-c",
       email,
       "-d",
       "/home/distren",
       "--gid",
       "541", // Add in shellscript to generate ssh key and set keyname
       username,
       (char *)NULL
     };
   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);
   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" */
+}
-void loginuser(char *username){
+void 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?
+  }
   char buf[10];
   struct execio *testrem;
   char *execargv[] =
+    {
   "ssh",
   userhost, // username and hostname
   "-i",
   userkey, // Key created from registeruser()
   "-p",
   "23",
   "echo",
   "hello", // This should eventually open a non-terminating connection to the server for communication
   (char *)NULL
   };
   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);
+}
 /* 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
 	fsync(); // fsync the file we wrote data to
 	rename(); // rename the old file to the new file
 */
+}
 /* Executors */
 /*
   It seems that the client will need to know the job number. fixme.
 */
 void exec_blender(struct blendjob* blendjob, char *input, char *output, int frame)
+{
   char *frame_str;
   asprintf(frame,frame_str); // GNU/*nix compatible only, fix before releasing win32, although dll for windows for asprintf exists!
   int ret;
   char *cmd[] = { "blender", "-b", "-o", output, input, "-f", frame_str, (char *)0 };
   ret = execv("/usr/bin/blender", cmd); // This path will be absolute for testing, should be relative to install on production
+}

src/server/slavefuncs.h

➞

Show inline comments

 /*
   Copyright 2009 Nathan Phillip Brink, Ethan Zonca, Matthew Orlando
   This file is a part of DistRen.
   DistRen is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   DistRen is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   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 loginuser(char *username);
+void 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)