static void cleanup(RADIUS_PACKET *packet)
{
if (!packet) return;
- if (packet->sockfd >= 0) close(packet->sockfd);
+ if (packet->sockfd >= 0) {
+ close(packet->sockfd);
+ }
+
rad_free(&packet);
}
* @param[in] request The current request.
* @param[in] list of attributes to copy to the duplicate packet.
* @param[in] code to write into the code field of the duplicate packet.
- * @return RCODE fail on error, invalid if list does not exist, noop if no
- * replications succeeded, else ok.
+ * @return RCODE fail on error, invalid if list does not exist, noop if no replications succeeded, else ok.
*/
-static int replicate_packet(UNUSED void *instance, REQUEST *request,
- pair_lists_t list, unsigned int code)
+static int replicate_packet(UNUSED void *instance, REQUEST *request, pair_lists_t list, unsigned int code)
{
int rcode = RLM_MODULE_NOOP;
VALUE_PAIR *vp, **vps;
vp_cursor_t cursor;
- home_server *home;
+ home_server_t *home;
REALM *realm;
home_pool_t *pool;
RADIUS_PACKET *packet = NULL;
* Send as many packets as necessary to different
* destinations.
*/
- paircursor(&cursor, &request->config_items);
- while ((vp = pairfindnext(&cursor, PW_REPLICATE_TO_REALM, 0, TAG_ANY))) {
-
+ fr_cursor_init(&cursor, &request->config_items);
+ while ((vp = fr_cursor_next_by_num(&cursor, PW_REPLICATE_TO_REALM, 0, TAG_ANY))) {
realm = realm_find2(vp->vp_strvalue);
if (!realm) {
- REDEBUG2("Cannot Replicate to unknown realm %s", realm);
+ REDEBUG2("Cannot Replicate to unknown realm \"%s\"", vp->vp_strvalue);
continue;
}
-
+
/*
* We shouldn't really do this on every loop.
*/
switch (request->packet->code) {
default:
- REDEBUG2("Cannot replicate unknown packet code %d",
- request->packet->code);
+ REDEBUG2("Cannot replicate unknown packet code %d", request->packet->code);
cleanup(packet);
return RLM_MODULE_FAIL;
-
- case PW_AUTHENTICATION_REQUEST:
+
+ case PW_CODE_ACCESS_REQUEST:
pool = realm->auth_pool;
break;
-
+
#ifdef WITH_ACCOUNTING
-
- case PW_ACCOUNTING_REQUEST:
+
+ case PW_CODE_ACCOUNTING_REQUEST:
pool = realm->acct_pool;
break;
#endif
-
+
#ifdef WITH_COA
- case PW_COA_REQUEST:
- case PW_DISCONNECT_REQUEST:
+ case PW_CODE_COA_REQUEST:
+ case PW_CODE_DISCONNECT_REQUEST:
pool = realm->acct_pool;
break;
#endif
}
-
+
if (!pool) {
- RWDEBUG2("Cancelling replication to Realm %s, as the realm is local.", realm->name);
+ RWDEBUG2("Cancelling replication to Realm %s, as the realm is local", realm->name);
continue;
}
-
+
home = home_server_ldb(realm->name, pool, request);
if (!home) {
- REDEBUG2("Failed to find live home server for realm %s",
- realm->name);
+ REDEBUG2("Failed to find live home server for realm %s", realm->name);
continue;
}
-
+
/*
* For replication to multiple servers we re-use the packet
* we built here.
*/
if (!packet) {
- packet = rad_alloc(NULL, 1);
- if (!packet) return RLM_MODULE_FAIL;
- packet->sockfd = -1;
+ packet = rad_alloc(request, true);
+ if (!packet) {
+ return RLM_MODULE_FAIL;
+ }
+
packet->code = code;
packet->id = fr_rand() & 0xff;
-
packet->sockfd = fr_socket(&home->src_ipaddr, 0);
if (packet->sockfd < 0) {
REDEBUG("Failed opening socket: %s", fr_strerror());
rcode = RLM_MODULE_FAIL;
goto done;
}
-
+
vps = radius_list(request, list);
if (!vps) {
- RWDEBUG("List '%s' doesn't exist for "
- "this packet", fr_int2str(pair_lists,
- list, "?unknown?"));
+ RWDEBUG("List '%s' doesn't exist for this packet",
+ fr_int2str(pair_lists, list, "<INVALID>"));
rcode = RLM_MODULE_INVALID;
goto done;
}
-
+
/*
* Don't assume the list actually contains any
* attributes.
goto done;
}
}
-
-
/*
* For CHAP, create the CHAP-Challenge if
* it doesn't exist.
*/
- if ((code == PW_AUTHENTICATION_REQUEST) &&
+ if ((code == PW_CODE_ACCESS_REQUEST) &&
(pairfind(request->packet->vps, PW_CHAP_PASSWORD, 0, TAG_ANY) != NULL) &&
(pairfind(request->packet->vps, PW_CHAP_CHALLENGE, 0, TAG_ANY) == NULL)) {
uint8_t *p;
- vp = radius_paircreate(request, &packet->vps,
- PW_CHAP_CHALLENGE, 0);
+ vp = radius_paircreate(packet, &packet->vps, PW_CHAP_CHALLENGE, 0);
vp->length = AUTH_VECTOR_LEN;
vp->vp_octets = p = talloc_array(vp, uint8_t, vp->length);
- memcpy(p, request->packet->vector,
- AUTH_VECTOR_LEN);
+ memcpy(p, request->packet->vector, AUTH_VECTOR_LEN);
}
} else {
size_t i;
}
packet->id++;
- free(packet->data);
+ talloc_free(packet->data);
packet->data = NULL;
packet->data_len = 0;
}
packet->dst_port = home->port;
memset(&packet->src_ipaddr, 0, sizeof(packet->src_ipaddr));
packet->src_port = 0;
-
+
/*
* Encode, sign and then send the packet.
*/
- RDEBUG("Replicating list '%s' to Realm '%s'",
- fr_int2str(pair_lists, list, "¿unknown?"),realm->name);
+ RDEBUG("Replicating list '%s' to Realm '%s'", fr_int2str(pair_lists, list, "<INVALID>"),
+ realm->name);
if (rad_send(packet, NULL, home->secret) < 0) {
- REDEBUG("Failed replicating packet: %s",
- fr_strerror());
+ REDEBUG("Failed replicating packet: %s", fr_strerror());
rcode = RLM_MODULE_FAIL;
goto done;
}
*/
rcode = RLM_MODULE_OK;
}
-
+
done:
-
+
cleanup(packet);
return rcode;
}
#else
-static rlm_rcode_t replicate_packet(void *instance, REQUEST *request,
- pair_lists_t list, unsigned int code)
+static rlm_rcode_t replicate_packet(UNUSED void *instance,
+ UNUSED REQUEST *request,
+ UNUSED pair_lists_t list,
+ UNUSED unsigned int code)
{
- RDEBUG("Replication is unsupported in this build.");
+ RDEBUG("Replication is unsupported in this build");
return RLM_MODULE_FAIL;
}
#endif
-static rlm_rcode_t mod_authorize(void *instance, REQUEST *request)
-{
- return replicate_packet(instance, request, PAIR_LIST_REQUEST,
- request->packet->code);
-}
-
-static rlm_rcode_t mod_preaccounting(void *instance, REQUEST *request)
-{
- return replicate_packet(instance, request, PAIR_LIST_REQUEST,
- request->packet->code);
-}
-
-static rlm_rcode_t mod_accounting(void *instance, REQUEST *request)
-{
- return replicate_packet(instance, request, PAIR_LIST_REPLY,
- request->reply->code);
-}
-
-static rlm_rcode_t mod_pre_proxy(void *instance, REQUEST *request)
+static rlm_rcode_t CC_HINT(nonnull) mod_authorize(void *instance, REQUEST *request)
{
- return replicate_packet(instance, request, PAIR_LIST_PROXY_REQUEST,
- request->proxy->code);
+ return replicate_packet(instance, request, PAIR_LIST_REQUEST, request->packet->code);
}
-static rlm_rcode_t mod_post_proxy(void *instance, REQUEST *request)
+static rlm_rcode_t CC_HINT(nonnull) mod_preaccounting(void *instance, REQUEST *request)
{
- return replicate_packet(instance, request, PAIR_LIST_PROXY_REPLY,
- request->proxy_reply->code);
+ return replicate_packet(instance, request, PAIR_LIST_REQUEST, request->packet->code);
}
-static rlm_rcode_t mod_post_auth(void *instance, REQUEST *request)
+#ifdef WITH_PROXY
+static rlm_rcode_t CC_HINT(nonnull) mod_pre_proxy(void *instance, REQUEST *request)
{
- return replicate_packet(instance, request, PAIR_LIST_REPLY,
- request->reply->code);
+ return replicate_packet(instance, request, PAIR_LIST_PROXY_REQUEST, request->proxy->code);
}
+#endif
-static rlm_rcode_t mod_recv_coa(void *instance, REQUEST *request)
+#ifdef WITH_COA
+static rlm_rcode_t CC_HINT(nonnull) mod_recv_coa(void *instance, REQUEST *request)
{
- return replicate_packet(instance, request, PAIR_LIST_REQUEST,
- request->packet->code);
+ return replicate_packet(instance, request, PAIR_LIST_REQUEST, request->packet->code);
}
+#endif
/*
* The module name should be the only globally exported symbol.
NULL, /* detach */
{
NULL, /* authentication */
- mod_authorize, /* authorization */
- mod_preaccounting,/* preaccounting */
- mod_accounting, /* accounting */
+ mod_authorize, /* authorization */
+ mod_preaccounting, /* preaccounting */
+ NULL, /* accounting */
NULL, /* checksimul */
- mod_pre_proxy, /* pre-proxy */
- mod_post_proxy, /* post-proxy */
- mod_post_auth /* post-auth */
+#ifdef WITH_PROXY
+ mod_pre_proxy, /* pre-proxy */
+ NULL, /* post-proxy */
+#else
+ NULL, NULL,
+#endif
+ NULL /* post-auth */
#ifdef WITH_COA
- , mod_recv_coa, /* coa-request */
+ , mod_recv_coa, /* coa-request */
NULL
#endif
},
projects / freeradius.git / blobdiff