Another big & bad commit:

- Added some extra search functions to rbl routines
- Fix subnet_lookup()
- Reorder some syslog messages to make more sense
- daemon() is back
- Don't let scripts execute in parallel (gives race conditions, and
  anyway something MIGHT just be configured which is necessary for further
  execution of tinc itself)
- Accidently merged check_child() with execute_script().
- Small fixes
This commit is contained in:
Guus Sliepen 2000-11-24 23:13:07 +00:00
parent 97c54ffb35
commit cf49b2c064
10 changed files with 146 additions and 187 deletions

View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: net.c,v 1.35.4.80 2000/11/20 23:29:46 guus Exp $
$Id: net.c,v 1.35.4.81 2000/11/24 23:13:02 guus Exp $
*/
#include "config.h"
@ -806,8 +806,6 @@ cp
myself->status.active = 1;
syslog(LOG_NOTICE, _("Ready: listening on port %hd"), myself->port);
child_pids = list_new();
cp
return 0;
}
@ -869,12 +867,12 @@ cp
if(setup_tap_fd() < 0)
return -1;
if(setup_myself() < 0)
return -1;
/* Run tinc-up script to further initialize the tap interface */
execute_script("tinc-up");
if(setup_myself() < 0)
return -1;
if(!(cfg = get_config_val(config, config_connectto)))
/* No upstream IP given, we're listen only. */
return 0;
@ -925,8 +923,6 @@ cp
execute_script("tinc-down");
destroy_connection_tree();
syslog(LOG_NOTICE, _("Terminating"));
cp
return;
}
@ -1417,8 +1413,6 @@ cp
if(FD_ISSET(tap_fd, &fset))
handle_tap_input();
}
check_children();
}
cp
}