|
|
|
@ -54,7 +54,7 @@ static int daemon_call_branch(s_sysentry *syst, const char *lockdir, s_modemport
|
|
|
|
|
|
|
|
|
|
s_bforce_opts opts;
|
|
|
|
|
// TODO: add hiddenline round-robin
|
|
|
|
|
opts.hiddline=0;
|
|
|
|
|
opts.hiddline = 0;
|
|
|
|
|
opts.runmode = MODE_CALL_DEFAULT;
|
|
|
|
|
opts.ipproto = NULL;
|
|
|
|
|
opts.phone = NULL;
|
|
|
|
@ -62,7 +62,7 @@ static int daemon_call_branch(s_sysentry *syst, const char *lockdir, s_modemport
|
|
|
|
|
opts.inetd = 0;
|
|
|
|
|
opts.connect = NULL;
|
|
|
|
|
opts.device = NULL;
|
|
|
|
|
|
|
|
|
|
DEB((D_DAEMON, "daemon_call: calling call_system from branch"));
|
|
|
|
|
// log("doing call_system");
|
|
|
|
|
return call_system(syst->node.addr, &opts);
|
|
|
|
|
}
|
|
|
|
@ -87,8 +87,11 @@ int daemon_call(s_sysentry *syst)
|
|
|
|
|
/*
|
|
|
|
|
* Check whether this node is allready locked
|
|
|
|
|
*/
|
|
|
|
|
if( out_bsy_check(syst->node.addr) )
|
|
|
|
|
if( out_bsy_check(syst->node.addr) )
|
|
|
|
|
{
|
|
|
|
|
DEB((D_DAEMON, "daemon_call: node locked by .bsy file"));
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Set state structure to make expressions works properly now
|
|
|
|
@ -101,6 +104,7 @@ int daemon_call(s_sysentry *syst)
|
|
|
|
|
|
|
|
|
|
if( syst->tcpip == FALSE )
|
|
|
|
|
{
|
|
|
|
|
DEB((D_DAEMON, "daemon_call: tcpip false - prep modem line"));
|
|
|
|
|
if( (p_lockdir = conf_string(cf_uucp_lock_directory)) == NULL )
|
|
|
|
|
p_lockdir = BFORCE_LOCK_DIR;
|
|
|
|
|
|
|
|
|
@ -110,7 +114,10 @@ int daemon_call(s_sysentry *syst)
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
DEB((D_DAEMON, "call %s line %d via %s",
|
|
|
|
|
ftn_addrstr(abuf, syst->node.addr), syst->line,
|
|
|
|
|
syst->tcpip ? "TCP/IP" : modemport->name));
|
|
|
|
|
|
|
|
|
|
log("call %s line %d via %s",
|
|
|
|
|
ftn_addrstr(abuf, syst->node.addr), syst->line,
|
|
|
|
|
syst->tcpip ? "TCP/IP" : modemport->name);
|
|
|
|
@ -138,7 +145,7 @@ int daemon_call(s_sysentry *syst)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Now we are in child process */
|
|
|
|
|
|
|
|
|
|
DEB((D_DAEMON, "daemon_call: fork success - calling..."));
|
|
|
|
|
exit(daemon_call_branch(syst, p_lockdir, modemport));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|