Changed IP capabilities showing

ChangeLog

@@ -7,6 +7,7 @@ v0.61.2		11-Jul-2004
 	upgrade:
 		Make sure that /opt/mbse/queue is empty, then close the
 		bbs with "mbstat close wait". Then do the upgrade.
+		In mbsetup menu 1.14 update the TCP/IP connection details.
 
 	general:
 		Added -fno-strict-aliasing switch to gcc to prevent some
@@ -48,9 +49,15 @@ v0.61.2		11-Jul-2004
 	mbout:
 		Changed to use direct instead of immediate mail.
 
+	mbaff:
+		In newfiles and filefind reports with the tty info lines, also
+		display TCP/IP connection details.
+
 	mbsetup:
 		In menu 2, added 3 checks to see if enough info is entered to
 		make a valid network setup.
+		Changed in menu 1.14 some labels and help messages for TCP/IP
+		global settings.
 
 	mbtask:
 		Changed to use direct instead of immediate mail.

lib/nodelist.c

@@ -468,7 +468,7 @@ int initnl(void)
      *  Read all our TCP/IP capabilities and set the global flag.
      */
     if (TCFG.max_tcp) {
-	sprintf(buf, "%s", CFG.Flags);
+	sprintf(buf, "%s", CFG.IP_Flags);
 	q = buf;
 	for (p = q; p; p = q) {
 	    if ((q = strchr(p, ',')))

mbcico/binkp.c

@@ -1758,7 +1758,7 @@ int binkp_banner(void)
     if (!rc)
 	rc = binkp_send_command(MM_NUL,"LOC %s", CFG.location);
     if (!rc)
-	rc = binkp_send_command(MM_NUL,"NDL %s", CFG.Flags);
+	rc = binkp_send_command(MM_NUL,"NDL %s", CFG.IP_Flags);
     t = time(NULL);
     if (!rc)
 	rc = binkp_send_command(MM_NUL,"TIME %s", rfcdate(t));
@@ -1768,8 +1768,8 @@ int binkp_banner(void)
 	else
 	    rc = binkp_send_command(MM_NUL,"VER mbcico/%s/%s-%s %s/%s", VERSION, OsName(), OsCPU(), PRTCLNAME, PRTCLVER);
     }
-    if (strlen(CFG.Phone) && !rc)
+    if (strlen(CFG.IP_Phone) && !rc)
-	rc = binkp_send_command(MM_NUL,"PHN %s", CFG.Phone);
+	rc = binkp_send_command(MM_NUL,"PHN %s", CFG.IP_Phone);
     if (strlen(CFG.comment) && !rc)
 	rc = binkp_send_command(MM_NUL,"OPM %s", CFG.comment);
 

mbcico/emsidat.c

@@ -219,8 +219,8 @@ char *mkemsidat(int caller)
     p=xstrcat(p,(char *)"][");
     p=xstrcat(p,phone?emsiencode(phone):(char *)"-Unpublished-");
     p=xstrcat(p,(char *)"][");
-    if (CFG.Speed) 
+    if ((CFG.IP_Speed) && (emsi_local_protos & PROT_TCP))
-	sprintf(cbuf,"%ld",CFG.Speed);
+	sprintf(cbuf,"%ld",CFG.IP_Speed);
     else 
 	strcpy(cbuf,"9600");
     p=xstrcat(p,cbuf);

mbcico/mbcico.c

@@ -276,8 +276,8 @@ int main(int argc, char *argv[])
     inbound	= xstrcpy(CFG.inbound);
     uxoutbound	= xstrcpy(CFG.uxpath);
     name	= xstrcpy(CFG.bbs_name);
-    phone	= xstrcpy(CFG.Phone);
+    phone	= xstrcpy(CFG.IP_Phone);
-    flags	= xstrcpy(CFG.Flags);
+    flags	= xstrcpy(CFG.IP_Flags);
 
     while (argv[optind]) {
 

mbfido/msgutil.c

@@ -165,8 +165,8 @@ long Msg_Top(char *template, int language, fidoaddr aka)
 	    fread(&ttyinfohdr, sizeof(ttyinfohdr), 1, fp);
 
 	    MacroVars("pqrf", "dsss", 0, "", "", "");
-	    if (strlen(CFG.Flags)) {
+	    if (strlen(CFG.IP_Flags) && strlen(CFG.IP_Phone)) {
-		MacroVars("pqrf", "dsds", 2, CFG.Phone, CFG.Speed, CFG.Flags);
+		MacroVars("pqrf", "dsds", 2, CFG.IP_Phone, CFG.IP_Speed, CFG.IP_Flags);
 		fseek(fi, fileptr, SEEK_SET);
 		Msg_Macro(fi);
 	    }

mbsebbs/offline.c

@@ -2129,7 +2129,7 @@ void OLR_DownQWK(void)
     if ((fp = fopen(Temp, "w+")) != NULL) {
 	fprintf(fp, "%s\n", CFG.bbs_name);
 	fprintf(fp, "%s\n", CFG.location);
-	fprintf(fp, "%s\n", CFG.Phone);
+	fprintf(fp, "-Unpublished-\n");
 	fprintf(fp, "%s\n", CFG.sysop_name);
 	fprintf(fp, "00000,%s\n", CFG.bbsid);
 		

mbsetup/m_global.c

@@ -1231,9 +1231,9 @@ void s_mailer(void)
 	mvprintw( 5, 2, "1.14 EDIT MAILER SETTINGS");
 	set_color(CYAN, BLACK);
 	mvprintw( 7, 2, "1.   Mailer logl.");
-	mvprintw( 8, 2, "2.   Default phone");
+	mvprintw( 8, 2, "2.   TCP/IP \"phone\"");
 	mvprintw( 9, 2, "3.   TCP/IP flags");
-	mvprintw(10, 2, "4.   Default speed");
+	mvprintw(10, 2, "4.   TCP/IP speed");
 	mvprintw(11, 2, "5.   Timeout reset");
 	mvprintw(12, 2, "6.   Timeout connect");
 	mvprintw(13, 2, "7.   Dial delay");
@@ -1297,9 +1297,9 @@ void e_mailer(void)
     for (;;) {
 	set_color(WHITE, BLACK);
 	show_logl( 7,23,   CFG.cico_loglevel);
-	show_str(  8,23,20,CFG.Phone);
+	show_str(  8,23,20,CFG.IP_Phone);
-	show_str(  9,23,30,CFG.Flags);
+	show_str(  9,23,30,CFG.IP_Flags);
-	show_int( 10,23,   CFG.Speed);
+	show_int( 10,23,   CFG.IP_Speed);
 	show_int( 11,23,   CFG.timeoutreset);
 	show_int( 12,23,   CFG.timeoutconnect);
 	show_int( 13,23,   CFG.dialdelay);
@@ -1320,9 +1320,9 @@ void e_mailer(void)
 	switch(select_menu(22)) {
 	    case 0: return;
 	    case 1: E_LOGL(CFG.cico_loglevel, "1.14.1", s_mailer)
-	    case 2: E_STR(  8,23,20,CFG.Phone,          "The mailer default ^phone number^ for this system")
+	    case 2: E_STR(  8,23,20,CFG.IP_Phone,       "The mailer ^TCP/IP \"phone\" number^ for this system, empty is no TCP/IP")
-	    case 3: E_STR(  9,23,30,CFG.Flags,          "The mailer ^TCP/IP capability flags^ for this system")
+	    case 3: E_STR(  9,23,30,CFG.IP_Flags,       "The mailer ^TCP/IP capability flags^ for this system")
-	    case 4: E_INT( 10,23,   CFG.Speed,          "The mailer ^default linespeed^ for this system")
+	    case 4: E_INT( 10,23,   CFG.IP_Speed,       "The mailer ^TCP/IP linespeed^ for this system")
 	    case 5: E_INT( 11,23,   CFG.timeoutreset,   "The modem ^reset timeout^ in seconds")
 	    case 6: E_INT( 12,23,   CFG.timeoutconnect, "The modem ^wait for connect timeout^ in seconds")
 	    case 7: E_INT( 13,23,   CFG.dialdelay,      "The ^random dialdelay^ in seconds ((^n^ <= delay) and (^n^ > (delay / 10)))")
@@ -2163,9 +2163,9 @@ int global_doc(FILE *fp, FILE *toc, int page)
     add_webdigit(wp, (char *)"Reset modem timeout", CFG.timeoutreset);
     add_webdigit(wp, (char *)"Connect timeout", CFG.timeoutconnect);
     add_webdigit(wp, (char *)"Random dialdelay", CFG.dialdelay);
-    add_webtable(wp, (char *)"Default phone number", CFG.Phone);
+    add_webtable(wp, (char *)"TCP/IP \"phone\" number", CFG.IP_Phone);
-    add_webdigit(wp, (char *)"Default linespeed", CFG.Speed);
+    add_webdigit(wp, (char *)"TCP/IP linespeed", CFG.IP_Speed);
-    add_webtable(wp, (char *)"TCP/IP flags", CFG.Flags);
+    add_webtable(wp, (char *)"TCP/IP flags", CFG.IP_Flags);
     add_webtable(wp, (char *)"No Filerequests", getboolean(CFG.NoFreqs));
     add_webtable(wp, (char *)"No Calls", getboolean(CFG.NoCall));
     add_webtable(wp, (char *)"No EMSI", getboolean(CFG.NoEMSI));
@@ -2187,9 +2187,9 @@ int global_doc(FILE *fp, FILE *toc, int page)
     fprintf(fp, "      Res. modem timeout %ld\n", CFG.timeoutreset);
     fprintf(fp, "      Connect timeout    %ld\n", CFG.timeoutconnect);
     fprintf(fp, "      Random dialdelay   %ld\n", CFG.dialdelay);
-    fprintf(fp, "      Default phone nr.  %s\n",  CFG.Phone);
+    fprintf(fp, "      TCP/IP phone nr.   %s\n",  CFG.IP_Phone);
-    fprintf(fp, "      Default speed      %lu\n", CFG.Speed);
+    fprintf(fp, "      TCP/IP speed       %lu\n", CFG.IP_Speed);
-    fprintf(fp, "      TCP/IP flags       %s\n",  CFG.Flags);
+    fprintf(fp, "      TCP/IP flags       %s\n",  CFG.IP_Flags);
     fprintf(fp, "      No Filerequests    %s\n",  getboolean(CFG.NoFreqs));
     fprintf(fp, "      No Calls           %s\n",  getboolean(CFG.NoCall));
     fprintf(fp, "      No EMSI            %s\n",  getboolean(CFG.NoEMSI));

mbtask/mbtask.c

@@ -337,9 +337,9 @@ void load_maincfg(void)
         sprintf(CFG.phonetrans[1].match, "31-");
         sprintf(CFG.phonetrans[1].repl, "0");
         sprintf(CFG.phonetrans[2].repl, "00");
-        CFG.Speed = 9600;
+        CFG.IP_Speed = 256000;
         CFG.dialdelay = 60;
-        sprintf(CFG.Flags, "CM,XX");
+        sprintf(CFG.IP_Flags, "ICM,XX,IBN");
         CFG.cico_loglevel = DLOG_ALLWAYS | DLOG_ERROR | DLOG_ATTENT | DLOG_NORMAL | DLOG_VERBOSE;
 
 	/*