* Use unix domain sockets because we're going to need to run this locally anyway...

diff --git a/ctdlsh/src/main.c b/ctdlsh/src/main.c
index bbc14eb127b4e61dde746877e6ef163ec546f4c5..876b8e0f4cb8bf55fbb91a20d2d988c44c56db02 100644 (file)
--- a/ctdlsh/src/main.c
+++ b/ctdlsh/src/main.c
@@ -14,18 +14,21 @@ int main(int argc, char **argv)
        char *cmd = NULL;
        char *prompt = "> ";
        int server_socket = 0;
+       char buf[1024];
+
+       printf("\nCitadel administration shell v" PACKAGE_VERSION "\n");
+       printf("(c) 2009 citadel.org GPLv3\n");
 
        printf("Attaching to server...\r");
        fflush(stdout);
-       server_socket = sock_connect("localhost", "504", "tcp");
+       server_socket = uds_connectsock("/root/ctdl/trunk/citadel/citadel.socket");
        if (server_socket < 0) {
                exit(1);
        }
        printf("                      \r");
 
-       printf("\nCitadel administration shell v" PACKAGE_VERSION "\n");
-       printf("(c) 2009 citadel.org GPLv3\n");
-       printf("Type a command.  Or don't.  We don't care.\n\n");
+       sock_getln(server_socket, buf, sizeof buf);
+       printf("%s\n", buf);
 
        while (cmd = readline(prompt)) {
 
@@ -36,6 +39,11 @@ int main(int argc, char **argv)
                printf("\nHaha, you said: '%s'\n\n", cmd);
                free(cmd);
        }
+       printf("\r");
 
+       sock_puts(server_socket, "QUIT");
+       sock_getln(server_socket, buf, sizeof buf);
+       printf("%s\n", buf);
+       close(server_socket);
        exit(0);
 }

diff --git a/ctdlsh/src/sockets.c b/ctdlsh/src/sockets.c
index 00f0d7e350f3e1e36d1c38e028eec5c0c1397cdb..f949fe0eb89ae99ef5581ef9968922cc2c972515 100644 (file)
--- a/ctdlsh/src/sockets.c
+++ b/ctdlsh/src/sockets.c
@@ -10,9 +10,7 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
+#include <sys/un.h>
 #include <string.h>
 #include <pwd.h>
 #include <errno.h>
@@ -22,68 +20,31 @@
 #define INADDR_NONE 0xffffffff
 #endif
 
-int sock_connect(char *host, char *service, char *protocol)
+int uds_connectsock(char *sockpath)
 {
-       struct hostent *phe;
-       struct servent *pse;
-       struct protoent *ppe;
-       struct sockaddr_in sin;
-       struct sockaddr_in egress_sin;
-       int s, type;
-
-       if (host == NULL) return(-1);
-       if (service == NULL) return(-1);
-       if (protocol == NULL) return(-1);
-
-       memset(&sin, 0, sizeof(sin));
-       sin.sin_family = AF_INET;
-
-       pse = getservbyname(service, protocol);
-       if (pse) {
-               sin.sin_port = pse->s_port;
-       } else if ((sin.sin_port = htons((u_short) atoi(service))) == 0) {
-               fprintf(stderr, "Can't get %s service entry: %s\n",
-                       service, strerror(errno));
-               return(-1);
-       }
-       phe = gethostbyname(host);
-       if (phe) {
-               memcpy(&sin.sin_addr, phe->h_addr, phe->h_length);
-       } else if ((sin.sin_addr.s_addr = inet_addr(host)) == INADDR_NONE) {
-               fprintf(stderr, "Can't get %s host entry: %s\n",
-                       host, strerror(errno));
-               return(-1);
-       }
-       if ((ppe = getprotobyname(protocol)) == 0) {
-               fprintf(stderr, "Can't get %s protocol entry: %s\n",
-                       protocol, strerror(errno));
-               return(-1);
-       }
-       if (!strcmp(protocol, "udp")) {
-               type = SOCK_DGRAM;
-       } else {
-               type = SOCK_STREAM;
-       }
+       struct sockaddr_un addr;
+       int s;
+
+       memset(&addr, 0, sizeof(addr));
+       addr.sun_family = AF_UNIX;
+       strncpy(addr.sun_path, sockpath, sizeof addr.sun_path);
 
-       s = socket(PF_INET, type, ppe->p_proto);
+       s = socket(AF_UNIX, SOCK_STREAM, 0);
        if (s < 0) {
-               fprintf(stderr, "Can't create socket: %s\n", strerror(errno));
+               fprintf(stderr, "Can't create socket[%s]: %s\n", sockpath, strerror(errno));
                return(-1);
        }
 
-       /* Now try to connect to the remote host. */
-       if (connect(s, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
-               fprintf(stderr, "Can't connect to %s:%s: %s\n",
-                       host, service, strerror(errno));
+       if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+               fprintf(stderr, "Can't connect [%s]: %s\n", sockpath, strerror(errno));
                close(s);
                return(-1);
        }
 
-       return (s);
+       return s;
 }
 
 
-
 /*
  * sock_read_to() - input binary data from socket, with a settable timeout.
  * Returns the number of bytes read, or -1 for error.
@@ -204,3 +165,5 @@ int sock_puts(int sock, char *buf)
        if (j<0) return(j);
        return(i+j);
 }
+
+