From f9c6ee79b596cd040c597c5a78defc86b032abbc Mon Sep 17 00:00:00 2001 From: Michiel Broek Date: Sat, 8 Nov 2003 18:42:37 +0000 Subject: [PATCH] Dropped ITN support --- ChangeLog | 10 +++++ SETUP.sh | 13 ------- lib/nodelist.conf | 6 +-- mbcico/call.c | 2 - mbcico/mbcico.c | 7 +--- mbcico/opentcp.c | 98 +---------------------------------------------- mbcico/opentcp.h | 75 +----------------------------------- mbcico/session.c | 15 -------- mbcico/session.h | 1 - mbcico/ttyio.h | 72 ---------------------------------- mbsetup/m_tty.c | 4 +- mbtask/outstat.c | 10 ++--- 12 files changed, 24 insertions(+), 289 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f58a42c..4efea6a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,12 @@ v0.39.1 22-Oct-2003 Two html pages are now under control of configure. The configure scripts shows the use of zlib compression for Hydra. + Completly dropped support for ITN connections sice this is so + buggy on different implementations that this is impossible to + get it right to connect to every system. + You may need to remove the lines for itn support from + /etc/inetd.conf or /etc/xinetd.d/mbsebbs or /etc/xinetd.conf. + Also check mbsetup 1.14.3 and remove any ITN flag in there. upgrade: If you don't have any personal archivers, then remove @@ -33,6 +39,7 @@ v0.39.1 22-Oct-2003 Compression log fixed and added percentage compression. Added dynamic optimum sendbuffer size with a maximum of 8192 bytes with an average size of 2048 bytes. + Removed ITN support. mbsetup: In node editor, fixed error message when there was no more @@ -41,6 +48,9 @@ v0.39.1 22-Oct-2003 Changed all fidonet domain names to maximum 8 characters so that we now follow the FTSC specs. + mbtask: + Removed support for ITN. + v0.39.0 09-Oct-2003 - 22-Oct-2003 diff --git a/SETUP.sh b/SETUP.sh index 70b3f9b3..1675a7aa 100644 --- a/SETUP.sh +++ b/SETUP.sh @@ -410,7 +410,6 @@ if [ "$FIDO" = "TRUE" ] || [ "$BINKD" = "TRUE" ]; then fi if [ "$FIDO" = "TRUE" ]; then echo -n ", fido at port 60179" - echo "tfido 60177/tcp # mbcico ITN mode">>/etc/services echo "fido 60179/tcp # mbcico IFC mode">>/etc/services fi chmod 644 /etc/services @@ -429,7 +428,6 @@ cat << EOF >>/etc/inetd.conf #:MBSE-BBS: bbs service binkp stream tcp nowait mbse $MHOME/bin/mbcico mbcico -t ibn -tfido stream tcp nowait mbse $MHOME/bin/mbcico mbcico -t itn fido stream tcp nowait mbse $MHOME/bin/mbcico mbcico -t ifc EOF @@ -470,17 +468,6 @@ service binkp server_args = -t ibn } -service tfido -{ - socket_type = stream - protocol = tcp - wait = no - user = mbse - instances = 10 - server = $MHOME/bin/mbcico - server_args = -t itn -} - service fido { socket_type = stream diff --git a/lib/nodelist.conf b/lib/nodelist.conf index 36ad867b..71f25889 100644 --- a/lib/nodelist.conf +++ b/lib/nodelist.conf @@ -80,7 +80,6 @@ reqbits RQ_WU 0x00000008 # Wazoo update # service IBN binkp 24554 service IFC fido 60179 -service ITN telnet 23 # Switched network service names, they are used to build the @@ -133,9 +132,8 @@ isdn X75 0x00000010 0x00000010 # Supported IP protocols by the mailer in order of preference. # The names must match the service names. # -tcpip ITN 0x00000001 0x00000001 -tcpip IFC 0x00000002 0x00000002 -tcpip IBN 0x00000004 0x00000004 +tcpip IFC 0x00000001 0x00000001 +tcpip IBN 0x00000002 0x00000002 # The following gives the order to search for the diff --git a/mbcico/call.c b/mbcico/call.c index 146261ea..8df1ff3c 100644 --- a/mbcico/call.c +++ b/mbcico/call.c @@ -175,8 +175,6 @@ int call(faddr *addr) tcp_mode = TCPMODE_IBN; } else if (strcmp(protocol, "fido") == 0) { tcp_mode = TCPMODE_IFC; - } else if (strcmp(protocol, "telnet") == 0) { - tcp_mode = TCPMODE_ITN; } else { Syslog('+', "No common TCP/IP protocols for node %s", nlent->name); free(inetaddr); diff --git a/mbcico/mbcico.c b/mbcico/mbcico.c index a5dad82d..a66e1b23 100644 --- a/mbcico/mbcico.c +++ b/mbcico/mbcico.c @@ -85,11 +85,11 @@ void usage(void) fprintf(stderr,"-a \n"); fprintf(stderr,"-n forced phone number\n"); fprintf(stderr,"-l forced tty device\n"); - fprintf(stderr,"-t must be one of ifc|itn|ibn, forces TCP/IP\n"); + fprintf(stderr,"-t must be one of ifc|ibn, forces TCP/IP\n"); fprintf(stderr,"-a supply internet hostname if not in nodelist\n"); fprintf(stderr," should be in domain form, e.g. f11.n22.z3\n"); fprintf(stderr," (this implies master mode)\n"); - fprintf(stderr,"\n or: %s tsync|yoohoo|**EMSI_INQC816|-t ibn|-t ifc|-t itn\n",myname); + fprintf(stderr,"\n or: %s tsync|yoohoo|**EMSI_INQC816|-t ibn|-t ifc\n",myname); fprintf(stderr," (this implies slave mode)\n"); } @@ -243,9 +243,6 @@ int main(int argc, char *argv[]) if (strncmp(p, "ifc", 3) == 0) { tcp_mode = TCPMODE_IFC; protocol = xstrcpy((char *)"fido"); - } else if (strncmp(p, "itn", 3) == 0) { - tcp_mode = TCPMODE_ITN; - protocol = xstrcpy((char *)"telnet"); } else if (strncmp(p, "ibn", 3) == 0) { tcp_mode = TCPMODE_IBN; protocol = xstrcpy((char *)"binkp"); diff --git a/mbcico/opentcp.c b/mbcico/opentcp.c index 6c0caab1..ee563538 100644 --- a/mbcico/opentcp.c +++ b/mbcico/opentcp.c @@ -44,7 +44,7 @@ #define BINKPORT 24554 -#define TELNPORT 23 +// #define TELNPORT 23 #define FIDOPORT 60179 /* Eugene G. Crossers birthday */ @@ -59,19 +59,6 @@ extern int carrier; extern long sentbytes; extern long rcvdbytes; extern int Loaded; - - -char telnet_options[256]; -char do_dont_resp[256]; -char will_wont_resp[256]; - -void tel_enter_binary(int rw); -void tel_leave_binary(int rw); -void send_do(register int); -void send_dont(register int); -void send_will(register int); -void send_wont(register int); - static int tcp_is_open = FALSE; @@ -90,7 +77,6 @@ int opentcp(char *name) Syslog('+', "Open TCP connection to \"%s\"", MBSE_SS(name)); tcp_is_open = FALSE; - memset(&telnet_options, 0, sizeof(telnet_options)); server.sin_family = AF_INET; /* @@ -117,11 +103,6 @@ int opentcp(char *name) else server.sin_port = htons(FIDOPORT); break; - case TCPMODE_ITN: if ((se = getservbyname("telnet", "tcp"))) - server.sin_port = se->s_port; - else - server.sin_port = htons(TELNPORT); - break; case TCPMODE_IBN: if ((se = getservbyname("binkd", "tcp"))) server.sin_port = se->s_port; else @@ -179,11 +160,8 @@ int opentcp(char *name) f_flags=0; - if (tcp_mode == TCPMODE_ITN) - tel_enter_binary(3); - Syslog('+', "Established %s/TCP connection with %s, port %d", - (tcp_mode == TCPMODE_ITN) ? "ITN":(tcp_mode == TCPMODE_IFC) ? "IFC":(tcp_mode == TCPMODE_IBN) ? "IBN":"Unknown", + (tcp_mode == TCPMODE_IFC) ? "IFC":(tcp_mode == TCPMODE_IBN) ? "IBN":"Unknown", inet_ntoa(server.sin_addr), (int)ntohs(server.sin_port)); c_start = time(NULL); carrier = TRUE; @@ -201,9 +179,6 @@ void closetcp(void) if (!tcp_is_open) return; - if (tcp_mode == TCPMODE_ITN) - tel_leave_binary(3); - shutdown(fd, 2); Syslog('d', "SIGHUP => SIG_IGN"); signal(SIGHUP, SIG_IGN); @@ -239,72 +214,3 @@ void closetcp(void) } - -void tel_enter_binary(int rw) -{ - Syslog('d', "Telnet enter binary %d", rw); - if (rw & 1) - send_do(TELOPT_BINARY); - if (rw & 2) - send_will(TELOPT_BINARY); - - send_dont(TELOPT_ECHO); - send_do(TELOPT_SGA); - send_dont(TELOPT_RCTE); - send_dont(TELOPT_TTYPE); - - send_wont(TELOPT_ECHO); - send_will(TELOPT_SGA); - send_wont(TELOPT_RCTE); - send_wont(TELOPT_TTYPE); -} - - - -void tel_leave_binary(int rw) -{ - Syslog('d', "Telnet leave binary %d", rw); - if (rw & 1) - send_dont(TELOPT_BINARY); - if (rw & 2) - send_wont(TELOPT_BINARY); -} - - - -/* - * These routines are in charge of sending option negotiations - * to the other side. - * The basic idea is that we send the negotiation if either side - * is in disagreement as to what the current state should be. - */ - -void send_do(register int c) -{ - NET2ADD(IAC, DO); - NETADD(c); -} - - -void send_dont(register int c) -{ - NET2ADD(IAC, DONT); - NETADD(c); -} - - -void send_will(register int c) -{ - NET2ADD(IAC, WILL); - NETADD(c); -} - - -void send_wont(register int c) -{ - NET2ADD(IAC, WONT); - NETADD(c); -} - - - diff --git a/mbcico/opentcp.h b/mbcico/opentcp.h index 431c8311..0a899fd8 100644 --- a/mbcico/opentcp.h +++ b/mbcico/opentcp.h @@ -1,81 +1,10 @@ +/* $Id$ */ + #ifndef _OPENTCP_H #define _OPENTCP_H int opentcp(char *); void closetcp(void); -#define PUTCHAR(x) tty_putc(x) - -#define ClearArray(x) memset((char *)x, 0, sizeof x) - -#define NETADD(c) { PUTCHAR(c); } -#define NET2ADD(c1,c2) { NETADD(c1); NETADD(c2); } - -#define MY_STATE_WILL 0x01 -#define MY_WANT_STATE_WILL 0x02 -#define MY_STATE_DO 0x04 -#define MY_WANT_STATE_DO 0x08 -#define my_state_is_do(opt) (telnet_options[opt]&MY_STATE_DO) -#define my_state_is_will(opt) (telnet_options[opt]&MY_STATE_WILL) -#define my_want_state_is_do(opt) (telnet_options[opt]&MY_WANT_STATE_DO) -#define my_want_state_is_will(opt) (telnet_options[opt]&MY_WANT_STATE_WILL) -#define my_state_is_dont(opt) (!my_state_is_do(opt)) -#define my_state_is_wont(opt) (!my_state_is_will(opt)) -#define my_want_state_is_dont(opt) (!my_want_state_is_do(opt)) -#define my_want_state_is_wont(opt) (!my_want_state_is_will(opt)) -#define set_my_want_state_do(opt) {telnet_options[opt] |= MY_WANT_STATE_DO;} -#define set_my_want_state_will(opt) {telnet_options[opt] |= MY_WANT_STATE_WILL;} -#define set_my_want_state_dont(opt) {telnet_options[opt] &= ~MY_WANT_STATE_DO;} -#define set_my_want_state_wont(opt) {telnet_options[opt] &= ~MY_WANT_STATE_WILL;} - -#define IAC 255 /* interpret as command: */ -#define DONT 254 /* you are not to use option */ -#define DO 253 /* please, you use option */ -#define WONT 252 /* I won't use option */ -#define WILL 251 /* I will use option */ - -/* telnet options */ -#define TELOPT_BINARY 0 /* 8-bit data path */ -#define TELOPT_ECHO 1 /* echo */ -#define TELOPT_RCP 2 /* prepare to reconnect */ -#define TELOPT_SGA 3 /* suppress go ahead */ -#define TELOPT_NAMS 4 /* approximate message size */ -#define TELOPT_STATUS 5 /* give status */ -#define TELOPT_TM 6 /* timing mark */ -#define TELOPT_RCTE 7 /* remote controlled transmission and echo */ -#define TELOPT_NAOL 8 /* negotiate about output line width */ -#define TELOPT_NAOP 9 /* negotiate about output page size */ -#define TELOPT_NAOCRD 10 /* negotiate about CR disposition */ -#define TELOPT_NAOHTS 11 /* negotiate about horizontal tabstops */ -#define TELOPT_NAOHTD 12 /* negotiate about horizontal tab disposition */ -#define TELOPT_NAOFFD 13 /* negotiate about formfeed disposition */ -#define TELOPT_NAOVTS 14 /* negotiate about vertical tab stops */ -#define TELOPT_NAOVTD 15 /* negotiate about vertical tab disposition */ -#define TELOPT_NAOLFD 16 /* negotiate about output LF disposition */ -#define TELOPT_XASCII 17 /* extended ascic character set */ -#define TELOPT_LOGOUT 18 /* force logout */ -#define TELOPT_BM 19 /* byte macro */ -#define TELOPT_DET 20 /* data entry terminal */ -#define TELOPT_SUPDUP 21 /* supdup protocol */ -#define TELOPT_SUPDUPOUTPUT 22 /* supdup output */ -#define TELOPT_SNDLOC 23 /* send location */ -#define TELOPT_TTYPE 24 /* terminal type */ -#define TELOPT_EOR 25 /* end or record */ -#define TELOPT_TUID 26 /* TACACS user identification */ -#define TELOPT_OUTMRK 27 /* output marking */ -#define TELOPT_TTYLOC 28 /* terminal location number */ -#define TELOPT_3270REGIME 29 /* 3270 regime */ -#define TELOPT_X3PAD 30 /* X.3 PAD */ -#define TELOPT_NAWS 31 /* window size */ -#define TELOPT_TSPEED 32 /* terminal speed */ -#define TELOPT_LFLOW 33 /* remote flow control */ -#define TELOPT_LINEMODE 34 /* Linemode option */ -#define TELOPT_XDISPLOC 35 /* X Display Location */ -#define TELOPT_ENVIRON 36 /* Environment variables */ -#define TELOPT_AUTHENTICATION 37/* Authenticate */ -#define TELOPT_ENCRYPT 38 /* Encryption option */ -#define TELOPT_EXOPL 255 /* extended-options-list */ - #endif - diff --git a/mbcico/session.c b/mbcico/session.c index 4bb5d48c..10d21541 100644 --- a/mbcico/session.c +++ b/mbcico/session.c @@ -96,9 +96,6 @@ int session(faddr *a, node *nl, int role, int tp, char *dt) if (tcp_mode == TCPMODE_IBN) { Syslog('+', "Incoming IBN/TCP connection from %s", inet_ntoa(peeraddr.sin_addr)); IsDoing("Incoming IBN/TCP"); - } else if (tcp_mode == TCPMODE_ITN) { - Syslog('+', "Incoming ITN/TCP connection from %s", inet_ntoa(peeraddr.sin_addr)); - IsDoing("Incoming ITN/TCP"); } else if (tcp_mode == TCPMODE_IFC) { Syslog('+', "Incoming IFC/TCP connection from %s", inet_ntoa(peeraddr.sin_addr)); IsDoing("Incoming IFC/TCP"); @@ -435,18 +432,6 @@ SM_STATE(sendintro) if ((localoptions & NOEMSI) == 0) { PUTSTR((char *)"**EMSI_REQA77E\r\021"); } -// PUTSTR((char *)"\r\rAddress: "); -// PUTSTR(aka2str(CFG.aka[0])); -// PUTSTR((char *)" using mbcico "); -// PUTSTR((char *)VERSION); -// switch (tcp_mode) { -// case TCPMODE_IFC: PUTSTR((char *)"; IFC"); -// break; -// case TCPMODE_ITN: PUTSTR((char *)"; ITN"); -// break; -// case TCPMODE_IBN: PUTSTR((char *)"; IBN"); -// break; -// } PUTCHAR('\r'); if (STATUS) { SM_ERROR; diff --git a/mbcico/session.h b/mbcico/session.h index 20d30df7..323a8839 100644 --- a/mbcico/session.h +++ b/mbcico/session.h @@ -5,7 +5,6 @@ #define TCPMODE_NONE 0 #define TCPMODE_IFC 1 /* ifcico native EMSI on raw TCP */ -#define TCPMODE_ITN 2 /* EMSI encapsulation through telnet */ #define TCPMODE_IBN 3 /* Binkp protocol */ #define SESSION_UNKNOWN 0 diff --git a/mbcico/ttyio.h b/mbcico/ttyio.h index 1494f9f4..f35c1e33 100644 --- a/mbcico/ttyio.h +++ b/mbcico/ttyio.h @@ -87,78 +87,6 @@ #define TSYNC 0xae #define YOOHOO 0xf1 -/* ### Modifned by T.Tanaka on 4 Dec 1995 */ -#define ClearArray(x) memset((char *)x, 0, sizeof x) - -#define NETADD(c) { PUTCHAR(c); } -#define NET2ADD(c1,c2) { NETADD(c1); NETADD(c2); } - -#define MY_STATE_WILL 0x01 -#define MY_WANT_STATE_WILL 0x02 -#define MY_STATE_DO 0x04 -#define MY_WANT_STATE_DO 0x08 -#define my_state_is_do(opt) (telnet_options[opt]&MY_STATE_DO) -#define my_state_is_will(opt) (telnet_options[opt]&MY_STATE_WILL) -#define my_want_state_is_do(opt) (telnet_options[opt]&MY_WANT_STATE_DO) -#define my_want_state_is_will(opt) (telnet_options[opt]&MY_WANT_STATE_WILL) -#define my_state_is_dont(opt) (!my_state_is_do(opt)) -#define my_state_is_wont(opt) (!my_state_is_will(opt)) -#define my_want_state_is_dont(opt) (!my_want_state_is_do(opt)) -#define my_want_state_is_wont(opt) (!my_want_state_is_will(opt)) -#define set_my_want_state_do(opt) {telnet_options[opt] |= MY_WANT_STATE_DO;} -#define set_my_want_state_will(opt) {telnet_options[opt] |= MY_WANT_STATE_WILL;} -#define set_my_want_state_dont(opt) {telnet_options[opt] &= ~MY_WANT_STATE_DO;} -#define set_my_want_state_wont(opt) {telnet_options[opt] &= ~MY_WANT_STATE_WILL;} - -#define IAC 255 /* interpret as command: */ -#define DONT 254 /* you are not to use option */ -#define DO 253 /* please, you use option */ -#define WONT 252 /* I won't use option */ -#define WILL 251 /* I will use option */ - -/* telnet options */ -#define TELOPT_BINARY 0 /* 8-bit data path */ -#define TELOPT_ECHO 1 /* echo */ -#define TELOPT_RCP 2 /* prepare to reconnect */ -#define TELOPT_SGA 3 /* suppress go ahead */ -#define TELOPT_NAMS 4 /* approximate message size */ -#define TELOPT_STATUS 5 /* give status */ -#define TELOPT_TM 6 /* timing mark */ -#define TELOPT_RCTE 7 /* remote controlled transmission and echo */ -#define TELOPT_NAOL 8 /* negotiate about output line width */ -#define TELOPT_NAOP 9 /* negotiate about output page size */ -#define TELOPT_NAOCRD 10 /* negotiate about CR disposition */ -#define TELOPT_NAOHTS 11 /* negotiate about horizontal tabstops */ -#define TELOPT_NAOHTD 12 /* negotiate about horizontal tab disposition */ -#define TELOPT_NAOFFD 13 /* negotiate about formfeed disposition */ -#define TELOPT_NAOVTS 14 /* negotiate about vertical tab stops */ -#define TELOPT_NAOVTD 15 /* negotiate about vertical tab disposition */ -#define TELOPT_NAOLFD 16 /* negotiate about output LF disposition */ -#define TELOPT_XASCII 17 /* extended ascic character set */ -#define TELOPT_LOGOUT 18 /* force logout */ -#define TELOPT_BM 19 /* byte macro */ -#define TELOPT_DET 20 /* data entry terminal */ -#define TELOPT_SUPDUP 21 /* supdup protocol */ -#define TELOPT_SUPDUPOUTPUT 22 /* supdup output */ -#define TELOPT_SNDLOC 23 /* send location */ -#define TELOPT_TTYPE 24 /* terminal type */ -#define TELOPT_EOR 25 /* end or record */ -#define TELOPT_TUID 26 /* TACACS user identification */ -#define TELOPT_OUTMRK 27 /* output marking */ -#define TELOPT_TTYLOC 28 /* terminal location number */ -#define TELOPT_3270REGIME 29 /* 3270 regime */ -#define TELOPT_X3PAD 30 /* X.3 PAD */ -#define TELOPT_NAWS 31 /* window size */ -#define TELOPT_TSPEED 32 /* terminal speed */ -#define TELOPT_LFLOW 33 /* remote flow control */ -#define TELOPT_LINEMODE 34 /* Linemode option */ -#define TELOPT_XDISPLOC 35 /* X Display Location */ -#define TELOPT_ENVIRON 36 /* Environment variables */ -#define TELOPT_AUTHENTICATION 37/* Authenticate */ -#define TELOPT_ENCRYPT 38 /* Encryption option */ -#define TELOPT_EXOPL 255 /* extended-options-list */ -/* ### */ - extern int tty_status; extern int tty_resettimer(int tno); diff --git a/mbsetup/m_tty.c b/mbsetup/m_tty.c index 79e25ed0..269e9cbb 100644 --- a/mbsetup/m_tty.c +++ b/mbsetup/m_tty.c @@ -71,7 +71,7 @@ int CountTtyinfo(void) sprintf(ttyinfo.comment, "Network port %d", i+11); sprintf(ttyinfo.tty, "pts/%d", i); sprintf(ttyinfo.speed, "10 mbit"); - sprintf(ttyinfo.flags, "IBN,IFC,ITN:60177,XX"); + sprintf(ttyinfo.flags, "IBN,IFC,XX"); ttyinfo.type = NETWORK; ttyinfo.available = TRUE; sprintf(ttyinfo.name, "Network port #%d", i+11); @@ -83,7 +83,7 @@ int CountTtyinfo(void) sprintf(ttyinfo.comment, "Network port %d", i+1); sprintf(ttyinfo.tty, "ttyp%d", i); sprintf(ttyinfo.speed, "10 mbit"); - sprintf(ttyinfo.flags, "IBN,IFC,ITN:60177,XX"); + sprintf(ttyinfo.flags, "IBN,IFC,XX"); ttyinfo.type = NETWORK; ttyinfo.available = TRUE; sprintf(ttyinfo.name, "Network port #%d", i+1); diff --git a/mbtask/outstat.c b/mbtask/outstat.c index b33d0ba6..b230e01a 100644 --- a/mbtask/outstat.c +++ b/mbtask/outstat.c @@ -203,7 +203,7 @@ int outstat() struct dirent *de; struct stat sb; struct passwd *pw; - unsigned long cmmask, ibnmask = 0, ifcmask = 0, itnmask = 0; + unsigned long cmmask, ibnmask = 0, ifcmask = 0; nodelist_modem **tmpm; cmmask = getCMmask(); @@ -212,8 +212,6 @@ int outstat() ibnmask = (*tmpm)->mask; if (strcmp((*tmpm)->name, "IFC") == 0) ifcmask = (*tmpm)->mask; - if (strcmp((*tmpm)->name, "ITN") == 0) - itnmask = (*tmpm)->mask; } now = time(NULL); tm = gmtime(&now); /* UTC time */ @@ -336,7 +334,7 @@ int outstat() rc = load_node(tmp->addr); // Syslog('o', "Load node %s rc=%s, NoCall=%s, NoTCP=%s", fido2str(tmp->addr, 0x0f), rc?"true":"false", -// nodes.NoCall?"True":"False", (itnmask + ibnmask + ifcmask)?"False":"True"); +// nodes.NoCall?"True":"False", (ibnmask + ifcmask)?"False":"True"); /* * Zone Mail Hours, only use Fidonet Hours. @@ -420,7 +418,7 @@ int outstat() */ if (TCFG.max_tcp && (tmp->olflags & cmmask) && (((tmp->flavors) & F_IMM) || ((tmp->flavors) & F_CRASH) || ((tmp->flavors) & F_NORMAL)) && - ((tmp->ipflags & ibnmask) || (tmp->ipflags & ifcmask) || (tmp->ipflags & itnmask))) { + ((tmp->ipflags & ibnmask) || (tmp->ipflags & ifcmask) )) { tmp->flavors |= F_CALL; } @@ -499,7 +497,7 @@ int outstat() if ((tmp->flavors) & F_CALL) { tmp->callmode = CM_NONE; - if (TCFG.max_tcp && ((tmp->ipflags & ibnmask) || (tmp->ipflags & ifcmask) || (tmp->ipflags & itnmask))) { + if (TCFG.max_tcp && ((tmp->ipflags & ibnmask) || (tmp->ipflags & ifcmask))) { inet_calls++; tmp->callmode = CM_INET; }