diff --git a/ChangeLog b/ChangeLog index 056ff0f6..aa643a01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,8 @@ v0.81.0 07-Oct-2005 mbsetup: Removed settings for users screenlength. + In tty setup the network records are automatic removed. The + setting for auth log is removed (was never used). lang: Removed prompts 64, 80 and 81. Changed prompt 348. diff --git a/html/Makefile b/html/Makefile index 02348882..885e9aae 100644 --- a/html/Makefile +++ b/html/Makefile @@ -25,7 +25,7 @@ H_IMAGES = images/b_arrow.png images/magic.png images/nodes1.png \ images/filefind.png images/nodelist1.png images/tty.png \ images/files.png images/nodelist2.png images/tty1.png \ images/go_to.png images/nodelist3.png images/tty2.png \ - images/hatch.png images/nodelist4.png images/tty3.png \ + images/hatch.png images/nodelist4.png \ images/language.png images/nodelist5.png images/uarrow.png \ images/larrow.png images/users.png images/doors2.png \ images/mbse.png images/taskmgr.png images/mbsebbs-s.png \ diff --git a/html/images/tty.png b/html/images/tty.png index e2ba6d7e..04c589f5 100644 Binary files a/html/images/tty.png and b/html/images/tty.png differ diff --git a/html/images/tty1.png b/html/images/tty1.png index aecf5500..6b0dc3e0 100644 Binary files a/html/images/tty1.png and b/html/images/tty1.png differ diff --git a/html/images/tty2.png b/html/images/tty2.png index b4f5046e..f2f874d1 100644 Binary files a/html/images/tty2.png and b/html/images/tty2.png differ diff --git a/html/images/tty3.png b/html/images/tty3.png deleted file mode 100644 index 2b55548b..00000000 Binary files a/html/images/tty3.png and /dev/null differ diff --git a/html/setup/ttyinfo.html b/html/setup/ttyinfo.html index 4ec1015d..c5a7b0b1 100644 --- a/html/setup/ttyinfo.html +++ b/html/setup/ttyinfo.html @@ -14,22 +14,20 @@
-
Last update 29-Dec-2001
+
Last update 08-Oct-2005

MBSE BBS Setup - TTY Lines.

Introduction.

-For each line your bbs has you must setup a tty line. This also includes -console lines (for local login), network lines for internet and lan connections -and X-terminal connections, ISDN lines, and Analogue modem lines. If a call -comes in over a tty you didn't define, that call is refused. So if you are -directly connected to the internet, and have only 5 network tty's defined, -then maximum 5 users are allowed to telnet to your bbs via the internet. +For each modem or ISDN line your bbs has you must setup a tty line. +This also includes console lines (for local login). Since version 0.81.0 +you don't need to setup network lines anymore, these are now buildin. +If a call comes in over a (modem or ISDN) tty you didn't define, that call is refused.

One thing about the portspeed, this is only needed for devices connected to -serial ports such as modems and external ISDN adapters. For network tty's and -internal ISDN cards this should be set to zero. If you set it to some other value, -things still word but you will get error messages in the logs. +serial ports such as modems and external ISDN adapters. +For internal ISDN cards this should be set to zero. If you set it to some other value, +things still work but you will get error messages in the logs.

A note about the EMSI flags, this must match your modem capabilities, if not dialout will not work correct. It is used to see which line to use to call @@ -48,7 +46,6 @@ may represent combined ISDN and analogue flags but the flags that belong to a mo Fido Flags The EMSI flags for this line, include your modem flags here! Line Type Can be POTS, ISDN, Network and Local. Available Is this line available for use. -Auth. log Not in use yet. Honor ZMH Deny users during ZMH on this line. Deleted If this line must be deleted. Callout Allow calling other systems from this line. @@ -63,7 +60,6 @@ may represent combined ISDN and analogue flags but the flags that belong to a mo Overview of tty ports

A analogue modem port at COM1

A ISDN channel

-A network (internet telnet) port

