9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

authd: dynamically allocate data and timeout elements

Browse source
This commit is contained in:
Elizabeth Myers 2016-04-05 03:08:52 -05:00
parent d475622639
commit a68d9a2b61
2 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
authd/provider.c
View file

@ -165,6 +165,7 @@ cancel_providers(struct auth_client *auth)
} }
rb_dictionary_delete(auth_clients, RB_UINT_TO_POINTER(auth->cid)); rb_dictionary_delete(auth_clients, RB_UINT_TO_POINTER(auth->cid));
rb_free(auth->data);
rb_free(auth); rb_free(auth);
} }
@ -285,7 +286,8 @@ start_auth(const char *cid, const char *l_ip, const char *l_port, const char *c_
rb_strlcpy(auth->hostname, "*", sizeof(auth->hostname)); rb_strlcpy(auth->hostname, "*", sizeof(auth->hostname));
rb_strlcpy(auth->username, "*", sizeof(auth->username)); rb_strlcpy(auth->username, "*", sizeof(auth->username));
memset(auth->data, 0, sizeof(auth->data)); auth->data = rb_malloc(rb_dlink_list_length(&auth_providers) *
sizeof(struct auth_client_data));
auth->providers_starting = true; auth->providers_starting = true;
RB_DLINK_FOREACH(ptr, auth_providers.head) RB_DLINK_FOREACH(ptr, auth_providers.head)
@ -364,7 +366,7 @@ provider_timeout_event(void *notused __unused)
RB_DLINK_FOREACH(ptr, auth_providers.head) RB_DLINK_FOREACH(ptr, auth_providers.head)
{ {
struct auth_provider *provider = ptr->data; struct auth_provider *provider = ptr->data;
const time_t timeout = auth->timeout[provider->id]; const time_t timeout = get_provider_timeout(auth, provider->id);
if(is_provider_on(auth, provider->id) && provider->timeout != NULL && if(is_provider_on(auth, provider->id) && provider->timeout != NULL &&
timeout > 0 && timeout < curtime) timeout > 0 && timeout < curtime)
@ -379,27 +381,33 @@ void *
get_provider_data(struct auth_client *auth, uint32_t id) get_provider_data(struct auth_client *auth, uint32_t id)
{ {
lrb_assert(id < rb_dlink_list_length(&auth_providers)); lrb_assert(id < rb_dlink_list_length(&auth_providers));
return auth->data[(size_t)id]; return auth->data[id].data;
} }
void void
set_provider_data(struct auth_client *auth, uint32_t id, void *data) set_provider_data(struct auth_client *auth, uint32_t id, void *data)
{ {
lrb_assert(id < rb_dlink_list_length(&auth_providers)); lrb_assert(id < rb_dlink_list_length(&auth_providers));
auth->data[(size_t)id] = data; auth->data[id].data = data;
} }
void void
set_provider_timeout_relative(struct auth_client *auth, uint32_t id, time_t timeout) set_provider_timeout_relative(struct auth_client *auth, uint32_t id, time_t timeout)
{ {
lrb_assert(id < rb_dlink_list_length(&auth_providers)); lrb_assert(id < rb_dlink_list_length(&auth_providers));
auth->timeout[(size_t)id] = timeout + rb_current_time(); auth->data[id].timeout = timeout + rb_current_time();
} }
void void
set_provider_timeout_absolute(struct auth_client *auth, uint32_t id, time_t timeout) set_provider_timeout_absolute(struct auth_client *auth, uint32_t id, time_t timeout)
{ {
lrb_assert(id < rb_dlink_list_length(&auth_providers)); lrb_assert(id < rb_dlink_list_length(&auth_providers));
auth->timeout[(size_t)id] = timeout; auth->data[id].timeout = timeout;
} }
time_t
get_provider_timeout(struct auth_client *auth, uint32_t id)
{
lrb_assert(id < rb_dlink_list_length(&auth_providers));
return auth->data[id].timeout;
}

10
authd/provider.h
View file

@ -36,6 +36,12 @@ typedef enum
PROVIDER_OPM, PROVIDER_OPM,
} provider_t; } provider_t;
struct auth_client_data
{
time_t timeout; /* Provider timeout */
void *data; /* Proivder data */
};
struct auth_client struct auth_client
{ {
uint16_t cid; /* Client ID */ uint16_t cid; /* Client ID */
@ -56,8 +62,7 @@ struct auth_client
uint32_t providers_done; /* Providers completed */ uint32_t providers_done; /* Providers completed */
bool providers_starting; /* Providers are still warming up */ bool providers_starting; /* Providers are still warming up */
void *data[MAX_PROVIDERS]; /* Provider-specific data slots */ struct auth_client_data *data; /* Provider-specific data */
time_t timeout[MAX_PROVIDERS]; /* When to call timeout callback */
}; };
typedef bool (*provider_init_t)(void); typedef bool (*provider_init_t)(void);
@ -119,6 +124,7 @@ void *get_provider_data(struct auth_client *auth, uint32_t id);
void set_provider_data(struct auth_client *auth, uint32_t id, void *data); void set_provider_data(struct auth_client *auth, uint32_t id, void *data);
void set_provider_timeout_relative(struct auth_client *auth, uint32_t id, time_t timeout); void set_provider_timeout_relative(struct auth_client *auth, uint32_t id, time_t timeout);
void set_provider_timeout_absolute(struct auth_client *auth, uint32_t id, time_t timeout); void set_provider_timeout_absolute(struct auth_client *auth, uint32_t id, time_t timeout);
time_t get_provider_timeout(struct auth_client *auth, uint32_t id);
/* Provider is operating on this auth_client (set this if you have async work to do) */ /* Provider is operating on this auth_client (set this if you have async work to do) */
static inline void static inline void