diff --git a/ChangeLog b/ChangeLog index bec9b068..abc4952f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ v0.35.06 both short and long filenames. Just ignore the errors but check for real deleted files. Start the bbs again (mbstat open). + Check new settings in nodes setup, screen 6, items 9 and 10. templates: The html templates are changed by Joachim Kuwan and now they @@ -61,6 +62,10 @@ v0.35.06 With TIC file attaches, the filename attached is the 8.3 name. TIC processing completly modified to make better LFN support, internal everything works on the 8.3 filename. + When writing ticfiles for downlinks, the To line now depends + on the new nodes setting. + When writing ticfiles for downlinks, the format of the Seenby + lines now depends on the new nodes setting. mbcico: With filetransfer errors, the attempts counter was not @@ -77,7 +82,8 @@ v0.35.06 mbsetup: In filedatabase editor, if a file is deleted the name is displayed in light blue. - + Added setup switches in nodes setup, files, to toggle sending + advanced seen-by lines and the To line in ticfiles. v0.35.05 19-Oct-2002 - 13-Nov-2002. diff --git a/html/images/nodes6.gif b/html/images/nodes6.gif index 430d2253..ac4604f5 100644 Binary files a/html/images/nodes6.gif and b/html/images/nodes6.gif differ diff --git a/html/setup/nodes.html b/html/setup/nodes.html index 436f946e..82282fe0 100644 --- a/html/setup/nodes.html +++ b/html/setup/nodes.html @@ -12,7 +12,7 @@
-
Last update 31-Oct-2002
+
Last update 01-Dec-2002

MBSE BBS Setup - Fidonet nodes.

@@ -169,22 +169,43 @@ carefull not to allow a node to connect areas from networks he has no aka in.

6. File setup

- + + + + + + + + + + + + + + + + +
Files passwordThe password for .tic files. -
Mgr passwordThe password for the Areamgr and Filemgr. -
UplMgr programThe name of the Filemgr progrom of this node. This could be FileMgr, Allfix, Raid etc. -
UplMgr passwdThe password of the Filemgr if this node. -
UplMgr Add +Add a "+" in the command to connect areas. -
Incl. messageSend a netmail message for each file to send. -
Send TIC fileSend .tic file to this node. -
Advanced TICSend advanced or standard .tic files. -
File forwardForward TIC files for this node (not yet). -
BillingIs Costsharing active for this node. -
Bill directSend the bill direct or on command. -
CreditThe credit this node has in units. -
DebetThe debet we have with this node (informational). -
AddAdd (or substract) factor to the bill. -
Warn levelThe debet level when to write a warning mesage. -
Stop levelThe debet level when to stop sending files. +
Files passwordThe password for +.tic files.
Mgr passwordThe password for the +Areamgr and Filemgr.
UplMgr programThe name of the +Filemgr progrom of this node. This could be FileMgr, Allfix, Raid etc.
UplMgr passwdThe password of the +Filemgr if this node.
UplMgr Add +Add a "+" in the +command to connect areas.
Incl. messageSend a netmail +message for each file to send.
Send TIC fileSend .tic file to +this node.
Advanced TICSend advanced or +standard .tic files.
Advanced SBSend advanced Seen-By +lines, some systems can't handle this!
To line in TICSend the To line in +the ticfile. Some braindead systems will forward this line instead of processing +it and then the next system in the line will fail.
File forwardForward TIC files for +this node (not yet).
BillingIs Costsharing active for +this node.
Bill directSend the bill direct or +on command (billing is not yet available).
CreditThe credit this node has in +units.
DebetThe debet we have with this +node (informational).
AddAdd (or substract) factor to +the bill.
Warn levelThe debet level when to +write a warning mesage.
Stop levelThe debet level when to +stop sending files.