BackBack to index  HomeBack to main index diff --git a/lib/mbselib.h b/lib/mbselib.h index 0da65c81..3ba0dacf 100644 --- a/lib/mbselib.h +++ b/lib/mbselib.h @@ -1517,7 +1517,7 @@ struct _ttyinfo { char flags[31]; /* Fidonet capabilty flags */ int type; /* Pots/ISDN/Netw/Local */ unsigned available : 1; /* Available flag */ - unsigned authlog : 1; /* Is speed logged */ + unsigned xauthlog : 1; unsigned honor_zmh : 1; /* Honor ZMH on this line */ unsigned deleted : 1; /* Is deleted */ unsigned callout : 1; /* Callout allowed */ diff --git a/mbsetup/ledit.c b/mbsetup/ledit.c index 2e8be7fa..c6165bb4 100644 --- a/mbsetup/ledit.c +++ b/mbsetup/ledit.c @@ -1673,45 +1673,51 @@ int edit_msgkinds(int y, int x, int val) char *getlinetype(int val) { - switch (val) { - case POTS: return (char *)"POTS "; - case ISDN: return (char *)"ISDN "; - case NETWORK: return (char *)"Network"; - case LOCAL: return (char *)"Local "; - default: return NULL; - } + switch (val) { + case POTS: return (char *)"POTS "; + case ISDN: return (char *)"ISDN "; + case NETWORK: return (char *)"Network"; + case LOCAL: return (char *)"Local "; + default: return NULL; + } } void show_linetype(int y, int x, int val) { - mbse_mvprintw(y, x, getlinetype(val)); + mbse_mvprintw(y, x, getlinetype(val)); } int edit_linetype(int y, int x, int val) { - int ch; + int ch; - showhelp((char *)"Toggle ^Line Type^ with spacebar, press whene done."); - do { - set_color(YELLOW, BLUE); - show_linetype(y, x, val); - - ch = readkey(y, x, YELLOW, BLUE); - - if (ch == ' ') { - if (val < LOCAL) - val++; - else - val = POTS; - } - } while (ch != KEY_ENTER && ch != '\012'); - set_color(WHITE, BLACK); + showhelp((char *)"Toggle ^Line Type^ with spacebar, press whene done."); + do { + set_color(YELLOW, BLUE); show_linetype(y, x, val); - return val; + + ch = readkey(y, x, YELLOW, BLUE); + + if (ch == ' ') { + if (val < LOCAL) { + val++; + /* + * Network is for buildin linetypes only and cannot be selected. + */ + if (val == NETWORK) + val++; + } else { + val = POTS; + } + } + } while (ch != KEY_ENTER && ch != '\012'); + set_color(WHITE, BLACK); + show_linetype(y, x, val); + return val; } diff --git a/mbsetup/m_tty.c b/mbsetup/m_tty.c index cf774619..2fd443cf 100644 --- a/mbsetup/m_tty.c +++ b/mbsetup/m_tty.c @@ -50,47 +50,18 @@ int TtyUpdated = 0; int CountTtyinfo(void) { FILE *fil; - char ffile[PATH_MAX]; + char *ffile; int count = 0, i; + ffile = calloc(PATH_MAX, sizeof(char)); snprintf(ffile, PATH_MAX, "%s/etc/ttyinfo.data", getenv("MBSE_ROOT")); + if ((fil = fopen(ffile, "r")) == NULL) { if ((fil = fopen(ffile, "a+")) != NULL) { ttyinfohdr.hdrsize = sizeof(ttyinfohdr); ttyinfohdr.recsize = sizeof(ttyinfo); fwrite(&ttyinfohdr, sizeof(ttyinfohdr), 1, fil); -#if defined(__linux__) - /* - * Only seen on Linux systems - */ - for (i = 0; i < 16; i++) { - count++; - memset(&ttyinfo, 0, sizeof(ttyinfo)); - snprintf(ttyinfo.comment, 41, "Network port %d", count); - snprintf(ttyinfo.tty, 7, "pts/%d", i); - snprintf(ttyinfo.speed, 21, "10 mbit"); - snprintf(ttyinfo.flags, 31, "IBN,IFC,XX"); - ttyinfo.type = NETWORK; - ttyinfo.available = TRUE; - snprintf(ttyinfo.name, 36, "Network port #%d", count); - fwrite(&ttyinfo, sizeof(ttyinfo), 1, fil); - } -#endif - - for (i = 0; i < 16; i++) { - count++; - memset(&ttyinfo, 0, sizeof(ttyinfo)); - snprintf(ttyinfo.comment, 41, "Network port %d", count); - snprintf(ttyinfo.tty, 7, "ttyp%x", i); - snprintf(ttyinfo.speed, 21, "10 mbit"); - snprintf(ttyinfo.flags, 31, "IBN,IFC,XX"); - ttyinfo.type = NETWORK; - ttyinfo.available = TRUE; - snprintf(ttyinfo.name, 36, "Network port #%d", count); - fwrite(&ttyinfo, sizeof(ttyinfo), 1, fil); - } - #if defined(__linux__) /* * Linux has 6 virtual consoles @@ -98,7 +69,7 @@ int CountTtyinfo(void) for (i = 0; i < 6; i++) { memset(&ttyinfo, 0, sizeof(ttyinfo)); snprintf(ttyinfo.comment, 41, "Console port %d", i+1); - snprintf(ttyinfo.tty, 7, "tty%d", i); + snprintf(ttyinfo.tty, 7, "tty%d", i+1); snprintf(ttyinfo.speed, 21, "10 mbit"); ttyinfo.type = LOCAL; ttyinfo.available = TRUE; @@ -195,15 +166,19 @@ int CountTtyinfo(void) fclose(fil); chmod(ffile, 0640); Syslog('+', "Creaded new %s with %d ttys", ffile, count); + free(ffile); return count; - } else + } else { + free(ffile); return -1; + } } fread(&ttyinfohdr, sizeof(ttyinfohdr), 1, fil); fseek(fil, 0, SEEK_END); count = (ftell(fil) - ttyinfohdr.hdrsize) / ttyinfohdr.recsize; fclose(fil); + free(ffile); return count; } @@ -218,48 +193,64 @@ int CountTtyinfo(void) int OpenTtyinfo(void); int OpenTtyinfo(void) { - FILE *fin, *fout; - char fnin[PATH_MAX], fnout[PATH_MAX]; - long oldsize; + FILE *fin, *fout; + char *fnin, *fnout; + long oldsize; - snprintf(fnin, PATH_MAX, "%s/etc/ttyinfo.data", getenv("MBSE_ROOT")); - snprintf(fnout, PATH_MAX, "%s/etc/ttyinfo.temp", getenv("MBSE_ROOT")); - if ((fin = fopen(fnin, "r")) != NULL) { - if ((fout = fopen(fnout, "w")) != NULL) { - fread(&ttyinfohdr, sizeof(ttyinfohdr), 1, fin); - /* - * In case we are automatic upgrading the data format - * we save the old format. If it is changed, the - * database must always be updated. - */ - oldsize = ttyinfohdr.recsize; - if (oldsize != sizeof(ttyinfo)) { - TtyUpdated = 1; - Syslog('+', "Updated %s, format changed", fnin); - } else - TtyUpdated = 0; - ttyinfohdr.hdrsize = sizeof(ttyinfohdr); - ttyinfohdr.recsize = sizeof(ttyinfo); - fwrite(&ttyinfohdr, sizeof(ttyinfohdr), 1, fout); + fnin = calloc(PATH_MAX, sizeof(char)); + fnout = calloc(PATH_MAX, sizeof(char)); + snprintf(fnin, PATH_MAX, "%s/etc/ttyinfo.data", getenv("MBSE_ROOT")); + snprintf(fnout, PATH_MAX, "%s/etc/ttyinfo.temp", getenv("MBSE_ROOT")); - /* - * The datarecord is filled with zero's before each - * read, so if the format changed, the new fields - * will be empty. - */ - memset(&ttyinfo, 0, sizeof(ttyinfo)); - while (fread(&ttyinfo, oldsize, 1, fin) == 1) { - fwrite(&ttyinfo, sizeof(ttyinfo), 1, fout); - memset(&ttyinfo, 0, sizeof(ttyinfo)); - } + if ((fin = fopen(fnin, "r")) != NULL) { + if ((fout = fopen(fnout, "w")) != NULL) { + fread(&ttyinfohdr, sizeof(ttyinfohdr), 1, fin); + /* + * In case we are automatic upgrading the data format + * we save the old format. If it is changed, the + * database must always be updated. + */ + oldsize = ttyinfohdr.recsize; + if (oldsize != sizeof(ttyinfo)) { + TtyUpdated = 1; + Syslog('+', "Updated %s, format changed", fnin); + } else + TtyUpdated = 0; + ttyinfohdr.hdrsize = sizeof(ttyinfohdr); + ttyinfohdr.recsize = sizeof(ttyinfo); + fwrite(&ttyinfohdr, sizeof(ttyinfohdr), 1, fout); - fclose(fin); - fclose(fout); - return 0; - } else - return -1; + /* + * The datarecord is filled with zero's before each + * read, so if the format changed, the new fields + * will be empty. + */ + memset(&ttyinfo, 0, sizeof(ttyinfo)); + while (fread(&ttyinfo, oldsize, 1, fin) == 1) { + /* + * If network ports available, set updated so the records will + * be deleted during close. + */ + if (ttyinfo.type == NETWORK) { + TtyUpdated = 1; + ttyinfo.deleted = TRUE; + ttyinfo.available = FALSE; + } + fwrite(&ttyinfo, sizeof(ttyinfo), 1, fout); + memset(&ttyinfo, 0, sizeof(ttyinfo)); + } + + fclose(fin); + fclose(fout); + free(fnin); + free(fnout); + return 0; } - return -1; + } + + free(fnin); + free(fnout); + return -1; } @@ -267,88 +258,100 @@ int OpenTtyinfo(void) void CloseTtyinfo(int); void CloseTtyinfo(int force) { - char fin[PATH_MAX], fout[PATH_MAX]; - FILE *fi, *fo; - st_list *tty = NULL, *tmp; + char *fin, *fout; + FILE *fi, *fo; + st_list *tty = NULL, *tmp; - snprintf(fin, PATH_MAX, "%s/etc/ttyinfo.data", getenv("MBSE_ROOT")); - snprintf(fout, PATH_MAX, "%s/etc/ttyinfo.temp", getenv("MBSE_ROOT")); + fin = calloc(PATH_MAX, sizeof(char)); + fout = calloc(PATH_MAX, sizeof(char)); + snprintf(fin, PATH_MAX, "%s/etc/ttyinfo.data", getenv("MBSE_ROOT")); + snprintf(fout, PATH_MAX, "%s/etc/ttyinfo.temp", getenv("MBSE_ROOT")); - if (TtyUpdated == 1) { - if (force || (yes_no((char *)"Database is changed, save changes") == 1)) { - working(1, 0, 0); - fi = fopen(fout, "r"); - fo = fopen(fin, "w"); - fread(&ttyinfohdr, ttyinfohdr.hdrsize, 1, fi); - fwrite(&ttyinfohdr, ttyinfohdr.hdrsize, 1, fo); + if (TtyUpdated == 1) { + if (force || (yes_no((char *)"Database is changed, save changes") == 1)) { + working(1, 0, 0); + fi = fopen(fout, "r"); + fo = fopen(fin, "w"); + fread(&ttyinfohdr, ttyinfohdr.hdrsize, 1, fi); + fwrite(&ttyinfohdr, ttyinfohdr.hdrsize, 1, fo); - while (fread(&ttyinfo, ttyinfohdr.recsize, 1, fi) == 1) - if (!ttyinfo.deleted) - fill_stlist(&tty, ttyinfo.comment, ftell(fi) - ttyinfohdr.recsize); - sort_stlist(&tty); + while (fread(&ttyinfo, ttyinfohdr.recsize, 1, fi) == 1) + if (!ttyinfo.deleted) + fill_stlist(&tty, ttyinfo.comment, ftell(fi) - ttyinfohdr.recsize); + sort_stlist(&tty); - for (tmp = tty; tmp; tmp = tmp->next) { - fseek(fi, tmp->pos, SEEK_SET); - fread(&ttyinfo, ttyinfohdr.recsize, 1, fi); - fwrite(&ttyinfo, ttyinfohdr.recsize, 1, fo); - } + for (tmp = tty; tmp; tmp = tmp->next) { + fseek(fi, tmp->pos, SEEK_SET); + fread(&ttyinfo, ttyinfohdr.recsize, 1, fi); + fwrite(&ttyinfo, ttyinfohdr.recsize, 1, fo); + } - tidy_stlist(&tty); - fclose(fi); - fclose(fo); - unlink(fout); - chmod(fin, 0640); - Syslog('+', "Updated \"ttyinfo.data\""); - if (!force) - working(6, 0, 0); - return; - } + tidy_stlist(&tty); + fclose(fi); + fclose(fo); + unlink(fout); + chmod(fin, 0640); + Syslog('+', "Updated \"ttyinfo.data\""); + if (!force) + working(6, 0, 0); + free(fin); + free(fout); + return; } - chmod(fin, 0640); - working(1, 0, 0); - unlink(fout); + } + + free(fin); + free(fout); + chmod(fin, 0640); + working(1, 0, 0); + unlink(fout); } int AppendTtyinfo(void) { - FILE *fil; - char ffile[PATH_MAX]; + FILE *fil; + char *ffile; - snprintf(ffile, PATH_MAX, "%s/etc/ttyinfo.temp", getenv("MBSE_ROOT")); - if ((fil = fopen(ffile, "a")) != NULL) { - memset(&ttyinfo, 0, sizeof(ttyinfo)); - fwrite(&ttyinfo, sizeof(ttyinfo), 1, fil); - fclose(fil); - TtyUpdated = 1; - return 0; - } else - return -1; + ffile = calloc(PATH_MAX, sizeof(char)); + snprintf(ffile, PATH_MAX, "%s/etc/ttyinfo.temp", getenv("MBSE_ROOT")); + + if ((fil = fopen(ffile, "a")) != NULL) { + memset(&ttyinfo, 0, sizeof(ttyinfo)); + fwrite(&ttyinfo, sizeof(ttyinfo), 1, fil); + fclose(fil); + TtyUpdated = 1; + free(ffile); + return 0; + } + + free(ffile); + return -1; } + void TtyScreen(void) { - clr_index(); - set_color(WHITE, BLACK); - mbse_mvprintw( 5, 6, "6. EDIT TTY LINE"); - set_color(CYAN, BLACK); - mbse_mvprintw( 7, 6, "1. Comment"); - mbse_mvprintw( 8, 6, "2. TTY Device"); - mbse_mvprintw( 9, 6, "3. Phone nr."); - mbse_mvprintw(10, 6, "4. Line Speed"); - mbse_mvprintw(11, 6, "5. Fido Flags"); - mbse_mvprintw(12, 6, "6. Line Type"); - mbse_mvprintw(13, 6, "7. Available"); - mbse_mvprintw(14, 6, "8. Auth. log"); - mbse_mvprintw(15, 6, "9. Honor ZMH"); - mbse_mvprintw(16, 6, "10. Deleted"); - mbse_mvprintw(17, 6, "11. Callout"); + clr_index(); + set_color(WHITE, BLACK); + mbse_mvprintw( 5, 6, "6. EDIT TTY LINE"); + set_color(CYAN, BLACK); + mbse_mvprintw( 7, 6, "1. Comment"); + mbse_mvprintw( 8, 6, "2. TTY Device"); + mbse_mvprintw( 9, 6, "3. Phone nr."); + mbse_mvprintw(10, 6, "4. Line Speed"); + mbse_mvprintw(11, 6, "5. Fido Flags"); + mbse_mvprintw(12, 6, "6. Line Type"); + mbse_mvprintw(13, 6, "7. Available"); + mbse_mvprintw(14, 6, "8. Honor ZMH"); + mbse_mvprintw(15, 6, "9. Deleted"); + mbse_mvprintw(16, 6, "10. Callout"); - mbse_mvprintw(15,31, "12. Portspeed"); - mbse_mvprintw(16,31, "13. Modemtype"); - mbse_mvprintw(17,31, "14. EMSI name"); + mbse_mvprintw(14,31, "11. Portspeed"); + mbse_mvprintw(15,31, "12. Modemtype"); + mbse_mvprintw(16,31, "13. EMSI name"); } @@ -358,206 +361,215 @@ void TtyScreen(void) */ int EditTtyRec(int Area) { - FILE *fil; - char mfile[PATH_MAX]; - long offset; - int j; - unsigned long crc, crc1; + FILE *fil; + char *mfile; + long offset; + int j; + unsigned long crc, crc1; - clr_index(); - working(1, 0, 0); - IsDoing("Edit Ttyinfo"); + clr_index(); + working(1, 0, 0); + IsDoing("Edit Ttyinfo"); + mfile = calloc(PATH_MAX, sizeof(char)); + snprintf(mfile, PATH_MAX, "%s/etc/ttyinfo.temp", getenv("MBSE_ROOT")); + + if ((fil = fopen(mfile, "r")) == NULL) { + working(2, 0, 0); + free(mfile); + return -1; + } - snprintf(mfile, PATH_MAX, "%s/etc/ttyinfo.temp", getenv("MBSE_ROOT")); - if ((fil = fopen(mfile, "r")) == NULL) { - working(2, 0, 0); - return -1; - } - - offset = sizeof(ttyinfohdr) + ((Area -1) * sizeof(ttyinfo)); - if (fseek(fil, offset, 0) != 0) { - working(2, 0, 0); - return -1; - } - - fread(&ttyinfo, sizeof(ttyinfo), 1, fil); + offset = sizeof(ttyinfohdr) + ((Area -1) * sizeof(ttyinfo)); + if (fseek(fil, offset, 0) != 0) { + working(2, 0, 0); fclose(fil); - crc = 0xffffffff; - crc = upd_crc32((char *)&ttyinfo, crc, sizeof(ttyinfo)); - TtyScreen(); - - for (;;) { - set_color(WHITE, BLACK); - show_str( 7,21,40, ttyinfo.comment); - show_str( 8,21, 6, ttyinfo.tty); - show_str( 9,21,25, ttyinfo.phone); - show_str(10,21,20, ttyinfo.speed); - show_str(11,21,30, ttyinfo.flags); - show_linetype(12,21, ttyinfo.type); - show_bool(13,21, ttyinfo.available); - show_bool(14,21, ttyinfo.authlog); - show_bool(15,21, ttyinfo.honor_zmh); - show_bool(16,21, ttyinfo.deleted); - show_bool(17,21, ttyinfo.callout); - show_int( 15,45, ttyinfo.portspeed); - show_str( 16,45,30,ttyinfo.modem); - show_str( 17,45,35,ttyinfo.name); + free(mfile); + return -1; + } - j = select_menu(14); - switch(j) { - case 0: crc1 = 0xffffffff; - crc1 = upd_crc32((char *)&ttyinfo, crc1, sizeof(ttyinfo)); - if (crc != crc1) { - if (yes_no((char *)"Record is changed, save") == 1) { - working(1, 0, 0); - if ((fil = fopen(mfile, "r+")) == NULL) { - working(2, 0, 0); - return -1; - } - fseek(fil, offset, 0); - fwrite(&ttyinfo, sizeof(ttyinfo), 1, fil); - fclose(fil); - TtyUpdated = 1; - working(6, 0, 0); - } + fread(&ttyinfo, sizeof(ttyinfo), 1, fil); + fclose(fil); + crc = 0xffffffff; + crc = upd_crc32((char *)&ttyinfo, crc, sizeof(ttyinfo)); + TtyScreen(); + + for (;;) { + set_color(WHITE, BLACK); + show_str( 7,21,40, ttyinfo.comment); + show_str( 8,21, 6, ttyinfo.tty); + show_str( 9,21,25, ttyinfo.phone); + show_str(10,21,20, ttyinfo.speed); + show_str(11,21,30, ttyinfo.flags); + show_linetype(12,21, ttyinfo.type); + show_bool(13,21, ttyinfo.available); + show_bool(14,21, ttyinfo.honor_zmh); + show_bool(15,21, ttyinfo.deleted); + show_bool(16,21, ttyinfo.callout); + show_int( 14,45, ttyinfo.portspeed); + show_str( 15,45,30,ttyinfo.modem); + show_str( 16,45,35,ttyinfo.name); + + j = select_menu(13); + switch(j) { + case 0: crc1 = 0xffffffff; + crc1 = upd_crc32((char *)&ttyinfo, crc1, sizeof(ttyinfo)); + if (crc != crc1) { + if (yes_no((char *)"Record is changed, save") == 1) { + working(1, 0, 0); + if ((fil = fopen(mfile, "r+")) == NULL) { + working(2, 0, 0); + free(mfile); + return -1; + } + fseek(fil, offset, 0); + fwrite(&ttyinfo, sizeof(ttyinfo), 1, fil); + fclose(fil); + TtyUpdated = 1; + working(6, 0, 0); + } + } + IsDoing("Browsing Menu"); + free(mfile); + return 0; + case 1: E_STR( 7,21,40,ttyinfo.comment, "The ^Comment^ for this record") + case 2: E_STR( 8,21,7, ttyinfo.tty, "The ^Device name^ of this tty line") + case 3: E_STR( 9,21,25,ttyinfo.phone, "The ^Phone number^ or ^Hostname^ or ^IP address^ of this tty line") + case 4: E_STR( 10,21,20,ttyinfo.speed, "The ^Speed^ of this device") + case 5: E_STR( 11,21,30,ttyinfo.flags, "The ^Fidonet Capability Flags^ for this tty line") + case 6: ttyinfo.type = edit_linetype(12,21, ttyinfo.type); + if (ttyinfo.type == POTS) { + if (!ttyinfo.portspeed) + ttyinfo.portspeed = 57600; + } else { + ttyinfo.portspeed = 0; + } + break; + case 7: ttyinfo.available = edit_bool(13,21, ttyinfo.available, + (char *)"Switch if this tty line is ^Available^ for use."); + if (ttyinfo.available) { + if ((ttyinfo.type == POTS) || (ttyinfo.type == ISDN)) { + ttyinfo.callout = TRUE; + ttyinfo.honor_zmh = TRUE; } - IsDoing("Browsing Menu"); - return 0; - case 1: E_STR( 7,21,40,ttyinfo.comment, "The ^Comment^ for this record") - case 2: E_STR( 8,21,7, ttyinfo.tty, "The ^Device name^ of this tty line") - case 3: E_STR( 9,21,25,ttyinfo.phone, "The ^Phone number^ or ^Hostname^ or ^IP address^ of this tty line") - case 4: E_STR( 10,21,20,ttyinfo.speed, "The ^Speed^ of this device") - case 5: E_STR( 11,21,30,ttyinfo.flags, "The ^Fidonet Capability Flags^ for this tty line") - case 6: ttyinfo.type = edit_linetype(12,21, ttyinfo.type); if (ttyinfo.type == POTS) { if (!ttyinfo.portspeed) ttyinfo.portspeed = 57600; } else { ttyinfo.portspeed = 0; } - break; - case 7: ttyinfo.available = edit_bool(13,21, ttyinfo.available, - (char *)"Switch if this tty line is ^Available^ for use."); - if (ttyinfo.available) { - if ((ttyinfo.type == POTS) || (ttyinfo.type == ISDN)) { - ttyinfo.callout = TRUE; - ttyinfo.authlog = TRUE; - ttyinfo.honor_zmh = TRUE; - } - if (ttyinfo.type == POTS) { - if (!ttyinfo.portspeed) - ttyinfo.portspeed = 57600; - } else { - ttyinfo.portspeed = 0; - } - } - break; - case 8: E_BOOL(14,21, ttyinfo.authlog, "Is mgetty ^Auth^ logging available") - case 9: E_BOOL(15,21, ttyinfo.honor_zmh,"Honor ^Zone Mail Hour^ on this tty line") - case 10:E_BOOL(16,21, ttyinfo.deleted, "Is this tty line ^deleted") - case 11:E_BOOL(17,21, ttyinfo.callout, "Is this line available for ^calling out^") - case 12:E_INT (15,45, ttyinfo.portspeed,"The ^locked speed^ of this tty port (only for modems)") - case 13:strcpy(ttyinfo.modem, PickModem((char *)"6.13")); TtyScreen(); break; - case 14:E_STR( 17,45,30,ttyinfo.name, "The ^EMSI name^ for this tty line") - } + } + break; + case 8: E_BOOL(14,21, ttyinfo.honor_zmh,"Honor ^Zone Mail Hour^ for bbs users on this tty") + case 9: E_BOOL(15,21, ttyinfo.deleted, "Is this tty line ^deleted") + case 10:E_BOOL(16,21, ttyinfo.callout, "Is this line available for ^calling out^") + case 11:E_INT (14,45, ttyinfo.portspeed,"The ^locked speed^ of this tty port (only for modems)") + case 12:if ((ttyinfo.type == POTS) || (ttyinfo.type == ISDN)) { + strcpy(ttyinfo.modem, PickModem((char *)"6.12")); + TtyScreen(); + } + break; + case 13:E_STR( 16,45,30,ttyinfo.name, "The ^EMSI name^ for this tty line") } + } - return 0; + return 0; } void EditTtyinfo(void) { - int records, i, o, x, y; - char pick[12]; - FILE *fil; - char temp[PATH_MAX]; - long offset; + int records, i, o, x, y; + char pick[12]; + FILE *fil; + char temp[PATH_MAX]; + long offset; + clr_index(); + working(1, 0, 0); + IsDoing("Browsing Menu"); + if (config_read() == -1) { + working(2, 0, 0); + return; + } + + records = CountTtyinfo(); + if (records == -1) { + working(2, 0, 0); + return; + } + + if (OpenTtyinfo() == -1) { + working(2, 0, 0); + return; + } + o = 0; + + for (;;) { clr_index(); - working(1, 0, 0); - IsDoing("Browsing Menu"); - if (config_read() == -1) { - working(2, 0, 0); - return; - } - - records = CountTtyinfo(); - if (records == -1) { - working(2, 0, 0); - return; - } - - if (OpenTtyinfo() == -1) { - working(2, 0, 0); - return; - } - o = 0; - - for (;;) { - clr_index(); - set_color(WHITE, BLACK); - mbse_mvprintw( 5, 4, "6. TTY LINES SETUP"); + set_color(WHITE, BLACK); + mbse_mvprintw( 5, 4, "6. TTY LINES SETUP"); + set_color(CYAN, BLACK); + if (records != 0) { + snprintf(temp, PATH_MAX, "%s/etc/ttyinfo.temp", getenv("MBSE_ROOT")); + if ((fil = fopen(temp, "r")) != NULL) { + fread(&ttyinfohdr, sizeof(ttyinfohdr), 1, fil); + x = 2; + y = 7; set_color(CYAN, BLACK); - if (records != 0) { - snprintf(temp, PATH_MAX, "%s/etc/ttyinfo.temp", getenv("MBSE_ROOT")); - if ((fil = fopen(temp, "r")) != NULL) { - fread(&ttyinfohdr, sizeof(ttyinfohdr), 1, fil); - x = 2; - y = 7; - set_color(CYAN, BLACK); - for (i = 1; i <= 20 ; i++) { - if (i == 11) { - x = 42; - y = 7; - } - if ((o + i) <= records) { - offset = sizeof(ttyinfohdr) + (((o + i) - 1) * ttyinfohdr.recsize); - fseek(fil, offset, 0); - fread(&ttyinfo, ttyinfohdr.recsize, 1, fil); - if (ttyinfo.available) - set_color(CYAN, BLACK); - else - set_color(LIGHTBLUE, BLACK); - snprintf(temp, 81, "%3d. %-6s %-25s", o+i, ttyinfo.tty, ttyinfo.comment); - temp[37] = 0; - mbse_mvprintw(y, x, temp); - y++; - } - } - fclose(fil); - } - } - strcpy(pick, select_record(records, 20)); - - if (strncmp(pick, "-", 1) == 0) { - CloseTtyinfo(FALSE); - return; - } - - if (strncmp(pick, "A", 1) == 0) { - working(1, 0, 0); - if (AppendTtyinfo() == 0) { - records++; - working(1, 0, 0); - } else - working(2, 0, 0); - } - - if (strncmp(pick, "N", 1) == 0) - if ((o + 20) < records) - o = o + 20; - - if (strncmp(pick, "P", 1) == 0) - if ((o - 20) >= 0) - o = o - 20; - - if ((atoi(pick) >= 1) && (atoi(pick) <= records)) { - EditTtyRec(atoi(pick)); - o = ((atoi(pick) -1) / 20) * 20; + for (i = 1; i <= 20 ; i++) { + if (i == 11) { + x = 42; + y = 7; + } + if ((o + i) <= records) { + offset = sizeof(ttyinfohdr) + (((o + i) - 1) * ttyinfohdr.recsize); + fseek(fil, offset, 0); + fread(&ttyinfo, ttyinfohdr.recsize, 1, fil); + if (ttyinfo.deleted) + set_color(LIGHTRED, BLACK); + else if (ttyinfo.available) + set_color(CYAN, BLACK); + else + set_color(LIGHTBLUE, BLACK); + snprintf(temp, 81, "%3d. %-6s %-25s", o+i, ttyinfo.tty, ttyinfo.comment); + temp[37] = 0; + mbse_mvprintw(y, x, temp); + y++; + } } + fclose(fil); + } } + strcpy(pick, select_record(records, 20)); + + if (strncmp(pick, "-", 1) == 0) { + CloseTtyinfo(FALSE); + return; + } + + if (strncmp(pick, "A", 1) == 0) { + working(1, 0, 0); + if (AppendTtyinfo() == 0) { + records++; + working(1, 0, 0); + } else + working(2, 0, 0); + } + + if (strncmp(pick, "N", 1) == 0) + if ((o + 20) < records) + o = o + 20; + + if (strncmp(pick, "P", 1) == 0) + if ((o - 20) >= 0) + o = o - 20; + + if ((atoi(pick) >= 1) && (atoi(pick) <= records)) { + EditTtyRec(atoi(pick)); + o = ((atoi(pick) -1) / 20) * 20; + } + } } @@ -625,7 +637,6 @@ int tty_doc(FILE *fp, FILE *toc, int page) add_webtable(wp, (char *)"Fido flags", ttyinfo.flags); add_webtable(wp, (char *)"Equipment", getlinetype(ttyinfo.type)); add_webtable(wp, (char *)"Available", getboolean(ttyinfo.available)); - add_webtable(wp, (char *)"Auth. log", getboolean(ttyinfo.authlog)); add_webtable(wp, (char *)"Honor ZMH", getboolean(ttyinfo.honor_zmh)); add_webtable(wp, (char *)"Callout", getboolean(ttyinfo.callout)); add_webtable(wp, (char *)"Modem type", ttyinfo.modem); @@ -643,7 +654,6 @@ int tty_doc(FILE *fp, FILE *toc, int page) fprintf(fp, " Fido flags %s\n", ttyinfo.flags); fprintf(fp, " Equipment %s\n", getlinetype(ttyinfo.type)); fprintf(fp, " Available %s\n", getboolean(ttyinfo.available)); - fprintf(fp, " Auth. log %s\n", getboolean(ttyinfo.authlog)); fprintf(fp, " Honor ZMH %s\n", getboolean(ttyinfo.honor_zmh)); fprintf(fp, " Callout %s\n", getboolean(ttyinfo.callout)); fprintf(fp, " Modem type %s\n", ttyinfo.modem);