return ident;
}
+static int validate_htb_exists(int node, int parent) {
+ FILE *pipe = popen("/sbin/tc class show dev eth0", "r");
+ char line[200];
+
+ while (fgets(line, 200, pipe) != NULL) {
+ int n, p;
+ char ignore[200];
+
+ sscanf(line, "class htb 1:%x parent 1:%x prio %s", &n, &p, ignore);
+ if (n == node && p == parent) {
+ pclose(pipe);
+ return 0;
+ }
+ }
+
+ pclose(pipe);
+ return 1;
+}
+
/* Determines the validity of the parameters of one ident_config.
*
* 0 valid
printlog(LOG_CRITICAL, "When create_htb is disabled in ulogd.conf, an identity must specify the htb_node and htb_parent propertities in its configuration.\n");
return 1;
}
+
+ if (validate_htb_exists(config->htb_node, config->htb_parent)) {
+ printlog(LOG_CRITICAL, "Identity specified htb node %x with parent %x. No such node/parent combo seems to exist!\n", config->htb_node, config->htb_parent);
+ return 1;
+ }
} else {
if (config->htb_node > -1 || config->htb_parent > -1) {
printlog(LOG_WARN, "htb_node or htb_parent are configured but ignored because we're configured to create our own htb hierarchy.\n");
sigaddset(&sigs, SIGHUP);
sigaddset(&sigs, SIGUSR1);
sigaddset(&sigs, SIGUSR2);
+ sigaddset(&sigs, SIGRTMAX);
pthread_sigmask(SIG_BLOCK, &sigs, NULL);
while (1) {
sigemptyset(&sigs);
- sigaddset(&sigs, SIGHUP);
+ //sigaddset(&sigs, SIGHUP);
sigaddset(&sigs, SIGUSR1);
sigaddset(&sigs, SIGUSR2);
+ sigaddset(&sigs, SIGRTMAX);
err = sigwait(&sigs, &sig);
if (err) {
printlog(LOG_CRITICAL, "sigwait() returned an error.\n");
flushlog();
+ continue;
+ }
+
+ if (sig == SIGRTMAX) {
+ printf("Caught SIGRTMAX - toggling fake partitions.\n");
+ do_partition = !do_partition;
+ continue;
}
switch (sig) {
case SIGHUP:
- printlog(LOG_WARN, "Caught SIGHUP - re-reading XML file.\n");
- reconfig();
- //time_reconfig(1000); /* instrumentation */
- flushlog();
+ printlog(LOG_CRITICAL, "Caught SIGHUP in signal_thread_func?!?\n");
+ printf("Caught SIGHUP in signal_thread_func?!?\n");
break;
case SIGUSR1:
pthread_rwlock_wrlock(&limiter.limiter_lock);
pthread_rwlock_unlock(&limiter.limiter_lock);
break;
case SIGUSR2:
- do_partition = !do_partition;
+ printlog(LOG_WARN, "Caught SIGUSR2 - re-reading XML file.\n");
+ printf("Caught SIGUSR2 - re-reading XML file.\n");
+ reconfig();
+ flushlog();
break;
default:
/* Intentionally blank. */
sigset_t signal_mask;
sigemptyset(&signal_mask);
- sigaddset(&signal_mask, SIGHUP);
+ //sigaddset(&signal_mask, SIGHUP);
sigaddset(&signal_mask, SIGUSR1);
sigaddset(&signal_mask, SIGUSR2);
+ sigaddset(&signal_mask, SIGRTMAX);
pthread_sigmask(SIG_BLOCK, &signal_mask, NULL);
if (pthread_create(&signal_thread, NULL, &signal_thread_func, NULL) != 0) {
return 0;
}
+static void drl_signal(int sig) {
+ if (sig == SIGHUP) {
+ printf("Caught SIGHUP - reopening DRL log file.\n");
+
+ fclose(logfile);
+ logfile = fopen(drl_logfile.u.string, "a");
+ printlog(LOG_CRITICAL, "Reopened logfile.\n");
+ } else {
+ printlog(LOG_WARN, "Caught unexpected signal %d in drl_signal.\n", sig);
+ }
+}
+
static ulog_output_t drl_op = {
.name = "drl",
.output = &_output_drl,
- .signal = NULL, /* This appears to be broken. Using my own handler. */
+ .signal = &drl_signal,
.init = &drl_plugin_init,
.fini = NULL,
};