bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Splitted TCP settings into IBN, IFC and ITN

Browse Source
This commit is contained in:
Michiel Broek 2002-04-06 14:04:41 +00:00
parent 56ea18bebf
commit f590b8f31f
19 changed files with 145 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -4602,6 +4602,8 @@ v0.33.20 10-Feb-2002
Added the turbodiesel macro language so that reports can be Added the turbodiesel macro language so that reports can be
customized per language and reports. Thanks to Redy Rodriguez customized per language and reports. Thanks to Redy Rodriguez
for finding this one and implement it into mbse bbs. 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: common.a:
Added 2 functions to return the OS name and CPU family. Added 2 functions to return the OS name and CPU family.
@ -4639,6 +4641,8 @@ v0.33.20 10-Feb-2002
during init. during init.
When adding a new newfiles or filefind record some defaults When adding a new newfiles or filefind record some defaults
are automatic filled in. are automatic filled in.
Splitted no TCP into no IBN, no IFC and no ITN in global and
nodes setup.
mbfido: mbfido:
In AreaMgr and FileMgr changed aka matching for area 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 new sessions if the limit from the setup is reached. This will
hopefully prevent that mbcico will use too much bandwidth on hopefully prevent that mbcico will use too much bandwidth on
TCP/IP trafic. TCP/IP trafic.
Splitted no TCP settings in no IBN, no IFC and no ITN.
mbcico: mbcico:
Fixed binkp driver to accept incoming unprotected sessions. Fixed binkp driver to accept incoming unprotected sessions.
@ -4739,6 +4744,8 @@ v0.33.20 10-Feb-2002
test now. test now.
Registers TCP/IP sessions with mbtask. Registers TCP/IP sessions with mbtask.
All filetransfer times and cps rates are calculated in mSecs. 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: mbout:
The status display has now 9 digits for the outbound size. The status display has now 9 digits for the outbound size.

BIN
examples/templates.tar
View File

Binary file not shown.

2
html/Makefile
View File

@ -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/go_to.gif images/nodelist3.gif images/tty2.gif \
images/hatch.gif images/nodelist4.gif images/tty3.gif \ images/hatch.gif images/nodelist4.gif images/tty3.gif \
images/language.gif images/nodelist5.gif images/uarrow.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/mbse.jpg images/taskmgr.png images/mbsebbs.gif \
images/mbsebbs.png images/users2.png images/hand.up.gif \ images/mbsebbs.png images/users2.png images/hand.up.gif \
images/dream1.png images/dream2.png images/dream3.png \ images/dream1.png images/dream2.png images/dream3.png \

8
html/setup/global.html
View File

@ -12,7 +12,7 @@
</HEAD> </HEAD>
<BODY> <BODY>
<BLOCKQUOTE> <BLOCKQUOTE>
<h5>Last update 06-Mar-2002</h5> <h5>Last update 06-Apr-2002</h5>
<P>&nbsp;<P> <P>&nbsp;<P>
<H1>MBSE BBS Setup - Global Setup</H1> <H1>MBSE BBS Setup - Global Setup</H1>
@ -388,14 +388,14 @@ carrier select functions.
<strong>Dial delay </strong>The maximum delay between calls, minimum is 10 seconds. <strong>Dial delay </strong>The maximum delay between calls, minimum is 10 seconds.
<strong>No Filerquests </strong>Disable filerequests <strong>No Filerquests </strong>Disable filerequests
<strong>No callout </strong>Disable callout <strong>No callout </strong>Disable callout
<strong>No hold mail </strong>Send &quot;hold&quot; mail if we make the call
<strong>No pickup all </strong>Exchange mail for one aka only
<strong>No EMSI session </strong>Disable EMSI <strong>No EMSI session </strong>Disable EMSI
<strong>No YooHoo/2U2 </strong>Disable FTS-0006 sessions <strong>No YooHoo/2U2 </strong>Disable FTS-0006 sessions
<strong>No Zmodem </strong>Disable zmodem protocol <strong>No Zmodem </strong>Disable zmodem protocol
<strong>No Zedzap </strong>Disable zedzap protocol <strong>No Zedzap </strong>Disable zedzap protocol
<strong>No Hydra </strong>Disable Hydra protocol <strong>No Hydra </strong>Disable Hydra protocol
<strong>No TCP/IP </strong>Disable TCP/IP protocol, set to Yes if you don't have internet. <strong>No TCP/IP IBN </strong>Disable TCP/IP IBN (binkp) protocol.
<strong>No TCP/IP IFC </strong>Disable TCP/IP IFC (ifcico) protocol.
<strong>No TCP/IP ITN </strong>Disable TCP/IP ITN (telnet) protocol.
<strong>Phonetrans 1..40 </strong>Maximum 40 phone number translations <strong>Phonetrans 1..40 </strong>Maximum 40 phone number translations
<strong>Max. files </strong>Maximum files to request, 0 is unlimited <strong>Max. files </strong>Maximum files to request, 0 is unlimited
<strong>Max. MBytes </strong>Maximum MBytes to request, 0 is unlimited <strong>Max. MBytes </strong>Maximum MBytes to request, 0 is unlimited

