X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/238a9ed590ea50b0e09f1390f6bc2551be1563ab..ee7f92714ad53c5bc362447fc98670d873863411:/authd/provider.h

diff --git a/authd/provider.h b/authd/provider.h
index d443c0bb..c5462c93 100644
--- a/authd/provider.h
+++ b/authd/provider.h
@@ -22,17 +22,17 @@
 #define __CHARYBDIS_AUTHD_PROVIDER_H__
 
 #include "stdinc.h"
+#include "authd.h"
+#include "rb_dictionary.h"
 
-/* Arbitrary limit */
-#define MAX_CLIENTS 4096
+#define MAX_PROVIDERS 32	/* This should be enough */
 
 /* Registered providers */
 typedef enum
 {
-	PROVIDER_NULL = 0x0, /* Dummy value */
-	PROVIDER_RDNS = 0x1,
-	PROVIDER_IDENT = 0x2,
-	PROVIDER_BLACKLIST = 0x4,
+	PROVIDER_RDNS,
+	PROVIDER_IDENT,
+	PROVIDER_BLACKLIST,
 } provider_t;
 
 struct auth_client
@@ -41,25 +41,36 @@ struct auth_client
 
 	char l_ip[HOSTIPLEN + 1];		/* Listener IP address */
 	uint16_t l_port;			/* Listener port */
+	struct rb_sockaddr_storage l_addr;	/* Listener address/port */
 
 	char c_ip[HOSTIPLEN + 1];		/* Client IP address */
 	uint16_t c_port;			/* Client port */
+	struct rb_sockaddr_storage c_addr;	/* Client address/port */
 
 	char hostname[HOSTLEN + 1];		/* Used for DNS lookup */
 	char username[USERLEN + 1];		/* Used for ident lookup */
 
-	unsigned int providers;			/* Providers at work,
+	uint32_t providers;			/* Providers at work,
 						 * none left when set to 0 */
+	uint32_t providers_done;		/* Providers completed */
+	bool providers_starting;		/* Providers are still warming up */
 
-	struct Dictionary *data;		/* Provider-specific data */
+	void *data[MAX_PROVIDERS];		/* Provider-specific data slots */
 };
 
 typedef bool (*provider_init_t)(void);
-typedef bool (*provider_perform_t)(struct auth_client *);
-typedef void (*provider_complete_t)(struct auth_client *, provider_t provider);
-typedef void (*provider_cancel_t)(struct auth_client *);
 typedef void (*provider_destroy_t)(void);
 
+typedef bool (*provider_start_t)(struct auth_client *);
+typedef void (*provider_cancel_t)(struct auth_client *);
+typedef void (*provider_complete_t)(struct auth_client *, provider_t);
+
+struct auth_stats_handler
+{
+	const char letter;
+	authd_stat_handler handler;
+};
+
 struct auth_provider
 {
 	rb_dlink_node node;
@@ -69,16 +80,21 @@ struct auth_provider
 	provider_init_t init;		/* Initalise the provider */
 	provider_destroy_t destroy;	/* Terminate the provider */
 
-	provider_perform_t start;	/* Perform authentication */
+	provider_start_t start;		/* Perform authentication */
 	provider_cancel_t cancel;	/* Authentication cancelled */
 	provider_complete_t completed;	/* Callback for when other performers complete (think dependency chains) */
+
+	struct auth_stats_handler stats_handler;
+
+	struct auth_opts_handler *opt_handlers;
 };
 
 extern rb_dlink_list auth_providers;
+extern rb_dictionary *auth_clients;
+
 extern struct auth_provider rdns_provider;
 extern struct auth_provider ident_provider;
-
-extern struct auth_client auth_clients[MAX_CLIENTS];
+extern struct auth_provider blacklist_provider;
 
 void load_provider(struct auth_provider *provider);
 void unload_provider(struct auth_provider *provider);
@@ -89,28 +105,43 @@ void cancel_providers(struct auth_client *auth);
 
 void provider_done(struct auth_client *auth, provider_t id);
 void accept_client(struct auth_client *auth, provider_t id);
-void reject_client(struct auth_client *auth, provider_t id, const char *reason);
-
-void notice_client(struct auth_client *auth, const char *notice);
+void reject_client(struct auth_client *auth, provider_t id, const char *data, const char *reason);
 
 void handle_new_connection(int parc, char *parv[]);
+void handle_cancel_connection(int parc, char *parv[]);
 
 /* Provider is operating on this auth_client (set this if you have async work to do) */
-static inline void set_provider(struct auth_client *auth, provider_t provider)
+static inline void
+set_provider_on(struct auth_client *auth, provider_t provider)
 {
-	auth->providers |= provider;
+	auth->providers |= (1 << provider);
 }
 
 /* Provider is no longer operating on this auth client (you should use provider_done) */
-static inline void unset_provider(struct auth_client *auth, provider_t provider)
+static inline void
+set_provider_off(struct auth_client *auth, provider_t provider)
+{
+	auth->providers &= ~(1 << provider);
+}
+
+/* Set the provider to done (you should use provider_done) */
+static inline void
+set_provider_done(struct auth_client *auth, provider_t provider)
 {
-	auth->providers &= ~provider;
+	auth->providers_done |= (1 << provider);
 }
 
 /* Check if provider is operating on this auth client */
-static inline bool is_provider(struct auth_client *auth, provider_t provider)
+static inline bool
+is_provider_on(struct auth_client *auth, provider_t provider)
+{
+	return auth->providers & (1 << provider);
+}
+
+static inline bool
+is_provider_done(struct auth_client *auth, provider_t provider)
 {
-	return auth->providers & provider;
+	return auth->providers_done & (1 << provider);
 }
 
 #endif /* __CHARYBDIS_AUTHD_PROVIDER_H__ */