DistRen Changeset - 8dabe557e169 · protofusion repositories

Changeset - 8dabe557e169

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Nathan Brink (binki) - 16 years ago 2009-11-16 23:40:30
ohnobinki@ohnopublishing.net

prepare remoteio for TCP, stubs

3 files changed with 28 insertions and 11 deletions:

configure.ac

src/common/libremoteio.h

src/common/remoteio.c

0 comments (0 inline, 0 general)

configure.ac

➞

Show inline comments

@@ @@ -16,7 +16,7 @@ @@
 # along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 AC_PREREQ(2.61)
-AC_INIT([distren],[0.0],[ohnobinki@ohnopublishing.net])
+AC_INIT([distren],[0.0],[http://bugs.ohnopub.net/])
 AC_CONFIG_SRCDIR([src/server/distrend.c])
 AC_PROG_CC

src/common/libremoteio.h

➞

Show inline comments

@@ @@ -33,9 +33,9 @@ enum remoteio_method @@
 #ifndef WINDOWS
     REMOTEIO_METHOD_UNIX = 1,
 #endif
     /*    REMOTEIO_METHOD_TCP */ /*< someday, maybe */
     /*    REMOETIO_METHOD_XMLRPC */ /*< again, maybe someday */
     REMOTEIO_METHOD_MAX = 2 /*< This is a number used to check the consitency of remoteio_server structs */
     REMOTEIO_METHOD_TCP = 2,
     /*    REMOETIO_METHOD_XMLRPC */ /*< maybe someday */
     REMOTEIO_METHOD_MAX = 3 /*< This is a number used to check the consitency of remoteio_server structs */
   };
 struct remoteio_server

src/common/remoteio.c

➞

Show inline comments

@@ @@ -39,13 +39,14 @@ int _remoteio_ssh_write(struct remoteio @@
 int _remoteio_ssh_close(struct remoteio *rem);
 #ifndef WINDOWS
 int _remoteio_sock_open(struct remoteio *rem, struct remoteio_server *server);
 int _remoteio_sock_close(struct remoteio *rem);
 #endif
 int _remoteio_sock_read(struct remoteio *rem, void *buf, size_t len, size_t *bytesread);
 int _remoteio_sock_write(struct remoteio *rem, void *buf, size_t len, size_t *byteswritten);
 int _remoteio_sock_close(struct remoteio *rem);
 #endif
 int _remoteio_tcp_open(struct remoteio *rem, struct remoteio_server *server);
 int _remoteio_tcp_close(struct remoteio *rem);
 /**
   lookup table for different methods of remoteio:
@@ @@ -60,6 +61,7 @@ struct remoteio_method_funcmap funcmap[] @@
 #ifndef WINDOWS
     {REMOTEIO_METHOD_UNIX, &_remoteio_sock_open, &_remoteio_sock_read, &_remoteio_sock_write, &_remoteio_sock_close, "unix"},
 #endif
     {REMOTEIO_METHOD_TCP, &_remoteio_tcp_open, &_remoteio_sock_read, &_remoteio_sock_write, &_remoteio_tcp_close, "tcp"},
     {REMOTEIO_METHOD_MAX, NULL, NULL, NULL, NULL, NULL}
   };
@@ @@ -312,6 +314,15 @@ int _remoteio_sock_open(struct remoteio @@
   return 0;
+}
 int _remoteio_sock_close(struct remoteio *rem)
+{
   close(rem->sock);
   return 0;
+}
 #endif
 int _remoteio_sock_read(struct remoteio *rem, void *buf, size_t len, size_t *bytesread)
+{
   ssize_t readrtn;
@@ @@ -383,11 +394,17 @@ int _remoteio_sock_write(struct remoteio @@
   return 0;
+}
 int _remoteio_sock_close(struct remoteio *rem)
 /**
    TCP, taking advantage of the two generic socks read/write functions:
  */
 int _remoteio_tcp_open(struct remoteio *rem, struct remoteio_server *server)
+{
   close(rem->sock);
-  return 0;
+  return 1;
+}
 #endif
 int _remoteio_tcp_close(struct remoteio *rem)
+{
   return 1;
+}

0 comments (0 inline, 0 general)