DistRen Changeset - dd687d0e8de0 · protofusion repositories

Changeset - dd687d0e8de0

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Ethan Zonca (ethanzonca) - 16 years ago 2010-02-21 21:00:20
e@ethanzonca.com

Auth updates

3 files changed with 24 insertions and 2 deletions:

src/server/distrend.c

src/server/mysql.c

src/server/mysql.h

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -437,24 +437,26 @@ int interactiveTest(int test, struct gen @@
      fprintf(stderr, "\t5 \tQuit\n");
      scanf("%d", &command);
      switch(command)
+     {
      case 1:
        fprintf(stderr,"Slave Key: ");
        scanf("%d", &slaveKey);
        fprintf(stderr, "Got frame: ");
        if(find_jobframe(conn, slaveKey, &jobKey, &frameNum))
          fprintf(stderr,"No frames available to render!\n");
        else if(jobKey == -1)
          fprintf(stderr,"Slave &d has no render power!", slaveKey);
        else
          fprintf(stderr, "jobKey: %d, frameNum: %d\n",jobKey,frameNum);
        break;
      case 2:
        fprintf(stderr,"Job key: ");
        scanf("%d", &tmp);
        jobKey = tmp;
        fprintf(stderr,"New priority: ");
        scanf("%d", &tmp);
        newPriority = tmp;

src/server/mysql.c

➞

Show inline comments

@@ @@ -285,24 +285,34 @@ void finish_frame(distrend_mysql_conn_t @@
+}
 void start_frame(distrend_mysql_conn_t conn, int32_t slavekey, int32_t jobkey, int32_t framenum)
+{
   char *query;
   _distren_asprintf(&query, "CALL `distren`.`Frame_Start`(%d,%d,%d);", slavekey, jobkey, framenum);
   mysqlQuery(conn, query, 0);
   free(query);
+}
 void set_renderpower(distrend_mysql_conn_t conn, int32_t slavekey, int32_t renderpower)
+{
   char *query;
   _distren_asprintf(&query, "CALL `distren`.`Set_Render_Power`(%d,%d);", slavekey, renderpower);
   mysqlQuery(conn, query, 0);
   free(query);
+}
 int change_job_priority(distrend_mysql_conn_t conn, int32_t jobkey, int32_t newpriority)
+{
   char *query;
   _distren_asprintf(&query, "UPDATE `distren`.`Job` SET `Priority`=%d WHERE `Job_Key`=%d",
 		    newpriority, jobkey);
   mysqlQuery(conn, query, 0);
   return 0;
+}
 int find_jobframe(distrend_mysql_conn_t conn, int32_t slavekey, jobnum_t *jobkey, int32_t *framenum)
@@ @@ -327,34 +337,35 @@ int find_jobframe(distrend_mysql_conn_t @@
       mysqlResultFree(conn, result);
       return 1;
+    }
   rtn = distrend_mysql_getint(row, 0, (int32_t *)jobkey);
   rtn += distrend_mysql_getint(row, 1, framenum);
   mysqlResultFree(conn, result);
   return rtn;
+}
-int auth_slave(distrend_mysql_conn_t conn, int32_t slavekey, int32_t slavepass)
+int auth_slave(distrend_mysql_conn_t conn, int32_t slavekey, char *slavepass)
+{
   distrend_mysql_result_t result;
   char *query;
   MYSQL_ROW row;
   int32_t *isAuth = 0;
   int rtn;
   mysql_real_escape_string(conn->mysqlconn,slavepass,slavepass,(unsigned int)strlen(slavepass));
-  _distren_asprintf(&query, "CALL `distren`.`Slave_Auth`(%d,%d);", slavekey, slavepass);
+  _distren_asprintf(&query, "CALL `distren`.`Slave_Auth`(%d,'%s');", slavekey, slavepass);
   result = mysqlQuery(conn, query, 2);
   free(query);
   if(!result)
     return 1;
   row = mysql_fetch_row(result->mysqlresult);
   if(!row)
+    {
       mysqlResultFree(conn, result);
       return 1;

src/server/mysql.h

➞

Show inline comments

@@ @@ -48,25 +48,34 @@ int mysqlDisconnect(distrend_mysql_conn_ @@
 /**
    Mark a frame as finished in the database and calculate the seconds spent on that frame.
  */
 void finish_frame(distrend_mysql_conn_t conn, int32_t slavekey, int32_t jobkey, int32_t framenum);
 /**
    Mark a frame as started in the database and save the time at which it started.
  */
 void start_frame(distrend_mysql_conn_t conn, int32_t slavekey, int32_t jobkey, int32_t framenum);
 /**
    Mark a frame as started in the database and save the time at which it started.
 */
 void set_renderpower(distrend_mysql_conn_t conn, int32_t slavekey, int32_t renderpower);
 /**
    Changes the priority of an existing (and maybe running) job. @arg head I may end up changing the head if job == head
 */
 int change_job_priority(distrend_mysql_conn_t conn, int32_t jobkey, int32_t newpriority);
 /**
   Frame Finder: Finds a frame for a slave to render
 */
 int find_jobframe(distrend_mysql_conn_t conn, int32_t slaveKey, jobnum_t *jobKey, int32_t *frameNum);
 /**
   Auth Slave: Checks username/password of slave
 */
 int auth_slave(distrend_mysql_conn_t conn, int32_t slavekey, char *slavepass);
 #endif /* MYSQL_H_ */

0 comments (0 inline, 0 general)