*
*/
-#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#include <sys/types.h>
#include <signal.h>
#include <pwd.h>
-#include <setjmp.h>
#include <errno.h>
#include <stdarg.h>
+#include "sysdep.h"
#include "citadel.h"
+#include "citadel_ipc.h"
#include "citadel_decls.h"
#include "routines2.h"
#include "routines.h"
#include "snprintf.h"
#endif
#include "screen.h"
-#include "client_crypto.h"
+
+/* work around solaris include files */
+#ifdef reg
+#undef reg
+#endif
extern char temp[];
extern char tempdir[];
-extern char *axdefs[7];
+extern char *axdefs[8];
extern long highest_msg_read;
extern long maxmsgnum;
extern unsigned room_flags;
extern int screenwidth;
+/*
int eopen(char *name, int mode)
{
int ret;
}
return (ret);
}
+*/
-int room_prompt(int qrflags)
+int room_prompt(unsigned int qrflags)
{ /* return proper room prompt character */
int a;
a = '>';
return (a);
}
-void entregis(void)
+void entregis(CtdlIPC *ipc)
{ /* register with name and address */
char buf[SIZ];
- char tmpname[SIZ];
- char tmpaddr[SIZ];
- char tmpcity[SIZ];
- char tmpstate[SIZ];
- char tmpzip[SIZ];
- char tmpphone[SIZ];
+ char tmpname[30];
+ char tmpaddr[25];
+ char tmpcity[15];
+ char tmpstate[3];
+ char tmpzip[11];
+ char tmpphone[15];
char tmpemail[SIZ];
- char tmpcountry[SIZ];
- char diruser[SIZ];
- char dirnode[SIZ];
+ char tmpcountry[32];
+ char diruser[256];
+ char dirnode[256];
char holdemail[SIZ];
- int a;
+ char *reg = NULL;
int ok = 0;
+ int r; /* IPC response code */
strcpy(tmpname, "");
strcpy(tmpaddr, "");
strcpy(tmpemail, "");
strcpy(tmpcountry, "");
- serv_puts("GREG _SELF_");
- serv_gets(buf);
- if (buf[0] == '1') {
- a = 0;
- while (serv_gets(buf), strcmp(buf, "000")) {
+ r = CtdlIPCGetUserRegistration(ipc, NULL, ®, buf);
+ if (r / 100 == 1) {
+ int a = 0;
+
+ while (reg && !IsEmptyStr(reg)) {
+
+ extract_token(buf, reg, 0, '\n', sizeof buf);
+ remove_token(reg, 0, '\n');
+
if (a == 2)
- strcpy(tmpname, buf);
- if (a == 3)
- strcpy(tmpaddr, buf);
- if (a == 4)
- strcpy(tmpcity, buf);
- if (a == 5)
- strcpy(tmpstate, buf);
- if (a == 6)
- strcpy(tmpzip, buf);
- if (a == 7)
- strcpy(tmpphone, buf);
- if (a == 9)
- strcpy(tmpemail, buf);
- if (a == 10)
- strcpy(tmpcountry, buf);
+ safestrncpy(tmpname, buf, sizeof tmpname);
+ else if (a == 3)
+ safestrncpy(tmpaddr, buf, sizeof tmpaddr);
+ else if (a == 4)
+ safestrncpy(tmpcity, buf, sizeof tmpcity);
+ else if (a == 5)
+ safestrncpy(tmpstate, buf, sizeof tmpstate);
+ else if (a == 6)
+ safestrncpy(tmpzip, buf, sizeof tmpzip);
+ else if (a == 7)
+ safestrncpy(tmpphone, buf, sizeof tmpphone);
+ else if (a == 9)
+ safestrncpy(tmpemail, buf, sizeof tmpemail);
+ else if (a == 10)
+ safestrncpy(tmpcountry, buf, sizeof tmpcountry);
++a;
}
}
do {
ok = 1;
- strcpy(holdemail, tmpemail);
+ safestrncpy(holdemail, tmpemail, sizeof holdemail);
strprompt("Email address", tmpemail, 31);
- snprintf(buf, sizeof buf, "QDIR %s", tmpemail);
- serv_puts(buf);
- serv_gets(buf);
- if (buf[0]=='2') {
- extract_token(diruser, &buf[4], 0, '@');
- extract_token(dirnode, &buf[4], 1, '@');
+ r = CtdlIPCDirectoryLookup(ipc, tmpemail, buf);
+ if (r / 100 == 2) {
+ extract_token(diruser, buf, 0, '@', sizeof diruser);
+ extract_token(dirnode, buf, 1, '@', sizeof dirnode);
striplt(diruser);
striplt(dirnode);
if ((strcasecmp(diruser, fullname))
- || (strcasecmp(dirnode, serv_info.serv_nodename))) {
+ || (strcasecmp(dirnode, ipc->ServInfo.nodename))) {
scr_printf(
"\nYou can't use %s as your address.\n",
tmpemail);
"It is already in use by %s @ %s.\n",
diruser, dirnode);
ok = 0;
- strcpy(tmpemail, holdemail);
+ safestrncpy(tmpemail, holdemail, sizeof tmpemail);
}
}
} while (ok == 0);
/* now send the registration info back to the server */
- serv_puts("REGI");
- serv_gets(buf);
- if (buf[0] != '4') {
- scr_printf("%s\n", &buf[4]);
- return;
+ reg = (char *)realloc(reg, SIZ);
+ if (reg) {
+ sprintf(reg, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
+ tmpname, tmpaddr, tmpcity, tmpstate,
+ tmpzip, tmpphone, tmpemail, tmpcountry);
+ r = CtdlIPCSetRegistration(ipc, reg, buf);
+ if (r / 100 != 4)
+ scr_printf("%s\n", buf);
+ free(reg);
}
- serv_puts(tmpname);
- serv_puts(tmpaddr);
- serv_puts(tmpcity);
- serv_puts(tmpstate);
- serv_puts(tmpzip);
- serv_puts(tmpphone);
- serv_puts(tmpemail);
- serv_puts(tmpcountry);
- serv_puts("000");
scr_printf("\n");
}
-void updatels(void)
+void updatels(CtdlIPC *ipc)
{ /* make all messages old in current room */
- char buf[SIZ];
+ char buf[256];
+ int r; /* IPC response code */
if (rc_alt_semantics) {
- if (maxmsgnum == highest_msg_read == 0) {
- /* err_printf("maxmsgnum == highest_msg_read == 0\n"); */
+ if (maxmsgnum == 0 && highest_msg_read == 0) {
return;
}
- snprintf(buf, sizeof(buf), "SLRP %ld",
- (maxmsgnum > highest_msg_read) ?
- maxmsgnum : highest_msg_read);
- serv_puts(buf);
+ r = CtdlIPCSetLastRead(ipc, (maxmsgnum > highest_msg_read) ?
+ maxmsgnum : highest_msg_read, buf);
} else {
- serv_puts("SLRP HIGHEST");
+ r = CtdlIPCSetLastRead(ipc, (maxmsgnum > highest_msg_read) ?
+ maxmsgnum : highest_msg_read, buf);
+/* r = CtdlIPCSetLastRead(ipc, maxmsgnum, buf); */
+/* This is a quick-and-dirty fix to all msgs becoming new in Mail>.
+ * It will need to be rethought when messages.c is rewritten.
+ */
}
- serv_gets(buf);
- if (buf[0] != '2')
- scr_printf("%s\n", &buf[4]);
+ if (r / 100 != 2)
+ scr_printf("%s\n", buf);
}
/*
* only make messages old in this room that have been read
*/
-void updatelsa(void)
+void updatelsa(CtdlIPC *ipc)
{
- char buf[SIZ];
+ char buf[256];
+ int r; /* IPC response code */
- snprintf(buf, sizeof buf, "SLRP %ld", highest_msg_read);
- serv_puts(buf);
- serv_gets(buf);
- if (buf[0] != '2')
+ r = CtdlIPCSetLastRead(ipc, highest_msg_read, buf);
+ if (r / 100 != 2)
scr_printf("%s\n", &buf[4]);
}
-/*
- * This routine completes a client upload
- */
-void do_upload(int fd)
-{
- char buf[SIZ];
- char tbuf[4096];
- long transmitted_bytes, total_bytes;
- int bytes_to_send;
- int bytes_expected;
-
- /* learn the size of the file */
- total_bytes = lseek(fd, 0L, 2);
- lseek(fd, 0L, 0);
-
- transmitted_bytes = 0L;
- progress(transmitted_bytes, total_bytes);
- do {
- bytes_to_send = read(fd, tbuf, 4096);
- if (bytes_to_send > 0) {
- snprintf(buf, sizeof buf, "WRIT %d", bytes_to_send);
- serv_puts(buf);
- serv_gets(buf);
- if (buf[0] == '7') {
- bytes_expected = atoi(&buf[4]);
- serv_write(tbuf, bytes_expected);
- } else {
- scr_printf("%s\n", &buf[4]);
- }
- }
- transmitted_bytes = transmitted_bytes + (long) bytes_to_send;
- progress(transmitted_bytes, total_bytes);
- } while (bytes_to_send > 0);
-
- /* close the upload file, locally and at the server */
- close(fd);
- serv_puts("UCLS 1");
- serv_gets(buf);
- scr_printf("%s\n", &buf[4]);
-}
-
-
/*
* client-based uploads (for users with their own clientware)
*/
-void cli_upload(void)
+void cli_upload(CtdlIPC *ipc)
{
- char flnm[SIZ];
+ char flnm[PATH_MAX];
char desc[151];
- char buf[SIZ];
- char tbuf[SIZ];
+ char buf[256];
+ char tbuf[256];
+ int r; /* IPC response code */
int a;
int fd;
scr_printf("Enter a description of this file:\n");
newprompt(": ", desc, 75);
- /* keep generating filenames in hope of finding a unique one */
+ /* Keep generating filenames in hope of finding a unique one */
a = 0;
- do {
- if (a == 10)
- return; /* fail if tried 10 times */
- strcpy(buf, flnm);
- while ((strlen(buf) > 0) && (haschar(buf, '/')))
- strcpy(buf, &buf[1]);
+ while (a < 10) {
+ /* basename of filename */
+ strcpy(tbuf, flnm);
+ if (haschar(tbuf, '/'))
+ extract_token(tbuf, flnm,
+ num_tokens(tbuf, '/') - 1,
+ '/', sizeof tbuf
+ );
+ /* filename.1, filename.2, etc */
if (a > 0) {
- size_t tmp = strlen(buf);
- snprintf(&buf[tmp], sizeof buf - tmp, "%d", a);
+ sprintf(&tbuf[strlen(tbuf)], ".%d", a);
}
- snprintf(tbuf, sizeof tbuf, "UOPN %s|%s", buf, desc);
- serv_puts(tbuf);
- serv_gets(buf);
- if (buf[0] != '2')
- scr_printf("%s\n", &buf[4]);
+ /* Try upload */
+ r = CtdlIPCFileUpload(ipc, tbuf, desc, flnm, progress, buf);
+ if (r / 100 == 5 || r < 0)
+ scr_printf("%s\n", buf);
+ else
+ break;
++a;
- } while (buf[0] != '2');
-
- /* at this point we have an open upload file at the server */
- do_upload(fd);
+ }
+ if (a > 0) scr_printf("Saved as '%s'\n", tbuf);
}
/*
* Function used for various image upload commands
*/
-void cli_image_upload(char *keyname)
+void cli_image_upload(CtdlIPC *ipc, char *keyname)
{
- char flnm[SIZ];
- char buf[SIZ];
- int fd;
-
- snprintf(buf, sizeof buf, "UIMG 0|%s", keyname);
- serv_puts(buf);
- serv_gets(buf);
- if (buf[0] != '2') {
- scr_printf("%s\n", &buf[4]);
+ char flnm[PATH_MAX];
+ char buf[256];
+ int r;
+
+ /* Can we upload this image? */
+ r = CtdlIPCImageUpload(ipc, 0, NULL, keyname, NULL, buf);
+ if (r / 100 != 2) {
+ err_printf("%s\n", buf);
return;
}
newprompt("Image file to be uploaded: ", flnm, 55);
- fd = open(flnm, O_RDONLY);
- if (fd < 0) {
- scr_printf("Cannot open '%s': %s\n", flnm, strerror(errno));
- return;
+ r = CtdlIPCImageUpload(ipc, 1, flnm, keyname, progress, buf);
+ if (r / 100 == 5) {
+ err_printf("%s\n", buf);
+ } else if (r < 0) {
+ err_printf("Cannot upload '%s': %s\n", flnm, strerror(errno));
}
- snprintf(buf, sizeof buf, "UIMG 1|%s", keyname);
- serv_puts(buf);
- serv_gets(buf);
- if (buf[0] != '2') {
- scr_printf("%s\n", &buf[4]);
- return;
- }
- do_upload(fd);
+ /* else upload succeeded */
}
/*
* protocol-based uploads (Xmodem, Ymodem, Zmodem)
*/
-void upload(int c)
+void upload(CtdlIPC *ipc, int c)
{ /* c = upload mode */
- char flnm[SIZ];
+ char flnm[PATH_MAX];
char desc[151];
- char buf[SIZ];
+ char buf[256];
char tbuf[4096];
int xfer_pid;
int a, b;
FILE *fp, *lsfp;
- int fd;
+ int r;
if ((room_flags & QR_UPLOAD) == 0) {
scr_printf("*** You cannot upload to this room.\n");
else
newprompt("Enter filename: ", flnm, 15);
- for (a = 0; a < strlen(flnm); ++a)
+ for (a = 0; !IsEmptyStr(&flnm[a]); ++a)
if ((flnm[a] == '/') || (flnm[a] == '\\') || (flnm[a] == '>')
|| (flnm[a] == '?') || (flnm[a] == '*')
|| (flnm[a] == ';') || (flnm[a] == '&'))
flnm[a] = '_';
- newprompt("Enter a short description of the file:\n: ", desc, 150);
-
/* create a temporary directory... */
if (mkdir(tempdir, 0700) != 0) {
scr_printf("*** Could not create temporary directory %s: %s\n",
chdir(tempdir);
switch (c) {
case 0:
- sttybbs(0);
+ stty_ctdl(0);
scr_printf("Receiving %s - press Ctrl-D to end.\n", flnm);
fp = fopen(flnm, "w");
do {
exit(0);
case 1:
screen_reset();
- sttybbs(3);
+ stty_ctdl(3);
execlp("rx", "rx", flnm, NULL);
exit(1);
case 2:
screen_reset();
- sttybbs(3);
+ stty_ctdl(3);
execlp("rb", "rb", NULL);
exit(1);
case 3:
screen_reset();
- sttybbs(3);
+ stty_ctdl(3);
execlp("rz", "rz", NULL);
exit(1);
}
do {
b = ka_wait(&a);
} while ((b != xfer_pid) && (b != (-1)));
- sttybbs(0);
+ stty_ctdl(0);
screen_set();
if (a != 0) {
nukedir(tempdir);
return;
}
- scr_printf("\r*** Transfer successful. Sending file(s) to server...\n");
+ scr_printf("\r*** Transfer successful.\n");
snprintf(buf, sizeof buf, "cd %s; ls", tempdir);
lsfp = popen(buf, "r");
if (lsfp != NULL) {
while (fgets(flnm, sizeof flnm, lsfp) != NULL) {
- flnm[strlen(flnm) - 1] = 0;
+ flnm[strlen(flnm) - 1] = 0; /* chop newline */
+ snprintf(buf, sizeof buf,
+ "Enter a short description of '%s':\n: ",
+ flnm);
+ newprompt(buf, desc, 150);
snprintf(buf, sizeof buf, "%s/%s", tempdir, flnm);
- fd = open(buf, O_RDONLY);
- if (fd >= 0) {
- a = 0;
- do {
- snprintf(buf, sizeof buf, "UOPN %s|%s", flnm, desc);
- if (a > 0) {
- size_t tmp = strlen(buf);
- snprintf(&buf[tmp],
- sizeof buf - tmp,
- ".%d", a);
- }
- ++a;
- serv_puts(buf);
- serv_gets(buf);
- } while ((buf[0] != '2') && (a < 100));
- if (buf[0] == '2')
- do {
- a = read(fd, tbuf, 4096);
- if (a > 0) {
- snprintf(buf, sizeof buf, "WRIT %d", a);
- serv_puts(buf);
- serv_gets(buf);
- if (buf[0] == '7')
- serv_write(tbuf, a);
- }
- } while (a > 0);
- close(fd);
- serv_puts("UCLS 1");
- serv_gets(buf);
- scr_printf("%s\n", &buf[4]);
- }
+ r = CtdlIPCFileUpload(ipc, flnm, desc, buf, progress, tbuf);
+ scr_printf("%s\n", tbuf);
}
pclose(lsfp);
}
}
/*
- * validate a user
+ * validate a user (returns 0 for successful validation, nonzero if quitting)
*/
-void val_user(char *user, int do_validate)
+int val_user(CtdlIPC *ipc, char *user, int do_validate)
{
int a;
- char cmd[SIZ];
- char buf[SIZ];
+ char cmd[256];
+ char buf[256];
+ char *resp = NULL;
int ax = 0;
+ char answer[2];
+ int r; /* IPC response code */
- snprintf(cmd, sizeof cmd, "GREG %s", user);
- serv_puts(cmd);
- serv_gets(cmd);
- if (cmd[0] == '1') {
+ scr_printf("\n");
+ r = CtdlIPCGetUserRegistration(ipc, user, &resp, cmd);
+ if (r / 100 == 1) {
a = 0;
do {
- serv_gets(buf);
+ extract_token(buf, resp, 0, '\n', sizeof buf);
+ remove_token(resp, 0, '\n');
++a;
if (a == 1)
- scr_printf("User #%s - %s ", buf, &cmd[4]);
+ scr_printf("User #%s - %s ", buf, cmd);
if (a == 2)
scr_printf("PW: %s\n", buf);
if (a == 3)
scr_printf("%s\n", buf);
if (a == 11)
scr_printf("%s\n", buf);
- } while (strcmp(buf, "000"));
+ } while (!IsEmptyStr(resp));
+
+/* TODODRW: discrepancy here. Parts of the code refer to axdefs[7] as the highest
+ * but most of it limits it to axdefs[6].
+ * Webcit limits to 6 as does the code here but there are 7 in axdefs.h
+ */
scr_printf("Current access level: %d (%s)\n", ax, axdefs[ax]);
} else {
- scr_printf("%-30s\n%s\n", user, &cmd[4]);
+ scr_printf("%s\n%s\n", user, &cmd[4]);
}
+ if (resp) free(resp);
if (do_validate) {
/* now set the access level */
- ax = intprompt("Access level", ax, 0, 6);
- snprintf(cmd, sizeof cmd, "VALI %s|%d", user, ax);
- serv_puts(cmd);
- serv_gets(cmd);
- if (cmd[0] != '2')
- scr_printf("%s\n", &cmd[4]);
+ while(1) {
+ sprintf(answer, "%d", ax);
+ strprompt("New access level (? for help, q to quit)",
+ answer, 1);
+ if ((answer[0] >= '0') && (answer[0] <= '6')) {
+ ax = atoi(answer);
+ r = CtdlIPCValidateUser(ipc, user, ax, cmd);
+ if (r / 100 != 2)
+ scr_printf("%s\n\n", cmd);
+ return(0);
+ }
+ if (tolower(answer[0]) == 'q') {
+ scr_printf("*** Aborted.\n\n");
+ return(1);
+ }
+ if (answer[0] == '?') {
+ scr_printf("Available access levels:\n");
+ for (a=0; a<7; ++a) {
+ scr_printf("%d - %s\n",
+ a, axdefs[a]);
+ }
+ }
+ }
}
- scr_printf("\n");
+ return(0);
}
-void validate(void)
+void validate(CtdlIPC *ipc)
{ /* validate new users */
- char cmd[SIZ];
- char buf[SIZ];
+ char cmd[256];
+ char buf[256];
int finished = 0;
+ int r; /* IPC response code */
do {
- serv_puts("GNUR");
- serv_gets(cmd);
- if (cmd[0] != '3')
+ r = CtdlIPCNextUnvalidatedUser(ipc, cmd);
+ if (r / 100 != 3)
finished = 1;
- if (cmd[0] == '2')
- scr_printf("%s\n", &cmd[4]);
- if (cmd[0] == '3') {
- extract(buf, cmd, 0);
- val_user(&buf[4], 1);
+ if (r / 100 == 2)
+ scr_printf("%s\n", cmd);
+ if (r / 100 == 3) {
+ extract_token(buf, cmd, 0, '|', sizeof buf);
+ if (val_user(ipc, buf, 1) != 0) finished = 1;
}
} while (finished == 0);
}
void subshell(void)
{
int a, b;
+
+ screen_reset();
+ stty_ctdl(SB_RESTORE);
a = fork();
if (a == 0) {
- screen_reset();
- sttybbs(SB_RESTORE);
signal(SIGINT, SIG_DFL);
signal(SIGQUIT, SIG_DFL);
execlp(getenv("SHELL"), getenv("SHELL"), NULL);
do {
b = ka_wait(NULL);
} while ((a != b) && (a != (-1)));
- sttybbs(0);
+ stty_ctdl(0);
screen_set();
}
/*
* <.A>ide <F>ile <D>elete command
*/
-void deletefile(void)
+void deletefile(CtdlIPC *ipc)
{
char filename[32];
- char cmd[SIZ];
+ char buf[256];
newprompt("Filename: ", filename, 31);
- if (strlen(filename) == 0)
+ if (IsEmptyStr(filename))
return;
- snprintf(cmd, sizeof cmd, "DELF %s", filename);
- serv_puts(cmd);
- serv_gets(cmd);
- err_printf("%s\n", &cmd[4]);
+ CtdlIPCDeleteFile(ipc, filename, buf);
+ err_printf("%s\n", buf);
}
/*
* <.A>ide <F>ile <S>end command
*/
-void netsendfile(void)
+void netsendfile(CtdlIPC *ipc)
{
- char filename[32], destsys[20], cmd[SIZ];
+ char filename[32], destsys[20], buf[256];
newprompt("Filename: ", filename, 31);
- if (strlen(filename) == 0)
+ if (IsEmptyStr(filename))
return;
newprompt("System to send to: ", destsys, 19);
- snprintf(cmd, sizeof cmd, "NETF %s|%s", filename, destsys);
- serv_puts(cmd);
- serv_gets(cmd);
- err_printf("%s\n", &cmd[4]);
+ CtdlIPCNetSendFile(ipc, filename, destsys, buf);
+ err_printf("%s\n", buf);
return;
}
/*
* <.A>ide <F>ile <M>ove command
*/
-void movefile(void)
+void movefile(CtdlIPC *ipc)
{
char filename[64];
char newroom[ROOMNAMELEN];
- char cmd[SIZ];
+ char buf[256];
newprompt("Filename: ", filename, 63);
- if (strlen(filename) == 0)
+ if (IsEmptyStr(filename))
return;
newprompt("Enter target room: ", newroom, ROOMNAMELEN - 1);
-
- snprintf(cmd, sizeof cmd, "MOVF %s|%s", filename, newroom);
- serv_puts(cmd);
- serv_gets(cmd);
- err_printf("%s\n", &cmd[4]);
+ CtdlIPCMoveFile(ipc, filename, newroom, buf);
+ err_printf("%s\n", buf);
}
/*
* list of users who have filled out a bio
*/
-void list_bio(void)
+void list_bio(CtdlIPC *ipc)
{
- char buf[SIZ];
+ char buf[256];
+ char *resp = NULL;
int pos = 1;
+ int r; /* IPC response code */
- serv_puts("LBIO");
- serv_gets(buf);
- if (buf[0] != '1') {
- pprintf("%s\n", &buf[4]);
+ r = CtdlIPCListUsersWithBios(ipc, &resp, buf);
+ if (r / 100 != 1) {
+ pprintf("%s\n", buf);
return;
}
- while (serv_gets(buf), strcmp(buf, "000")) {
+ while (resp && !IsEmptyStr(resp)) {
+ extract_token(buf, resp, 0, '\n', sizeof buf);
+ remove_token(resp, 0, '\n');
if ((pos + strlen(buf) + 5) > screenwidth) {
pprintf("\n");
pos = 1;
pos = pos + strlen(buf) + 2;
}
pprintf("%c%c \n\n", 8, 8);
+ if (resp) free(resp);
}
/*
* read bio
*/
-void read_bio(void)
+void read_bio(CtdlIPC *ipc)
{
- char who[SIZ];
- char buf[SIZ];
+ char who[256];
+ char buf[256];
+ char *resp = NULL;
+ int r; /* IPC response code */
do {
newprompt("Read bio for who ('?' for list) : ", who, 25);
pprintf("\n");
if (!strcmp(who, "?"))
- list_bio();
+ list_bio(ipc);
} while (!strcmp(who, "?"));
- snprintf(buf, sizeof buf, "RBIO %s", who);
- serv_puts(buf);
- serv_gets(buf);
- if (buf[0] != '1') {
- pprintf("%s\n", &buf[4]);
+
+ r = CtdlIPCGetBio(ipc, who, &resp, buf);
+ if (r / 100 != 1) {
+ pprintf("%s\n", buf);
return;
}
- while (serv_gets(buf), strcmp(buf, "000")) {
+ while (!IsEmptyStr(resp)) {
+ extract_token(buf, resp, 0, '\n', sizeof buf);
+ remove_token(resp, 0, '\n');
pprintf("%s\n", buf);
}
+ if (resp) free(resp);
}
/*
* General system configuration command
*/
-void do_system_configuration(void)
+void do_system_configuration(CtdlIPC *ipc)
{
- char buf[SIZ];
- char sc[30][SIZ];
- int expire_mode = 0;
- int expire_value = 0;
+
+#define NUM_CONFIGS 60
+
+ char buf[256];
+ char sc[NUM_CONFIGS][256];
+ char *resp = NULL;
+ struct ExpirePolicy *site_expirepolicy = NULL;
+ struct ExpirePolicy *mbx_expirepolicy = NULL;
int a;
int logpages = 0;
+ int r; /* IPC response code */
+ int server_configs = 0;
/* Clear out the config buffers */
memset(&sc[0][0], 0, sizeof(sc));
/* Fetch the current config */
- serv_puts("CONF get");
- serv_gets(buf);
- if (buf[0] == '1') {
- a = 0;
- while (serv_gets(buf), strcmp(buf, "000")) {
- if (a < 30) {
- strcpy(&sc[a][0], buf);
+ r = CtdlIPCGetSystemConfig(ipc, &resp, buf);
+ if (r / 100 == 1) {
+ server_configs = num_tokens(resp, '\n');
+ for (a=0; a<server_configs; ++a) {
+ if (a < NUM_CONFIGS) {
+ extract_token(&sc[a][0], resp, a, '\n', sizeof sc[a]);
}
- ++a;
}
}
+ if (resp) free(resp);
+ resp = NULL;
/* Fetch the expire policy (this will silently fail on old servers,
* resulting in "default" policy)
*/
- serv_puts("GPEX site");
- serv_gets(buf);
- if (buf[0] == '2') {
- expire_mode = extract_int(&buf[4], 0);
- expire_value = extract_int(&buf[4], 1);
- }
-
+ r = CtdlIPCGetMessageExpirationPolicy(ipc, 2, &site_expirepolicy, buf);
+ r = CtdlIPCGetMessageExpirationPolicy(ipc, 3, &mbx_expirepolicy, buf);
/* Identification parameters */
strprompt("Node name", &sc[0][0], 15);
strprompt("Fully qualified domain name", &sc[1][0], 63);
strprompt("Human readable node name", &sc[2][0], 20);
- strprompt("Modem dialup number", &sc[3][0], 15);
+ strprompt("Telephone number", &sc[3][0], 15);
strprompt("Geographic location of this system", &sc[12][0], 31);
strprompt("Name of system administrator", &sc[13][0], 25);
strprompt("Paginator prompt", &sc[10][0], 79);
- /* this prompt is commented out until we finish the moderation system
- strprompt("Default moderation filter for new users", &sc[25][0], 4);
- */
-
/* Security parameters */
snprintf(sc[7], sizeof sc[7], "%d", (boolprompt(
- "Require registration for new users",
- atoi(&sc[7][0]))));
+ "Require registration for new users",
+ atoi(&sc[7][0]))));
snprintf(sc[29], sizeof sc[29], "%d", (boolprompt(
- "Disable self-service user account creation",
- atoi(&sc[29][0]))));
+ "Disable self-service user account creation",
+ atoi(&sc[29][0]))));
strprompt("Initial access level for new users", &sc[6][0], 1);
strprompt("Access level required to create rooms", &sc[19][0], 1);
snprintf(sc[4], sizeof sc[4], "%d", (boolprompt(
- "Automatically give room aide privs to a user who creates a private room",
- atoi(&sc[4][0]))));
+ "Automatically give room aide privs to a user who creates a private room",
+ atoi(&sc[4][0]))));
snprintf(sc[8], sizeof sc[8], "%d", (boolprompt(
- "Automatically move problem user messages to twit room",
- atoi(&sc[8][0]))));
+ "Automatically move problem user messages to twit room",
+ atoi(&sc[8][0]))));
strprompt("Name of twit room", &sc[9][0], ROOMNAMELEN);
snprintf(sc[11], sizeof sc[11], "%d", (boolprompt(
- "Restrict Internet mail to only those with that privilege",
- atoi(&sc[11][0]))));
+ "Restrict Internet mail to only those with that privilege",
+ atoi(&sc[11][0]))));
snprintf(sc[26], sizeof sc[26], "%d", (boolprompt(
- "Allow Aides to Zap (forget) rooms",
- atoi(&sc[26][0]))));
+ "Allow Aides to Zap (forget) rooms",
+ atoi(&sc[26][0]))));
- if (strlen(&sc[18][0]) > 0) logpages = 1;
+ if (!IsEmptyStr(&sc[18][0])) logpages = 1;
else logpages = 0;
logpages = boolprompt("Log all pages", logpages);
if (logpages) {
sc[18][0] = 0;
}
+ /* Commented out because this setting isn't really appropriate to
+ * change while the server is running.
+ *
+ * snprintf(sc[52], sizeof sc[52], "%d", (boolprompt(
+ * "Use system authentication",
+ * atoi(&sc[52][0]))));
+ */
/* Server tuning */
strprompt("Maximum message length", &sc[20][0], 20);
strprompt("Minimum number of worker threads", &sc[21][0], 3);
strprompt("Maximum number of worker threads", &sc[22][0], 3);
+ snprintf(sc[43], sizeof sc[43], "%d", (boolprompt(
+ "Automatically delete committed database logs",
+ atoi(&sc[43][0]))));
- /* no longer applicable ... deprecated
- strprompt("Server-to-server networking password", &sc[15][0], 19);
- */
-
- strprompt("How often to run network jobs (in seconds)", &sc[28][0], 5);
- strprompt("SMTP server port (-1 to disable)", &sc[24][0], 5);
+ strprompt("Server IP address (0.0.0.0 for 'any')", &sc[37][0], 15);
strprompt("POP3 server port (-1 to disable)", &sc[23][0], 5);
+ strprompt("POP3S server port (-1 to disable)", &sc[40][0], 5);
strprompt("IMAP server port (-1 to disable)", &sc[27][0], 5);
+ strprompt("IMAPS server port (-1 to disable)", &sc[39][0], 5);
+ strprompt("SMTP MTA server port (-1 to disable)", &sc[24][0], 5);
+ strprompt("SMTP MSA server port (-1 to disable)", &sc[38][0], 5);
+ strprompt("SMTPS server port (-1 to disable)", &sc[41][0], 5);
+ strprompt("Postfix TCP Dictionary Port server port (-1 to disable)", &sc[50][0], 5);
+ strprompt("ManageSieve server port (-1 to disable)", &sc[51][0], 5);
+ /* This logic flips the question around, because it's one of those
+ * situations where 0=yes and 1=no
+ */
+ a = atoi(sc[25]);
+ a = (a ? 0 : 1);
+ a = boolprompt("Correct forged From: lines during authenticated SMTP",
+ a);
+ a = (a ? 0 : 1);
+ snprintf(sc[25], sizeof sc[25], "%d", a);
+ snprintf(sc[45], sizeof sc[45], "%d", (boolprompt(
+ "Allow unauthenticated SMTP clients to spoof my domains",
+ atoi(&sc[45][0]))));
+ snprintf(sc[57], sizeof sc[57], "%d", (boolprompt(
+ "Perform RBL checks at greeting instead of after RCPT",
+ atoi(&sc[57][0]))));
+ snprintf(sc[44], sizeof sc[44], "%d", (boolprompt(
+ "Instantly expunge deleted IMAP messages",
+ atoi(&sc[44][0]))));
+
+ /* LDAP settings */
+ if (ipc->ServInfo.supports_ldap) {
+ a = strlen(&sc[32][0]);
+ a = (a ? 1 : 0); /* Set only to 1 or 0 */
+ a = boolprompt("Connect this Citadel to an external LDAP directory", a);
+ if (a) {
+ strprompt("Host name of LDAP server",
+ &sc[32][0], 127);
+ strprompt("Port number of LDAP service",
+ &sc[33][0], 5);
+ strprompt("Base DN", &sc[34][0], 255);
+ strprompt("Bind DN", &sc[35][0], 255);
+ strprompt("Password for bind DN", &sc[36][0], 255);
+ }
+ else {
+ strcpy(&sc[32][0], "");
+ }
+ }
/* Expiry settings */
strprompt("Default user purge time (days)", &sc[16][0], 5);
/* Angels and demons dancing in my head... */
do {
- snprintf(buf, sizeof buf, "%d", expire_mode);
+ snprintf(buf, sizeof buf, "%d", site_expirepolicy->expire_mode);
strprompt("System default message expire policy (? for list)",
buf, 1);
if (buf[0] == '?') {
"2. Expire by message count\n"
"3. Expire by message age\n");
}
- } while ((buf[0] < 49) || (buf[0] > 51));
- expire_mode = buf[0] - 48;
+ } while ((buf[0] < '1') || (buf[0] > '3'));
+ site_expirepolicy->expire_mode = buf[0] - '0';
/* ...lunatics and monsters underneath my bed */
- if (expire_mode == 2) {
- snprintf(buf, sizeof buf, "%d", expire_value);
+ if (site_expirepolicy->expire_mode == 2) {
+ snprintf(buf, sizeof buf, "%d", site_expirepolicy->expire_value);
+ strprompt("Keep how many messages online?", buf, 10);
+ site_expirepolicy->expire_value = atol(buf);
+ }
+ if (site_expirepolicy->expire_mode == 3) {
+ snprintf(buf, sizeof buf, "%d", site_expirepolicy->expire_value);
+ strprompt("Keep messages for how many days?", buf, 10);
+ site_expirepolicy->expire_value = atol(buf);
+ }
+
+ /* Media messiahs preying on my fears... */
+ do {
+ snprintf(buf, sizeof buf, "%d", mbx_expirepolicy->expire_mode);
+ strprompt("Mailbox default message expire policy (? for list)",
+ buf, 1);
+ if (buf[0] == '?') {
+ scr_printf("\n"
+ "0. Go with the system default\n"
+ "1. Never automatically expire messages\n"
+ "2. Expire by message count\n"
+ "3. Expire by message age\n");
+ }
+ } while ((buf[0] < '0') || (buf[0] > '3'));
+ mbx_expirepolicy->expire_mode = buf[0] - '0';
+
+ /* ...Pop culture prophets playing in my ears */
+ if (mbx_expirepolicy->expire_mode == 2) {
+ snprintf(buf, sizeof buf, "%d", mbx_expirepolicy->expire_value);
strprompt("Keep how many messages online?", buf, 10);
- expire_value = atol(buf);
+ mbx_expirepolicy->expire_value = atol(buf);
}
- if (expire_mode == 3) {
- snprintf(buf, sizeof buf, "%d", expire_value);
+ if (mbx_expirepolicy->expire_mode == 3) {
+ snprintf(buf, sizeof buf, "%d", mbx_expirepolicy->expire_value);
strprompt("Keep messages for how many days?", buf, 10);
- expire_value = atol(buf);
+ mbx_expirepolicy->expire_value = atol(buf);
}
+
+ strprompt("How often to run network jobs (in seconds)", &sc[28][0], 5);
+ strprompt("Hour to run purges (0-23)", &sc[31][0], 2);
+ snprintf(sc[42], sizeof sc[42], "%d", (boolprompt(
+ "Enable full text search index (warning: resource intensive)",
+ atoi(&sc[42][0]))));
+
+ snprintf(sc[46], sizeof sc[46], "%d", (boolprompt(
+ "Perform journaling of email messages",
+ atoi(&sc[46][0]))));
+ snprintf(sc[47], sizeof sc[47], "%d", (boolprompt(
+ "Perform journaling of non-email messages",
+ atoi(&sc[47][0]))));
+ if ( (atoi(&sc[46][0])) || (atoi(&sc[47][0])) ) {
+ strprompt("Email destination of journalized messages",
+ &sc[48][0], 127);
+ }
+
+ /* Funambol push stuff */
+ int yes_funambol = 0;
+ if (strlen(sc[53]) > 0) yes_funambol = 1;
+ yes_funambol = boolprompt("Connect to an external Funambol sync server", yes_funambol);
+ if (yes_funambol) {
+ strprompt("Funambol server (blank to disable)", &sc[53][0], 63);
+ strprompt("Funambol server port", &sc[54][0], 5);
+ strprompt("Funambol sync source", &sc[55][0], 63);
+ strprompt("Funambol authentication details (user:pass in Base64)", &sc[56][0],63);
+ }
+ else {
+ sc[53][0] = 0;
+ sc[54][0] = 0;
+ sc[55][0] = 0;
+ sc[56][0] = 0;
+ }
+
+ /* Master user account */
+ int yes_muacct = 0;
+ if (strlen(sc[58]) > 0) yes_muacct = 1;
+ yes_muacct = boolprompt("Enable a 'master user' account", yes_muacct);
+ if (yes_muacct) {
+ strprompt("Master user name", &sc[58][0], 31);
+ strprompt("Master user password", &sc[59][0], -31);
+ }
+ else {
+ strcpy(&sc[58][0], "");
+ strcpy(&sc[59][0], "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
+ }
+
/* Save it */
scr_printf("Save this configuration? ");
if (yesno()) {
- serv_puts("CONF set");
- serv_gets(buf);
- if (buf[0] == '4') {
- for (a = 0; a < 30; ++a)
- serv_puts(&sc[a][0]);
- serv_puts("000");
+ r = 1;
+ for (a = 0; a < NUM_CONFIGS; a++)
+ r += 1 + strlen(sc[a]);
+ resp = (char *)calloc(1, r);
+ if (!resp) {
+ err_printf("Can't save config - out of memory!\n");
+ logoff(ipc, 1);
+ }
+ for (a = 0; a < NUM_CONFIGS; a++) {
+ strcat(resp, sc[a]);
+ strcat(resp, "\n");
+ }
+ r = CtdlIPCSetSystemConfig(ipc, resp, buf);
+ if (r / 100 != 4) {
+ err_printf("%s\n", buf);
+ }
+ free(resp);
+
+ r = CtdlIPCSetMessageExpirationPolicy(ipc, 2, site_expirepolicy, buf);
+ if (r / 100 != 2) {
+ err_printf("%s\n", buf);
+ }
+
+ r = CtdlIPCSetMessageExpirationPolicy(ipc, 3, mbx_expirepolicy, buf);
+ if (r / 100 != 2) {
+ err_printf("%s\n", buf);
}
- snprintf(buf, sizeof buf, "SPEX site|%d|%d",
- expire_mode, expire_value);
- serv_puts(buf);
- serv_gets(buf);
+
}
+ if (site_expirepolicy) free(site_expirepolicy);
+ if (mbx_expirepolicy) free(mbx_expirepolicy);
}
/*
* support function for do_internet_configuration()
*/
-void get_inet_rec_type(char *buf) {
+void get_inet_rec_type(CtdlIPC *ipc, char *buf) {
int sel;
keyopt(" <1> localhost (Alias for this computer)\n");
keyopt(" <2> gateway domain (Domain for all Citadel systems)\n");
keyopt(" <3> smart-host (Forward all outbound mail to this host)\n");
keyopt(" <4> directory (Consult the Global Address Book)\n");
- sel = intprompt("Which one", 1, 1, 4);
+ keyopt(" <5> SpamAssassin (Address of SpamAssassin server)\n");
+ keyopt(" <6> RBL (domain suffix of spam hunting RBL)\n");
+ keyopt(" <7> masq domains (Domains as which users are allowed to masquerade)\n");
+ sel = intprompt("Which one", 1, 1, 6);
switch(sel) {
case 1: strcpy(buf, "localhost");
return;
return;
case 4: strcpy(buf, "directory");
return;
+ case 5: strcpy(buf, "spamassassin");
+ return;
+ case 6: strcpy(buf, "rbl");
+ return;
+ case 7: strcpy(buf, "masqdomain");
+ return;
}
}
/*
* Internet mail configuration
*/
-void do_internet_configuration(void) {
- char buf[SIZ];
+void do_internet_configuration(CtdlIPC *ipc)
+{
+ char buf[256];
+ char *resp = NULL;
int num_recs = 0;
char **recs = NULL;
char ch;
int badkey;
int i, j;
int quitting = 0;
+ int modified = 0;
+ int r;
-
- snprintf(buf, sizeof buf, "CONF getsys|%s", INTERNETCFG);
- serv_puts(buf);
- serv_gets(buf);
- if (buf[0] == '1') while (serv_gets(buf), strcmp(buf, "000")) {
- ++num_recs;
- if (num_recs == 1) recs = malloc(sizeof(char *));
- else recs = realloc(recs, (sizeof(char *)) * num_recs);
- recs[num_recs-1] = malloc(SIZ);
- strcpy(recs[num_recs-1], buf);
+ r = CtdlIPCGetSystemConfigByType(ipc, INTERNETCFG, &resp, buf);
+ if (r / 100 == 1) {
+ while (!IsEmptyStr(resp)) {
+ extract_token(buf, resp, 0, '\n', sizeof buf);
+ remove_token(resp, 0, '\n');
+ ++num_recs;
+ if (num_recs == 1) recs = malloc(sizeof(char *));
+ else recs = realloc(recs, (sizeof(char *)) * num_recs);
+ recs[num_recs-1] = malloc(strlen(buf) + 1);
+ strcpy(recs[num_recs-1], buf);
+ }
}
+ if (resp) free(resp);
do {
scr_printf("\n");
for (i=0; i<num_recs; ++i) {
color(DIM_WHITE);
scr_printf("%3d ", i+1);
- extract(buf, recs[i], 0);
+ extract_token(buf, recs[i], 0, '|', sizeof buf);
color(BRIGHT_CYAN);
scr_printf("%-50s ", buf);
- extract(buf, recs[i], 1);
+ extract_token(buf, recs[i], 1, '|', sizeof buf);
color(BRIGHT_MAGENTA);
scr_printf("%-20s\n", buf);
color(DIM_WHITE);
ch = keymenu("", "<A>dd|<D>elete|<S>ave|<Q>uit");
switch(ch) {
case 'a':
- ++num_recs;
- if (num_recs == 1)
- recs = malloc(sizeof(char *));
- else recs = realloc(recs,
- (sizeof(char *)) * num_recs);
newprompt("Enter host name: ",
buf, 50);
- strcat(buf, "|");
- get_inet_rec_type(&buf[strlen(buf)]);
- recs[num_recs-1] = strdup(buf);
+ striplt(buf);
+ if (!IsEmptyStr(buf)) {
+ ++num_recs;
+ if (num_recs == 1)
+ recs = malloc(sizeof(char *));
+ else recs = realloc(recs,
+ (sizeof(char *)) * num_recs);
+ strcat(buf, "|");
+ get_inet_rec_type(ipc,
+ &buf[strlen(buf)]);
+ recs[num_recs-1] = strdup(buf);
+ }
+ modified = 1;
break;
case 'd':
i = intprompt("Delete which one",
--num_recs;
for (j=i; j<num_recs; ++j)
recs[j] = recs[j+1];
+ modified = 1;
break;
case 's':
- snprintf(buf, sizeof buf, "CONF putsys|%s",
- INTERNETCFG);
- serv_puts(buf);
- serv_gets(buf);
- if (buf[0] == '4') {
- for (i=0; i<num_recs; ++i) {
- serv_puts(recs[i]);
- }
- serv_puts("000");
+ r = 1;
+ for (i = 0; i < num_recs; i++)
+ r += 1 + strlen(recs[i]);
+ resp = (char *)calloc(1, r);
+ if (!resp) {
+ err_printf("Can't save config - out of memory!\n");
+ logoff(ipc, 1);
}
- else {
- scr_printf("%s\n", &buf[4]);
+ if (num_recs) for (i = 0; i < num_recs; i++) {
+ strcat(resp, recs[i]);
+ strcat(resp, "\n");
}
- quitting = 1;
+ r = CtdlIPCSetSystemConfigByType(ipc, INTERNETCFG, resp, buf);
+ if (r / 100 != 4) {
+ err_printf("%s\n", buf);
+ } else {
+ scr_printf("Wrote %d records.\n", num_recs);
+ modified = 0;
+ }
+ free(resp);
break;
case 'q':
- quitting = boolprompt(
+ quitting = !modified || boolprompt(
"Quit without saving", 0);
break;
default:
badkey = 1;
}
- } while (quitting == 0);
+ } while (!quitting);
if (recs != NULL) {
for (i=0; i<num_recs; ++i) free(recs[i]);
/*
* Edit network configuration for room sharing, mailing lists, etc.
*/
-void network_config_management(char *entrytype, char *comment) {
+void network_config_management(CtdlIPC *ipc, char *entrytype, char *comment)
+{
char filename[PATH_MAX];
char changefile[PATH_MAX];
int e_ex_code;
pid_t editor_pid;
int cksum;
- int b, i;
- char buf[SIZ];
- char instr[SIZ];
- char addr[SIZ];
+ int b, i, tokens;
+ char buf[1024];
+ char instr[1024];
+ char addr[1024];
FILE *tempfp;
FILE *changefp;
+ char *listing = NULL;
+ int r;
- if (strlen(editor_path) == 0) {
+ if (IsEmptyStr(editor_paths[0])) {
scr_printf("You must have an external editor configured in"
" order to use this function.\n");
return;
}
- snprintf(filename, sizeof filename, "%s.listedit", tmpnam(NULL));
- snprintf(changefile, sizeof changefile, "%s.listedit", tmpnam(NULL));
+ CtdlMakeTempFileName(filename, sizeof filename);
+ CtdlMakeTempFileName(changefile, sizeof changefile);
tempfp = fopen(filename, "w");
if (tempfp == NULL) {
fprintf(tempfp, "# Specify one per line.\n"
"\n\n");
- serv_puts("GNET");
- serv_gets(buf);
- if (buf[0] == '1') {
- while(serv_gets(buf), strcmp(buf, "000")) {
- extract(instr, buf, 0);
+ r = CtdlIPCGetRoomNetworkConfig(ipc, &listing, buf);
+ if (r / 100 == 1) {
+ while(listing && !IsEmptyStr(listing)) {
+ extract_token(buf, listing, 0, '\n', sizeof buf);
+ remove_token(listing, 0, '\n');
+ extract_token(instr, buf, 0, '|', sizeof instr);
if (!strcasecmp(instr, entrytype)) {
- extract(addr, buf, 1);
- fprintf(tempfp, "%s\n", addr);
+ tokens = num_tokens(buf, '|');
+ for (i=1; i<tokens; ++i) {
+ extract_token(addr, buf, i, '|', sizeof addr);
+ fprintf(tempfp, "%s", addr);
+ if (i < (tokens-1)) {
+ fprintf(tempfp, "|");
+ }
+ }
+ fprintf(tempfp, "\n");
}
}
}
+ if (listing) {
+ free(listing);
+ listing = NULL;
+ }
fclose(tempfp);
e_ex_code = 1; /* start with a failed exit code */
+ screen_reset();
+ stty_ctdl(SB_RESTORE);
editor_pid = fork();
cksum = file_checksum(filename);
if (editor_pid == 0) {
chmod(filename, 0600);
- screen_reset();
- sttybbs(SB_RESTORE);
putenv("WINDOW_TITLE=Network configuration");
- execlp(editor_path, editor_path, filename, NULL);
+ execlp(editor_paths[0], editor_paths[0], filename, NULL);
exit(1);
}
if (editor_pid > 0) {
b = ka_wait(&e_ex_code);
} while ((b != editor_pid) && (b >= 0));
editor_pid = (-1);
- sttybbs(0);
+ stty_ctdl(0);
screen_set();
}
if (file_checksum(filename) == cksum) {
- err_printf("*** Not saving changes.\n");
+ err_printf("*** No changes to save.\n");
e_ex_code = 1;
}
if (e_ex_code == 0) { /* Save changes */
changefp = fopen(changefile, "w");
- serv_puts("GNET");
- serv_gets(buf);
- if (buf[0] == '1') {
- while(serv_gets(buf), strcmp(buf, "000")) {
- extract(instr, buf, 0);
+
+ /* Load all netconfig entries that are *not* of the type we are editing */
+ r = CtdlIPCGetRoomNetworkConfig(ipc, &listing, buf);
+ if (r / 100 == 1) {
+ while(listing && !IsEmptyStr(listing)) {
+ extract_token(buf, listing, 0, '\n', sizeof buf);
+ remove_token(listing, 0, '\n');
+ extract_token(instr, buf, 0, '|', sizeof instr);
if (strcasecmp(instr, entrytype)) {
fprintf(changefp, "%s\n", buf);
}
}
}
+ if (listing) {
+ free(listing);
+ listing = NULL;
+ }
+
+ /* ...and merge that with the data we just edited */
tempfp = fopen(filename, "r");
while (fgets(buf, sizeof buf, tempfp) != NULL) {
for (i=0; i<strlen(buf); ++i) {
if (buf[i] == '#') buf[i] = 0;
}
striplt(buf);
- if (strlen(buf) > 0) {
+ if (!IsEmptyStr(buf)) {
fprintf(changefp, "%s|%s\n", entrytype, buf);
}
}
fclose(changefp);
/* now write it to the server... */
- serv_puts("SNET");
- serv_gets(buf);
- if (buf[0] == '4') {
- changefp = fopen(changefile, "r");
- if (changefp != NULL) {
- while (fgets(buf, sizeof buf,
- changefp) != NULL) {
- buf[strlen(buf) - 1] = 0;
- serv_puts(buf);
- }
- fclose(changefp);
+ changefp = fopen(changefile, "r");
+ if (changefp != NULL) {
+ listing = load_message_from_file(changefp);
+ if (listing) {
+ r = CtdlIPCSetRoomNetworkConfig(ipc, listing, buf);
+ free(listing);
+ listing = NULL;
}
- serv_puts("000");
+ fclose(changefp);
}
}
/*
* IGnet node configuration
*/
-void do_ignet_configuration(void) {
+void do_ignet_configuration(CtdlIPC *ipc) {
char buf[SIZ];
int num_recs = 0;
char **recs = NULL;
int badkey;
int i, j;
int quitting = 0;
-
+ int modified = 0;
+ char *listing = NULL;
+ int r;
+
+ r = CtdlIPCGetSystemConfigByType(ipc, IGNETCFG, &listing, buf);
+ if (r / 100 == 1) while (*listing && !IsEmptyStr(listing)) {
+ extract_token(buf, listing, 0, '\n', sizeof buf);
+ remove_token(listing, 0, '\n');
- snprintf(buf, sizeof buf, "CONF getsys|%s", IGNETCFG);
- serv_puts(buf);
- serv_gets(buf);
- if (buf[0] == '1') while (serv_gets(buf), strcmp(buf, "000")) {
++num_recs;
if (num_recs == 1) recs = malloc(sizeof(char *));
else recs = realloc(recs, (sizeof(char *)) * num_recs);
recs[num_recs-1] = malloc(SIZ);
strcpy(recs[num_recs-1], buf);
}
+ if (listing) free(listing);
do {
scr_printf("\n");
for (i=0; i<num_recs; ++i) {
color(DIM_WHITE);
scr_printf("%3d ", i+1);
- extract(buf, recs[i], 0);
+ extract_token(buf, recs[i], 0, '|', sizeof buf);
color(BRIGHT_CYAN);
scr_printf("%-16s ", buf);
- extract(buf, recs[i], 1);
+ extract_token(buf, recs[i], 1, '|', sizeof buf);
color(BRIGHT_MAGENTA);
scr_printf("%-18s ", buf);
- extract(buf, recs[i], 2);
+ extract_token(buf, recs[i], 2, '|', sizeof buf);
color(BRIGHT_CYAN);
scr_printf("%-32s ", buf);
- extract(buf, recs[i], 3);
+ extract_token(buf, recs[i], 3, '|', sizeof buf);
color(BRIGHT_MAGENTA);
scr_printf("%-3s\n", buf);
color(DIM_WHITE);
}
+ scr_printf("\n");
ch = keymenu("", "<A>dd|<D>elete|<S>ave|<Q>uit");
switch(ch) {
strprompt("Enter port number : ",
&buf[strlen(buf)-3], 5);
recs[num_recs-1] = strdup(buf);
+ modified = 1;
break;
case 'd':
i = intprompt("Delete which one",
--num_recs;
for (j=i; j<num_recs; ++j)
recs[j] = recs[j+1];
+ modified = 1;
break;
case 's':
- snprintf(buf, sizeof buf, "CONF putsys|%s", IGNETCFG);
- serv_puts(buf);
- serv_gets(buf);
- if (buf[0] == '4') {
- for (i=0; i<num_recs; ++i) {
- serv_puts(recs[i]);
- }
- serv_puts("000");
+ r = 1;
+ for (i = 0; i < num_recs; ++i)
+ r += 1 + strlen(recs[i]);
+ listing = (char*) calloc(1, r);
+ if (!listing) {
+ err_printf("Can't save config - out of memory!\n");
+ logoff(ipc, 1);
+ }
+ if (num_recs) for (i = 0; i < num_recs; ++i) {
+ strcat(listing, recs[i]);
+ strcat(listing, "\n");
}
- else {
- scr_printf("%s\n", &buf[4]);
+ r = CtdlIPCSetSystemConfigByType(ipc, IGNETCFG, listing, buf);
+ if (r / 100 != 4) {
+ scr_printf("%s\n", buf);
+ } else {
+ scr_printf("Wrote %d records.\n", num_recs);
+ modified = 0;
}
- quitting = 1;
+ free(listing);
break;
case 'q':
- quitting = boolprompt(
+ quitting = !modified || boolprompt(
"Quit without saving", 0);
break;
default:
badkey = 1;
}
- } while (quitting == 0);
+ } while (!quitting);
if (recs != NULL) {
for (i=0; i<num_recs; ++i) free(recs[i]);
/*
* Filter list configuration
*/
-void do_filterlist_configuration(void) {
+void do_filterlist_configuration(CtdlIPC *ipc)
+{
char buf[SIZ];
int num_recs = 0;
char **recs = NULL;
int badkey;
int i, j;
int quitting = 0;
-
+ int modified = 0;
+ char *listing = NULL;
+ int r;
+
+ r = CtdlIPCGetSystemConfigByType(ipc, FILTERLIST, &listing, buf);
+ if (r / 100 == 1) while (*listing && !IsEmptyStr(listing)) {
+ extract_token(buf, listing, 0, '\n', sizeof buf);
+ remove_token(listing, 0, '\n');
- snprintf(buf, sizeof buf, "CONF getsys|%s", FILTERLIST);
- serv_puts(buf);
- serv_gets(buf);
- if (buf[0] == '1') while (serv_gets(buf), strcmp(buf, "000")) {
++num_recs;
if (num_recs == 1) recs = malloc(sizeof(char *));
else recs = realloc(recs, (sizeof(char *)) * num_recs);
recs[num_recs-1] = malloc(SIZ);
strcpy(recs[num_recs-1], buf);
}
+ if (listing) free(listing);
do {
scr_printf("\n");
for (i=0; i<num_recs; ++i) {
color(DIM_WHITE);
scr_printf("%3d ", i+1);
- extract(buf, recs[i], 0);
+ extract_token(buf, recs[i], 0, '|', sizeof buf);
color(BRIGHT_CYAN);
scr_printf("%-28s ", buf);
- extract(buf, recs[i], 1);
+ extract_token(buf, recs[i], 1, '|', sizeof buf);
color(BRIGHT_MAGENTA);
scr_printf("%-28s ", buf);
- extract(buf, recs[i], 2);
+ extract_token(buf, recs[i], 2, '|', sizeof buf);
color(BRIGHT_CYAN);
scr_printf("%-16s\n", buf);
- extract(buf, recs[i], 3);
+ extract_token(buf, recs[i], 3, '|', sizeof buf);
color(DIM_WHITE);
}
&buf[strlen(buf)], 16);
strcat(buf, "|");
recs[num_recs-1] = strdup(buf);
+ modified = 1;
break;
case 'd':
i = intprompt("Delete which one",
--num_recs;
for (j=i; j<num_recs; ++j)
recs[j] = recs[j+1];
+ modified = 1;
break;
case 's':
- snprintf(buf, sizeof buf, "CONF putsys|%s", FILTERLIST);
- serv_puts(buf);
- serv_gets(buf);
- if (buf[0] == '4') {
- for (i=0; i<num_recs; ++i) {
- serv_puts(recs[i]);
- }
- serv_puts("000");
+ r = 1;
+ for (i = 0; i < num_recs; ++i)
+ r += 1 + strlen(recs[i]);
+ listing = (char*) calloc(1, r);
+ if (!listing) {
+ err_printf("Can't save config - out of memory!\n");
+ logoff(ipc, 1);
+ }
+ if (num_recs) for (i = 0; i < num_recs; ++i) {
+ strcat(listing, recs[i]);
+ strcat(listing, "\n");
}
- else {
- scr_printf("%s\n", &buf[4]);
+ r = CtdlIPCSetSystemConfigByType(ipc, FILTERLIST, listing, buf);
+ if (r / 100 != 4) {
+ scr_printf("%s\n", buf);
+ } else {
+ scr_printf("Wrote %d records.\n", num_recs);
+ modified = 0;
}
- quitting = 1;
+ free(listing);
break;
case 'q':
- quitting = boolprompt(
+ quitting = !modified || boolprompt(
"Quit without saving", 0);
break;
default:
badkey = 1;
}
- } while (quitting == 0);
+ } while (!quitting);
if (recs != NULL) {
for (i=0; i<num_recs; ++i) free(recs[i]);
projects / citadel.git / blobdiff