{ NULL, 0 }
};
+
/*
* If we're limiting outstanding packets, then mark the response
* as being sent.
*/
int detail_send(rad_listen_t *listener, REQUEST *request)
{
- int rtt;
- struct timeval now;
+#ifdef WITH_DETAIL_THREAD
+ char c = 0;
+#endif
listen_detail_t *data = listener->data;
rad_assert(request->listener == listener);
data->signal = 1;
data->state = STATE_NO_REPLY;
- RDEBUG("Detail - No response configured for request %d. Will retry in %d seconds",
- request->number, data->retry_interval);
+ RDEBUG("detail (%s): No response to request. Will retry in %d seconds",
+ data->name, data->retry_interval);
+ } else {
+ int rtt;
+ struct timeval now;
- radius_signal_self(RADIUS_SIGNAL_SELF_DETAIL);
- return 0;
- }
+ RDEBUG("detail (%s): Done %s packet.", data->name, fr_packet_codes[request->packet->code]);
- /*
- * We call gettimeofday a lot. But it should be OK,
- * because there's nothing else to do.
- */
- gettimeofday(&now, NULL);
+ /*
+ * We call gettimeofday a lot. But it should be OK,
+ * because there's nothing else to do.
+ */
+ gettimeofday(&now, NULL);
- /*
- * If we haven't sent a packet in the last second, reset
- * the RTT.
- */
- now.tv_sec -= 1;
- if (timercmp(&data->last_packet, &now, <)) {
- data->has_rtt = false;
- }
- now.tv_sec += 1;
+ /*
+ * If we haven't sent a packet in the last second, reset
+ * the RTT.
+ */
+ now.tv_sec -= 1;
+ if (timercmp(&data->last_packet, &now, <)) {
+ data->has_rtt = false;
+ }
+ now.tv_sec += 1;
- /*
- * Only one detail packet may be outstanding at a time,
- * so it's safe to update some entries in the detail
- * structure.
- *
- * We keep smoothed round trip time (SRTT), but not round
- * trip timeout (RTO). We use SRTT to calculate a rough
- * load factor.
- */
- rtt = now.tv_sec - request->packet->timestamp.tv_sec;
- rtt *= USEC;
- rtt += now.tv_usec;
- rtt -= request->packet->timestamp.tv_usec;
+ /*
+ * Only one detail packet may be outstanding at a time,
+ * so it's safe to update some entries in the detail
+ * structure.
+ *
+ * We keep smoothed round trip time (SRTT), but not round
+ * trip timeout (RTO). We use SRTT to calculate a rough
+ * load factor.
+ */
+ rtt = now.tv_sec - request->packet->timestamp.tv_sec;
+ rtt *= USEC;
+ rtt += now.tv_usec;
+ rtt -= request->packet->timestamp.tv_usec;
- /*
- * If we're proxying, the RTT is our processing time,
- * plus the network delay there and back, plus the time
- * on the other end to process the packet. Ideally, we
- * should remove the network delays from the RTT, but we
- * don't know what they are.
- *
- * So, to be safe, we over-estimate the total cost of
- * processing the packet.
- */
- if (!data->has_rtt) {
- data->has_rtt = true;
- data->srtt = rtt;
- data->rttvar = rtt / 2;
+ /*
+ * If we're proxying, the RTT is our processing time,
+ * plus the network delay there and back, plus the time
+ * on the other end to process the packet. Ideally, we
+ * should remove the network delays from the RTT, but we
+ * don't know what they are.
+ *
+ * So, to be safe, we over-estimate the total cost of
+ * processing the packet.
+ */
+ if (!data->has_rtt) {
+ data->has_rtt = true;
+ data->srtt = rtt;
+ data->rttvar = rtt / 2;
- } else {
- data->rttvar -= data->rttvar >> 2;
- data->rttvar += (data->srtt - rtt);
- data->srtt -= data->srtt >> 3;
- data->srtt += rtt >> 3;
- }
+ } else {
+ data->rttvar -= data->rttvar >> 2;
+ data->rttvar += (data->srtt - rtt);
+ data->srtt -= data->srtt >> 3;
+ data->srtt += rtt >> 3;
+ }
- /*
- * Calculate the time we wait before sending the next
- * packet.
- *
- * rtt / (rtt + delay) = load_factor / 100
- */
- data->delay_time = (data->srtt * (100 - data->load_factor)) / (data->load_factor);
+ /*
+ * Calculate the time we wait before sending the next
+ * packet.
+ *
+ * rtt / (rtt + delay) = load_factor / 100
+ */
+ data->delay_time = (data->srtt * (100 - data->load_factor)) / (data->load_factor);
- /*
- * Cap delay at 4 packets/s. If the end system can't
- * handle this, then it's very broken.
- */
- if (data->delay_time > (USEC / 4)) data->delay_time= USEC / 4;
+ /*
+ * Cap delay at no less than 4 packets/s. If the
+ * end system can't handle this, then it's very
+ * broken.
+ */
+ if (data->delay_time > (USEC / 4)) data->delay_time= USEC / 4;
- RDEBUG3("Received response for request %d. Will read the next packet in %d seconds",
- request->number, data->delay_time / USEC);
+ RDEBUG3("detail (%s): Received response for request %d. Will read the next packet in %d seconds",
+ data->name, request->number, data->delay_time / USEC);
- data->last_packet = now;
- data->signal = 1;
- data->state = STATE_REPLIED;
- data->counter++;
+ data->last_packet = now;
+ data->signal = 1;
+ data->state = STATE_REPLIED;
+ data->counter++;
+ }
+
+#ifdef WITH_DETAIL_THREAD
+ if (write(data->child_pipe[1], &c, 1) < 0) {
+ RERROR("detail (%s): Failed writing ack to reader thread: %s", data->name, fr_syserror(errno));
+ }
+#else
radius_signal_self(RADIUS_SIGNAL_SELF_DETAIL);
+#endif
return 0;
}
* this file will be read && processed before the
* file globbing is done.
*/
- this->fd = open(data->filename_work, O_RDWR);
- if (this->fd < 0) {
- bool free_filename = false;
- char *filename = data->filename;
+ data->fp = NULL;
+ data->work_fd = open(data->filename_work, O_RDWR);
- DEBUG2("Polling for detail file %s", filename);
+ /*
+ * Couldn't open it for a reason OTHER than "it doesn't
+ * exist". Complain and tell the admin.
+ */
+ if ((data->work_fd < 0) && (errno != ENOENT)) {
+ ERROR("Failed opening detail file %s: %s",
+ data->filename_work, fr_syserror(errno));
+ return 0;
+ }
- /*
- * Try reading the detail file. If it
- * doesn't exist, we can't do anything.
- *
- * Doing the stat will tell us if the file
- * exists, even if we don't have permissions
- * to read it.
- */
- if (stat(filename, &st) < 0) {
+ /*
+ * The file doesn't exist. Poll for it again.
+ */
+ if (data->work_fd < 0) {
#ifndef HAVE_GLOB_H
- return 0;
+ return 0;
#else
- unsigned int i;
- int found;
- time_t chtime;
- glob_t files;
-
- memset(&files, 0, sizeof(files));
- if (glob(filename, 0, NULL, &files) != 0) {
- globfree(&files);
- return 0;
- }
+ unsigned int i;
+ int found;
+ time_t chtime;
+ char const *filename;
+ glob_t files;
- chtime = 0;
- found = -1;
- for (i = 0; i < files.gl_pathc; i++) {
- if (stat(files.gl_pathv[i], &st) < 0) continue;
-
- if ((i == 0) ||
- (st.st_ctime < chtime)) {
- chtime = st.st_ctime;
- found = i;
- }
- }
+ DEBUG2("detail (%s): Polling for detail file", data->name);
- if (found < 0) {
- globfree(&files);
- return 0;
- }
-
- filename = strdup(files.gl_pathv[found]);
- free_filename = true;
+ memset(&files, 0, sizeof(files));
+ if (glob(data->filename, 0, NULL, &files) != 0) {
+ noop:
globfree(&files);
-#endif
+ return 0;
}
/*
- * Open it BEFORE we rename it, just to
- * be safe...
+ * Loop over the glob'd files, looking for the
+ * oldest one.
*/
- this->fd = open(filename, O_RDWR);
- if (this->fd < 0) {
- ERROR("Detail - Failed to open %s: %s",
- filename, strerror(errno));
- if (free_filename) free(filename);
- return 0;
+ chtime = 0;
+ found = -1;
+ for (i = 0; i < files.gl_pathc; i++) {
+ if (stat(files.gl_pathv[i], &st) < 0) continue;
+
+ if ((i == 0) || (st.st_ctime < chtime)) {
+ chtime = st.st_ctime;
+ found = i;
+ }
}
+ if (found < 0) goto noop;
+
/*
* Rename detail to detail.work
*/
- DEBUG("Detail - Renaming %s -> %s", filename, data->filename_work);
+ filename = files.gl_pathv[found];
+
+ DEBUG("detail (%s): Renaming %s -> %s", data->name, filename, data->filename_work);
if (rename(filename, data->filename_work) < 0) {
- ERROR("Detail - Failed renaming %s to %s: %s",
- filename, data->filename_work, strerror(errno));
- if (free_filename) free(filename);
- close(this->fd);
- this->fd = -1;
- return 0;
+ ERROR("detail (%s): Failed renaming %s to %s: %s",
+ data->name, filename, data->filename_work, fr_syserror(errno));
+ goto noop;
}
+ globfree(&files); /* Shouldn't be using anything in files now */
+
/*
- * Ensure we don't leak memory.
+ * And try to open the filename.
*/
- if (free_filename) free(filename);
+ data->work_fd = open(data->filename_work, O_RDWR);
+ if (data->work_fd < 0) {
+ ERROR("Failed opening detail file %s: %s",
+ data->filename_work, fr_syserror(errno));
+ return 0;
+ }
+#endif
} /* else detail.work existed, and we opened it */
rad_assert(data->vps == NULL);
data->client_ip.af = AF_UNSPEC;
data->timestamp = 0;
- data->offset = 0;
+ data->offset = data->last_offset = data->timestamp_offset = 0;
data->packets = 0;
data->tries = 0;
+ data->done_entry = false;
return 1;
}
* t_rtt + t_delay wait for signal that the server is idle.
*
*/
+#ifndef WITH_DETAIL_THREAD
+static RADIUS_PACKET *detail_poll(rad_listen_t *listener);
+
int detail_recv(rad_listen_t *listener)
{
- char key[256], op[8], value[1024];
- vp_cursor_t cursor;
- VALUE_PAIR *vp;
- RADIUS_PACKET *packet;
- char buffer[2048];
+ RADIUS_PACKET *packet;
listen_detail_t *data = listener->data;
+ RAD_REQUEST_FUNP fun = NULL;
/*
* We may be in the main thread. It needs to update the
*/
if (data->signal) return 0;
- switch (data->state) {
- case STATE_UNOPENED:
- open_file:
- rad_assert(listener->fd < 0);
+ packet = detail_poll(listener);
+ if (!packet) return -1;
- if (!detail_open(listener)) return 0;
+ if (DEBUG_ENABLED2) {
+ VALUE_PAIR *vp;
+ vp_cursor_t cursor;
- rad_assert(data->state == STATE_UNLOCKED);
- rad_assert(listener->fd >= 0);
+ DEBUG2("detail (%s): Read packet from %s", data->name, data->filename_work);
+ for (vp = fr_cursor_init(&cursor, &packet->vps);
+ vp;
+ vp = fr_cursor_next(&cursor)) {
+ debug_pair(vp);
+ }
+ }
- /* FALL-THROUGH */
+ switch (packet->code) {
+ case PW_CODE_ACCOUNTING_REQUEST:
+ fun = rad_accounting;
+ break;
- /*
- * Try to lock fd. If we can't, return.
- * If we can, continue. This means that
- * the server doesn't block while waiting
- * for the lock to open...
- */
- case STATE_UNLOCKED:
- /*
- * Note that we do NOT block waiting for
- * the lock. We've re-named the file
- * above, so we've already guaranteed
- * that any *new* detail writer will not
- * be opening this file. The only
- * purpose of the lock is to catch a race
- * condition where the execution
- * "ping-pongs" between radiusd &
- * radrelay.
- */
- if (rad_lockfd_nonblock(listener->fd, 0) < 0) {
- /*
- * Close the FD. The main loop
- * will wake up in a second and
- * try again.
- */
- close(listener->fd);
- listener->fd = -1;
- data->state = STATE_UNOPENED;
- return 0;
- }
+ case PW_CODE_COA_REQUEST:
+ case PW_CODE_DISCONNECT_REQUEST:
+ fun = rad_coa_recv;
+ break;
- data->fp = fdopen(listener->fd, "r");
- if (!data->fp) {
- ERROR("FATAL: Failed to re-open detail file %s: %s",
- data->filename, strerror(errno));
- fr_exit(1);
- }
+ default:
+ rad_free(&packet);
+ data->state = STATE_REPLIED;
+ return 0;
+ }
- /*
- * Look for the header
- */
- data->state = STATE_HEADER;
- data->delay_time = USEC;
- data->vps = NULL;
-
- /* FALL-THROUGH */
-
- case STATE_HEADER:
- do_header:
- data->tries = 0;
- if (!data->fp) {
- data->state = STATE_UNOPENED;
- goto open_file;
- }
+ /*
+ * Don't bother doing limit checks, etc.
+ */
+ if (!request_receive(NULL, listener, packet, &data->detail_client, fun)) {
+ rad_free(&packet);
+ data->state = STATE_NO_REPLY; /* try again later */
+ return 0;
+ }
- {
- struct stat buf;
+ return 1;
+}
+#else
+int detail_recv(rad_listen_t *listener)
+{
+ char c = 0;
+ ssize_t rcode;
+ RADIUS_PACKET *packet;
+ listen_detail_t *data = listener->data;
+ RAD_REQUEST_FUNP fun = NULL;
- if (fstat(listener->fd, &buf) < 0) {
- ERROR("Failed to stat "
- "detail file %s: %s",
- data->filename,
- strerror(errno));
+ /*
+ * Block until there's a packet ready.
+ */
+ rcode = read(data->master_pipe[0], &packet, sizeof(packet));
+ if (rcode <= 0) return rcode;
- goto cleanup;
- }
- if (((off_t) ftell(data->fp)) == buf.st_size) {
- goto cleanup;
- }
- }
+ rad_assert(packet != NULL);
- /*
- * End of file. Delete it, and re-set
- * everything.
- */
- if (feof(data->fp)) {
- cleanup:
- DEBUG("Detail - unlinking %s",
- data->filename_work);
- unlink(data->filename_work);
- if (data->fp) fclose(data->fp);
- data->fp = NULL;
- listener->fd = -1;
- data->state = STATE_UNOPENED;
- rad_assert(data->vps == NULL);
-
- if (data->one_shot) {
- INFO("Finished reading \"one shot\" detail file - Exiting");
- radius_signal_self(RADIUS_SIGNAL_SELF_EXIT);
- }
+ if (DEBUG_ENABLED2) {
+ VALUE_PAIR *vp;
+ vp_cursor_t cursor;
- return 0;
- }
+ DEBUG2("detail (%s): Read packet from %s", data->name, data->filename_work);
+ for (vp = fr_cursor_init(&cursor, &packet->vps);
+ vp;
+ vp = fr_cursor_next(&cursor)) {
+ debug_pair(vp);
+ }
+ }
- /*
- * Else go read something.
- */
- break;
+ switch (packet->code) {
+ case PW_CODE_ACCOUNTING_REQUEST:
+ fun = rad_accounting;
+ break;
- /*
- * Read more value-pair's, unless we're
- * at EOF. In that case, queue whatever
- * we have.
- */
- case STATE_READING:
- if (data->fp && !feof(data->fp)) break;
- data->state = STATE_QUEUED;
+ case PW_CODE_COA_REQUEST:
+ case PW_CODE_DISCONNECT_REQUEST:
+ fun = rad_coa_recv;
+ break;
- /* FALL-THROUGH */
+ default:
+ data->state = STATE_REPLIED;
+ goto signal_thread;
+ }
- case STATE_QUEUED:
- goto alloc_packet;
+ if (!request_receive(NULL, listener, packet, &data->detail_client, fun)) {
+ data->state = STATE_NO_REPLY; /* try again later */
- /*
- * Periodically check what's going on.
- * If the request is taking too long,
- * retry it.
- */
- case STATE_RUNNING:
- if (time(NULL) < (data->running + data->retry_interval)) {
- return 0;
- }
+ signal_thread:
+ rad_free(&packet);
+ if (write(data->child_pipe[1], &c, 1) < 0) {
+ ERROR("detail (%s): Failed writing ack to reader thread: %s", data->name,
+ fr_syserror(errno));
+ }
+ }
- DEBUG("No response to detail request. Retrying");
- data->state = STATE_NO_REPLY;
- /* FALL-THROUGH */
+ /*
+ * Wait for the child thread to write an answer to the pipe
+ */
+ return 0;
+}
+#endif
- /*
- * If there's no reply, keep
- * retransmitting the current packet
- * forever.
- */
- case STATE_NO_REPLY:
- data->state = STATE_QUEUED;
- goto alloc_packet;
+static RADIUS_PACKET *detail_poll(rad_listen_t *listener)
+{
+ int y;
+ char key[256], op[8], value[1024];
+ vp_cursor_t cursor;
+ VALUE_PAIR *vp;
+ RADIUS_PACKET *packet;
+ char buffer[2048];
+ listen_detail_t *data = listener->data;
- /*
- * We have a reply. Clean up the old
- * request, and go read another one.
- */
- case STATE_REPLIED:
- pairfree(&data->vps);
- data->state = STATE_HEADER;
- goto do_header;
- }
+ switch (data->state) {
+ case STATE_UNOPENED:
+open_file:
+ rad_assert(data->work_fd < 0);
+
+ if (!detail_open(listener)) return NULL;
- paircursor(&cursor, &data->vps);
+ rad_assert(data->state == STATE_UNLOCKED);
+ rad_assert(data->work_fd >= 0);
+
+ /* FALL-THROUGH */
/*
- * Read a header, OR a value-pair.
+ * Try to lock fd. If we can't, return.
+ * If we can, continue. This means that
+ * the server doesn't block while waiting
+ * for the lock to open...
*/
- while (fgets(buffer, sizeof(buffer), data->fp)) {
- data->offset = ftell(data->fp); /* for statistics */
-
+ case STATE_UNLOCKED:
/*
- * Badly formatted file: delete it.
- *
- * FIXME: Maybe flag an error?
+ * Note that we do NOT block waiting for
+ * the lock. We've re-named the file
+ * above, so we've already guaranteed
+ * that any *new* detail writer will not
+ * be opening this file. The only
+ * purpose of the lock is to catch a race
+ * condition where the execution
+ * "ping-pongs" between radiusd &
+ * radrelay.
*/
- if (!strchr(buffer, '\n')) {
- pairfree(&data->vps);
- goto cleanup;
+ if (rad_lockfd_nonblock(data->work_fd, 0) < 0) {
+ /*
+ * Close the FD. The main loop
+ * will wake up in a second and
+ * try again.
+ */
+ close(data->work_fd);
+ data->fp = NULL;
+ data->work_fd = -1;
+ data->state = STATE_UNOPENED;
+ return NULL;
}
/*
- * We're reading VP's, and got a blank line.
- * Queue the packet.
+ * Only open for writing if we're
+ * marking requests as completed.
*/
- if ((data->state == STATE_READING) &&
- (buffer[0] == '\n')) {
- data->state = STATE_QUEUED;
- break;
+ data->fp = fdopen(data->work_fd, data->track ? "r+" : "r");
+ if (!data->fp) {
+ ERROR("detail (%s): FATAL: Failed to re-open detail file: %s",
+ data->name, fr_syserror(errno));
+ fr_exit(1);
}
/*
- * Look for date/time header, and read VP's if
- * found. If not, keep reading lines until we
- * find one.
+ * Look for the header
*/
- if (data->state == STATE_HEADER) {
- int y;
+ data->state = STATE_HEADER;
+ data->delay_time = USEC;
+ data->vps = NULL;
+
+ /* FALL-THROUGH */
+
+ case STATE_HEADER:
+ do_header:
+ data->done_entry = false;
+ data->timestamp_offset = 0;
+
+ data->tries = 0;
+ if (!data->fp) {
+ data->state = STATE_UNOPENED;
+ goto open_file;
+ }
+
+ {
+ struct stat buf;
+
+ if (fstat(data->work_fd, &buf) < 0) {
+ ERROR("detail (%s): Failed to stat detail file: %s",
+ data->name, fr_syserror(errno));
- if (sscanf(buffer, "%*s %*s %*d %*d:%*d:%*d %d", &y)) {
- data->state = STATE_READING;
+ goto cleanup;
+ }
+ if (((off_t) ftell(data->fp)) == buf.st_size) {
+ goto cleanup;
}
- continue;
}
/*
- * We have a full "attribute = value" line.
- * If it doesn't look reasonable, skip it.
- *
- * FIXME: print an error for badly formatted attributes?
+ * End of file. Delete it, and re-set
+ * everything.
*/
- if (sscanf(buffer, "%255s %8s %1023s", key, op, value) != 3) {
- WDEBUG2("Skipping badly formatted line %s",
- buffer);
- continue;
+ if (feof(data->fp)) {
+ cleanup:
+ DEBUG("detail (%s): Unlinking %s", data->name, data->filename_work);
+ unlink(data->filename_work);
+ if (data->fp) fclose(data->fp);
+ data->fp = NULL;
+ data->work_fd = -1;
+ data->state = STATE_UNOPENED;
+ rad_assert(data->vps == NULL);
+
+ if (data->one_shot) {
+ INFO("detail (%s): Finished reading \"one shot\" detail file - Exiting", data->name);
+ radius_signal_self(RADIUS_SIGNAL_SELF_EXIT);
+ }
+
+ return NULL;
}
/*
- * Should be =, :=, +=, ...
+ * Else go read something.
*/
- if (!strchr(op, '=')) continue;
+ if (!fgets(buffer, sizeof(buffer), data->fp)) {
+ DEBUG("detail (%s): Failed reading header from file - %s",
+ data->name, data->filename_work);
+ goto cleanup;
+ }
/*
- * Skip non-protocol attributes.
+ * Badly formatted file: delete it.
*/
- if (!strcasecmp(key, "Request-Authenticator")) continue;
+ if (!strchr(buffer, '\n')) {
+ DEBUG("detail (%s): Invalid line without trailing LF - %s", data->name, buffer);
+ goto cleanup;
+ }
+
+ if (!sscanf(buffer, "%*s %*s %*d %*d:%*d:%*d %d", &y)) {
+ DEBUG("detail (%s): Failed reading detail file header in line - %s", data->name, buffer);
+ goto cleanup;
+ }
+
+ data->state = STATE_READING;
+ /* FALL-THROUGH */
+
+
+ /*
+ * Read more value-pair's, unless we're
+ * at EOF. In that case, queue whatever
+ * we have.
+ */
+ case STATE_READING:
+ rad_assert(data->fp != NULL);
+
+ fr_cursor_init(&cursor, &data->vps);
/*
- * Set the original client IP address, based on
- * what's in the detail file.
- *
- * Hmm... we don't set the server IP address.
- * or port. Oh well.
+ * Read a header, OR a value-pair.
*/
- if (!strcasecmp(key, "Client-IP-Address")) {
- data->client_ip.af = AF_INET;
- if (ip_hton(value, AF_INET, &data->client_ip) < 0) {
- ERROR("Failed parsing Client-IP-Address");
+ while (fgets(buffer, sizeof(buffer), data->fp)) {
+ data->last_offset = data->offset;
+ data->offset = ftell(data->fp); /* for statistics */
+
+ /*
+ * Badly formatted file: delete it.
+ */
+ if (!strchr(buffer, '\n')) {
+ WARN("detail (%s): Skipping line without trailing LF - %s", data->name, buffer);
+ fr_pair_list_free(&data->vps);
+ goto cleanup;
+ }
+
+ /*
+ * We're reading VP's, and got a blank line.
+ * That indicates the end of an entry. Queue the
+ * packet.
+ */
+ if (buffer[0] == '\n') {
+ data->state = STATE_QUEUED;
+ data->tries = 0;
+ data->packets++;
+ goto alloc_packet;
+ }
+
+ /*
+ * We have a full "attribute = value" line.
+ * If it doesn't look reasonable, skip it.
+ *
+ * FIXME: print an error for badly formatted attributes?
+ */
+ if (sscanf(buffer, "%255s %7s %1023s", key, op, value) != 3) {
+ DEBUG("detail (%s): Skipping badly formatted line - %s", data->name, buffer);
+ continue;
+ }
+
+ /*
+ * Should be =, :=, +=, ...
+ */
+ if (!strchr(op, '=')) {
+ DEBUG("detail (%s): Skipping line without operator - %s", data->name, buffer);
+ continue;
+ }
+
+ /*
+ * Skip non-protocol attributes.
+ */
+ if (!strcasecmp(key, "Request-Authenticator")) continue;
+
+ /*
+ * Set the original client IP address, based on
+ * what's in the detail file.
+ *
+ * Hmm... we don't set the server IP address.
+ * or port. Oh well.
+ */
+ if (!strcasecmp(key, "Client-IP-Address")) {
+ data->client_ip.af = AF_INET;
+ if (ip_hton(&data->client_ip, AF_INET, value, false) < 0) {
+ DEBUG("detail (%s): Failed parsing Client-IP-Address", data->name);
+ fr_pair_list_free(&data->vps);
+ goto cleanup;
+ }
+ continue;
+ }
- pairfree(&data->vps);
+ /*
+ * The original time at which we received the
+ * packet. We need this to properly calculate
+ * Acct-Delay-Time.
+ */
+ if (!strcasecmp(key, "Timestamp")) {
+ data->timestamp = atoi(value);
+ data->timestamp_offset = data->last_offset;
+
+ vp = fr_pair_afrom_num(data, PW_PACKET_ORIGINAL_TIMESTAMP, 0);
+ if (vp) {
+ vp->vp_date = (uint32_t) data->timestamp;
+ vp->type = VT_DATA;
+ fr_cursor_insert(&cursor, vp);
+ }
+ continue;
+ }
+
+ if (!strcasecmp(key, "Donestamp")) {
+ data->timestamp = atoi(value);
+ data->done_entry = true;
+ continue;
+ }
+
+ DEBUG3("detail (%s): Trying to read VP from line - %s", data->name, buffer);
+
+ /*
+ * Read one VP.
+ *
+ * FIXME: do we want to check for non-protocol
+ * attributes like radsqlrelay does?
+ */
+ vp = NULL;
+ if ((fr_pair_list_afrom_str(data, buffer, &vp) > 0) &&
+ (vp != NULL)) {
+ fr_cursor_merge(&cursor, vp);
+ } else {
+ DEBUG("detail (%s): Failed reading VP from line - %s", data->name, buffer);
goto cleanup;
}
- continue;
}
/*
- * The original time at which we received the
- * packet. We need this to properly calculate
- * Acct-Delay-Time.
+ * The writer doesn't check that the
+ * record was completely written. If the
+ * disk is full, this can result in a
+ * truncated record which has no trailing
+ * blank line. When that happens, it's a
+ * bad record, and we ignore it.
*/
- if (!strcasecmp(key, "Timestamp")) {
- data->timestamp = atoi(value);
-
- vp = paircreate(data, PW_PACKET_ORIGINAL_TIMESTAMP, 0);
- if (vp) {
- vp->vp_date = (uint32_t) data->timestamp;
- vp->type = VT_DATA;
- pairinsert(&cursor, vp);
- }
- continue;
+ if (feof(data->fp)) {
+ DEBUG("detail (%s): Truncated record: treating it as EOF for detail file %s",
+ data->name, data->filename_work);
+ fr_pair_list_free(&data->vps);
+ goto cleanup;
}
/*
- * Read one VP.
+ * Some kind of non-eof error.
*
- * FIXME: do we want to check for non-protocol
- * attributes like radsqlrelay does?
+ * FIXME: Leave the file in-place, and warn the
+ * administrator?
*/
- vp = NULL;
- if ((userparse(data, buffer, &vp) > 0) &&
- (vp != NULL)) {
- pairinsert(&cursor, vp);
- }
- }
+ DEBUG("detail (%s): Unknown error, deleting detail file %s",
+ data->name, data->filename_work);
+ goto cleanup;
+
+ case STATE_QUEUED:
+ goto alloc_packet;
/*
- * Some kind of error.
- *
- * FIXME: Leave the file in-place, and warn the
- * administrator?
+ * Periodically check what's going on.
+ * If the request is taking too long,
+ * retry it.
*/
- if (ferror(data->fp)) goto cleanup;
+ case STATE_RUNNING:
+ if (time(NULL) < (data->running + (int)data->retry_interval)) {
+ return NULL;
+ }
- data->tries = 0;
- data->packets++;
+ DEBUG("detail (%s): No response to detail request. Retrying", data->name);
+ /* FALL-THROUGH */
/*
- * Process the packet.
+ * If there's no reply, keep
+ * retransmitting the current packet
+ * forever.
*/
- alloc_packet:
- data->tries++;
+ case STATE_NO_REPLY:
+ data->state = STATE_QUEUED;
+ goto alloc_packet;
/*
- * The writer doesn't check that the record was
- * completely written. If the disk is full, this can
- * result in a truncated record. When that happens,
- * treat it as EOF.
+ * We have a reply. Clean up the old
+ * request, and go read another one.
*/
- if (data->state != STATE_QUEUED) {
- ERROR("Truncated record: treating it as EOF for detail file %s", data->filename_work);
- goto cleanup;
+ case STATE_REPLIED:
+ if (data->track) {
+ rad_assert(data->fp != NULL);
+
+ if (fseek(data->fp, data->timestamp_offset, SEEK_SET) < 0) {
+ DEBUG("detail (%s): Failed seeking to timestamp offset: %s",
+ data->name, fr_syserror(errno));
+ } else if (fwrite("\tDone", 1, 5, data->fp) < 5) {
+ DEBUG("detail (%s): Failed marking request as done: %s",
+ data->name, fr_syserror(errno));
+ } else if (fflush(data->fp) != 0) {
+ DEBUG("detail (%s): Failed flushing marked detail file to disk: %s",
+ data->name, fr_syserror(errno));
+ }
+
+ if (fseek(data->fp, data->offset, SEEK_SET) < 0) {
+ DEBUG("detail (%s): Failed seeking to next detail request: %s",
+ data->name, fr_syserror(errno));
+ }
+ }
+
+ fr_pair_list_free(&data->vps);
+ data->state = STATE_HEADER;
+ goto do_header;
}
/*
+ * Process the packet.
+ */
+ alloc_packet:
+ if (data->done_entry) {
+ DEBUG2("detail (%s): Skipping record for timestamp %lu", data->name, data->timestamp);
+ fr_pair_list_free(&data->vps);
+ data->state = STATE_HEADER;
+ goto do_header;
+ }
+
+ data->tries++;
+
+ /*
* We're done reading the file, but we didn't read
* anything. Clean up, and don't return anything.
*/
if (!data->vps) {
+ WARN("detail (%s): Read empty packet from file %s",
+ data->name, data->filename_work);
data->state = STATE_HEADER;
- if (!data->fp || feof(data->fp)) goto cleanup;
- return 0;
+ return NULL;
}
/*
* Allocate the packet. If we fail, it's a serious
* problem.
*/
- packet = rad_alloc(NULL, 1);
+ packet = rad_alloc(NULL, true);
if (!packet) {
- ERROR("FATAL: Failed allocating memory for detail");
+ ERROR("detail (%s): FATAL: Failed allocating memory for detail", data->name);
fr_exit(1);
- _exit(1);
}
memset(packet, 0, sizeof(*packet));
packet->sockfd = -1;
packet->src_ipaddr.af = AF_INET;
packet->src_ipaddr.ipaddr.ip4addr.s_addr = htonl(INADDR_NONE);
- packet->code = PW_ACCOUNTING_REQUEST;
+
+ /*
+ * If everything's OK, this is a waste of memory.
+ * Otherwise, it lets us re-send the original packet
+ * contents, unmolested.
+ */
+ packet->vps = fr_pair_list_copy(packet, data->vps);
+
+ packet->code = PW_CODE_ACCOUNTING_REQUEST;
+ vp = fr_pair_find_by_num(packet->vps, PW_PACKET_TYPE, 0, TAG_ANY);
+ if (vp) packet->code = vp->vp_integer;
+
gettimeofday(&packet->timestamp, NULL);
/*
packet->src_ipaddr = data->client_ip;
}
- vp = pairfind(packet->vps, PW_PACKET_SRC_IP_ADDRESS, 0, TAG_ANY);
+ vp = fr_pair_find_by_num(packet->vps, PW_PACKET_SRC_IP_ADDRESS, 0, TAG_ANY);
if (vp) {
packet->src_ipaddr.af = AF_INET;
packet->src_ipaddr.ipaddr.ip4addr.s_addr = vp->vp_ipaddr;
+ packet->src_ipaddr.prefix = 32;
} else {
- vp = pairfind(packet->vps, PW_PACKET_SRC_IPV6_ADDRESS, 0, TAG_ANY);
+ vp = fr_pair_find_by_num(packet->vps, PW_PACKET_SRC_IPV6_ADDRESS, 0, TAG_ANY);
if (vp) {
packet->src_ipaddr.af = AF_INET6;
memcpy(&packet->src_ipaddr.ipaddr.ip6addr,
&vp->vp_ipv6addr, sizeof(vp->vp_ipv6addr));
+ packet->src_ipaddr.prefix = 128;
}
}
- vp = pairfind(packet->vps, PW_PACKET_DST_IP_ADDRESS, 0, TAG_ANY);
+ vp = fr_pair_find_by_num(packet->vps, PW_PACKET_DST_IP_ADDRESS, 0, TAG_ANY);
if (vp) {
packet->dst_ipaddr.af = AF_INET;
packet->dst_ipaddr.ipaddr.ip4addr.s_addr = vp->vp_ipaddr;
+ packet->dst_ipaddr.prefix = 32;
} else {
- vp = pairfind(packet->vps, PW_PACKET_DST_IPV6_ADDRESS, 0, TAG_ANY);
+ vp = fr_pair_find_by_num(packet->vps, PW_PACKET_DST_IPV6_ADDRESS, 0, TAG_ANY);
if (vp) {
packet->dst_ipaddr.af = AF_INET6;
memcpy(&packet->dst_ipaddr.ipaddr.ip6addr,
&vp->vp_ipv6addr, sizeof(vp->vp_ipv6addr));
+ packet->dst_ipaddr.prefix = 128;
}
}
packet->dst_ipaddr.ipaddr.ip4addr.s_addr = htonl((INADDR_LOOPBACK & ~0xffffff) | ((data->counter >> 24) & 0xff));
/*
- * If everything's OK, this is a waste of memory.
- * Otherwise, it lets us re-send the original packet
- * contents, unmolested.
- */
- packet->vps = paircopy(packet, data->vps);
-
- /*
- * Prefer the Event-Timestamp in the packet, if it
- * exists. That is when the event occurred, whereas the
- * "Timestamp" field is when we wrote the packet to the
- * detail file, which could have been much later.
+ * Create / update accounting attributes.
*/
- vp = pairfind(packet->vps, PW_EVENT_TIMESTAMP, 0, TAG_ANY);
- if (vp) {
- data->timestamp = vp->vp_integer;
- }
+ if (packet->code == PW_CODE_ACCOUNTING_REQUEST) {
+ /*
+ * Prefer the Event-Timestamp in the packet, if it
+ * exists. That is when the event occurred, whereas the
+ * "Timestamp" field is when we wrote the packet to the
+ * detail file, which could have been much later.
+ */
+ vp = fr_pair_find_by_num(packet->vps, PW_EVENT_TIMESTAMP, 0, TAG_ANY);
+ if (vp) {
+ data->timestamp = vp->vp_integer;
+ }
- /*
- * Look for Acct-Delay-Time, and update
- * based on Acct-Delay-Time += (time(NULL) - timestamp)
- */
- vp = pairfind(packet->vps, PW_ACCT_DELAY_TIME, 0, TAG_ANY);
- if (!vp) {
- vp = paircreate(packet, PW_ACCT_DELAY_TIME, 0);
- rad_assert(vp != NULL);
- pairadd(&packet->vps, vp);
- }
- if (data->timestamp != 0) {
- vp->vp_integer += time(NULL) - data->timestamp;
+ /*
+ * Look for Acct-Delay-Time, and update
+ * based on Acct-Delay-Time += (time(NULL) - timestamp)
+ */
+ vp = fr_pair_find_by_num(packet->vps, PW_ACCT_DELAY_TIME, 0, TAG_ANY);
+ if (!vp) {
+ vp = fr_pair_afrom_num(packet, PW_ACCT_DELAY_TIME, 0);
+ rad_assert(vp != NULL);
+ fr_pair_add(&packet->vps, vp);
+ }
+ if (data->timestamp != 0) {
+ vp->vp_integer += time(NULL) - data->timestamp;
+ }
}
/*
* Set the transmission count.
*/
- vp = pairfind(packet->vps, PW_PACKET_TRANSMIT_COUNTER, 0, TAG_ANY);
+ vp = fr_pair_find_by_num(packet->vps, PW_PACKET_TRANSMIT_COUNTER, 0, TAG_ANY);
if (!vp) {
- vp = paircreate(packet, PW_PACKET_TRANSMIT_COUNTER, 0);
+ vp = fr_pair_afrom_num(packet, PW_PACKET_TRANSMIT_COUNTER, 0);
rad_assert(vp != NULL);
- pairadd(&packet->vps, vp);
+ fr_pair_add(&packet->vps, vp);
}
vp->vp_integer = data->tries;
- if (debug_flag) {
- fr_printf_log("detail_recv: Read packet from %s\n", data->filename_work);
- for (vp = paircursor(&cursor, &packet->vps);
- vp;
- vp = pairnext(&cursor)) {
- debug_pair(vp);
- }
- }
-
- /*
- * Don't bother doing limit checks, etc.
- */
- if (!request_receive(listener, packet, &data->detail_client,
- rad_accounting)) {
- rad_free(&packet);
- data->state = STATE_NO_REPLY; /* try again later */
- return 0;
- }
-
data->state = STATE_RUNNING;
data->running = packet->timestamp.tv_sec;
- return 1;
+ return packet;
}
-
/*
* Free detail-specific stuff.
*/
{
listen_detail_t *data = this->data;
- talloc_free(data->filename);
- data->filename = NULL;
- pairfree(&data->vps);
+#ifdef WITH_DETAIL_THREAD
+ if (!check_config) {
+ ssize_t ret;
+ void *arg = NULL;
+
+ /*
+ * Mark the child pipes as unusable
+ */
+ close(data->child_pipe[0]);
+ close(data->child_pipe[1]);
+ data->child_pipe[0] = -1;
+
+ /*
+ * Tell it to stop (interrupting its sleep)
+ */
+ pthread_kill(data->pthread_id, SIGTERM);
+
+ /*
+ * Wait for it to acknowledge that it's stopped.
+ */
+ ret = read(data->master_pipe[0], &arg, sizeof(arg));
+ if (ret < 0) {
+ ERROR("detail (%s): Reader thread exited without informing the master: %s",
+ data->name, fr_syserror(errno));
+ } else if (ret != sizeof(arg)) {
+ ERROR("detail (%s): Invalid thread pointer received from reader thread during exit",
+ data->name);
+ ERROR("detail (%s): Expected %zu bytes, got %zi bytes", data->name, sizeof(arg), ret);
+ }
+
+ close(data->master_pipe[0]);
+ close(data->master_pipe[1]);
+
+ if (arg) pthread_join(data->pthread_id, &arg);
+ }
+#endif
if (data->fp != NULL) {
fclose(data->fp);
this->server);
}
+
/*
- * Overloaded to return delay times.
+ * Delay while waiting for a file to be ready
*/
-int detail_encode(rad_listen_t *this, UNUSED REQUEST *request)
+static int detail_delay(listen_detail_t *data)
{
- listen_detail_t *data = this->data;
+ int delay = (data->poll_interval - 1) * USEC;
/*
- * We haven't sent a packet... delay things a bit.
+ * Add +/- 0.25s of jitter
*/
- if (!data->signal) {
- int delay = (data->poll_interval - 1) * USEC;
+ delay += (USEC * 3) / 4;
+ delay += fr_rand() % (USEC / 2);
- /*
- * Add +/- 0.25s of jitter
- */
- delay += (USEC * 3) / 4;
- delay += fr_rand() % (USEC / 2);
+ DEBUG2("detail (%s): Detail listener state %s waiting %d.%06d sec",
+ data->name,
+ fr_int2str(state_names, data->state, "?"),
+ (delay / USEC), delay % USEC);
- DEBUG2("Detail listener %s state %s signalled %d waiting %d.%06d sec",
- data->filename,
- fr_int2str(state_names, data->state, "?"), data->signal,
- (delay / USEC), delay % USEC);
+ return delay;
+}
- return delay;
- }
+/*
+ * Overloaded to return delay times.
+ */
+int detail_encode(UNUSED rad_listen_t *this, UNUSED REQUEST *request)
+{
+#ifdef WITH_DETAIL_THREAD
+ return 0;
+#else
+ listen_detail_t *data = this->data;
+
+ /*
+ * We haven't sent a packet... delay things a bit.
+ */
+ if (!data->signal) return detail_delay(data);
data->signal = 0;
- DEBUG2("Detail listener %s state %s signalled %d waiting %d.%06d sec",
- data->filename, fr_int2str(state_names, data->state, "?"),
+ DEBUG2("detail (%s): Detail listener state %s signalled %d waiting %d.%06d sec",
+ data->name,
+ fr_int2str(state_names, data->state, "?"),
data->signal,
data->delay_time / USEC,
data->delay_time % USEC);
return data->delay_time;
+#endif
}
-
/*
* Overloaded to return "should we fix delay times"
*/
-int detail_decode(rad_listen_t *this, UNUSED REQUEST *request)
+int detail_decode(rad_listen_t *this, REQUEST *request)
{
+#ifdef WITH_DETAIL_THREAD
listen_detail_t *data = this->data;
+ RDEBUG("Received %s from detail file %s",
+ fr_packet_codes[request->packet->code], data->filename_work);
+
+ rdebug_pair_list(L_DBG_LVL_1, request, request->packet->vps, "\t");
+
+ return 0;
+#else
+ listen_detail_t *data = this->data;
+
+ RDEBUG("Received %s from detail file %s",
+ fr_packet_codes[request->packet->code], data->filename_work);
+
+ rdebug_pair_list(L_DBG_LVL_1, request, request->packet->vps, "\t");
+
return data->signal;
+#endif
+}
+
+
+#ifdef WITH_DETAIL_THREAD
+static void *detail_handler_thread(void *arg)
+{
+ char c;
+ rad_listen_t *this = arg;
+ listen_detail_t *data = this->data;
+
+ while (true) {
+ RADIUS_PACKET *packet;
+
+ while ((packet = detail_poll(this)) == NULL) {
+ usleep(detail_delay(data));
+
+ /*
+ * If we're supposed to exit then tell
+ * the master thread we've exited.
+ */
+ if (data->child_pipe[0] < 0) {
+ packet = NULL;
+ if (write(data->master_pipe[1], &packet, sizeof(packet)) < 0) {
+ ERROR("detail (%s): Failed writing exit status to master: %s",
+ data->name, fr_syserror(errno));
+ }
+ return NULL;
+ }
+ }
+
+ /*
+ * Keep retrying forever.
+ *
+ * FIXME: cap the retries.
+ */
+ do {
+ if (write(data->master_pipe[1], &packet, sizeof(packet)) < 0) {
+ ERROR("detail (%s): Failed passing detail packet pointer to master: %s",
+ data->name, fr_syserror(errno));
+ }
+
+ if (read(data->child_pipe[0], &c, 1) < 0) {
+ ERROR("detail (%s): Failed getting detail packet ack from master: %s",
+ data->name, fr_syserror(errno));
+ break;
+ }
+
+ if (data->delay_time > 0) usleep(data->delay_time);
+
+ packet = detail_poll(this);
+ if (!packet) break;
+ } while (data->state != STATE_REPLIED);
+ }
+
+ return NULL;
}
+#endif
static const CONF_PARSER detail_config[] = {
- { "detail", PW_TYPE_FILE_OUTPUT | PW_TYPE_DEPRECATED,
- offsetof(listen_detail_t, filename), NULL, NULL },
- { "filename", PW_TYPE_FILE_OUTPUT | PW_TYPE_REQUIRED,
- offsetof(listen_detail_t, filename), NULL, NULL },
- { "load_factor", PW_TYPE_INTEGER,
- offsetof(listen_detail_t, load_factor), NULL, STRINGIFY(10)},
- { "poll_interval", PW_TYPE_INTEGER,
- offsetof(listen_detail_t, poll_interval), NULL, STRINGIFY(1)},
- { "retry_interval", PW_TYPE_INTEGER,
- offsetof(listen_detail_t, retry_interval), NULL, STRINGIFY(30)},
- { "one_shot", PW_TYPE_BOOLEAN,
- offsetof(listen_detail_t, one_shot), NULL, NULL},
- { "max_outstanding", PW_TYPE_INTEGER,
- offsetof(listen_detail_t, load_factor), NULL, NULL},
-
- { NULL, -1, 0, NULL, NULL } /* end the list */
+ { "detail", FR_CONF_OFFSET(PW_TYPE_FILE_OUTPUT | PW_TYPE_DEPRECATED, listen_detail_t, filename), NULL },
+ { "filename", FR_CONF_OFFSET(PW_TYPE_FILE_OUTPUT | PW_TYPE_REQUIRED, listen_detail_t, filename), NULL },
+ { "load_factor", FR_CONF_OFFSET(PW_TYPE_INTEGER, listen_detail_t, load_factor), STRINGIFY(10) },
+ { "poll_interval", FR_CONF_OFFSET(PW_TYPE_INTEGER, listen_detail_t, poll_interval), STRINGIFY(1) },
+ { "retry_interval", FR_CONF_OFFSET(PW_TYPE_INTEGER, listen_detail_t, retry_interval), STRINGIFY(30) },
+ { "one_shot", FR_CONF_OFFSET(PW_TYPE_BOOLEAN, listen_detail_t, one_shot), "no" },
+ { "track", FR_CONF_OFFSET(PW_TYPE_BOOLEAN, listen_detail_t, track), "no" },
+ CONF_PARSER_TERMINATOR
};
-extern bool check_config;
-
/*
* Parse a detail section.
*/
int rcode;
listen_detail_t *data;
RADCLIENT *client;
- char buffer[2048];
-
- if (check_config) return 0;
+ char buffer[2048];
data = this->data;
return -1;
}
+ data->name = cf_section_name2(cs);
+ if (!data->name) data->name = data->filename;
+
/*
* We don't do duplicate detection for "detail" sockets.
*/
return -1;
}
- if ((data->load_factor < 1) || (data->load_factor > 100)) {
- cf_log_err_cs(cs, "Load factor must be between 1 and 100");
- return -1;
- }
+ FR_INTEGER_BOUND_CHECK("load_factor", data->load_factor, >=, 1);
+ FR_INTEGER_BOUND_CHECK("load_factor", data->load_factor, <=, 100);
- if ((data->poll_interval < 1) || (data->poll_interval > 20)) {
- cf_log_err_cs(cs, "poll_interval must be between 1 and 20");
- return -1;
- }
+ FR_INTEGER_BOUND_CHECK("poll_interval", data->poll_interval, >=, 1);
+ FR_INTEGER_BOUND_CHECK("poll_interval", data->poll_interval, <=, 60);
- if (data->max_outstanding == 0) data->max_outstanding = 1;
+ FR_INTEGER_BOUND_CHECK("retry_interval", data->retry_interval, >=, 4);
+ FR_INTEGER_BOUND_CHECK("retry_interval", data->retry_interval, <=, 3600);
+
+ /*
+ * Only checking the config. Don't start threads or anything else.
+ */
+ if (check_config) return 0;
/*
* If the filename is a glob, use "detail.work" as the
char *p;
#ifndef HAVE_GLOB_H
- WARN("Detail file \"%s\" appears to use file globbing, but it is not supported on this system.",
- data->filename);
+ WARN("detail (%s): File \"%s\" appears to use file globbing, but it is not supported on this system",
+ data->name, data->filename);
#endif
strlcpy(buffer, data->filename, sizeof(buffer));
p = strrchr(buffer, FR_DIR_SEP);
} else {
buffer[0] = '\0';
}
+
+ /*
+ * Globbing cannot be done across directories.
+ */
+ if ((strchr(buffer, '*') != NULL) ||
+ (strchr(buffer, '[') != NULL)) {
+ cf_log_err_cs(cs, "Wildcard directories are not supported");
+ return -1;
+ }
+
strlcat(buffer, "detail.work",
sizeof(buffer) - strlen(buffer));
snprintf(buffer, sizeof(buffer), "%s.work", data->filename);
}
- free(data->filename_work);
- data->filename_work = strdup(buffer); /* FIXME: leaked */
+ data->filename_work = talloc_strdup(data, buffer);
+ data->work_fd = -1;
data->vps = NULL;
data->fp = NULL;
data->state = STATE_UNOPENED;
memset(client, 0, sizeof(*client));
client->ipaddr.af = AF_INET;
client->ipaddr.ipaddr.ip4addr.s_addr = INADDR_NONE;
- client->prefix = 0;
+ client->ipaddr.prefix = 0;
client->longname = client->shortname = data->filename;
client->secret = client->shortname;
- client->nas_type = strdup("none");
+ client->nas_type = talloc_strdup(data, "none"); /* Part of 'data' not dynamically allocated */
+
+#ifdef WITH_DETAIL_THREAD
+ /*
+ * Create the communication pipes.
+ */
+ if (pipe(data->master_pipe) < 0) {
+ ERROR("detail (%s): Error opening internal pipe: %s", data->name, fr_syserror(errno));
+ fr_exit(1);
+ }
+
+ if (pipe(data->child_pipe) < 0) {
+ ERROR("detail (%s): Error opening internal pipe: %s", data->name, fr_syserror(errno));
+ fr_exit(1);
+ }
+
+ pthread_create(&data->pthread_id, NULL, detail_handler_thread, this);
+
+ this->fd = data->master_pipe[0];
+#endif
return 0;
}
projects / freeradius.git / blobdiff