Merge commit 'origin' into netspool

source/include/bforce.h

@@ -170,20 +170,31 @@ typedef signed char     SINT8;
 typedef struct {
 	bool   daemon;		/* Run as daemon?                 */
 	bool   quit;		/* Quit from daemon               */
-        bool   dontcall;        /* -m key */
+	bool   usestdio;	/* Session on stdin and stdout    */
 	int    inetd;		/* Called from inetd?             */
 	int    force;		/* Force call?                    */
 	int    hiddline;	/* Hidden line number (0,1..)     */
 	char  *confname;	/* Use this config instead def.   */
 	char  *incname;		/* Include this config            */
 	char  *phone;		/* Forced phone number            */
-	char  *iaddr;		/* Forced IP address              */
 	char  *connect;		/* Connect string                 */
 	char  *device;		/* Forced device name             */
-	int    stype;		/* Handshake type in slave mode   */
+	char  *iphost;		/* Forced IP address              */
+	char  *ipproto;		/* proto to use over TCP/IP       */
+	int    stype;		/* Handshake type in slave (answer) mode   */
+	int    runmode;		/* concluded runmode              */
 	s_falist *addrlist;
 } s_bforce_opts;
 
+#define MODE_UNDEFINED (0)
+#define MODE_CALL_DEFAULT (1)
+#define MODE_CALL_MODEM (2)
+#define MODE_CALL_IP (3)
+#define MODE_CALL_STDIO (4)
+#define MODE_ANSWER (5)
+#define MODE_DAEMON (6)
+
+
 /*
  *  Global variables
  */

source/include/nodelist.h

@@ -82,7 +82,8 @@ enum nodelist_limit
 	BNI_MAXLOCATION = 48,
 	BNI_MAXSYSOP = 48,
 	BNI_MAXPHONE = 48,
-	BNI_MAXFLAGS = 120
+	BNI_MAXHOST = 200,
+	BNI_MAXFLAGS = 200
 };
 
 /*
@@ -148,6 +149,10 @@ typedef struct node
 	char phone[BNI_MAXPHONE+1];
 	long speed;
 	char flags[BNI_MAXFLAGS+1];
+	bool do_binkp;
+	bool do_ifcico;
+	bool do_telnet;
+	char host[BNI_MAXHOST+1];
 	s_timevec worktime;
 }
 s_node;

source/include/session.h

@@ -176,8 +176,8 @@ void  init_state(s_state *pstate);
 void  deinit_state(s_state *pstate);
 
 /* s_init.c */
-int   session_init_outgoing(void);
-int   session_init_incoming(void);
+int   session_init_outgoing();
+int   session_init_incoming();
 
 /* s_main.c */
 extern s_state state;
@@ -209,7 +209,7 @@ int   session(void);
 /* sess_call.c */
 int   call_system(s_faddr addr, const s_bforce_opts *opts);
 int   call_system_modem(void);
-int   call_system_tcpip(void);
+int   call_system_tcpip(int callwith);
 
 /* sess_answ.c */
 int   answ_system(e_session type, char *connstr, int inetd);