#include "tools.h"
#include "citadel_ipc.h"
#include "server.h"
-#include "serv_extensions.h"
#include "config.h"
#define LOCKFILE "/tmp/LCK.sendcommand"
exit(e);
}
+/*
+ * send binary to server
+ */
+void serv_write(CtdlIPC *ipc, const char *buf, unsigned int nbytes)
+{
+ unsigned int bytes_written = 0;
+ int retval;
+/*
+#if defined(HAVE_OPENSSL)
+ if (ipc->ssl) {
+ serv_write_ssl(ipc, buf, nbytes);
+ return;
+ }
+#endif
+*/
+ while (bytes_written < nbytes) {
+ retval = write(ipc->sock, &buf[bytes_written],
+ nbytes - bytes_written);
+ if (retval < 1) {
+ connection_died(ipc, 0);
+ return;
+ }
+ bytes_written += retval;
+ }
+}
+
+
void cleanup(int e)
{
static int nested = 0;
alarm(30);
signal(SIGALRM, nq_cleanup);
+ serv_write(ipc, "\n", 1);
if (nested++ < 1)
CtdlIPCQuit(ipc);
nq_cleanup(e);
/*
* Connect sendcommand to the Citadel server running on this computer.
*/
-void np_attach_to_server(void)
+void np_attach_to_server(char *host, char *port)
{
- char hostbuf[SIZ], portbuf[SIZ];
char buf[SIZ];
+ char hostbuf[256], portbuf[256];
char *args[] =
{"sendcommand", NULL};
int r;
- strcpy(hostbuf, UDS); /* Only run on a unix domain socket */
- strcpy(portbuf, "."); /* IPGM will refuse to run on the network */
fprintf(stderr, "Attaching to server...\n");
+ strcpy(hostbuf, host);
+ strcpy(portbuf, port);
ipc = CtdlIPC_new(1, args, hostbuf, portbuf);
- CtdlIPC_getline(ipc, buf);
+ if (!ipc) {
+ fprintf(stderr, "Can't connect: %s\n", strerror(errno));
+ exit(3);
+ }
+ 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);
}
+void sendcommand_die(void) {
+ exit(0);
+}
+
/*
* main
char cmd[SIZ];
char buf[SIZ];
- strcpy(bbs_home_directory, BBSDIR);
+ int relh=0;
+ int home=0;
+ char relhome[PATH_MAX]="";
+ char ctdldir[PATH_MAX]=CTDLDIR;
+ fd_set read_fd;
+ struct timeval tv;
+ int ret, err;
+
+ CtdlInitBase64Table();
+
+ strcpy(ctdl_home_directory, DEFAULT_PORT);
strcpy(cmd, "");
/*
*/
for (a = 1; a < argc; ++a) {
if (!strncmp(argv[a], "-h", 2)) {
- strcpy(bbs_home_directory, argv[a]);
- strcpy(bbs_home_directory, &bbs_home_directory[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_specified = 1;
+ home=1;
} else {
- if (strlen(cmd) > 0)
+ if (!IsEmptyStr(cmd))
strcat(cmd, " ");
strcat(cmd, argv[a]);
}
}
+ calc_dirs_n_files(relh, home, relhome, ctdldir);
get_config();
signal(SIGINT, cleanup);
fprintf(stderr, "sendcommand: started (pid=%d) "
"running in %s\n",
(int) getpid(),
- bbs_home_directory);
+ ctdl_home_directory);
fflush(stderr);
- np_attach_to_server();
+
+ alarm(5);
+ 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);
fprintf(stderr, "%s\n", cmd);
- CtdlIPC_putline(ipc, cmd);
- CtdlIPC_getline(ipc, buf);
+ CtdlIPC_chat_send(ipc, cmd);
+ CtdlIPC_chat_recv(ipc, buf);
fprintf(stderr, "%s\n", buf);
+ tv.tv_sec = 0;
+ tv.tv_usec = 1000;
+
if (buf[0] == '1') {
- while (CtdlIPC_getline(ipc, buf), strcmp(buf, "000")) {
+ while (CtdlIPC_chat_recv(ipc, buf), strcmp(buf, "000")) {
printf("%s\n", buf);
+ alarm(5); /* Kick the watchdog timer */
}
} else if (buf[0] == '4') {
do {
if (fgets(buf, sizeof buf, stdin) == NULL)
strcpy(buf, "000");
- if (strlen(buf) > 0)
+ if (!IsEmptyStr(buf))
if (buf[strlen(buf) - 1] == '\n')
buf[strlen(buf) - 1] = 0;
- if (strlen(buf) > 0)
+ if (!IsEmptyStr(buf))
if (buf[strlen(buf) - 1] == '\r')
buf[strlen(buf) - 1] = 0;
if (strcmp(buf, "000"))
- CtdlIPC_putline(ipc, buf);
+ 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);
+ err = errno;
+ if (err!=0)
+ printf("select failed: %d", err);
+
+ if (ret == -1) {
+ if (!(errno == EINTR || errno == EAGAIN))
+ printf("select failed: %d", err);
+ 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, rbuf);
+ fflush (stdout);
+ }
+ }
+ alarm(5); /* Kick the watchdog timer */
} while (strcmp(buf, "000"));
- CtdlIPC_putline(ipc, "000");
+ CtdlIPC_chat_send(ipc, "\n");
+ CtdlIPC_chat_send(ipc, "000");
}
+ alarm(0); /* Shutdown the watchdog timer */
fprintf(stderr, "sendcommand: processing ended.\n");
- cleanup(0);
+ if (strcasecmp(cmd, "DOWN"))
+ cleanup(0);
+ else /* If we downed the server we can't to do CtdlIPCQuit in cleanup()*/
+ nq_cleanup(0);
return 0;
}
projects / citadel.git / blobdiff