authd/provider: cleanups

[solanum.git] / authd / provider.h

diff --git a/authd/provider.h b/authd/provider.h
index a3326cc50b5eb3330953d2385c2b1c367832f96f..84d623181aa97d5c8dadbb0a9437904c8ba2ca2d 100644 (file)
--- a/authd/provider.h
+++ b/authd/provider.h
@@ -40,9 +40,11 @@ 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 */
@@ -54,11 +56,12 @@ struct auth_client
 };
 
 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 provider);
+
 struct auth_provider
 {
        rb_dlink_node node;
@@ -68,7 +71,7 @@ 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) */
 };
@@ -90,7 +93,8 @@ 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 notice_client(struct auth_client *auth, const char *fmt, ...);
+void warn_opers(provider_t id, const char *fmt, ...);
 
 void handle_new_connection(int parc, char *parv[]);