diff --git a/lib/structs.h b/lib/structs.h index 1ce6cb94..7825b8f2 100644 --- a/lib/structs.h +++ b/lib/structs.h @@ -1214,8 +1214,8 @@ struct _nodes { unsigned NoFreqs : 1; /* Don't allow requests */ unsigned NoCall : 1; /* Don't call this node */ - unsigned xNoHold : 1; - unsigned xNoPUA : 1; + unsigned TIC_AdvSB : 1; /* Advanced tic SB lines */ + unsigned TIC_To : 1; /* Add To line to ticfile */ unsigned NoZmodem : 1; /* Don't use Zmodem */ unsigned NoZedzap : 1; /* Don't use Zedzap */ unsigned xNoJanus : 1; /* Don't use Janus */ diff --git a/mbfido/forward.c b/mbfido/forward.c index 44624731..d84c8a13 100644 --- a/mbfido/forward.c +++ b/mbfido/forward.c @@ -207,8 +207,10 @@ void ForwardFile(fidoaddr Node, fa_list *sbl) fprintf(fp, "Size %ld\r\n", (long)(TIC.FileSize)); fprintf(fp, "Desc %s\r\n", TIC.TicIn.Desc); fprintf(fp, "Crc %s\r\n", TIC.TicIn.Crc); - if (nodes.AdvTic) { + if (nodes.TIC_To) { fprintf(fp, "To %s, %s\r\n", nodes.Sysop, ascfnode(dest, 0x1f)); + } + if (nodes.AdvTic) { fprintf(fp, "Areadesc %s\r\n", tic.Comment); fprintf(fp, "Fdn %s\r\n", fgroup.Comment); /* @@ -235,7 +237,7 @@ void ForwardFile(fidoaddr Node, fa_list *sbl) fprintf(fp, "Path %s %lu %s %s\r\n", ascfnode(ba, 0x1f), mktime(localtime(&now)), subject, tzname[0]); tidy_faddr(ba); - if (nodes.AdvTic) { + if (nodes.TIC_AdvSB) { /* * In advanced TIC mode we send multiple seenby * addresses on one line in stead of one line diff --git a/mbsetup/m_node.c b/mbsetup/m_node.c index 08179961..4d366c79 100644 --- a/mbsetup/m_node.c +++ b/mbsetup/m_node.c @@ -444,14 +444,17 @@ void E_Files(void) mvprintw(12, 6, "6. Incl. message"); mvprintw(13, 6, "7. Send TIC file"); mvprintw(14, 6, "8. Advanced TIC"); - mvprintw(15, 6, "9. File forward"); - mvprintw(16, 6, "10. Billing (CSO)"); - mvprintw( 7,46, "11. Bill direct"); - mvprintw( 8,46, "12. Credit"); - mvprintw( 9,46, "13. Debet"); - mvprintw(10,46, "14. Add %"); - mvprintw(11,46, "15. Warn level"); - mvprintw(12,46, "16. Stop level"); + mvprintw(15, 6, "9. Advanced SB"); + mvprintw(16, 6, "10. To line in TIC"); + + mvprintw( 7,46, "11. File forward"); + mvprintw( 8,46, "12. Billing (CSO)"); + mvprintw( 9,46, "13. Bill direct"); + mvprintw(10,46, "14. Credit"); + mvprintw(11,46, "15. Debet"); + mvprintw(12,46, "16. Add %"); + mvprintw(13,46, "17. Warn level"); + mvprintw(14,46, "18. Stop level"); for (;;) { set_color(WHITE, BLACK); @@ -463,16 +466,18 @@ void E_Files(void) show_bool(12,26, nodes.Message); show_bool(13,26, nodes.Tic); show_bool(14,26, nodes.AdvTic); - show_bool(15,26, nodes.FileFwd); - show_bool(16,26, nodes.Billing); - show_bool( 7,65, nodes.BillDirect); - show_int( 8,65, nodes.Credit); - show_int( 9,65, nodes.Debet); - show_int( 10,65, nodes.AddPerc); - show_int( 11,65, nodes.WarnLevel); - show_int( 12,65, nodes.StopLevel); + show_bool(15,26, nodes.TIC_AdvSB); + show_bool(16,26, nodes.TIC_To); + show_bool( 7,66, nodes.FileFwd); + show_bool( 8,66, nodes.Billing); + show_bool( 9,66, nodes.BillDirect); + show_int( 10,66, nodes.Credit); + show_int( 11,66, nodes.Debet); + show_int( 12,66, nodes.AddPerc); + show_int( 13,66, nodes.WarnLevel); + show_int( 14,66, nodes.StopLevel); - switch(select_menu(16)) { + switch(select_menu(18)) { case 0: return; case 1: E_STR( 7,26,15,nodes.Fpasswd, "The ^TIC^ files ^password^ for this node") case 2: E_STR( 8,26,15,nodes.Apasswd, "The filemanager ^password^ for this node") @@ -482,14 +487,16 @@ void E_Files(void) case 6: E_BOOL(12,26, nodes.Message, "Send ^messages^ with files send to this node") case 7: E_BOOL(13,26, nodes.Tic, "Send ^TIC^ files to this node") case 8: E_BOOL(14,26, nodes.AdvTic, "Send ^advanced^ TIC files to this node") - case 9: E_BOOL(15,26, nodes.FileFwd, "^Forward TIC^ files for this node") - case 10:E_BOOL(16,26, nodes.Billing, "Send ^bills^ to this node, Costsharing is active") - case 11:E_BOOL( 7,65, nodes.BillDirect, "Send bills ^direct^ after file processing") - case 12:E_INT( 8,65, nodes.Credit, "The ^credit^ this node has for costsharing") - case 13:E_INT( 9,65, nodes.Debet, "The ^debet^ in cents we have credit from this node") - case 14:E_INT( 10,65, nodes.AddPerc, "The + or - ^promille^ factor for this node") - case 15:E_INT( 11,65, nodes.WarnLevel, "Credit level in cents to ^Warn^ node for low credit") - case 16:E_INT( 12,65, nodes.StopLevel, "Credit level in cents to ^Stop^ sending files") + case 9: E_BOOL(15,26, nodes.TIC_AdvSB, "Send ^advanced Seen-By^ lines in ticfiles to this node") + case 10:E_BOOL(16,26, nodes.TIC_To, "Send ^To^ line in ticfiles to this node") + case 11:E_BOOL( 7,66, nodes.FileFwd, "^Forward TIC^ files for this node") + case 12:E_BOOL( 8,66, nodes.Billing, "Send ^bills^ to this node, Costsharing is active") + case 13:E_BOOL( 9,66, nodes.BillDirect, "Send bills ^direct^ after file processing") + case 14:E_INT( 10,66, nodes.Credit, "The ^credit^ this node has for costsharing") + case 15:E_INT( 11,66, nodes.Debet, "The ^debet^ in cents we have credit from this node") + case 16:E_INT( 12,66, nodes.AddPerc, "The + or - ^promille^ factor for this node") + case 17:E_INT( 13,66, nodes.WarnLevel, "Credit level in cents to ^Warn^ node for low credit") + case 18:E_INT( 14,66, nodes.StopLevel, "Credit level in cents to ^Stop^ sending files") } } } @@ -1487,8 +1494,10 @@ int node_doc(FILE *fp, FILE *toc, int page) fprintf(fp, " Send .TIC %s", getboolean(nodes.Tic)); fprintf(fp, " File forward %s\n", getboolean(nodes.FileFwd)); fprintf(fp, " Advanced TIC %s", getboolean(nodes.AdvTic)); + fprintf(fp, " Advanded SB %s", getboolean(nodes.TIC_AdvSB)); + fprintf(fp, " Sen To lines %s\n", getboolean(nodes.TIC_To)); fprintf(fp, " Billing %s", getboolean(nodes.Billing)); - fprintf(fp, " Bill direct %s\n", getboolean(nodes.BillDirect)); + fprintf(fp, " Bill direct %s", getboolean(nodes.BillDirect)); fprintf(fp, " Uplink add + %s\n", getboolean(nodes.AddPlus)); fprintf(fp, " Security flags %s\n\n", getflag(nodes.Security.flags, nodes.Security.notflags));