10
html/setup/nodes.html
View File

@ -12,7 +12,7 @@
</HEAD> </HEAD>
<BODY> <BODY>
<BLOCKQUOTE> <BLOCKQUOTE>
<h5>Last update 17-Feb-2002</h5> <h5>Last update 06-Apr-2002</h5>
<P>&nbsp;<P> <P>&nbsp;<P>
<H1>MBSE BBS Setup - Fidonet nodes.</H1> <H1>MBSE BBS Setup - Fidonet nodes.</H1>
@ -58,16 +58,16 @@ you can setup the aka's, mail, files and session handshake.
<strong>No YooHoo/2U2 </strong>Disable FTSC-0006 handshake. <strong>No YooHoo/2U2 </strong>Disable FTSC-0006 handshake.
<strong>No Filerequest </strong>Disable filerquest from this node. <strong>No Filerequest </strong>Disable filerquest from this node.
<strong>Don't call </strong>Do not call this node. <strong>Don't call </strong>Do not call this node.
<strong>No Hold mail </strong>Only pickup mail if we call, send nothing.
<strong>Pickup primary </strong>Only exchange mail for one Aka.
<strong>No Zmodem </strong>Disable Zmodem protocol. <strong>No Zmodem </strong>Disable Zmodem protocol.
<strong>No Zedzap </strong>Disable Zedzap protocol. <strong>No Zedzap </strong>Disable Zedzap protocol.
<strong>No Hydra </strong>Disable Hydra protocol. <strong>No Hydra </strong>Disable Hydra protocol.
<strong>No TCP/IP </strong>Disbale TCP/IP protocol, forces dial only. <strong>No TCP/IP IBN </strong>Disbale TCP/IP IBN (binkp) protocol.
<strong>No TCP/IP IFC </strong>Disable TCP/IP IFC (ifcico) protocol.
<strong>No TCP/IP ITN </strong>Disable TCP/IP ITN (telnet) protocol.
<strong>8.3 names </strong>Set this if the node only accepts 8.3 filenames. <strong>8.3 names </strong>Set this if the node only accepts 8.3 filenames.
</pre> </pre>
<P> <P>
<IMG SRC="../images/nodes.gif"> <IMG SRC="../images/nodes.png">
<P>&nbsp;<p> <P>&nbsp;<p>
<H3>Mail setup</H3> <H3>Mail setup</H3>

18
lib/structs.h
View File

