DistRen Changeset - f8b15ae5255a · protofusion repositories

Changeset - f8b15ae5255a

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Nathan Brink (binki) - 16 years ago 2009-08-03 23:13:59
ohnobinki@ohnopublishing.net

added partial server support to remoteio

3 files changed with 50 insertions and 4 deletions:

src/common/libremoteio.h

src/common/remoteio.c

src/common/remoteio.h

0 comments (0 inline, 0 general)

src/common/libremoteio.h

➞

Show inline comments

@@ @@ -28,25 +28,25 @@ @@
  */
 enum remoteio_method
+  {
     REMOTEIO_METHOD_SSH,
     /*    REMOTEIO_METHOD_TCP */ /*< someday, maybe */
     /*    REMOETIO_METHOD_XMLRPC */ /*< again, maybe someday */
   };
 struct remoteio_server
+{
   struct remoteio_server *next;
   char *name;
+  char *name; /*< The friendly named passed to remoteio_open() */
   char *hostname;
   char *username;
   enum remoteio_method method;
   unsigned int types; /*< See ``Server types'' in protocol.h */
 };
 struct remoteio_opts
+{
   char *ssh_command;
   struct remoteio_server *servers;
 };

src/common/remoteio.c

➞

Show inline comments

@@ @@ -11,29 +11,33 @@ @@
   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/>.
 */
 #include "libremoteio.h"
 #include "execio.h"
 #include "asprintf.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 /* local */
 struct remoteio_server *remoteio_getserver(const struct remoteio_opts *opts, const char *servername);
 int remoteio_config(cfg_t *cfg, struct remoteio_opts *opts)
+{
   size_t numservers;
   size_t counter;
   struct remoteio_server *aserver;
   opts->servers = malloc(sizeof(struct remoteio_server));
   if(!opts->servers)
+    {
       fprintf(stderr, "@todo cleanup!\n");
       abort();
@@ @@ -61,49 +65,91 @@ int remoteio_config(cfg_t *cfg, struct r @@
       if(counter < numservers - 1)
+	{
 	  aserver->next = malloc(sizeof(struct remoteio_server));
 	  aserver = aserver->next;
+	}
+    }
   aserver->next = NULL;
   return 0;
+}
 int remoteio_open(struct remoteio **rem, struct remoteio_opts *opts, char *servername)
 int remoteio_open(struct remoteio **rem, struct remoteio_opts *opts, const char *servername)
+{
   char *sshargs[] = {opts->ssh_command, servername, "distrend", "-d", (char *)NULL};
   char *userhost;
   char *sshargs[] = {opts->ssh_command, NULL /* userhost */, "distrend", "-d", (char *)NULL};
   int rtn;
   struct remoteio_server *theserver;
   theserver = remoteio_getserver(opts, servername);
   if(!theserver)
+    {
       fprintf(stderr, "%s:%d: Could not find server named ``%s''\n", __FILE__, __LINE__, servername);
       return 1;
+    }
   if(theserver->method != REMOTEIO_METHOD_SSH)
+    {
       fprintf(stderr, "%s:%d: Unsupported remoteio method %d\n", __FILE__, __LINE__, theserver->method);
       return 1;
+    }
   if(theserver->username)
     _distren_asprintf(&userhost, "%s@%s", aserver->username, aserver->hostname);
   else
     userhost = strdup(aserver->hostname);
   sshargs[1] = userhost;
   *rem = malloc(sizeof(struct remoteio));
   rtn = execio_open( &(*rem)->execio, "ssh", sshargs);
   if(rtn)
+    {
       fprintf(stderr, "error opening remoteio channel to server ``%s''" , servername);
       free(*rem);
       free(userhost);
       return 1;
+    }
   free(userhost);
   return 0;
+}
 int remoteio_read(struct remoteio *rem, void *buf, size_t len, size_t *bytesread)
+{
   return execio_read(rem->execio, buf, len, bytesread);
+}
 int remoteio_write(struct remoteio *rem, void *buf, size_t len, size_t *byteswritten)
+{
   return execio_write(rem->execio, buf, len, byteswritten);
+}
 int remoteio_close(struct remoteio *rem)
+{
   int rtn;
   rtn = execio_close(rem->execio);
   free(rem);
   return 0 + rtn;
+}
 struct remoteio_server *remoteio_getserver(const struct remoteio_opts *opts, const char *servername)
+{
   struct remoteio_server *aserver;
   for(aserver = opts->servers;
       aserver;
       aserver = aserver->next)
     if(!strcmp(servername, aserver->name))
       return aserver;
   return (struct remoteio_server *)NULL;
+}

src/common/remoteio.h

➞

Show inline comments

@@ @@ -28,25 +28,25 @@ @@
 struct remoteio_opts;
 struct remoteio {
   struct execio *execio;
 };
 /**
    Opens connection with remote distrend. Returns 1 on error.
    @todo should this be asynchronous?
  */
 int remoteio_open(struct remoteio **rem, struct remoteio_opts *opts, char *servername);
+int remoteio_open(struct remoteio **rem, struct remoteio_opts *opts, const char *servername);
 /**
    non-blocking I/O.
    @return 0 on success, 1 on failure
  */
 int remoteio_read(struct remoteio *rem, void *buf, size_t len, size_t *bytesread);
 int remoteio_write(struct remoteio *rem, void *buf, size_t len, size_t *byteswritten);
 /**
    Closes a remoteio session.
    @return nonzero on error
 */

0 comments (0 inline, 0 general)