From f590b8f31fc41682487d94f5fe837611460d3818 Mon Sep 17 00:00:00 2001 From: Michiel Broek Date: Sat, 6 Apr 2002 14:04:41 +0000 Subject: [PATCH] Splitted TCP settings into IBN, IFC and ITN --- ChangeLog | 7 ++++++ examples/templates.tar | Bin 51200 -> 51200 bytes html/Makefile | 2 +- html/setup/global.html | 8 +++--- html/setup/nodes.html | 10 ++++---- lib/structs.h | 18 +++++++++----- mbcico/binkp.c | 6 ++--- mbcico/call.c | 16 ++++++------ mbcico/dietifna.c | 11 ++++----- mbcico/emsi.c | 16 ++++++------ mbcico/ftsc.c | 6 ++--- mbcico/hydra.c | 6 ++--- mbcico/rdoptions.c | 30 +++++++++++----------- mbcico/session.h | 12 ++++++--- mbcico/tcp.c | 11 ++++----- mbcico/wazoo.c | 11 ++++----- mbsetup/m_global.c | 55 +++++++++++++++++++++-------------------- mbsetup/m_node.c | 46 +++++++++++++++++----------------- mbtask/outstat.c | 2 +- 19 files changed, 145 insertions(+), 128 deletions(-) diff --git a/ChangeLog b/ChangeLog index 18fee088..082f3fce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4602,6 +4602,8 @@ v0.33.20 10-Feb-2002 Added the turbodiesel macro language so that reports can be customized per language and reports. Thanks to Redy Rodriguez for finding this one and implement it into mbse bbs. + Splitted the No TCP settings in No IBN, No IFC and No ITN. + Removed settings for Non-hold mail and Pickup Primary. common.a: Added 2 functions to return the OS name and CPU family. @@ -4639,6 +4641,8 @@ v0.33.20 10-Feb-2002 during init. When adding a new newfiles or filefind record some defaults are automatic filled in. + Splitted no TCP into no IBN, no IFC and no ITN in global and + nodes setup. mbfido: In AreaMgr and FileMgr changed aka matching for area @@ -4726,6 +4730,7 @@ v0.33.20 10-Feb-2002 new sessions if the limit from the setup is reached. This will hopefully prevent that mbcico will use too much bandwidth on TCP/IP trafic. + Splitted no TCP settings in no IBN, no IFC and no ITN. mbcico: Fixed binkp driver to accept incoming unprotected sessions. @@ -4739,6 +4744,8 @@ v0.33.20 10-Feb-2002 test now. Registers TCP/IP sessions with mbtask. All filetransfer times and cps rates are calculated in mSecs. + Splitted no TCP settings in no IBN, no IFC and no ITN. + Removed settings for Non-hold mail and Pickup Primary. mbout: The status display has now 9 digits for the outbound size. diff --git a/examples/templates.tar b/examples/templates.tar index 8d3019e64e9a07a03356a6fb85ae61a499b44829..d8b8ff4a77161b754ae700de305917641356c710 100644 GIT binary patch delta 508 zcmY+Aze~eF9K{nV4wuP6t%G=@6_mT&T>=ggp>)%N4$d(>%h}kLG%iYM!Czn;N`gz# z-BBq18U8U&u71z{O7FJ!dGEpd_6LRjpz!%ZRv2Y2e1lNIU14B*P#c*vG4ntW4N?q* zEfCIJG9@C}$Yr>&*_2chmLp<9B51o?Y~#ey8BHD*h{J5Ei38**v2tx(@PDE+*}Ylh zu*Btp2|+j)u!;)m8kl512pq4!O9%VdlX%;^D51kh`grm{_3 z8ah=sa%Ri+hHE{L6{<$6u9{;2!X@%oE{GR85=N;wsQC|OiMQa2zEU;HYm@|QDkmQ}2gEOZJII>_24WUbf zQI9SN&vq&q#!Y9L@iST>yd<${yI*c&2-}P$k4wa(m|5Z(@|?MqHpc0k*i7-@Y}+Nm zh!_hds9A+M7Bz^9Z(tm6KP&4}!F_qr00*%O;NKOilMNy};6&f3Qi8Gz&#zOJfM&b7 z(4f@7k9Ak~=1Ork**ub$K;FuzF>I?r6oe|VNJgL)r2k!4))Nj7b);a}Pf}|MK}#iJ wtOu#?_n_>}f~oI}-=DU`d;#$|GViquFfnf_7ks#GaeTU4yxh4nGX2{71=I3$#{d8T diff --git a/html/Makefile b/html/Makefile index 50d3a728..34913766 100644 --- a/html/Makefile +++ b/html/Makefile @@ -38,7 +38,7 @@ H_IMAGES = images/b_arrow.gif images/magic.gif images/nodes1.gif \ images/go_to.gif images/nodelist3.gif images/tty2.gif \ images/hatch.gif images/nodelist4.gif images/tty3.gif \ images/language.gif images/nodelist5.gif images/uarrow.gif \ - images/larrow.gif images/nodes.gif images/users.png \ + images/larrow.gif images/nodes.png images/users.png \ images/mbse.jpg images/taskmgr.png images/mbsebbs.gif \ images/mbsebbs.png images/users2.png images/hand.up.gif \ images/dream1.png images/dream2.png images/dream3.png \ diff --git a/html/setup/global.html b/html/setup/global.html index e896a0b2..35046faf 100644 --- a/html/setup/global.html +++ b/html/setup/global.html @@ -12,7 +12,7 @@
-
Last update 06-Mar-2002
+
Last update 06-Apr-2002

 

MBSE BBS Setup - Global Setup

@@ -388,14 +388,14 @@ carrier select functions. Dial delay The maximum delay between calls, minimum is 10 seconds. No Filerquests Disable filerequests No callout Disable callout -No hold mail Send "hold" mail if we make the call -No pickup all Exchange mail for one aka only No EMSI session Disable EMSI No YooHoo/2U2 Disable FTS-0006 sessions No Zmodem Disable zmodem protocol No Zedzap Disable zedzap protocol No Hydra Disable Hydra protocol -No TCP/IP Disable TCP/IP protocol, set to Yes if you don't have internet. +No TCP/IP IBN Disable TCP/IP IBN (binkp) protocol. +No TCP/IP IFC Disable TCP/IP IFC (ifcico) protocol. +No TCP/IP ITN Disable TCP/IP ITN (telnet) protocol. Phonetrans 1..40 Maximum 40 phone number translations Max. files Maximum files to request, 0 is unlimited Max. MBytes Maximum MBytes to request, 0 is unlimited diff --git a/html/setup/nodes.html b/html/setup/nodes.html index 73207759..42f2b173 100644 --- a/html/setup/nodes.html +++ b/html/setup/nodes.html @@ -12,7 +12,7 @@
-
Last update 17-Feb-2002
+
Last update 06-Apr-2002

 

MBSE BBS Setup - Fidonet nodes.

@@ -58,16 +58,16 @@ you can setup the aka's, mail, files and session handshake. No YooHoo/2U2 Disable FTSC-0006 handshake. No Filerequest Disable filerquest from this node. Don't call Do not call this node. -No Hold mail Only pickup mail if we call, send nothing. -Pickup primary Only exchange mail for one Aka. No Zmodem Disable Zmodem protocol. No Zedzap Disable Zedzap protocol. No Hydra Disable Hydra protocol. -No TCP/IP Disbale TCP/IP protocol, forces dial only. +No TCP/IP IBN Disbale TCP/IP IBN (binkp) protocol. +No TCP/IP IFC Disable TCP/IP IFC (ifcico) protocol. +No TCP/IP ITN Disable TCP/IP ITN (telnet) protocol. 8.3 names Set this if the node only accepts 8.3 filenames.

- +

 

Mail setup

diff --git a/lib/structs.h b/lib/structs.h index 00aba218..1bd27902 100644 --- a/lib/structs.h +++ b/lib/structs.h @@ -705,15 +705,19 @@ struct sysconfig { long dialdelay; /* Delay between calls */ unsigned NoFreqs : 1; /* Don't allow requests */ unsigned NoCall : 1; /* Don't call */ - unsigned NoHold : 1; /* Don't send hold mail */ - unsigned NoPUA : 1; /* Don't Pickup All */ + unsigned xNoHold : 1; + unsigned xNoPUA : 1; unsigned NoEMSI : 1; /* Don't do EMSI */ unsigned NoWazoo : 1; /* Don't do Yooho/2U2 */ unsigned NoZmodem : 1; /* Don't do Zmodem */ unsigned NoZedzap : 1; /* Don't do Zedzap */ + unsigned xNoJanus : 1; unsigned NoHydra : 1; /* Don't do Hydra */ - unsigned NoTCP : 1; /* Don't do TCP/IP */ + unsigned NoIBN : 1; /* No TCP-IP binkp */ + unsigned NoITN : 1; /* No TCP-IP telnet */ + unsigned NoIFC : 1; /* No TCP-IP ifcico */ + char Phone[21]; /* Default phonenumber */ unsigned long Speed; /* Default linespeed */ char Flags[31]; /* Default EMSI flags */ @@ -1183,18 +1187,20 @@ struct _nodes { unsigned NoFreqs : 1; /* Don't allow requests */ unsigned NoCall : 1; /* Don't call this node */ - unsigned NoHold : 1; /* Don't send hold mail */ - unsigned NoPUA : 1; /* Don't pickup all */ + unsigned xNoHold : 1; + unsigned xNoPUA : 1; unsigned NoZmodem : 1; /* Don't use Zmodem */ unsigned NoZedzap : 1; /* Don't use Zedzap */ unsigned xNoJanus : 1; /* Don't use Janus */ unsigned NoHydra : 1; /* Don't use Hydra */ - unsigned NoTCP : 1; /* Don't use TCP/IP */ + unsigned NoIBN : 1; /* Don't use TCP-IP binkp */ unsigned PackNetmail : 1; /* Pack netmail */ unsigned ARCmailCompat : 1; /* ARCmail Compatibility */ unsigned ARCmailAlpha : 1; /* Allow a..z ARCmail name */ unsigned FNC : 1; /* Node needs 8.3 filenames*/ + unsigned NoITN : 1; /* Don't use TCP-IP telnet */ + unsigned NoIFC : 1; /* Don't use TCP-IP ifcico */ char xExtra[94]; time_t StartDate; /* Node start date */ diff --git a/mbcico/binkp.c b/mbcico/binkp.c index 5745da30..805bbd62 100644 --- a/mbcico/binkp.c +++ b/mbcico/binkp.c @@ -117,10 +117,10 @@ int binkp(int role) } if (role) { - if (localoptions & NOHOLD) +// if (localoptions & NOHOLD) nonhold_mail = (char *)ALL_MAIL; - else - nonhold_mail = (char *)NONHOLD_MAIL; +// else +// nonhold_mail = (char *)NONHOLD_MAIL; } else { nonhold_mail = (char *)ALL_MAIL; } diff --git a/mbcico/call.c b/mbcico/call.c index a5d55226..a18592df 100644 --- a/mbcico/call.c +++ b/mbcico/call.c @@ -91,7 +91,7 @@ int portopen(faddr *addr) } } - WriteError("call.c portopen(): should not be here"); + WriteError("No call method available"); return ST_PORTERR; } @@ -146,7 +146,7 @@ int call(faddr *addr) * First see if this node can be reached over the internet and * that internet calls are allowed. */ - if (nlent->iflags && ((localoptions & NOTCP) == 0)) { + if (nlent->iflags && ((localoptions & NOIBN & NOITN & NOIFC) == 0)) { if (!inetaddr) { Syslog('d', "Trying to find IP address..."); /* @@ -194,18 +194,20 @@ int call(faddr *addr) * from the nodelist. If it fails, fallback to dial. * Priority IBN, IFC, ITN. */ - if (nlent->iflags & IP_IBN) + if ((nlent->iflags & IP_IBN) && ((localoptions & NOIBN) == 0)) { tcp_mode = TCPMODE_IBN; - else if (nlent->iflags & IP_IFC) + Syslog('d', "TCP/IP mode set to IBN"); + } else if ((nlent->iflags & IP_IFC) && ((localoptions & NOIFC) == 0)) { tcp_mode = TCPMODE_IFC; - else if (nlent->iflags & IP_ITN) + Syslog('d', "TCP/IP mode set to IFC"); + } else if ((nlent->iflags & IP_ITN) && ((localoptions & NOITN) == 0)) { tcp_mode = TCPMODE_ITN; - else { + Syslog('d', "TCP/IP mode seto to ITN"); + } else { Syslog('+', "No common TCP/IP protocols for node %s", nlent->name); free(inetaddr); inetaddr = NULL; } - Syslog('d', "TCP mode set to %d", tcp_mode); } } else { WriteError("No IP address, abort call"); diff --git a/mbcico/dietifna.c b/mbcico/dietifna.c index db643577..dc2e90c7 100644 --- a/mbcico/dietifna.c +++ b/mbcico/dietifna.c @@ -1,11 +1,10 @@ /***************************************************************************** * - * File ..................: mbcico/dietifna.c + * $Id$ * Purpose ...............: Fidonet mailer - * Last modification date : 01-Feb-2000 * ***************************************************************************** - * Copyright (C) 1997-2000 + * Copyright (C) 1997-2002 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -87,10 +86,10 @@ int txdietifna(void) Syslog('+', "Start DietIFNA session"); session_flags |= SESSION_IFNA; session_flags &= ~SESSION_BARK; - if (localoptions & NOHOLD) +// if (localoptions & NOHOLD) nonhold_mail = (char *)ALL_MAIL; - else - nonhold_mail = (char *)NONHOLD_MAIL; +// else +// nonhold_mail = (char *)NONHOLD_MAIL; tosend = create_filelist(remote, nonhold_mail, 2); if ((rc = sendfiles(tosend)) == 0) diff --git a/mbcico/emsi.c b/mbcico/emsi.c index eaa17a1e..d9349228 100644 --- a/mbcico/emsi.c +++ b/mbcico/emsi.c @@ -77,8 +77,8 @@ int rx_emsi(char *data) Syslog('+', "Start inbound EMSI session"); emsi_local_lcodes = LCODE_RH1; - if (localoptions & NOPUA) - emsi_local_lcodes |= LCODE_PUP; +// if (localoptions & NOPUA) +// emsi_local_lcodes |= LCODE_PUP; emsi_remote_lcodes=0; emsi_local_protos=LOCAL_PROTOS; @@ -90,7 +90,7 @@ int rx_emsi(char *data) emsi_local_protos &= ~PROT_JAN; if (localoptions & NOHYDRA) emsi_local_protos &= ~PROT_HYD; - if ((localoptions & NOTCP) || ((session_flags & SESSION_TCP) == 0)) { + if ((localoptions & NOITN) || (localoptions & NOIFC) || ((session_flags & SESSION_TCP) == 0)) { emsi_local_protos &= ~PROT_TCP; } @@ -209,10 +209,10 @@ int tx_emsi(char *data) Syslog('+', "Start outbound EMSI session"); emsi_local_lcodes = LCODE_PUA | LCODE_RH1; - if (localoptions & NOPUA) { - emsi_local_lcodes |= LCODE_PUP; - emsi_local_lcodes &= ~LCODE_PUA; - } +// if (localoptions & NOPUA) { +// emsi_local_lcodes |= LCODE_PUP; +// emsi_local_lcodes &= ~LCODE_PUA; +// } emsi_remote_lcodes = 0; emsi_local_protos=LOCAL_PROTOS; @@ -224,7 +224,7 @@ int tx_emsi(char *data) emsi_local_protos &= ~PROT_JAN; if (localoptions & NOHYDRA) emsi_local_protos &= ~PROT_HYD; - if ((localoptions & NOTCP) || ((session_flags & SESSION_TCP) == 0)) { + if ((localoptions & NOIFC) || (localoptions & NOITN) || ((session_flags & SESSION_TCP) == 0)) { emsi_local_protos &= ~PROT_TCP; } emsi_remote_protos=0; diff --git a/mbcico/ftsc.c b/mbcico/ftsc.c index 47ca1e0e..4cbdbfc3 100644 --- a/mbcico/ftsc.c +++ b/mbcico/ftsc.c @@ -120,10 +120,10 @@ SM_EDECL char *nonhold_mail; int mailsent = FALSE, mailrcvd = FALSE; - if (localoptions & NOHOLD) +// if (localoptions & NOHOLD) nonhold_mail = (char *)ALL_MAIL; - else - nonhold_mail = (char *)NONHOLD_MAIL; +// else +// nonhold_mail = (char *)NONHOLD_MAIL; tosend = create_filelist(remote,nonhold_mail,2); Syslog('s', "txftsc SEND_MAIL"); diff --git a/mbcico/hydra.c b/mbcico/hydra.c index 660d00df..f64432b5 100644 --- a/mbcico/hydra.c +++ b/mbcico/hydra.c @@ -1615,10 +1615,10 @@ int hydra(int role) } if (role) { - if (localoptions & NOHOLD) +// if (localoptions & NOHOLD) nonhold_mail = (char *)ALL_MAIL; - else - nonhold_mail = (char *)NONHOLD_MAIL; +// else +// nonhold_mail = (char *)NONHOLD_MAIL; } else { nonhold_mail = (char *)ALL_MAIL; } diff --git a/mbcico/rdoptions.c b/mbcico/rdoptions.c index cf94f67e..e142590f 100644 --- a/mbcico/rdoptions.c +++ b/mbcico/rdoptions.c @@ -46,15 +46,15 @@ static struct _ktab { int flag; } ktab[] = { {(char *)"Call", NOCALL}, - {(char *)"Hold", NOHOLD}, - {(char *)"PUA", NOPUA}, {(char *)"WaZOO", NOWAZOO}, {(char *)"EMSI", NOEMSI}, {(char *)"Freqs", NOFREQS}, {(char *)"Zmodem", NOZMODEM}, {(char *)"ZedZap", NOZEDZAP}, {(char *)"Hydra", NOHYDRA}, - {(char *)"Tcp", NOTCP}, + {(char *)"IBN", NOIBN}, + {(char *)"ITN", NOITN}, + {(char *)"IFC", NOIFC}, {NULL, 0} }; @@ -85,10 +85,6 @@ void rdoptions(int Loaded) localoptions |= NOFREQS; if (CFG.NoCall) localoptions |= NOCALL; - if (CFG.NoHold) - localoptions |= NOHOLD; - if (CFG.NoPUA) - localoptions |= NOPUA; if (CFG.NoEMSI) localoptions |= NOEMSI; if (CFG.NoWazoo) @@ -99,8 +95,12 @@ void rdoptions(int Loaded) localoptions |= NOZEDZAP; if (CFG.NoHydra) localoptions |= NOHYDRA; - if (CFG.NoTCP) - localoptions |= NOTCP; + if (CFG.NoIBN) + localoptions |= NOIBN; + if (CFG.NoITN) + localoptions |= NOITN; + if (CFG.NoIFC) + localoptions |= NOIFC; if (nodes.Aka[0].zone == 0) { if (Loaded) @@ -119,18 +119,18 @@ void rdoptions(int Loaded) localoptions |= NOFREQS; if (nodes.NoCall) localoptions |= NOCALL; - if (nodes.NoHold) - localoptions |= NOHOLD; - if (nodes.NoPUA) - localoptions |= NOPUA; if (nodes.NoZmodem) localoptions |= NOZMODEM; if (nodes.NoZedzap) localoptions |= NOZEDZAP; if (nodes.NoHydra) localoptions |= NOHYDRA; - if (nodes.NoTCP) - localoptions |= NOTCP; + if (nodes.NoIBN) + localoptions |= NOIBN; + if (nodes.NoITN) + localoptions |= NOITN; + if (nodes.NoIFC) + localoptions |= NOIFC; logoptions(); } diff --git a/mbcico/session.h b/mbcico/session.h index f2e87c2d..e4b24031 100644 --- a/mbcico/session.h +++ b/mbcico/session.h @@ -1,3 +1,5 @@ +/* $Id$ */ + #ifndef _SESSION_H #define _SESSION_H @@ -29,7 +31,7 @@ typedef struct _file_list { #define HOLD_MAIL "h" #define NONHOLD_MAIL "ico" -#define ALL_MAIL "coh" +#define ALL_MAIL "icoh" extern int session_flags; extern int remote_flags; @@ -49,8 +51,8 @@ extern int remote_flags; extern int localoptions; #define NOCALL 0x0001 -#define NOHOLD 0x0002 -#define NOPUA 0x0004 +// #define NOHOLD 0x0002 +// #define NOPUA 0x0004 #define NOWAZOO 0x0008 #define NOEMSI 0x0010 #define NOFREQS 0x0020 @@ -58,7 +60,9 @@ extern int localoptions; #define NOZEDZAP 0x0080 #define NOJANUS 0x0100 #define NOHYDRA 0x0200 -#define NOTCP 0x0400 +#define NOIBN 0x0400 +#define NOITN 0x0800 +#define NOIFC 0x1000 struct _history history; /* History record for sessions */ diff --git a/mbcico/tcp.c b/mbcico/tcp.c index 0e842df7..d0f6f3ef 100644 --- a/mbcico/tcp.c +++ b/mbcico/tcp.c @@ -1,11 +1,10 @@ /***************************************************************************** * - * File ..................: mbcico/tcp.c + * $Id$ * Purpose ...............: Fidonet mailer - * Last modification date : 01-Feb-2000 * ***************************************************************************** - * Copyright (C) 1997-2000 + * Copyright (C) 1997-2002 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -106,10 +105,10 @@ int txtcp(void) Syslog('+', "Start TCP session"); - if (localoptions & NOHOLD) +// if (localoptions & NOHOLD) nonhold_mail = (char *)ALL_MAIL; - else - nonhold_mail = (char *)NONHOLD_MAIL; +// else +// nonhold_mail = (char *)NONHOLD_MAIL; if (emsi_remote_lcodes & LCODE_HAT) { Syslog('+', "Remote asked to \"hold all traffic\", no send"); tosend=NULL; diff --git a/mbcico/wazoo.c b/mbcico/wazoo.c index c26124ed..85eb6e7e 100644 --- a/mbcico/wazoo.c +++ b/mbcico/wazoo.c @@ -1,11 +1,10 @@ /***************************************************************************** * - * File ..................: mbcico/wazoo.c + * $Id$ * Purpose ...............: Fidonet mailer - * Last modification date : 01-Feb-2000 * ***************************************************************************** - * Copyright (C) 1997-2000 + * Copyright (C) 1997-2002 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -100,10 +99,10 @@ int txwazoo(void) char *nonhold_mail; Syslog('+', "Start WaZOO session"); - if (localoptions & NOHOLD) +// if (localoptions & NOHOLD) nonhold_mail = (char *)ALL_MAIL; - else - nonhold_mail = (char *)NONHOLD_MAIL; +// else +// nonhold_mail = (char *)NONHOLD_MAIL; if (emsi_remote_lcodes & LCODE_HAT) { Syslog('+', "Remote asked to \"hold all traffic\", no send"); tosend = NULL; diff --git a/mbsetup/m_global.c b/mbsetup/m_global.c index 85f7252c..387f4053 100644 --- a/mbsetup/m_global.c +++ b/mbsetup/m_global.c @@ -1255,15 +1255,15 @@ void s_mailer(void) mvprintw(13, 2, "7. Dial delay"); mvprintw(14, 2, "8. No Filerequests"); mvprintw(15, 2, "9. No callout"); - mvprintw(16, 2, "10. No Hold mail"); - mvprintw(17, 2, "11. No pickup all"); + mvprintw(16, 2, "10. No EMSI session"); + mvprintw(17, 2, "11. No Yooho/2U2"); - mvprintw(12,31, "12. No EMSI session"); - mvprintw(13,31, "13. No Yooho/2U2"); - mvprintw(14,31, "14. No Zmodem"); - mvprintw(15,31, "15. No Zedzap"); - mvprintw(16,31, "16. No Hydra"); - mvprintw(17,31, "17. No TCP/IP"); + mvprintw(12,31, "12. No Zmodem"); + mvprintw(13,31, "13. No Zedzap"); + mvprintw(14,31, "14. No Hydra"); + mvprintw(15,31, "15. No IBN binkp"); + mvprintw(16,31, "16. No IFC ifcico"); + mvprintw(17,31, "17. No ITN telnet"); mvprintw(12,59, "18. Phonetrans 1-10"); mvprintw(13,59, "19. Phonetrans 11-20"); @@ -1322,15 +1322,15 @@ void e_mailer(void) show_int( 13,23, CFG.dialdelay); show_bool(14,23, CFG.NoFreqs); show_bool(15,23, CFG.NoCall); - show_bool(16,23, CFG.NoHold); - show_bool(17,23, CFG.NoPUA); + show_bool(16,23, CFG.NoEMSI); + show_bool(17,23, CFG.NoWazoo); - show_bool(12,52, CFG.NoEMSI); - show_bool(13,52, CFG.NoWazoo); - show_bool(14,52, CFG.NoZmodem); - show_bool(15,52, CFG.NoZedzap); - show_bool(16,52, CFG.NoHydra); - show_bool(17,52, CFG.NoTCP); + show_bool(12,52, CFG.NoZmodem); + show_bool(13,52, CFG.NoZedzap); + show_bool(14,52, CFG.NoHydra); + show_bool(15,52, CFG.NoIBN); + show_bool(16,52, CFG.NoIFC); + show_bool(17,52, CFG.NoITN); show_int( 16,75, CFG.Req_Files); show_int( 17,75, CFG.Req_MBytes); @@ -1346,15 +1346,16 @@ void e_mailer(void) case 7: E_INT( 13,23, CFG.dialdelay, "The ^random dialdelay^ in seconds ((^n^ <= delay) and (^n^ > (delay / 10)))") case 8: E_BOOL(14,23, CFG.NoFreqs, "Set to true if ^No Filerequests^ are allowed") case 9: E_BOOL(15,23, CFG.NoCall, "Set to true if ^No Calls^ are allowed") - case 10:E_BOOL(16,23, CFG.NoHold, "Set to true if we send ^Hold packets^ when we initiate the session") - case 11:E_BOOL(17,23, CFG.NoPUA, "Set to true for ^pickup mail^ only from the primary address") + case 10:E_BOOL(16,23, CFG.NoEMSI, "If set then ^EMSI handshake^ is diabled") + case 11:E_BOOL(17,23, CFG.NoWazoo, "If set then ^YooHoo/2U2^ (FTSC-0006) is disabled") + + case 12:E_BOOL(12,52, CFG.NoZmodem, "If set then the ^Zmodem^ protocol is disabled") + case 13:E_BOOL(13,52, CFG.NoZedzap, "If set then the ^Zedzap^ protocol is disabled") + case 14:E_BOOL(14,52, CFG.NoHydra, "If set then the ^Hydra^ protocol is disabled") + case 15:E_BOOL(15,52, CFG.NoIBN, "If set then the ^TCP/IP IBN binkp^ protocol is disabled") + case 16:E_BOOL(16,52, CFG.NoIFC, "If set then the ^TCP/IP IFC ifcico^ protocol is disabled") + case 17:E_BOOL(17,52, CFG.NoITN, "If set then the ^TCP/IP ITN telnet^ protocol is disabled") - case 12:E_BOOL(12,52, CFG.NoEMSI, "If set then ^EMSI handshake^ is diabled") - case 13:E_BOOL(13,52, CFG.NoWazoo, "If set then ^YooHoo/2U2^ (FTSC-0006) is disabled") - case 14:E_BOOL(14,52, CFG.NoZmodem, "If set then the ^Zmodem^ protocol is disabled") - case 15:E_BOOL(15,52, CFG.NoZedzap, "If set then the ^Zedzap^ protocol is disabled") - case 16:E_BOOL(16,52, CFG.NoHydra, "If set then the ^Hydra^ protocol is disabled") - case 17:E_BOOL(17,52, CFG.NoTCP, "If set then the ^TCP/IP^ protocol is disabled"); case 18:e_trans(0); break; case 19:e_trans(10); @@ -2001,14 +2002,14 @@ int global_doc(FILE *fp, FILE *toc, int page) fprintf(fp, " TCP/IP flags %s\n", CFG.Flags); fprintf(fp, " No Filerequests %s\n", getboolean(CFG.NoFreqs)); fprintf(fp, " No Calls %s\n", getboolean(CFG.NoCall)); - fprintf(fp, " No Hold %s\n", getboolean(CFG.NoHold)); - fprintf(fp, " No Pickup All %s\n", getboolean(CFG.NoPUA)); fprintf(fp, " No EMSI %s\n", getboolean(CFG.NoEMSI)); fprintf(fp, " No YooHoo/2U2 %s\n", getboolean(CFG.NoWazoo)); fprintf(fp, " No Zmodem %s\n", getboolean(CFG.NoZmodem)); fprintf(fp, " No Zedzap %s\n", getboolean(CFG.NoZedzap)); fprintf(fp, " No Hydra %s\n", getboolean(CFG.NoHydra)); - fprintf(fp, " No TCP/IP %s\n", getboolean(CFG.NoTCP)); + fprintf(fp, " No TCP/IP IBN %s\n", getboolean(CFG.NoIBN)); + fprintf(fp, " No TCP/IP IFC %s\n", getboolean(CFG.NoIFC)); + fprintf(fp, " No TCP/IP ITN %s\n", getboolean(CFG.NoITN)); fprintf(fp, " Max request files %d\n", CFG.Req_Files); fprintf(fp, " Max request MBytes %d\n", CFG.Req_MBytes); diff --git a/mbsetup/m_node.c b/mbsetup/m_node.c index 63605a3c..14180079 100644 --- a/mbsetup/m_node.c +++ b/mbsetup/m_node.c @@ -640,12 +640,12 @@ void NScreen(void) mvprintw(10,51, "20. No YooHoo/2U2"); mvprintw(11,51, "21. No Filerequest"); mvprintw(12,51, "22. Don't call"); - mvprintw(13,51, "23. No Hold mail"); - mvprintw(14,51, "24. Pickup primary"); - mvprintw(15,51, "25. No Zmodem"); - mvprintw(16,51, "26. No Zedzap"); - mvprintw(17,51, "27. No Hydra"); - mvprintw(18,51, "28. No TCP/IP"); + mvprintw(13,51, "23. No Zmodem"); + mvprintw(14,51, "24. No Zedzap"); + mvprintw(15,51, "25. No Hydra"); + mvprintw(16,51, "26. No TCP/IP IBN"); + mvprintw(17,51, "27. No TCP/IP IFC"); + mvprintw(18,51, "28. No TCP/IP ITN"); mvprintw(19,51, "29. 8.3 names"); } @@ -770,12 +770,12 @@ int EditNodeRec(int Area) show_bool(10,70, nodes.NoWaZOO); show_bool(11,70, nodes.NoFreqs); show_bool(12,70, nodes.NoCall); - show_bool(13,70, nodes.NoHold); - show_bool(14,70, nodes.NoPUA); - show_bool(15,70, nodes.NoZmodem); - show_bool(16,70, nodes.NoZedzap); - show_bool(17,70, nodes.NoHydra); - show_bool(18,70, nodes.NoTCP); + show_bool(13,70, nodes.NoZmodem); + show_bool(14,70, nodes.NoZedzap); + show_bool(15,70, nodes.NoHydra); + show_bool(16,70, nodes.NoIBN); + show_bool(17,70, nodes.NoIFC); + show_bool(18,70, nodes.NoITN); show_bool(19,70, nodes.FNC); switch(select_menu(29)) { @@ -881,12 +881,12 @@ int EditNodeRec(int Area) case 20:E_BOOL(10,70, nodes.NoWaZOO, "Disable ^YooHoo/2U2 handshake^ (FTSC-0006) with this node") case 21:E_BOOL(11,70, nodes.NoFreqs, "Disallow ^file requests^ from this node") case 22:E_BOOL(12,70, nodes.NoCall, "Don't ^call^ this node") - case 23:E_BOOL(13,70, nodes.NoHold, "Don't ^hold hold-mail^ when we call (no = only pickup)") - case 24:E_BOOL(14,70, nodes.NoPUA, "Only pickup mail from the ^primary^ address") - case 25:E_BOOL(15,70, nodes.NoZmodem, "Disable ^Zmodem^ protocol with this node") - case 26:E_BOOL(16,70, nodes.NoZedzap, "Disable ^Zedzap^ protocol with this node") - case 27:E_BOOL(17,70, nodes.NoHydra, "Disable ^Hydra^ protocol with this node") - case 28:E_BOOL(18,70, nodes.NoTCP, "Disable ^TCP/IP^ protocol with this node") + case 23:E_BOOL(13,70, nodes.NoZmodem, "Disable ^Zmodem^ protocol with this node") + case 24:E_BOOL(14,70, nodes.NoZedzap, "Disable ^Zedzap^ protocol with this node") + case 25:E_BOOL(15,70, nodes.NoHydra, "Disable ^Hydra^ protocol with this node") + case 26:E_BOOL(16,70, nodes.NoIBN, "Disable ^TCP/IP IBN binkp^ protocol with this node") + case 27:E_BOOL(17,70, nodes.NoIFC, "Disable ^TCP/IP IFC ifcico^ protocol with this node") + case 28:E_BOOL(18,70, nodes.NoITN, "Disable ^TCP/IP ITN telnet^ protocol with this node") case 29:E_BOOL(19,70, nodes.FNC, "Node needs ^DOS 8.3^ filenames") } } @@ -1185,12 +1185,12 @@ int node_doc(FILE *fp, FILE *toc, int page) fprintf(fp, " No YooHoo/2U2 %s\n", getboolean(nodes.NoWaZOO)); fprintf(fp, " No Requests %s", getboolean(nodes.NoFreqs)); fprintf(fp, " Don't call %s", getboolean(nodes.NoCall)); - fprintf(fp, " No hold mail %s\n", getboolean(nodes.NoHold)); - fprintf(fp, " No Pickup all %s", getboolean(nodes.NoPUA)); - fprintf(fp, " No Zmodem %s", getboolean(nodes.NoZmodem)); - fprintf(fp, " No Zedzap %s\n", getboolean(nodes.NoZedzap)); + fprintf(fp, " No Zmodem %s\n", getboolean(nodes.NoZmodem)); + fprintf(fp, " No Zedzap %s", getboolean(nodes.NoZedzap)); fprintf(fp, " No Hydra %s", getboolean(nodes.NoHydra)); - fprintf(fp, " No TCP/IP %s", getboolean(nodes.NoTCP)); + fprintf(fp, " No TCP/IP IBN %s\n", getboolean(nodes.NoIBN)); + fprintf(fp, " No TCP/IP IFC %s", getboolean(nodes.NoIFC)); + fprintf(fp, " No TCP/IP ITN %s", getboolean(nodes.NoITN)); fprintf(fp, " Pack Netmail %s\n", getboolean(nodes.PackNetmail)); fprintf(fp, " ARCmail comp. %s", getboolean(nodes.ARCmailCompat)); fprintf(fp, " ACRmail a..z %s", getboolean(nodes.ARCmailAlpha)); diff --git a/mbtask/outstat.c b/mbtask/outstat.c index 6a3982cc..38fabe3c 100644 --- a/mbtask/outstat.c +++ b/mbtask/outstat.c @@ -388,7 +388,7 @@ int outstat() if ((tmp->flavors) & F_CALL) { tmp->callmode = CM_NONE; - if (TCFG.max_tcp && !nodes.NoTCP && + if (TCFG.max_tcp && !(nodes.NoIBN && nodes.NoIFC && nodes.NoITN) && ((tmp->ipflags & IP_IBN) || (tmp->ipflags & IP_IFC) || (tmp->ipflags & IP_ITN))) { inet_calls++; tmp->callmode = CM_INET;