@ -705,15 +705,19 @@ struct sysconfig {
long dialdelay; /* Delay between calls */ long dialdelay; /* Delay between calls */
unsigned NoFreqs : 1; /* Don't allow requests */ unsigned NoFreqs : 1; /* Don't allow requests */
unsigned NoCall : 1; /* Don't call */ unsigned NoCall : 1; /* Don't call */
unsigned NoHold : 1; /* Don't send hold mail */ unsigned xNoHold : 1;
unsigned NoPUA : 1; /* Don't Pickup All */ unsigned xNoPUA : 1;
unsigned NoEMSI : 1; /* Don't do EMSI */ unsigned NoEMSI : 1; /* Don't do EMSI */
unsigned NoWazoo : 1; /* Don't do Yooho/2U2 */ unsigned NoWazoo : 1; /* Don't do Yooho/2U2 */
unsigned NoZmodem : 1; /* Don't do Zmodem */ unsigned NoZmodem : 1; /* Don't do Zmodem */
unsigned NoZedzap : 1; /* Don't do Zedzap */ unsigned NoZedzap : 1; /* Don't do Zedzap */
unsigned xNoJanus : 1; unsigned xNoJanus : 1;
unsigned NoHydra : 1; /* Don't do Hydra */ 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 */ char Phone[21]; /* Default phonenumber */
unsigned long Speed; /* Default linespeed */ unsigned long Speed; /* Default linespeed */
char Flags[31]; /* Default EMSI flags */ char Flags[31]; /* Default EMSI flags */
@ -1183,18 +1187,20 @@ struct _nodes {
unsigned NoFreqs : 1; /* Don't allow requests */ unsigned NoFreqs : 1; /* Don't allow requests */
unsigned NoCall : 1; /* Don't call this node */ unsigned NoCall : 1; /* Don't call this node */
unsigned NoHold : 1; /* Don't send hold mail */ unsigned xNoHold : 1;
unsigned NoPUA : 1; /* Don't pickup all */ unsigned xNoPUA : 1;
unsigned NoZmodem : 1; /* Don't use Zmodem */ unsigned NoZmodem : 1; /* Don't use Zmodem */
unsigned NoZedzap : 1; /* Don't use Zedzap */ unsigned NoZedzap : 1; /* Don't use Zedzap */
unsigned xNoJanus : 1; /* Don't use Janus */ unsigned xNoJanus : 1; /* Don't use Janus */
unsigned NoHydra : 1; /* Don't use Hydra */ 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 PackNetmail : 1; /* Pack netmail */
unsigned ARCmailCompat : 1; /* ARCmail Compatibility */ unsigned ARCmailCompat : 1; /* ARCmail Compatibility */
unsigned ARCmailAlpha : 1; /* Allow a..z ARCmail name */ unsigned ARCmailAlpha : 1; /* Allow a..z ARCmail name */
unsigned FNC : 1; /* Node needs 8.3 filenames*/ 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]; char xExtra[94];
time_t StartDate; /* Node start date */ time_t StartDate; /* Node start date */

6
mbcico/binkp.c
View File

@ -117,10 +117,10 @@ int binkp(int role)
} }
if (role) { if (role) {
if (localoptions & NOHOLD) // if (localoptions & NOHOLD)
nonhold_mail = (char *)ALL_MAIL; nonhold_mail = (char *)ALL_MAIL;
else // else
nonhold_mail = (char *)NONHOLD_MAIL; // nonhold_mail = (char *)NONHOLD_MAIL;
} else { } else {
nonhold_mail = (char *)ALL_MAIL; nonhold_mail = (char *)ALL_MAIL;
} }

16
mbcico/call.c
View File

