Merge branch 'refs/heads/t/clean_server_exit'

[paraslash.git] / send.h

diff --git a/send.h b/send.h
index 84f35f9228cd05c62f9430063123d3e49761a06c..7a4c01bcb6cc1c80c77e06bc14b164dce8b3304d 100644 (file)
--- a/send.h
+++ b/send.h
@@ -27,14 +27,11 @@ struct sender {
        /** The name of the sender. */
        const char *name;
        /**
        /** The name of the sender. */
        const char *name;
        /**

-        * The init function of this sender.
-        *
-        * It must fill in all function pointers of \a s as well as the \a
-        * client_cmds array, see below. It should also do all necessary
-        * preparations to init this sending facility, for example it could
-        * open a tcp port.
+        * Parse the command line options and initialize this sender (e.g.,
+        * initialize target or access control lists, listen on a network
+        * socket, etc.).

         */
         */

-       void (*init)(struct sender *s);
+       void (*init)(void);

        /**
         * Return the help text of this sender.
         *
        /**
         * Return the help text of this sender.
         *


@@ -88,6 +85,8 @@ struct sender {
         * the clients aware of the end-of-file condition.
         */
        void (*shutdown_clients)(void);
         * the clients aware of the end-of-file condition.
         */
        void (*shutdown_clients)(void);

+       /** Dellocate all resources. Only called on exit. */
+       void (*shutdown)(void);

        /**
         * Array of function pointers for the sender subcommands.
         *
        /**
         * Array of function pointers for the sender subcommands.
         *


@@ -107,6 +106,11 @@ struct sender {
        int (*resolve_target)(const char *, struct sender_command_data *);
 };
 
        int (*resolve_target)(const char *, struct sender_command_data *);
 };
 

+/** NULL-terminated list, defined in \ref vss.c. */
+extern const struct sender * const senders[];
+/** Iterate over all senders. */
+#define FOR_EACH_SENDER(_i) for ((_i) = 0; senders[(_i)]; (_i)++)
+

 /** Describes one client, connected to a paraslash sender. */
 struct sender_client {
        /** The file descriptor of the client. */
 /** Describes one client, connected to a paraslash sender. */
 struct sender_client {
        /** The file descriptor of the client. */


@@ -187,6 +191,7 @@ void generic_com_allow(struct sender_command_data *scd,
 void generic_com_deny(struct sender_command_data *scd,
                struct sender_status *ss);
 void generic_com_on(struct sender_status *ss, unsigned protocol);
 void generic_com_deny(struct sender_command_data *scd,
                struct sender_status *ss);
 void generic_com_on(struct sender_status *ss, unsigned protocol);

+void generic_acl_deplete(struct list_head *acl);

 void generic_com_off(struct sender_status *ss);
 char *generic_sender_help(void);
 struct sender_client *accept_sender_client(struct sender_status *ss, fd_set *rfds);
 void generic_com_off(struct sender_status *ss);
 char *generic_sender_help(void);
 struct sender_client *accept_sender_client(struct sender_status *ss, fd_set *rfds);