Imported Upstream version 3.1.0

[debian/amanda] / common-src / security-util.h

diff --git a/common-src/security-util.h b/common-src/security-util.h
index dd1e3ccb9e5542b1d278eacb7a44b616d88d9231..6c5c41f0e771f225871f09ab02712f71c46ee820 100644 (file)
--- a/common-src/security-util.h
+++ b/common-src/security-util.h
@@ -34,7 +34,6 @@
 
 #include "stream.h"
 #include "dgram.h"
-#include "queue.h"
 #include "conffile.h"
 #include "security.h"
 #include "event.h"
@@ -75,9 +74,9 @@ struct tcp_conn {
     char *             errmsg;                 /* error passed up */
     int                        refcnt;                 /* number of handles using */
     int                        handle;                 /* last proto handle read */
+    int                        event_id;               /* event ID fired when token read */
     void               (*accept_fn)(security_handle_t *, pkt_t *);
-    struct sockaddr_storage    peer;
-    TAILQ_ENTRY(tcp_conn) tq;                  /* queue handle */
+    sockaddr_union     peer;
     int                        (*recv_security_ok)(struct sec_handle *, pkt_t *);
     char *             (*prefix_packet)(void *, pkt_t *);
     int                        toclose;
@@ -109,7 +108,7 @@ struct sec_handle {
     } fn;
     void *             arg;            /* argument to pass function */
     event_handle_t *   ev_timeout;     /* timeout handle for recv */
-    struct sockaddr_storage    peer;
+    sockaddr_union     peer;
     int                        sequence;
     event_id_t         event_id;
     char *             proto_handle;
@@ -140,24 +139,6 @@ struct sec_stream {
     int                        closed_by_network;
 };
 
-struct connq_s {
-    TAILQ_HEAD(, tcp_conn) tailq;
-    int qlength;
-};
-extern struct connq_s connq;
-
-#define connq_first()           TAILQ_FIRST(&connq.tailq)
-#define connq_next(rc)          TAILQ_NEXT(rc, tq)
-#define connq_append(rc)        do {                                    \
-    TAILQ_INSERT_TAIL(&connq.tailq, rc, tq);                            \
-    connq.qlength++;                                                    \
-} while (0)
-#define connq_remove(rc)        do {                                    \
-    assert(connq.qlength > 0);                                          \
-    TAILQ_REMOVE(&connq.tailq, rc, tq);                                 \
-    connq.qlength--;                                                    \
-} while (0)
-
 /*
  * This is data local to the datagram socket.  We have one datagram
  * per process per auth.
@@ -165,7 +146,7 @@ extern struct connq_s connq;
 typedef struct udp_handle {
     const struct security_driver *driver;      /* MUST be first */
     dgram_t dgram;             /* datagram to read/write from */
-    struct sockaddr_storage peer;      /* who sent it to us */
+    sockaddr_union peer;       /* who sent it to us */
     pkt_t pkt;                 /* parsed form of dgram */
     char *handle;              /* handle from recvd packet */
     int sequence;              /* seq no of packet */
@@ -255,7 +236,7 @@ void        udp_recvpkt_cancel(void *);
 void   udp_recvpkt_callback(void *);
 void   udp_recvpkt_timeout(void *);
 int    udp_inithandle(udp_handle_t *, struct sec_handle *, char *hostname,
-                      struct sockaddr_storage *, in_port_t, char *, int);
+                      sockaddr_union *, in_port_t, char *, int);
 void   udp_netfd_read_callback(void *);
 
 struct tcp_conn *sec_tcp_conn_get(const char *, int);
@@ -270,16 +251,17 @@ char *    check_user_ruserok    (const char *host,
                                struct passwd *pwd,
                                const char *user);
 char * check_user_amandahosts(const char *host,
-                               struct sockaddr_storage *addr,
+                               sockaddr_union *addr,
                                struct passwd *pwd,
                                const char *user,
                                const char *service);
 
-ssize_t        net_writev(int, struct iovec *, int);
 ssize_t        net_read(int, void *, size_t, int);
 ssize_t net_read_fillbuf(int, int, void *, size_t);
 void   show_stat_info(char *a, char *b);
 int     check_name_give_sockaddr(const char *hostname, struct sockaddr *addr,
                                 char **errstr);
+in_port_t find_port_for_service(char *service, char *proto);
+
 
 #endif /* _SECURITY_INFO_H */