MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-30 17:34:04 +01:00
Code Issues Releases Wiki Activity

authd: provider: make refcounting system less fragile

Browse source
This commit is contained in:
William Pitcock 2016-04-30 19:26:02 -05:00
parent a71b65b15c
commit b585278b32
2 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
authd/provider.c
View file

@ -167,9 +167,15 @@ unload_provider(struct auth_provider *provider)
rb_dlinkAddAlloc(RB_UINT_TO_POINTER(provider->id), &free_pids); rb_dlinkAddAlloc(RB_UINT_TO_POINTER(provider->id), &free_pids);
} }
void
auth_client_free(struct auth_client *auth)
{
rb_dictionary_delete(auth_clients, RB_UINT_TO_POINTER(auth->cid));
rb_free(auth->data);
rb_free(auth);
}
/* Cancel outstanding providers for a client (if any) and free the auth instance /* Cancel outstanding providers for a client (if any). */
* WARNING: do not use auth instance after calling! */
void void
cancel_providers(struct auth_client *auth) cancel_providers(struct auth_client *auth)
{ {
@ -185,10 +191,6 @@ cancel_providers(struct auth_client *auth)
provider->cancel(auth); provider->cancel(auth);
} }
} }
rb_dictionary_delete(auth_clients, RB_UINT_TO_POINTER(auth->cid));
rb_free(auth->data);
rb_free(auth);
} }
/* Provider is done /* Provider is done

18
authd/provider.h
View file

@ -120,7 +120,21 @@ void reject_client(struct auth_client *auth, uint32_t id, const char *data, cons
void handle_new_connection(int parc, char *parv[]); void handle_new_connection(int parc, char *parv[]);
void handle_cancel_connection(int parc, char *parv[]); void handle_cancel_connection(int parc, char *parv[]);
void auth_client_free(struct auth_client *auth);
static inline void
auth_client_ref(struct auth_client *auth)
{
auth->refcount++;
}
static inline void
auth_client_unref(struct auth_client *auth)
{
auth->refcount--;
if (auth->refcount == 0)
auth_client_free(auth);
}
/* Get a provider by name */ /* Get a provider by name */
static inline struct auth_provider * static inline struct auth_provider *
@ -163,7 +177,7 @@ set_provider_status(struct auth_client *auth, uint32_t provider, provider_status
static inline void static inline void
set_provider_running(struct auth_client *auth, uint32_t provider) set_provider_running(struct auth_client *auth, uint32_t provider)
{ {
auth->refcount++; auth_client_ref(auth);
set_provider_status(auth, provider, PROVIDER_STATUS_RUNNING); set_provider_status(auth, provider, PROVIDER_STATUS_RUNNING);
} }
@ -172,8 +186,8 @@ set_provider_running(struct auth_client *auth, uint32_t provider)
static inline void static inline void
set_provider_done(struct auth_client *auth, uint32_t provider) set_provider_done(struct auth_client *auth, uint32_t provider)
{ {
auth->refcount--;
set_provider_status(auth, provider, PROVIDER_STATUS_DONE); set_provider_status(auth, provider, PROVIDER_STATUS_DONE);
auth_client_unref(auth);
} }
/* Check if provider is operating on this auth client */ /* Check if provider is operating on this auth client */