#ifndef HAVE_SNPRINTF
#include "snprintf.h"
#endif
+#include "screen.h"
#include "md5.h"
int screenheight;
unsigned room_flags;
char room_name[ROOMNAMELEN];
-char ugname[ROOMNAMELEN];
-long uglsn; /* holds <u>ngoto info */
+char *uglist[UGLISTLEN]; /* size of the ungoto list */
+long uglistlsn[UGLISTLEN]; /* current read position for all the ungoto's. Not going to make any friends with this one. */
+int uglistsize = 0;
char is_mail = 0; /* nonzero when we're in a mail room */
char axlevel = 0; /* access level */
char is_room_aide = 0; /* boolean flag, 1 if room aide */
char floorlist[128][SIZ]; /* names of floors */
char express_msgs = 0; /* express messages waiting! */
int termn8 = 0; /* Set to nonzero to cause a logoff */
+int secure; /* Set to nonzero when wire is encrypted */
extern int rc_ansi_color; /* ansi color value from citadel.rc */
*/
void logoff(int code)
{
+ int lp;
if (editor_pid > 0) { /* kill the editor if it's running */
kill(editor_pid, SIGHUP);
}
+
+ /* Free the ungoto list */
+ for (lp = 0; lp < uglistsize; lp++)
+ free (uglist[lp]);
+
/* shut down the server... but not if the logoff code is 3, because
* that means we're exiting because we already lost the server
*/
* now clean up various things
*/
+ screen_delete();
+
unlink(temp);
unlink(temp2);
nukedir(tempdir);
serv_puts(cmd);
serv_gets(cmd);
if (cmd[0] != '1') {
- printf("%s\n", &cmd[4]);
+ scr_printf("%s\n", &cmd[4]);
return;
}
- fmout(screenwidth, NULL,
+ fmout(screenwidth, NULL, NULL,
((userflags & US_PAGINATOR) ? 1 : 0),
screenheight, 1, 1);
}
/*
* jump directly to a room
*/
-void dotgoto(char *towhere, int display_name)
+void dotgoto(char *towhere, int display_name, int fromungoto)
{
char aaa[SIZ], bbb[SIZ], psearch[SIZ];
static long ls = 0L;
- int newmailcount;
+ int newmailcount = 0;
static int oldmailcount = (-1);
int partial_match, best_match;
char from_floor;
+ int ugpos = uglistsize;
/* store ungoto information */
- strcpy(ugname, room_name);
- uglsn = ls;
-
+ if (fromungoto == 0)
+ {
+ if (uglistsize >= (UGLISTLEN-1))
+ { /* sloppy slide them all down, hey it's the client, who cares. :-) */
+ int lp;
+ free (uglist[0]);
+ for (lp = 0; lp < (UGLISTLEN-1); lp++)
+ {
+ uglist[lp] = uglist[lp+1];
+ uglistlsn[lp] = uglistlsn[lp+1];
+ }
+ ugpos--;
+ }
+ else
+ uglistsize++;
+
+ uglist[ugpos] = malloc(strlen(room_name)+1);
+ strcpy(uglist[ugpos], room_name);
+ uglistlsn[ugpos] = ls;
+ }
+
/* first try an exact match */
snprintf(aaa, sizeof aaa, "GOTO %s", towhere);
serv_puts(aaa);
express_msgs = 1;
}
if (!strncmp(aaa, "54", 2)) {
- printf("Wrong password.\n");
+ scr_printf("Wrong password.\n");
return;
}
/*
}
}
if (strlen(bbb) == 0) {
- printf("No room '%s'.\n", towhere);
+ scr_printf("No room '%s'.\n", towhere);
return;
}
snprintf(aaa, sizeof aaa, "GOTO %s", bbb);
express_msgs = 1;
}
if (aaa[0] != '2') {
- printf("%s\n", aaa);
+ scr_printf("%s\n", aaa);
return;
}
extract(room_name, &aaa[4], 0);
if ((from_floor != curr_floor) && (display_name > 0) && (floor_mode == 1)) {
if (floorlist[(int) curr_floor][0] == 0)
load_floorlist();
- printf("(Entering floor: %s)\n", &floorlist[(int) curr_floor][0]);
+ scr_printf("(Entering floor: %s)\n", &floorlist[(int) curr_floor][0]);
}
if (display_name == 1) {
color(BRIGHT_WHITE);
- printf("%s ", room_name);
+ scr_printf("%s ", room_name);
color(DIM_WHITE);
- printf("- ");
+ scr_printf("- ");
}
if (display_name != 2) {
color(BRIGHT_YELLOW);
- printf("%d ", extract_int(&aaa[4], 1));
+ scr_printf("%d ", extract_int(&aaa[4], 1));
color(DIM_WHITE);
- printf("new of ");
+ scr_printf("new of ");
color(BRIGHT_YELLOW);
- printf("%d ", extract_int(&aaa[4], 2));
+ scr_printf("%d ", extract_int(&aaa[4], 2));
color(DIM_WHITE);
- printf("messages.\n");
+ scr_printf("messages.\n");
}
highest_msg_read = extract_int(&aaa[4], 6);
maxmsgnum = extract_int(&aaa[4], 5);
newmailcount = extract_int(&aaa[4], 9);
if ((oldmailcount >= 0) && (newmailcount > oldmailcount)) {
color(BRIGHT_RED);
- printf("*** You have new mail\n");
+ scr_printf("*** You have new mail\n");
color(DIM_WHITE);
}
oldmailcount = newmailcount;
+ status_line(serv_info.serv_humannode, serv_info.serv_bbs_city,
+ room_name, secure, newmailcount);
+ } else {
+ status_line(serv_info.serv_humannode, serv_info.serv_bbs_city,
+ room_name, secure, -1);
}
}
strcpy(next_room, "_BASEROOM_");
}
remove_march(next_room, 0);
- dotgoto(next_room, 1);
+ dotgoto(next_room, 1, 0);
}
/*
char buf[SIZ];
struct march *flist, *fptr;
- printf("Forgetting all rooms on %s...\r", &floorlist[ffloor][0]);
- fflush(stdout);
+ scr_printf("Forgetting all rooms on %s...\r", &floorlist[ffloor][0]);
+ scr_flush();
snprintf(buf, sizeof buf, "LKRA %d", ffloor);
serv_puts(buf);
serv_gets(buf);
if (buf[0] != '1') {
- printf("%-72s\n", &buf[4]);
+ scr_printf("%-72s\n", &buf[4]);
return;
}
flist = NULL;
flist = flist->next;
free(fptr);
}
- printf("%-72s\r", "");
+ scr_printf("%-72s\r", "");
}
if (mode == GF_GOTO) { /* <;G>oto mode */
updatels();
- dotgoto(towhere, 1);
+ dotgoto(towhere, 1, 0);
}
if (mode == GF_SKIP) { /* <;S>kip mode */
- dotgoto(towhere, 1);
+ dotgoto(towhere, 1, 0);
remove_march("_FLOOR_", floor_being_left);
}
if (mode == GF_ZAP) { /* <;Z>ap mode */
- dotgoto(towhere, 1);
+ dotgoto(towhere, 1, 0);
remove_march("_FLOOR_", floor_being_left);
forget_all_rooms_on(floor_being_left);
}
tofloor = a;
}
if (tofloor < 0) {
- printf("No floor '%s'.\n", towhere);
+ scr_printf("No floor '%s'.\n", towhere);
return;
}
for (mptr = march; mptr != NULL; mptr = mptr->next) {
if (strlen(targ) > 0) {
gf_toroom(targ, mode);
} else {
- printf("There are no rooms on '%s'.\n", &floorlist[tofloor][0]);
+ scr_printf("There are no rooms on '%s'.\n", &floorlist[tofloor][0]);
}
}
{
if (curr_floor == 0) {
- printf("Can't forget this floor.\n");
+ scr_printf("Can't forget this floor.\n");
return;
}
if (floorlist[0][0] == 0)
load_floorlist();
- printf("Are you sure you want to forget all rooms on %s? ",
+ scr_printf("Are you sure you want to forget all rooms on %s? ",
&floorlist[(int) curr_floor][0]);
if (yesno() == 0)
return;
/*
* Figure out the physical screen dimensions, if we can
+ * WARNING: this is now called from a signal handler!
*/
void check_screen_dims(void)
{
if (have_xterm) { /* dynamically size screen if on an xterm */
if (ioctl(0, TIOCGWINSZ, &xwinsz) == 0) {
if (xwinsz.height)
- screenheight = (int) xwinsz.height;
+ screenheight = is_curses_enabled() ? (int)xwinsz.height - 1 : (int) xwinsz.height;
if (xwinsz.width)
screenwidth = (int) xwinsz.width;
}
snprintf(buf, sizeof buf, "SETP %s", pass1);
serv_puts(buf);
serv_gets(buf);
- printf("%s\n", &buf[4]);
+ scr_printf("%s\n", &buf[4]);
offer_to_remember_password(hostbuf, portbuf, fullname, pass1);
return (0);
} else {
- printf("*** They don't match... try again.\n");
+ scr_printf("*** They don't match... try again.\n");
return (1);
}
}
time_t timenow = 0;
time_t idletime, idlehours, idlemins, idlesecs;
int last_session = (-1);
+ int skipidle = 0;
+
+ if (longlist == 2)
+ {
+ longlist = 0;
+ skipidle = 1;
+ }
serv_puts("TIME");
serv_gets(tbuf);
serv_gets(buf);
if (buf[0] == '1') {
while (serv_gets(buf), strcmp(buf, "000")) {
+ int isidle = 0;
extract(username, buf, 1);
extract(roomname, buf, 2);
extract(fromhost, buf, 3);
strcat(roomname, " ");
}
strcpy(&roomname[14], "[idle]");
+ if (skipidle)
+ isidle = 1;
}
if (longlist) {
pprintf("\n");
} else {
- if (extract_int(buf, 0) == last_session) {
- pprintf(" ");
- } else {
- color(BRIGHT_MAGENTA);
- pprintf("%-3s ", flags);
- color(DIM_WHITE);
- pprintf("%-3d ", extract_int(buf, 0));
- }
- last_session = extract_int(buf, 0);
- color(BRIGHT_CYAN);
- pprintf("%-25s ", username);
- color(BRIGHT_MAGENTA);
- roomname[20] = 0;
- pprintf("%-20s ", roomname);
- color(BRIGHT_CYAN);
- fromhost[24] = '\0';
- pprintf("%-24s\n", fromhost);
- color(DIM_WHITE);
+ if (isidle == 0) {
+ if (extract_int(buf, 0) == last_session) {
+ pprintf(" ");
+ } else {
+ color(BRIGHT_MAGENTA);
+ pprintf("%-3s ", flags);
+ color(DIM_WHITE);
+ pprintf("%-3d ", extract_int(buf, 0));
+ }
+ last_session = extract_int(buf, 0);
+ color(BRIGHT_CYAN);
+ pprintf("%-25s ", username);
+ color(BRIGHT_MAGENTA);
+ roomname[20] = 0;
+ pprintf("%-20s ", roomname);
+ color(BRIGHT_CYAN);
+ fromhost[24] = '\0';
+ pprintf("%-24s\n", fromhost);
+ color(DIM_WHITE);
+ }
}
}
}
return argc;
}
+static void statusHook(char *s) {
+ sln_printf(s);
+ sln_flush();
+}
+
/*
* main
*/
char hexstring[MD5_HEXSTRING_SIZE];
int stored_password = 0;
char password[SIZ];
+
+ setIPCDeathHook(screen_delete);
+ setIPCErrorPrintf(err_printf);
+ setCryptoStatusHook(statusHook);
/* Permissions sanity check - don't run citadel setuid/setgid */
if (getuid() != geteuid()) {
- fprintf(stderr, "Please do not run citadel setuid!\n");
+ err_printf("Please do not run citadel setuid!\n");
logoff(3);
} else if (getgid() != getegid()) {
- fprintf(stderr, "Please do not run citadel setgid!\n");
+ err_printf("Please do not run citadel setgid!\n");
logoff(3);
}
sttybbs(SB_NO_INTR); /* Install the new ones */
signal(SIGHUP, dropcarr); /* Cleanup gracefully if carrier is dropped */
signal(SIGTERM, dropcarr); /* Cleanup gracefully if terminated */
- signal(SIGCONT, catch_sigcont); /* Catch SIGCONT so we can reset terminal */
+ signal(SIGCONT, catch_sigcont); /* Catch SIGCONT so we can reset terminal */
+#ifdef SIGWINCH
+ signal(SIGWINCH, scr_winch); /* Window resize signal */
+#endif
+#ifdef HAVE_OPENSSL
arg_encrypt = RC_DEFAULT;
+#endif
+#ifdef HAVE_CURSES_H
+ arg_screen = RC_DEFAULT;
+#endif
/*
* Handle command line options as if we were called like /bin/login
argc = shift(argc, argv, a, 2);
}
if (!strcmp(argv[a], "-x")) {
+#ifdef HAVE_OPENSSL
arg_encrypt = RC_NO;
+#endif
argc = shift(argc, argv, a, 1);
}
if (!strcmp(argv[a], "-X")) {
+#ifdef HAVE_OPENSSL
arg_encrypt = RC_YES;
+ argc = shift(argc, argv, a, 1);
+#else
+ fprintf(stderr, "Not compiled with encryption support");
+ return 1;
+#endif
+ }
+ if (!strcmp(argv[a], "-s")) {
+#ifdef HAVE_CURSES_H
+ arg_screen = RC_NO;
+#endif
+ argc = shift(argc, argv, a, 1);
+ }
+ if (!strcmp(argv[a], "-S")) {
+#ifdef HAVE_CURSES_H
+ arg_screen = RC_YES;
+#endif
argc = shift(argc, argv, a, 1);
}
if (!strcmp(argv[a], "-p")) {
logoff(3);
}
/*
- printf("Privileges changed to uid %d gid %d\n",
+ scr_printf("Privileges changed to uid %d gid %d\n",
getuid(), getgid());
*/
}
}
}
- printf("Attaching to server... \r");
- fflush(stdout);
- attach_to_server(argc, argv, hostbuf, portbuf);
+ screen_new();
- send_ansi_detect();
+ sln_printf("Attaching to server... \r");
+ sln_flush();
+ attach_to_server(argc, argv, hostbuf, portbuf);
serv_gets(aaa);
if (aaa[0] != '2') {
- printf("%s\n", &aaa[4]);
+ scr_printf("%s\n", &aaa[4]);
logoff(atoi(aaa));
}
get_serv_info(telnet_client_host);
- look_for_ansi();
- cls(0);
- color(7);
-
- if (!starttls()) {
- printf("Session will not be encrypted.\n");
- }
-
- printf("%-24s\n%s\n%s\n", serv_info.serv_software, serv_info.serv_humannode,
+ scr_printf("%-24s\n%s\n%s\n", serv_info.serv_software, serv_info.serv_humannode,
serv_info.serv_bbs_city);
+ scr_flush();
+
+ secure = starttls();
+ status_line(serv_info.serv_humannode, serv_info.serv_bbs_city, NULL,
+ secure, -1);
screenwidth = 80; /* default screen dimensions */
screenheight = 24;
- printf(" pause next stop\n");
- printf(" ctrl-s ctrl-o ctrl-c\n\n");
+ scr_printf(" pause next stop\n");
+ scr_printf(" ctrl-s ctrl-o ctrl-c\n\n");
formout("hello"); /* print the opening greeting */
- printf("\n");
+ scr_printf("\n");
GSTA: /* See if we have a username and password on disk */
if (rc_remember_passwords) {
serv_gets(aaa);
if (nonce[0])
{
- sprintf(aaa, "PAS2 %s", make_apop_string(password, nonce, hexstring));
+ snprintf(aaa, sizeof aaa, "PAS2 %s", make_apop_string(password, nonce, hexstring, sizeof hexstring));
}
else /* Else no APOP */
{
}
strproc(fullname);
if (!strcasecmp(fullname, "new")) { /* just in case */
- printf("Please enter the name you wish to log in with.\n");
+ scr_printf("Please enter the name you wish to log in with.\n");
}
} while (
(!strcasecmp(fullname, "bbs"))
if (nonce[0])
{
- sprintf(aaa, "PAS2 %s", make_apop_string(password, nonce, hexstring));
+ snprintf(aaa, sizeof aaa, "PAS2 %s", make_apop_string(password, nonce, hexstring, sizeof hexstring));
}
else /* Else no APOP */
{
- snprintf(aaa, sizeof(aaa)-1, "PASS %s", password);
+ snprintf(aaa, sizeof aaa, "PASS %s", password);
}
serv_puts(aaa);
fullname, password);
goto PWOK;
}
- printf("<< wrong password >>\n");
+ scr_printf("<< wrong password >>\n");
if (strlen(rc_password) > 0)
logoff(0);
goto GSTA;
NEWUSR: if (strlen(rc_password) == 0) {
- printf("No record. Enter as new user? ");
+ scr_printf("No record. Enter as new user? ");
if (yesno() == 0)
goto GSTA;
}
serv_puts(aaa);
serv_gets(aaa);
if (aaa[0] != '2') {
- printf("%s\n", aaa);
+ scr_printf("%s\n", aaa);
goto GSTA;
}
load_user_info(&aaa[4]);
enable_color = 0;
}
- printf("%s\nAccess level: %d (%s)\n"
+ scr_printf("%s\nAccess level: %d (%s)\n"
"User #%ld / Login #%d",
fullname, axlevel, axdefs[(int) axlevel],
usernum, timescalled);
if (lastcall > 0L) {
- printf(" / Last login: %s\n",
+ scr_printf(" / Last login: %s\n",
asctime(localtime(&lastcall)) );
}
- printf("\n");
+ scr_printf("\n");
serv_puts("CHEK");
serv_gets(aaa);
if (b > 0) {
color(BRIGHT_RED);
if (b == 1)
- printf("*** You have a new private message in Mail>\n");
+ scr_printf("*** You have a new private message in Mail>\n");
if (b > 1)
- printf("*** You have %d new private messages in Mail>\n", b);
+ scr_printf("*** You have %d new private messages in Mail>\n", b);
color(DIM_WHITE);
}
if ((axlevel >= 6) && (extract_int(&aaa[4], 2) > 0)) {
- printf("*** Users need validation\n");
+ scr_printf("*** Users need validation\n");
}
if (extract_int(&aaa[4], 1) > 0) {
- printf("*** Please register.\n");
+ scr_printf("*** Please register.\n");
formout("register");
entregis();
}
/* Enter the lobby */
- dotgoto("_BASEROOM_", 1);
+ dotgoto("_BASEROOM_", 1, 0);
/* Main loop for the system... user is logged in. */
- strcpy(ugname, "");
- uglsn = 0L;
+ uglistsize = 0;
if (newnow == 1)
readmsgs(3, 1, 5);
serv_puts(bbb);
serv_gets(aaa);
if (strncmp("200", aaa, 3))
- printf("\n%s\n", aaa);
+ scr_printf("\n%s\n", aaa);
else
entmsg(0, 0);
break;
case 90:
if (!rc_alt_semantics)
updatelsa();
- dotgoto(argbuf, 0);
+ dotgoto(argbuf, 0, 0);
break;
case 58:
updatelsa();
- dotgoto("_MAIL_", 1);
+ dotgoto("_MAIL_", 1, 0);
break;
case 20:
updatels();
- dotgoto(argbuf, 0);
+ dotgoto(argbuf, 0, 0);
break;
case 52:
if (rc_alt_semantics)
updatelsa();
- dotgoto(argbuf, 0);
+ dotgoto(argbuf, 0, 0);
break;
case 10:
readmsgs(0, 1, 0);
serv_puts(bbb);
serv_gets(aaa);
if (strncmp("200", aaa, 3))
- printf("\n%s\n", aaa);
+ scr_printf("\n%s\n", aaa);
break;
case 76:
enternew("hostname", aaa, 25);
serv_puts(bbb);
serv_gets(aaa);
if (strncmp("200", aaa, 3))
- printf("\n%s\n", aaa);
+ scr_printf("\n%s\n", aaa);
break;
case 77:
enternew("username", aaa, 32);
serv_puts(bbb);
serv_gets(aaa);
if (strncmp("200", aaa, 3))
- printf("\n%s\n", aaa);
+ scr_printf("\n%s\n", aaa);
break;
case 35:
break;
case 15:
- printf("Are you sure (y/n)? ");
+ scr_printf("Are you sure (y/n)? ");
if (yesno() == 1) {
updatels();
a = 0;
break;
case 85:
- printf("All users will be disconnected! "
+ scr_printf("All users will be disconnected! "
"Really terminate the server? ");
if (yesno() == 1) {
serv_puts("DOWN");
serv_gets(aaa);
- printf("%s\n", &aaa[4]);
+ scr_printf("%s\n", &aaa[4]);
if (aaa[0]=='2') {
updatels();
a = 0;
break;
case 86:
- printf("Do you really want to schedule a "
+ scr_printf("Do you really want to schedule a "
"server shutdown? ");
if (yesno() == 1) {
serv_puts("SCDN 1");
serv_gets(aaa);
if (aaa[0]=='2') {
if (atoi(&aaa[4])) {
- printf(
+ scr_printf(
"The Citadel server will terminate when all users are logged off.\n"
);
}
else {
- printf(
+ scr_printf(
"The Citadel server will not terminate.\n"
);
}
do_ignet_configuration();
break;
+ case 92:
+ do_filterlist_configuration();
+ break;
+
case 6:
if (rc_alt_semantics)
updatelsa();
case 2:
if (server_is_local) {
+ screen_reset();
sttybbs(SB_RESTORE);
snprintf(aaa, sizeof aaa, "USERNAME=\042%s\042; export USERNAME;"
"exec ./subsystem %ld %d %d", fullname,
usernum, screenwidth, axlevel);
ka_system(aaa);
sttybbs(SB_NO_INTR);
+ screen_set();
} else {
- printf("*** Can't run doors when server is not local.\n");
+ scr_printf("*** Can't run doors when server is not local.\n");
}
break;
who_is_online(1);
break;
+ case 91:
+ who_is_online(2);
+ break;
+
case 80:
do_system_configuration();
break;
case 8:
knrooms(floor_mode);
- printf("\n");
+ scr_printf("\n");
break;
case 68:
knrooms(2);
- printf("\n");
+ scr_printf("\n");
break;
case 69:
case 19:
listzrooms();
- printf("\n");
+ scr_printf("\n");
break;
case 51:
} /* end switch */
} while (termn8 == 0);
-TERMN8: printf("%s logged out.\n", fullname);
+TERMN8: scr_printf("%s logged out.\n", fullname);
while (march != NULL) {
remove_march(march->march_name, 0);
}
if (mcmd == 30) {
- printf("\n\nType 'off' to disconnect, or next user...\n");
+ sln_printf("\n\nType 'off' to disconnect, or next user...\n");
}
snprintf(aaa, sizeof aaa, "LOUT");
serv_puts(aaa);
serv_gets(aaa);
+ screen_delete();
+ sttybbs(SB_RESTORE);
if ((mcmd == 29) || (mcmd == 15)) {
formout("goodbye");
logoff(0);
projects / citadel.git / blobdiff