polypath: Reorganise to break up ifaddr handling

[secnet.git] / comm-common.h

diff --git a/comm-common.h b/comm-common.h
index ed6a86b44b7bd7a801bf98d2d71c13b24b9ac4a3..13709c7940ba9440f86f5f746c8760537c0d5b2b 100644 (file)
--- 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,9 +63,12 @@ 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 {
@@ -87,6 +91,15 @@ 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_register(struct udpcommon *uc, struct udpsocks *socks);
 void udp_socks_deregister(struct udpcommon *uc, struct udpsocks *socks);