PTHREAD_MUTEX_UNLOCK(&proxy_mutex);
}
+static int proxy_add_fds(rad_listen_t *proxy_listener)
+{
+ int i, proxy, found = -1;
+
+ proxy = proxy_listener->fd;
+ for (i = 0; i < 32; i++) {
+ /*
+ * Found a free entry. Save the socket,
+ * and remember where we saved it.
+ */
+ if (proxy_fds[(proxy + i) & 0x1f] == -1) {
+ found = (proxy + i) & 0x1f;
+ proxy_fds[found] = proxy;
+ proxy_listeners[found] = proxy_listener;
+ break;
+ }
+ }
+
+ return found;
+}
+
static int proxy_id_alloc(REQUEST *request, RADIUS_PACKET *packet)
{
- int i, proxy, found;
rad_listen_t *proxy_listener;
if (fr_packet_list_id_alloc(proxy_list, packet)) return 1;
/*
* Cache it locally.
*/
- found = -1;
- proxy = proxy_listener->fd;
- for (i = 0; i < 32; i++) {
- /*
- * Found a free entry. Save the socket,
- * and remember where we saved it.
- */
- if (proxy_fds[(proxy + i) & 0x1f] == -1) {
- found = (proxy + i) & 0x1f;
- proxy_fds[found] = proxy;
- proxy_listeners[found] = proxy_listener;
- break;
- }
- }
- if (found < 0) {
+ if (proxy_add_fds(proxy_listener) < 0) {
proxy_all_used = TRUE;
listen_free(&proxy_listener);
radlog(L_ERR, "Failed creating new proxy socket: server is too busy and home servers appear to be down");
if (!fr_packet_list_insert(proxy_list, &request->proxy)) {
fr_packet_list_id_free(proxy_list, request->proxy);
PTHREAD_MUTEX_UNLOCK(&proxy_mutex);
- RDEBUG2("ERROR: Failed to insert entry into proxy list");
+ RDEBUG2("ERROR: Failed to insert entry into proxy list.");
return 0;
}
request->number, request->component, request->module);
} else {
request->delay = USEC * request->root->max_request_time;
- RDEBUG2("WARNING: Child is still stuck for request %u",
+ RDEBUG2("WARNING: Child is hung after \"max_request_time\" for request %u",
request->number);
}
tv_add(&request->when, request->delay);
rad_assert(request->proxy_listener == NULL);
if (!insert_into_proxy_hash(request, FALSE)) {
- RDEBUG2("ERROR: Failed inserting status check %d into proxy hash. Discarding it.",
+ RDEBUG2("ERROR: Failed to insert status check %d into proxy list. Discarding it.",
request->number);
ev_request_free(&request);
return;
/*
* Don't touch request due to race conditions
*/
- if (home->state == HOME_STATE_IS_DEAD) {
- rad_assert(home->ev != NULL); /* or it will never wake up */
- return;
- }
/*
- * Enable the zombie period when we notice that the home
- * server hasn't responded. We do NOT back-date the start
- * of the zombie period.
- */
- if (home->state == HOME_STATE_ALIVE) {
- home->state = HOME_STATE_ZOMBIE;
- home->zombie_period_start = now;
- fr_event_delete(el, &home->ev);
- home->currently_outstanding = 0;
- home->num_received_pings = 0;
-
- radlog(L_PROXY, "Marking home server %s port %d as zombie (it looks like it is dead).",
- inet_ntop(home->ipaddr.af, &home->ipaddr.ipaddr,
- buffer, sizeof(buffer)),
- home->port);
-
+ * If it's not alive, don't try to make it a zombie.
+ */
+ if (home->state != HOME_STATE_ALIVE) {
/*
- * Start pinging the home server.
+ * Don't check home->ev due to race conditions.
*/
- ping_home_server(home);
+ return;
}
+
+ /*
+ * We've received a real packet recently. Don't mark the
+ * server as zombie until we've received NO packets for a
+ * while. The "1/4" of zombie period was chosen rather
+ * arbitrarily. It's a balance between too short, which
+ * gives quick fail-over and fail-back, or too long,
+ * where the proxy still sends packets to an unresponsive
+ * home server.
+ */
+ if ((home->last_packet + ((home->zombie_period + 3) / 4)) >= now.tv_sec) {
+ return;
+ }
+
+ /*
+ * Enable the zombie period when we notice that the home
+ * server hasn't responded for a while. We back-date the
+ * zombie period to when we last received a response from
+ * the home server.
+ */
+ home->state = HOME_STATE_ZOMBIE;
+
+ home->zombie_period_start.tv_sec = home->last_packet;
+ home->zombie_period_start.tv_sec = USEC / 2;
+
+ fr_event_delete(el, &home->ev);
+ home->currently_outstanding = 0;
+ home->num_received_pings = 0;
+
+ radlog(L_PROXY, "Marking home server %s port %d as zombie (it looks like it is dead).",
+ inet_ntop(home->ipaddr.af, &home->ipaddr.ipaddr,
+ buffer, sizeof(buffer)),
+ home->port);
+
+ /*
+ * Start pinging the home server.
+ */
+ ping_home_server(home);
}
#endif
*/
if (have_children &&
(pthread_equal(request->child_pid, NO_SUCH_CHILD_PID) == 0)) {
- radlog(L_ERR, "WARNING: Unresponsive child for request %u, in module %s component %s",
+ radlog(L_ERR, "WARNING: Unresponsive child for request %u, in component %s module %s",
request->number,
- request->module ? request->module : "<server core>",
- request->component ? request->component : "<server core>");
+ request->component ? request->component : "<server core>",
+ request->module ? request->module : "<server core>");
+
}
request->delay = USEC;
if (update_event_timestamp(request->proxy, now.tv_sec)) {
if (!insert_into_proxy_hash(request, TRUE)) {
- DEBUG("ERROR: Failed re-inserting CoA request into proxy hash.");
+ DEBUG("ERROR: Failed to insert retransmission of CoA request into proxy list.");
return;
}
coa->proxy->dst_port = coa->home_server->port;
if (!insert_into_proxy_hash(coa, FALSE)) {
- DEBUG("ERROR: Failed inserting CoA request into proxy hash.");
+ DEBUG("ERROR: Failed to insert CoA request into proxy list.");
goto fail;
}
#endif
if (request->home_server->server) {
- RDEBUG("ERROR: Cannot perform real proxying to a virtual server.");
+ RDEBUG("ERROR: Cannot proxy to a virtual server.");
return 0;
}
if (!insert_into_proxy_hash(request, FALSE)) {
- RDEBUG("ERROR: Failed inserting request into proxy hash.");
+ RDEBUG("ERROR: Failed to insert entry into proxy list.");
return 0;
}
home = home_server_ldb(NULL, request->home_pool, request);
if (!home) {
- RDEBUG2("Failed to find live home server for request %u", request->number);
+ RDEBUG2("ERROR: Failed to find live home server for request %u", request->number);
no_home_servers:
/*
* Do post-request processing,
* receive a packet? Setting this here means that we
* mark it alive on *any* packet, even if it's lost all
* of the *other* packets in the last 10s.
+ *
+ * This behavior could be configurable.
*/
request->home_server->state = HOME_STATE_ALIVE;
+ request->home_server->last_packet = now.tv_sec;
#ifdef WITH_COA
/*
if (check_config) {
DEBUG("%s: #### Skipping IP addresses and Ports ####",
mainconfig.name);
+ if (listen_init(cs, &head) < 0) {
+ fflush(NULL);
+ exit(1);
+ }
return 1;
}
#ifdef WITH_PROXY
case RAD_LISTEN_PROXY:
- rad_assert(proxy_fds[this->fd & 0x1f] == -1);
- rad_assert(proxy_listeners[this->fd & 0x1f] == NULL);
-
- proxy_fds[this->fd & 0x1f] = this->fd;
- proxy_listeners[this->fd & 0x1f] = this;
+ if (proxy_add_fds(this) < 0) {
+ radlog(L_ERR, "Failed creating new proxy socket");
+ return 0;
+ }
+
if (!fr_packet_list_socket_add(proxy_list,
this->fd)) {
rad_assert(0 == 1);
projects / freeradius.git / blobdiff