X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Futils%2Fsendcommand.c;h=7d8e089853fc1416e11739d8a29a23f3da922d06;hb=2bc27bb07d088ead764da7064df2633f552b9eb0;hp=71764bcbbbce69e2a84edf081ca5860dd52b15e7;hpb=57b37d4ed168b176d594bc149e5d16a1b9f0517a;p=citadel.git diff --git a/citadel/utils/sendcommand.c b/citadel/utils/sendcommand.c index 71764bcbb..7d8e08985 100644 --- a/citadel/utils/sendcommand.c +++ b/citadel/utils/sendcommand.c @@ -1,7 +1,7 @@ /* * Command-line utility to transmit a server command. * - * Copyright (c) 1987-2012 by the citadel.org team + * Copyright (c) 1987-2021 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3. @@ -12,8 +12,7 @@ * GNU General Public License for more details. */ -#include "ctdl_module.h" - +#include #include #include #include @@ -22,264 +21,223 @@ #include #include #include - -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - #include #include #include -#include +#include +#include #include "citadel.h" -#include "citadel_ipc.h" -#include "server.h" -#include "config.h" +#include "citadel_dirs.h" +#include -static CtdlIPC *ipc = NULL; +int serv_sock = (-1); -/* - * Why both cleanup() and nq_cleanup() ? Notice the alarm() call in - * cleanup() . If for some reason sendcommand hangs waiting for the server - * to clean up, the alarm clock goes off and the program exits anyway. - * The cleanup() routine makes a check to ensure it's not reentering, in - * case the ipc module looped it somehow. - */ -void nq_cleanup(int e) +int uds_connectsock(char *sockpath) { - if (e == SIGALRM) - fprintf(stderr, "\nWatch dog time out.\n"); - exit(e); + int s; + struct sockaddr_un addr; + + memset(&addr, 0, sizeof(addr)); + addr.sun_family = AF_UNIX; + strncpy(addr.sun_path, sockpath, sizeof addr.sun_path); + + s = socket(AF_UNIX, SOCK_STREAM, 0); + if (s < 0) { + fprintf(stderr, "sendcommand: Can't create socket: %s\n", strerror(errno)); + exit(3); + } + + if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) { + fprintf(stderr, "sendcommand: can't connect: %s\n", strerror(errno)); + close(s); + exit(3); + } + + return s; } + /* - * send binary to server + * input binary data from socket */ -void serv_write(CtdlIPC *ipc, const char *buf, unsigned int nbytes) +void serv_read(char *buf, int bytes) { - unsigned int bytes_written = 0; - int retval = 0; + int len, rlen; - while (bytes_written < nbytes) { - retval = write(ipc->sock, &buf[bytes_written], - nbytes - bytes_written); - if (retval < 1) { - connection_died(ipc, 0); + len = 0; + while (len < bytes) { + rlen = read(serv_sock, &buf[len], bytes - len); + if (rlen < 1) { return; } - bytes_written += retval; + len = len + rlen; } } -void cleanup(int e) -{ - static int nested = 0; - - alarm(30); - signal(SIGALRM, nq_cleanup); - if ((ipc != NULL) && - (ipc->sock > 0)) - serv_write(ipc, "\n", 1); - if ((nested++ < 1) && - (ipc != NULL) && - (ipc->sock > 0)) - CtdlIPCQuit(ipc); - nq_cleanup(e); -} - /* - * This is implemented as a function rather than as a macro because the - * client-side IPC modules expect logoff() to be defined. They call logoff() - * when a problem connecting or staying connected to the server occurs. + * send binary to server */ -void logoff(int e) +void serv_write(char *buf, int nbytes) { - cleanup(e); + int bytes_written = 0; + int retval; + while (bytes_written < nbytes) { + retval = write(serv_sock, &buf[bytes_written], nbytes - bytes_written); + if (retval < 1) { + return; + } + bytes_written = bytes_written + retval; + } } + /* - * Connect sendcommand to the Citadel server running on this computer. + * input string from socket - implemented in terms of serv_read() */ -void np_attach_to_server(char *host, char *port) +void serv_gets(char *buf) { - char buf[SIZ]; - char hostbuf[256], portbuf[256]; - char *args[] = - {"sendcommand", NULL}; - int r; - - fprintf(stderr, "Attaching to server...\n"); - strcpy(hostbuf, host); - strcpy(portbuf, port); - ipc = CtdlIPC_new(1, args, hostbuf, portbuf); - if (!ipc) { - fprintf(stderr, "Can't connect: %s\n", strerror(errno)); - exit(3); + int i; + + /* Read one character at a time. + */ + for (i = 0;; i++) { + serv_read(&buf[i], 1); + if (buf[i] == '\n' || i == (SIZ-1)) + break; } - CtdlIPC_chat_recv(ipc, buf); - fprintf(stderr, "%s\n", &buf[4]); - snprintf(buf, sizeof buf, "IPGM %d", config.c_ipgm_secret); - r = CtdlIPCInternalProgram(ipc, config.c_ipgm_secret, buf); - fprintf(stderr, "%s\n", buf); - if (r / 100 != 2) { - cleanup(2); + + /* If we got a long line, discard characters until the newline. + */ + if (i == (SIZ-1)) { + while (buf[i] != '\n') { + serv_read(&buf[i], 1); + } } + + /* Strip all trailing nonprintables (crlf) + */ + buf[i] = 0; } -void sendcommand_die(void) { - exit(0); +/* + * send line to server - implemented in terms of serv_write() + */ +void serv_puts(char *buf) +{ + serv_write(buf, strlen(buf)); + serv_write("\n", 1); } - +/* + * Main loop. Do things and have fun. + */ int main(int argc, char **argv) { int a; - char cmd[SIZ]; - char buf[SIZ]; int watchdog = 60; - - int relh=0; - int home=0; - char relhome[PATH_MAX]=""; + char buf[SIZ]; + int xfermode = 0; char ctdldir[PATH_MAX]=CTDLDIR; - fd_set read_fd; - struct timeval tv; - int ret; - int server_shutting_down = 0; - - strcpy(ctdl_home_directory, DEFAULT_PORT); - strcpy(cmd, ""); - /* - * Change directories if specified - */ - for (a = 1; a < argc; ++a) { - if (!strncmp(argv[a], "-h", 2)) { - relh=argv[a][2]!='/'; - if (!relh) safestrncpy(ctdl_home_directory, &argv[a][2], sizeof ctdl_home_directory); - else { - safestrncpy(relhome, &argv[a][2], sizeof relhome); - } - home=1; - } else if (!strncmp(argv[a], "-w", 2)) { - watchdog = atoi(&argv[a][2]); - if (watchdog<1) - watchdog=1; - } else { - if (!IsEmptyStr(cmd)) { - strcat(cmd, " "); - } - strcat(cmd, argv[a]); + StartLibCitadel(SIZ); + + /* Parse command line */ + while ((a = getopt(argc, argv, "h:w:")) != EOF) { + switch (a) { + case 'h': + strncpy(ctdldir, optarg, sizeof ctdldir); + break; + case 'w': + watchdog = atoi(optarg); + break; + default: + fprintf(stderr, "sendcommand: usage: sendcommand [-h server_dir] [-w watchdog_timeout]\n"); + return(1); } } - calc_dirs_n_files(relh, home, relhome, ctdldir, 0); - get_config(); - - signal(SIGINT, cleanup); - signal(SIGQUIT, cleanup); - signal(SIGHUP, cleanup); - signal(SIGTERM, cleanup); - - fprintf(stderr, "sendcommand: started (pid=%d) " - "running in %s\n", - (int) getpid(), - ctdl_home_directory); + fprintf(stderr, "sendcommand: started (pid=%d) connecting to Citadel server with data directory %s\n", + (int) getpid(), + ctdldir + ); fflush(stderr); + if (chdir(ctdldir) != 0) { + fprintf(stderr, "sendcommand: %s: %s\n", ctdldir, strerror(errno)); + exit(errno); + } + alarm(watchdog); - signal(SIGALRM, nq_cleanup); /* Set up a watchdog type timer in case we hang */ - - np_attach_to_server(UDS, ctdl_home_directory); - fflush(stderr); - setIPCDeathHook(sendcommand_die); + serv_sock = uds_connectsock(file_citadel_admin_socket); + serv_gets(buf); + fprintf(stderr, "%s\n", buf); + + strcpy(buf, ""); + for (a=optind; a 0) { + if (buf[strlen(buf)-1] == '\n') { + buf[strlen(buf)-1] = 0; + } + serv_puts(buf); + } + serv_puts("000"); } - if (buf[0] == '1') { - while (CtdlIPC_chat_recv(ipc, buf), strcmp(buf, "000")) { + if ((xfermode == '1') || (xfermode == '8')) { /* receive text */ + while(serv_gets(buf), strcmp(buf, "000")) { printf("%s\n", buf); - alarm(watchdog); /* Kick the watchdog timer */ } - } else if (buf[0] == '4') { - do { - if (fgets(buf, sizeof buf, stdin) == NULL) - strcpy(buf, "000"); - if (!IsEmptyStr(buf)) - if (buf[strlen(buf) - 1] == '\n') - buf[strlen(buf) - 1] = 0; - if (!IsEmptyStr(buf)) - if (buf[strlen(buf) - 1] == '\r') - buf[strlen(buf) - 1] = 0; - if (strcmp(buf, "000")) - CtdlIPC_chat_send(ipc, buf); - - FD_ZERO(&read_fd); - FD_SET(ipc->sock, &read_fd); - ret = select(ipc->sock+1, &read_fd, NULL, NULL, &tv); - if (ret == -1) { - if (!(errno == EINTR || errno == EAGAIN)) - fprintf(stderr, "select() failed: %s", strerror(errno)); - return(1); - } - - if (ret != 0) { - size_t n; - char rbuf[SIZ]; - - rbuf[0] = '\0'; - n = read(ipc->sock, rbuf, SIZ); - if (n>0) { - rbuf[n]='\0'; - fprintf(stderr, "%s", rbuf); - fflush (stdout); - } - } - alarm(watchdog); /* Kick the watchdog timer */ - } while (strcmp(buf, "000")); - CtdlIPC_chat_send(ipc, "\n"); - CtdlIPC_chat_send(ipc, "000"); } - alarm(0); /* Shutdown the watchdog timer */ - fprintf(stderr, "sendcommand: processing ended.\n"); - - /* Clean up and log off ... unless the server indicated that the command - * we sent is shutting it down, in which case we want to just cut the - * connection and exit. - */ - if (server_shutting_down) { - nq_cleanup(0); + + if (xfermode == '6') { /* receive binary */ + size_t len = atoi(&buf[4]); + size_t bytes_remaining = len; + + while (bytes_remaining > 0) { + size_t this_block = bytes_remaining; + if (this_block > SIZ) this_block = SIZ; + serv_read(buf, this_block); + fwrite(buf, this_block, 1, stdout); + bytes_remaining -= this_block; + } } - else { - cleanup(0); + + close(serv_sock); + alarm(0); /* cancel the watchdog timer */ + fprintf(stderr, "sendcommand: processing ended.\n"); + if (xfermode == '5') { + return(1); } - return 0; + return(0); } -/* - * Stub function - */ -void stty_ctdl(int cmd) { -} + + + + + + + + + + +