@ -91,7 +91,7 @@ int portopen(faddr *addr)
} }
} }
WriteError("call.c portopen(): should not be here"); WriteError("No call method available");
return ST_PORTERR; return ST_PORTERR;
} }
@ -146,7 +146,7 @@ int call(faddr *addr)
* First see if this node can be reached over the internet and * First see if this node can be reached over the internet and
* that internet calls are allowed. * that internet calls are allowed.
*/ */
if (nlent->iflags && ((localoptions & NOTCP) == 0)) { if (nlent->iflags && ((localoptions & NOIBN & NOITN & NOIFC) == 0)) {
if (!inetaddr) { if (!inetaddr) {
Syslog('d', "Trying to find IP address..."); Syslog('d', "Trying to find IP address...");
/* /*
@ -194,18 +194,20 @@ int call(faddr *addr)
* from the nodelist. If it fails, fallback to dial. * from the nodelist. If it fails, fallback to dial.
* Priority IBN, IFC, ITN. * Priority IBN, IFC, ITN.
*/ */
if (nlent->iflags & IP_IBN) if ((nlent->iflags & IP_IBN) && ((localoptions & NOIBN) == 0)) {
tcp_mode = TCPMODE_IBN; 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; 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; 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); Syslog('+', "No common TCP/IP protocols for node %s", nlent->name);
free(inetaddr); free(inetaddr);
inetaddr = NULL; inetaddr = NULL;
} }
Syslog('d', "TCP mode set to %d", tcp_mode);
} }
} else { } else {
WriteError("No IP address, abort call"); WriteError("No IP address, abort call");

11
mbcico/dietifna.c
View File

@ -1,11 +1,10 @@
/***************************************************************************** /*****************************************************************************
* *
* File ..................: mbcico/dietifna.c * $Id$
* Purpose ...............: Fidonet mailer * Purpose ...............: Fidonet mailer
* Last modification date : 01-Feb-2000
* *
***************************************************************************** *****************************************************************************
* Copyright (C) 1997-2000 * Copyright (C) 1997-2002
* *
* Michiel Broek FIDO: 2:280/2802 * Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10 * Beekmansbos 10
@ -87,10 +86,10 @@ int txdietifna(void)
Syslog('+', "Start DietIFNA session"); Syslog('+', "Start DietIFNA session");
session_flags |= SESSION_IFNA; session_flags |= SESSION_IFNA;
session_flags &= ~SESSION_BARK; session_flags &= ~SESSION_BARK;
if (localoptions & NOHOLD) // if (localoptions & NOHOLD)
nonhold_mail = (char *)ALL_MAIL; nonhold_mail = (char *)ALL_MAIL;
else // else
nonhold_mail = (char *)NONHOLD_MAIL; // nonhold_mail = (char *)NONHOLD_MAIL;
tosend = create_filelist(remote, nonhold_mail, 2); tosend = create_filelist(remote, nonhold_mail, 2);
if ((rc = sendfiles(tosend)) == 0) if ((rc = sendfiles(tosend)) == 0)

16
mbcico/emsi.c
View File

@ -77,8 +77,8 @@ int rx_emsi(char *data)
Syslog('+', "Start inbound EMSI session"); Syslog('+', "Start inbound EMSI session");
emsi_local_lcodes = LCODE_RH1; emsi_local_lcodes = LCODE_RH1;
if (localoptions & NOPUA) // if (localoptions & NOPUA)
emsi_local_lcodes |= LCODE_PUP; // emsi_local_lcodes |= LCODE_PUP;
emsi_remote_lcodes=0; emsi_remote_lcodes=0;
emsi_local_protos=LOCAL_PROTOS; emsi_local_protos=LOCAL_PROTOS;
@ -90,7 +90,7 @@ int rx_emsi(char *data)
emsi_local_protos &= ~PROT_JAN; emsi_local_protos &= ~PROT_JAN;
if (localoptions & NOHYDRA) if (localoptions & NOHYDRA)
emsi_local_protos &= ~PROT_HYD; 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; emsi_local_protos &= ~PROT_TCP;
} }
@ -209,10 +209,10 @@ int tx_emsi(char *data)
Syslog('+', "Start outbound EMSI session"); Syslog('+', "Start outbound EMSI session");
emsi_local_lcodes = LCODE_PUA | LCODE_RH1; emsi_local_lcodes = LCODE_PUA | LCODE_RH1;
if (localoptions & NOPUA) { // if (localoptions & NOPUA) {
emsi_local_lcodes |= LCODE_PUP; // emsi_local_lcodes |= LCODE_PUP;
emsi_local_lcodes &= ~LCODE_PUA; // emsi_local_lcodes &= ~LCODE_PUA;
} // }
emsi_remote_lcodes = 0; emsi_remote_lcodes = 0;
emsi_local_protos=LOCAL_PROTOS; emsi_local_protos=LOCAL_PROTOS;
@ -224,7 +224,7 @@ int tx_emsi(char *data)
emsi_local_protos &= ~PROT_JAN; emsi_local_protos &= ~PROT_JAN;
if (localoptions & NOHYDRA) if (localoptions & NOHYDRA)
emsi_local_protos &= ~PROT_HYD; 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_local_protos &= ~PROT_TCP;
} }
emsi_remote_protos=0; emsi_remote_protos=0;

6
mbcico/ftsc.c
View File

@ -120,10 +120,10 @@ SM_EDECL
char *nonhold_mail; char *nonhold_mail;
int mailsent = FALSE, mailrcvd = FALSE; int mailsent = FALSE, mailrcvd = FALSE;
if (localoptions & NOHOLD) // if (localoptions & NOHOLD)
nonhold_mail = (char *)ALL_MAIL; nonhold_mail = (char *)ALL_MAIL;
else // else
nonhold_mail = (char *)NONHOLD_MAIL; // nonhold_mail = (char *)NONHOLD_MAIL;
tosend = create_filelist(remote,nonhold_mail,2); tosend = create_filelist(remote,nonhold_mail,2);
Syslog('s', "txftsc SEND_MAIL"); Syslog('s', "txftsc SEND_MAIL");

6
mbcico/hydra.c
View File

@ -1615,10 +1615,10 @@ int hydra(int role)
} }
if (role) { if (role) {
if (localoptions & NOHOLD) // if (localoptions & NOHOLD)
nonhold_mail = (char *)ALL_MAIL; nonhold_mail = (char *)ALL_MAIL;
else // else
nonhold_mail = (char *)NONHOLD_MAIL; // nonhold_mail = (char *)NONHOLD_MAIL;
} else { } else {
nonhold_mail = (char *)ALL_MAIL; nonhold_mail = (char *)ALL_MAIL;
} }

30
mbcico/rdoptions.c
View File

@ -46,15 +46,15 @@ static struct _ktab {
int flag; int flag;
} ktab[] = { } ktab[] = {
{(char *)"Call", NOCALL}, {(char *)"Call", NOCALL},
{(char *)"Hold", NOHOLD},
{(char *)"PUA", NOPUA},
{(char *)"WaZOO", NOWAZOO}, {(char *)"WaZOO", NOWAZOO},
{(char *)"EMSI", NOEMSI}, {(char *)"EMSI", NOEMSI},
{(char *)"Freqs", NOFREQS}, {(char *)"Freqs", NOFREQS},
{(char *)"Zmodem", NOZMODEM}, {(char *)"Zmodem", NOZMODEM},
{(char *)"ZedZap", NOZEDZAP}, {(char *)"ZedZap", NOZEDZAP},
{(char *)"Hydra", NOHYDRA}, {(char *)"Hydra", NOHYDRA},
{(char *)"Tcp", NOTCP}, {(char *)"IBN", NOIBN},
{(char *)"ITN", NOITN},
{(char *)"IFC", NOIFC},
{NULL, 0} {NULL, 0}
}; };
@ -85,10 +85,6 @@ void rdoptions(int Loaded)
localoptions |= NOFREQS; localoptions |= NOFREQS;
if (CFG.NoCall) if (CFG.NoCall)
localoptions |= NOCALL; localoptions |= NOCALL;
if (CFG.NoHold)
localoptions |= NOHOLD;
if (CFG.NoPUA)
localoptions |= NOPUA;
if (CFG.NoEMSI) if (CFG.NoEMSI)
localoptions |= NOEMSI; localoptions |= NOEMSI;
if (CFG.NoWazoo) if (CFG.NoWazoo)
@ -99,8 +95,12 @@ void rdoptions(int Loaded)
localoptions |= NOZEDZAP; localoptions |= NOZEDZAP;
if (CFG.NoHydra) if (CFG.NoHydra)
localoptions |= NOHYDRA; localoptions |= NOHYDRA;
if (CFG.NoTCP) if (CFG.NoIBN)
localoptions |= NOTCP; localoptions |= NOIBN;
if (CFG.NoITN)
localoptions |= NOITN;
if (CFG.NoIFC)
localoptions |= NOIFC;
if (nodes.Aka[0].zone == 0) { if (nodes.Aka[0].zone == 0) {
if (Loaded) if (Loaded)
@ -119,18 +119,18 @@ void rdoptions(int Loaded)
localoptions |= NOFREQS; localoptions |= NOFREQS;
if (nodes.NoCall) if (nodes.NoCall)
localoptions |= NOCALL; localoptions |= NOCALL;
if (nodes.NoHold)
localoptions |= NOHOLD;
if (nodes.NoPUA)
localoptions |= NOPUA;
if (nodes.NoZmodem) if (nodes.NoZmodem)
localoptions |= NOZMODEM; localoptions |= NOZMODEM;
if (nodes.NoZedzap) if (nodes.NoZedzap)
localoptions |= NOZEDZAP; localoptions |= NOZEDZAP;
if (nodes.NoHydra) if (nodes.NoHydra)
localoptions |= NOHYDRA; localoptions |= NOHYDRA;
if (nodes.NoTCP) if (nodes.NoIBN)
localoptions |= NOTCP; localoptions |= NOIBN;
if (nodes.NoITN)
localoptions |= NOITN;
if (nodes.NoIFC)
localoptions |= NOIFC;
logoptions(); logoptions();
} }

12
mbcico/session.h
View File

@ -1,3 +1,5 @@
/* $Id$ */
#ifndef _SESSION_H #ifndef _SESSION_H
#define _SESSION_H #define _SESSION_H
@ -29,7 +31,7 @@ typedef struct _file_list {
#define HOLD_MAIL "h" #define HOLD_MAIL "h"
#define NONHOLD_MAIL "ico" #define NONHOLD_MAIL "ico"
#define ALL_MAIL "coh" #define ALL_MAIL "icoh"
extern int session_flags; extern int session_flags;
extern int remote_flags; extern int remote_flags;
@ -49,8 +51,8 @@ extern int remote_flags;
extern int localoptions; extern int localoptions;
#define NOCALL 0x0001 #define NOCALL 0x0001
#define NOHOLD 0x0002 // #define NOHOLD 0x0002
#define NOPUA 0x0004 // #define NOPUA 0x0004
#define NOWAZOO 0x0008 #define NOWAZOO 0x0008
#define NOEMSI 0x0010 #define NOEMSI 0x0010
#define NOFREQS 0x0020 #define NOFREQS 0x0020
@ -58,7 +60,9 @@ extern int localoptions;
#define NOZEDZAP 0x0080 #define NOZEDZAP 0x0080
#define NOJANUS 0x0100 #define NOJANUS 0x0100
#define NOHYDRA 0x0200 #define NOHYDRA 0x0200
#define NOTCP 0x0400 #define NOIBN 0x0400
#define NOITN 0x0800
#define NOIFC 0x1000
struct _history history; /* History record for sessions */ struct _history history; /* History record for sessions */

11
mbcico/tcp.c
View File

@ -1,11 +1,10 @@
/***************************************************************************** /*****************************************************************************
* *
* File ..................: mbcico/tcp.c * $Id$
* Purpose ...............: Fidonet mailer * Purpose ...............: Fidonet mailer
* Last modification date : 01-Feb-2000
* *
***************************************************************************** *****************************************************************************
* Copyright (C) 1997-2000 * Copyright (C) 1997-2002
* *
* Michiel Broek FIDO: 2:280/2802 * Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10 * Beekmansbos 10
@ -106,10 +105,10 @@ int txtcp(void)
Syslog('+', "Start TCP session"); Syslog('+', "Start TCP session");
if (localoptions & NOHOLD) // if (localoptions & NOHOLD)
nonhold_mail = (char *)ALL_MAIL; nonhold_mail = (char *)ALL_MAIL;
else // else
nonhold_mail = (char *)NONHOLD_MAIL; // nonhold_mail = (char *)NONHOLD_MAIL;
if (emsi_remote_lcodes & LCODE_HAT) { if (emsi_remote_lcodes & LCODE_HAT) {
Syslog('+', "Remote asked to \"hold all traffic\", no send"); Syslog('+', "Remote asked to \"hold all traffic\", no send");
tosend=NULL; tosend=NULL;

11
mbcico/wazoo.c
View File

@ -1,11 +1,10 @@
/***************************************************************************** /*****************************************************************************
* *
* File ..................: mbcico/wazoo.c * $Id$
* Purpose ...............: Fidonet mailer * Purpose ...............: Fidonet mailer
* Last modification date : 01-Feb-2000
* *
***************************************************************************** *****************************************************************************
* Copyright (C) 1997-2000 * Copyright (C) 1997-2002
* *
* Michiel Broek FIDO: 2:280/2802 * Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10 * Beekmansbos 10
@ -100,10 +99,10 @@ int txwazoo(void)
char *nonhold_mail; char *nonhold_mail;
Syslog('+', "Start WaZOO session"); Syslog('+', "Start WaZOO session");
if (localoptions & NOHOLD) // if (localoptions & NOHOLD)
nonhold_mail = (char *)ALL_MAIL; nonhold_mail = (char *)ALL_MAIL;
else // else
nonhold_mail = (char *)NONHOLD_MAIL; // nonhold_mail = (char *)NONHOLD_MAIL;
if (emsi_remote_lcodes & LCODE_HAT) { if (emsi_remote_lcodes & LCODE_HAT) {
Syslog('+', "Remote asked to \"hold all traffic\", no send"); Syslog('+', "Remote asked to \"hold all traffic\", no send");
tosend = NULL; tosend = NULL;

55
mbsetup/m_global.c
View File

@ -1255,15 +1255,15 @@ void s_mailer(void)
mvprintw(13, 2, "7. Dial delay"); mvprintw(13, 2, "7. Dial delay");
mvprintw(14, 2, "8. No Filerequests"); mvprintw(14, 2, "8. No Filerequests");
mvprintw(15, 2, "9. No callout"); mvprintw(15, 2, "9. No callout");
mvprintw(16, 2, "10. No Hold mail"); mvprintw(16, 2, "10. No EMSI session");
mvprintw(17, 2, "11. No pickup all"); mvprintw(17, 2, "11. No Yooho/2U2");
mvprintw(12,31, "12. No EMSI session"); mvprintw(12,31, "12. No Zmodem");
mvprintw(13,31, "13. No Yooho/2U2"); mvprintw(13,31, "13. No Zedzap");
mvprintw(14,31, "14. No Zmodem"); mvprintw(14,31, "14. No Hydra");
mvprintw(15,31, "15. No Zedzap"); mvprintw(15,31, "15. No IBN binkp");
mvprintw(16,31, "16. No Hydra"); mvprintw(16,31, "16. No IFC ifcico");
mvprintw(17,31, "17. No TCP/IP"); mvprintw(17,31, "17. No ITN telnet");
mvprintw(12,59, "18. Phonetrans 1-10"); mvprintw(12,59, "18. Phonetrans 1-10");
mvprintw(13,59, "19. Phonetrans 11-20"); mvprintw(13,59, "19. Phonetrans 11-20");
@ -1322,15 +1322,15 @@ void e_mailer(void)
show_int( 13,23, CFG.dialdelay); show_int( 13,23, CFG.dialdelay);
show_bool(14,23, CFG.NoFreqs); show_bool(14,23, CFG.NoFreqs);
show_bool(15,23, CFG.NoCall); show_bool(15,23, CFG.NoCall);
show_bool(16,23, CFG.NoHold); show_bool(16,23, CFG.NoEMSI);
show_bool(17,23, CFG.NoPUA); show_bool(17,23, CFG.NoWazoo);
show_bool(12,52, CFG.NoEMSI); show_bool(12,52, CFG.NoZmodem);
show_bool(13,52, CFG.NoWazoo); show_bool(13,52, CFG.NoZedzap);
show_bool(14,52, CFG.NoZmodem); show_bool(14,52, CFG.NoHydra);
show_bool(15,52, CFG.NoZedzap); show_bool(15,52, CFG.NoIBN);
show_bool(16,52, CFG.NoHydra); show_bool(16,52, CFG.NoIFC);
show_bool(17,52, CFG.NoTCP); show_bool(17,52, CFG.NoITN);
show_int( 16,75, CFG.Req_Files); show_int( 16,75, CFG.Req_Files);
show_int( 17,75, CFG.Req_MBytes); 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 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 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 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 10:E_BOOL(16,23, CFG.NoEMSI, "If set then ^EMSI handshake^ is diabled")
case 11:E_BOOL(17,23, CFG.NoPUA, "Set to true for ^pickup mail^ only from the primary address") 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); case 18:e_trans(0);
break; break;
case 19:e_trans(10); 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, " TCP/IP flags %s\n", CFG.Flags);
fprintf(fp, " No Filerequests %s\n", getboolean(CFG.NoFreqs)); fprintf(fp, " No Filerequests %s\n", getboolean(CFG.NoFreqs));
fprintf(fp, " No Calls %s\n", getboolean(CFG.NoCall)); 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 EMSI %s\n", getboolean(CFG.NoEMSI));
fprintf(fp, " No YooHoo/2U2 %s\n", getboolean(CFG.NoWazoo)); fprintf(fp, " No YooHoo/2U2 %s\n", getboolean(CFG.NoWazoo));
fprintf(fp, " No Zmodem %s\n", getboolean(CFG.NoZmodem)); fprintf(fp, " No Zmodem %s\n", getboolean(CFG.NoZmodem));
fprintf(fp, " No Zedzap %s\n", getboolean(CFG.NoZedzap)); fprintf(fp, " No Zedzap %s\n", getboolean(CFG.NoZedzap));
fprintf(fp, " No Hydra %s\n", getboolean(CFG.NoHydra)); 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 files %d\n", CFG.Req_Files);
fprintf(fp, " Max request MBytes %d\n", CFG.Req_MBytes); fprintf(fp, " Max request MBytes %d\n", CFG.Req_MBytes);

46
mbsetup/m_node.c
View File

@ -640,12 +640,12 @@ void NScreen(void)
mvprintw(10,51, "20. No YooHoo/2U2"); mvprintw(10,51, "20. No YooHoo/2U2");
mvprintw(11,51, "21. No Filerequest"); mvprintw(11,51, "21. No Filerequest");
mvprintw(12,51, "22. Don't call"); mvprintw(12,51, "22. Don't call");
mvprintw(13,51, "23. No Hold mail"); mvprintw(13,51, "23. No Zmodem");
mvprintw(14,51, "24. Pickup primary"); mvprintw(14,51, "24. No Zedzap");
mvprintw(15,51, "25. No Zmodem"); mvprintw(15,51, "25. No Hydra");
mvprintw(16,51, "26. No Zedzap"); mvprintw(16,51, "26. No TCP/IP IBN");
mvprintw(17,51, "27. No Hydra"); mvprintw(17,51, "27. No TCP/IP IFC");
mvprintw(18,51, "28. No TCP/IP"); mvprintw(18,51, "28. No TCP/IP ITN");
mvprintw(19,51, "29. 8.3 names"); mvprintw(19,51, "29. 8.3 names");
} }
@ -770,12 +770,12 @@ int EditNodeRec(int Area)
show_bool(10,70, nodes.NoWaZOO); show_bool(10,70, nodes.NoWaZOO);
show_bool(11,70, nodes.NoFreqs); show_bool(11,70, nodes.NoFreqs);
show_bool(12,70, nodes.NoCall); show_bool(12,70, nodes.NoCall);
show_bool(13,70, nodes.NoHold); show_bool(13,70, nodes.NoZmodem);
show_bool(14,70, nodes.NoPUA); show_bool(14,70, nodes.NoZedzap);
show_bool(15,70, nodes.NoZmodem); show_bool(15,70, nodes.NoHydra);
show_bool(16,70, nodes.NoZedzap); show_bool(16,70, nodes.NoIBN);
show_bool(17,70, nodes.NoHydra); show_bool(17,70, nodes.NoIFC);
show_bool(18,70, nodes.NoTCP); show_bool(18,70, nodes.NoITN);
show_bool(19,70, nodes.FNC); show_bool(19,70, nodes.FNC);
switch(select_menu(29)) { 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 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 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 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 23:E_BOOL(13,70, nodes.NoZmodem, "Disable ^Zmodem^ protocol with this node")
case 24:E_BOOL(14,70, nodes.NoPUA, "Only pickup mail from the ^primary^ address") case 24:E_BOOL(14,70, nodes.NoZedzap, "Disable ^Zedzap^ protocol with this node")
case 25:E_BOOL(15,70, nodes.NoZmodem, "Disable ^Zmodem^ 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.NoZedzap, "Disable ^Zedzap^ 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.NoHydra, "Disable ^Hydra^ 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.NoTCP, "Disable ^TCP/IP^ 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") 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 YooHoo/2U2 %s\n", getboolean(nodes.NoWaZOO));
fprintf(fp, " No Requests %s", getboolean(nodes.NoFreqs)); fprintf(fp, " No Requests %s", getboolean(nodes.NoFreqs));
fprintf(fp, " Don't call %s", getboolean(nodes.NoCall)); fprintf(fp, " Don't call %s", getboolean(nodes.NoCall));
fprintf(fp, " No hold mail %s\n", getboolean(nodes.NoHold)); fprintf(fp, " No Zmodem %s\n", getboolean(nodes.NoZmodem));
fprintf(fp, " No Pickup all %s", getboolean(nodes.NoPUA)); fprintf(fp, " No Zedzap %s", getboolean(nodes.NoZedzap));
fprintf(fp, " No Zmodem %s", getboolean(nodes.NoZmodem));
fprintf(fp, " No Zedzap %s\n", getboolean(nodes.NoZedzap));
fprintf(fp, " No Hydra %s", getboolean(nodes.NoHydra)); 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, " Pack Netmail %s\n", getboolean(nodes.PackNetmail));
fprintf(fp, " ARCmail comp. %s", getboolean(nodes.ARCmailCompat)); fprintf(fp, " ARCmail comp. %s", getboolean(nodes.ARCmailCompat));
fprintf(fp, " ACRmail a..z %s", getboolean(nodes.ARCmailAlpha)); fprintf(fp, " ACRmail a..z %s", getboolean(nodes.ARCmailAlpha));

2
mbtask/outstat.c
View File

@ -388,7 +388,7 @@ int outstat()
if ((tmp->flavors) & F_CALL) { if ((tmp->flavors) & F_CALL) {
tmp->callmode = CM_NONE; 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))) { ((tmp->ipflags & IP_IBN) || (tmp->ipflags & IP_IFC) || (tmp->ipflags & IP_ITN))) {
inet_calls++; inet_calls++;
tmp->callmode = CM_INET; tmp->callmode = CM_INET;