X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=comm-common.h;h=13709c7940ba9440f86f5f746c8760537c0d5b2b;hp=ba49254f47493dc48b75de30b91c226d48120443;hb=ae5ae3bf5c5709938e3a2bb6203094ede8af45e6;hpb=763e458ff3a1cb4f9d11226db91f17069f7b8f7a;ds=sidebyside

diff --git a/comm-common.h b/comm-common.h
index ba49254..13709c7 100644
--- a/comm-common.h
+++ b/comm-common.h
@@ -3,6 +3,7 @@
 #define COMM_COMMON_H
 
 #include "secnet.h"
+#include "util.h"
 
 /*----- for all comms -----*/
 
@@ -62,14 +63,20 @@ void comm_apply(struct commcommon *cc, void *st);
 
 #define UDP_MAX_SOCKETS 3 /* 2 ought to do really */
 
+#define MAX_AF MAX_RAW(AF_INET6,AF_INET)
+
 struct udpsock {
     union iaddr addr;
     int fd;
+    bool_t experienced[/*0=recv,1=send*/2][MAX_AF+1][/*success?*/2];
 };
 
 struct udpsocks {
     int n_socks;
     struct udpsock socks[UDP_MAX_SOCKETS];
+    /* private for udp_socks_* */
+    struct udpcommon *uc; /* link to parent, for cfg, notify list, etc. */
+    struct poll_interest *interest;
 };
 
 struct udpcommon {
@@ -80,12 +87,21 @@ struct udpcommon {
     union iaddr proxy;
 };
 
-int udp_socks_beforepoll(struct udpsocks *s,
-			 struct pollfd *fds, int *nfds_io,
-			 int *timeout_io);
+bool_t udp_make_socket(struct udpcommon *uc, struct udpsock *us,
+		       int failmsgclass);
+  /* Fills in us->fd.  Logs any errors with lg_[v]perror. */
+
+void udp_destroy_socket(struct udpcommon *uc, struct udpsock *us);
+  /* Idempotent.  No errors are possible. */
+
+const char *af_name(int af);
+void udp_sock_experienced(struct log_if *lg, struct udpcommon *uc,
+			  const char *socksdesc, struct udpsock *us,
+			  bool_t recvsend, int af /* 0 means any */,
+			  int r, int errnoval);
 
-void udp_socks_afterpoll(struct udpcommon *u, struct udpsocks *s,
-			 struct pollfd *fds, int nfds);
+void udp_socks_register(struct udpcommon *uc, struct udpsocks *socks);
+void udp_socks_deregister(struct udpcommon *uc, struct udpsocks *socks);
 
 #define UDP_APPLY_STANDARD(st,uc,desc)					\
     (uc)->use_proxy=False;						\