#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/time.h>
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/types.h>
int debuglevel = -1; /**< Server debug level */
char *debugmode = ""; /**< Server debug level */
static char *dpath = DPATH; /**< Working directory for daemon */
+static char *dbg_client; /**< Client specifier for chkconf */
static struct Timer connect_timer; /**< timer structure for try_connections() */
static struct Timer ping_timer; /**< timer structure for check_pings() */
*/
void server_panic(const char *message)
{
- /* inhibit sending server notice--we may be panicing due to low memory */
+ /* inhibit sending server notice--we may be panicking due to low memory */
log_write(LS_SYSTEM, L_CRIT, LOG_NOSNOTICE, "Server panic: %s", message);
flush_connections(0);
log_close();
time_t next = 0;
struct ConnectionClass* cltmp;
struct Jupe* ajupe;
+ int hold;
assert(ET_EXPIRE == ev_type(ev));
assert(0 != ev_timer(ev));
*/
if (!(aconf->status & CONF_SERVER)
|| aconf->address.port == 0
- || aconf->hold == 0
+ || !(aconf->flags & CONF_AUTOCONNECT)
|| ((ajupe = jupe_find(aconf->name)) && JupeIsActive(ajupe)))
continue;
/* Update the next time we can consider this entry. */
cltmp = aconf->conn_class;
+ hold = aconf->hold > CurrentTime; /* before we update aconf->hold */
aconf->hold = ConFreq(cltmp) ? CurrentTime + ConFreq(cltmp) : 0;
/* Do not try to connect if its use is still on hold until future,
* too many links in its connection class, it is already linked,
* or if connect rules forbid a link now.
*/
- if ((aconf->hold > CurrentTime)
- || (Links(cltmp) >= MaxLinks(cltmp))
+ if (hold
+ || (Links(cltmp) > MaxLinks(cltmp))
|| FindServer(aconf->name)
|| conf_eval_crule(aconf->name, CRULE_MASK))
continue;
/* Ok, the thing that will happen most frequently, is that someone will
* have sent something recently. Cover this first for speed.
* --
- * If it's an unregisterd client and hasn't managed to register within
+ * If it's an unregistered client and hasn't managed to register within
* max_ping then it's obviously having problems (broken client) or it's
* just up to no good, so we won't skip it, even if its been sending
* data to us.
if (!IsPingSent(cptr))
{
- /* If we havent PINGed the connection and we havent heard from it in a
+ /* If we haven't PINGed the connection and we haven't heard from it in a
* while, PING it to make sure it is still alive.
*/
SetPingSent(cptr);
* @param[in,out] argv Command-lne arguments.
*/
static void parse_command_line(int argc, char** argv) {
- const char *options = "d:f:h:nktvx:";
+ const char *options = "d:f:h:nktvx:c:";
int opt;
if (thisServer.euid != thisServer.uid)
setuid(thisServer.uid);
- /* Do we really need to santiy check the non-NULLness of optarg? That's
+ /* Do we really need to sanity check the non-NULLness of optarg? That's
* getopt()'s job... Removing those... -zs
*/
while ((opt = getopt(argc, argv, options)) != EOF)
switch (opt) {
- case 'k': thisServer.bootopt |= BOOT_CHKCONF; break;
+ case 'k': thisServer.bootopt |= BOOT_CHKCONF | BOOT_TTY; break;
+ case 'c': dbg_client = optarg; break;
case 'n':
case 't': thisServer.bootopt |= BOOT_TTY; break;
case 'd': dpath = optarg; break;
exit(0);
break;
-
+
case 'x':
debuglevel = atoi(optarg);
if (debuglevel < 0)
debugmode = optarg;
thisServer.bootopt |= BOOT_DEBUG;
break;
-
+
default:
- printf("Usage: ircd [-f config] [-h servername] [-x loglevel] [-ntvk]\n");
- printf("\n -n -t\t Don't detach\n -v\t display version\n -k\t exit after checking config\n\n");
- printf("Server not started.\n");
+ printf("Usage: ircd [-f config] [-h servername] [-x loglevel] [-ntv] [-k [-c clispec]]\n"
+ "\n -f config\t specify explicit configuration file"
+ "\n -x loglevel\t set debug logging verbosity"
+ "\n -n or -t\t don't detach"
+ "\n -v\t\t display version"
+ "\n -k\t\t exit after checking config"
+ "\n -c clispec\t search for client/kill blocks matching client"
+ "\n\t\t clispec is comma-separated list of user@host,"
+ "\n\t\t user@ip, $Rrealname, and port number"
+ "\n\nServer not started.\n");
exit(1);
}
}
close_connections(!(thisServer.bootopt & (BOOT_DEBUG | BOOT_TTY | BOOT_CHKCONF)));
+ /* daemon_init() must be before event_init() because kqueue() FDs
+ * are, perversely, not inherited across fork().
+ */
+ daemon_init(thisServer.bootopt & BOOT_TTY);
+
event_init(MAXCONNECTIONS);
setup_signals();
}
if (thisServer.bootopt & BOOT_CHKCONF) {
+ if (dbg_client)
+ conf_debug_iline(dbg_client);
fprintf(stderr, "Configuration file %s checked okay.\n", configfile);
return 0;
}
debug_init(thisServer.bootopt & BOOT_TTY);
- daemon_init(thisServer.bootopt & BOOT_TTY);
if (check_pid()) {
Debug((DEBUG_FATAL, "Failed to acquire PID file lock after fork"));
exit(2);
projects / ircu2.10.12-pk.git / blobdiff