#include <signal.h>
#include <errno.h>
#include <limits.h>
+#include <libcitadel.h>
#include "citadel.h"
-#include "tools.h"
#include "citadel_ipc.h"
#include "server.h"
#include "config.h"
*/
void nq_cleanup(int e)
{
+ if (e == SIGALRM)
+ fprintf(stderr, "\nWatch dog time out.\n");
remove_lockfile();
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);
}
+
/*
* main
*/
int a;
char cmd[SIZ];
char buf[SIZ];
+ int watchdog = 5;
int relh=0;
int home=0;
fd_set read_fd;
struct timeval tv;
int ret, err;
-
- CtdlInitBase64Table();
-
+ int server_shutting_down = 0;
+
strcpy(ctdl_home_directory, DEFAULT_PORT);
strcpy(cmd, "");
else
safestrncpy(relhome, &argv[a][2],
sizeof relhome);
- home_specified = 1;
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, " ");
}
}
- calc_dirs_n_files(relh, home, relhome, ctdldir);
+ calc_dirs_n_files(relh, home, relhome, ctdldir, 0);
get_config();
signal(SIGINT, cleanup);
(int) getpid(),
ctdl_home_directory);
fflush(stderr);
+
+ 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);
tv.tv_sec = 0;
tv.tv_usec = 1000;
+ if (!strncasecmp(&buf[1], "31", 2)) {
+ server_shutting_down = 1;
+ }
+
if (buf[0] == '1') {
while (CtdlIPC_chat_recv(ipc, buf), strcmp(buf, "000")) {
printf("%s\n", buf);
+ alarm(watchdog); /* Kick the watchdog timer */
}
} else if (buf[0] == '4') {
do {
n = read(ipc->sock, rbuf, SIZ);
if (n>0) {
rbuf[n]='\0';
- printf (rbuf);
+ fprintf (stderr, 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");
- cleanup(0);
+
+ /* 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);
+ }
+ else {
+ cleanup(0);
+ }
return 0;
}