Skip to content

radius: implement 2 separate queues for authentication and accounting #284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nuclearcat wants to merge 1 commit into
base: master
Choose a base branch
from
Open

radius: implement 2 separate queues for authentication and accounting #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions accel-pppd/radius/radius_p.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ struct rad_server_t {
int auth_port;
int acct_port;
int req_limit;
int req_cnt;
int queue_cnt;
int req_cnt[2];
int queue_cnt[2];
int fail_timeout;
int max_fail;
char bind_device[IFNAMSIZ];
Expand Down
65 changes: 41 additions & 24 deletions accel-pppd/radius/serv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ static void req_wakeup(struct rad_req_t *req)

if (ts.tv_sec < req->serv->fail_time || req->serv->need_free) {
req->active = 0;
req->serv->req_cnt--;
req->serv->req_cnt[req->type]--;
log_ppp_debug("radius(%i): server failed\n", req->serv->id);
pthread_mutex_unlock(&req->serv->lock);

Expand Down Expand Up @@ -151,7 +151,7 @@ int rad_server_req_cancel(struct rad_req_t *req, int full)
pthread_mutex_lock(&req->serv->lock);
if (req->entry.next) {
list_del(&req->entry);
req->serv->queue_cnt--;
req->serv->queue_cnt[req->type]--;
r = 1;
}
pthread_mutex_unlock(&req->serv->lock);
Expand Down Expand Up @@ -187,8 +187,21 @@ int rad_server_req_enter(struct rad_req_t *req)
return -1;

if (!req->serv->req_limit) {
if (req->send)
return req->send(req, 0);
__sync_add_and_fetch(&req->serv->req_cnt[req->type], 1);
req->active = 1;

if (req->send) {
r = req->send(req, 0);
if (r) {
if (r == -2) {
req->active = 0;
__sync_sub_and_fetch(&req->serv->req_cnt[req->type], 1);
rad_server_fail(req->serv);
} else
rad_server_req_exit(req);
}
return r;
}
return 0;
}

Expand All @@ -204,10 +217,10 @@ int rad_server_req_enter(struct rad_req_t *req)
return -1;
}

if (req->serv->req_cnt >= req->serv->req_limit) {
if (req->serv->req_cnt[req->type] >= req->serv->req_limit) {
if (req->send) {
list_add_tail(&req->entry, &req->serv->req_queue[req->prio]);
req->serv->queue_cnt++;
list_add_tail(&req->entry, &req->serv->req_queue[req->type]);
req->serv->queue_cnt[req->type]++;
Comment on lines +222 to +223
Copy link

Copilot AI Dec 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change from using req->prio to req->type for queue selection eliminates the priority-based queuing functionality that existed before. Previously, req_queue[0] held priority-0 requests and req_queue[1] held priority-1 requests (e.g., accounting stop requests had prio=1 as seen in acct.c line 484). Now all authentication requests go to queue[0] and all accounting requests go to queue[1], regardless of their priority value. This means priority-1 accounting stop requests will no longer be prioritized over regular accounting requests. Consider whether this loss of per-type priority handling is acceptable, or if a more sophisticated queue structure is needed.

Suggested change
list_add_tail(&req->entry, &req->serv->req_queue[req->type]);
req->serv->queue_cnt[req->type]++;
list_add_tail(&req->entry, &req->serv->req_queue[req->prio]);
req->serv->queue_cnt[req->prio]++;

Copilot uses AI. Check for mistakes.
log_ppp_debug("radius(%i): queue %p\n", req->serv->id, req);
pthread_mutex_unlock(&req->serv->lock);

Expand All @@ -221,8 +234,8 @@ int rad_server_req_enter(struct rad_req_t *req)
return 1;
}

req->serv->req_cnt++;
log_ppp_debug("radius(%i): req_enter %i\n", req->serv->id, req->serv->req_cnt);
req->serv->req_cnt[req->type]++;
log_ppp_debug("radius(%i): req_enter %i\n", req->serv->id, req->serv->req_cnt[req->type]);
pthread_mutex_unlock(&req->serv->lock);

req->active = 1;
Expand All @@ -233,7 +246,7 @@ int rad_server_req_enter(struct rad_req_t *req)
if (r == -2) {
req->active = 0;
pthread_mutex_lock(&req->serv->lock);
req->serv->req_cnt--;
req->serv->req_cnt[req->type]--;
pthread_mutex_unlock(&req->serv->lock);

rad_server_fail(req->serv);
Expand All @@ -249,30 +262,33 @@ void rad_server_req_exit(struct rad_req_t *req)
{
struct rad_server_t *serv = req->serv;

if (!req->serv->req_limit)
if (!req->serv->req_limit) {
if (req->active) {
req->active = 0;
__sync_sub_and_fetch(&serv->req_cnt[req->type], 1);
}
return;
}

assert(req->active);

req->active = 0;

pthread_mutex_lock(&serv->lock);
serv->req_cnt--;
log_ppp_debug("radius(%i): req_exit %i\n", serv->id, serv->req_cnt);
assert(serv->req_cnt >= 0);
if (serv->req_cnt < serv->req_limit) {
serv->req_cnt[req->type]--;
log_ppp_debug("radius(%i): req_exit %i\n", serv->id, serv->req_cnt[req->type]);
assert(serv->req_cnt[req->type] >= 0);
if (serv->req_cnt[req->type] < serv->req_limit) {
struct list_head *list = NULL;
if (!list_empty(&serv->req_queue[0]))
list = &serv->req_queue[0];
else if (!list_empty(&serv->req_queue[1]))
list = &serv->req_queue[1];
if (!list_empty(&serv->req_queue[req->type]))
list = &serv->req_queue[req->type];

if (list) {
struct rad_req_t *r = list_entry(list->next, typeof(*r), entry);
log_ppp_debug("radius(%i): wakeup %p\n", serv->id, r);
list_del(&r->entry);
serv->queue_cnt--;
serv->req_cnt++;
serv->queue_cnt[req->type]--;
serv->req_cnt[req->type]++;
r->active = 1;
triton_context_call(r->rpd ? r->rpd->ses->ctrl->ctx : NULL, (triton_event_func)req_wakeup, r);
}
Expand Down Expand Up @@ -337,7 +353,8 @@ void rad_server_fail(struct rad_server_t *s)
triton_context_call(r->rpd ? r->rpd->ses->ctrl->ctx : NULL, (triton_event_func)req_wakeup_failed, r);
}

s->queue_cnt = 0;
s->queue_cnt[0] = 0;
s->queue_cnt[1] = 0;
s->stat_fail_cnt++;

pthread_mutex_unlock(&s->lock);
Expand Down Expand Up @@ -505,8 +522,8 @@ static void show_stat(struct rad_server_t *s, void *client)

cli_sendv(client, " fail count: %lu\r\n", s->stat_fail_cnt);

cli_sendv(client, " request count: %i\r\n", s->req_cnt);
cli_sendv(client, " queue length: %i\r\n", s->queue_cnt);
cli_sendv(client, " request count (auth/acct): %i/%i\r\n", s->req_cnt[0], s->req_cnt[1]);
cli_sendv(client, " queue length (auth/acct): %i/%i\r\n", s->queue_cnt[0], s->queue_cnt[1]);

if (s->auth_port) {
cli_sendv(client, " auth sent: %lu\r\n", s->stat_auth_sent);
Expand Down