diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ # along with DistRen. If not, see . 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 diff --git a/src/common/libremoteio.h b/src/common/libremoteio.h --- a/src/common/libremoteio.h +++ b/src/common/libremoteio.h @@ -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 diff --git a/src/common/remoteio.c b/src/common/remoteio.c --- a/src/common/remoteio.c +++ b/src/common/remoteio.c @@ -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; +}