comm: Make udp_make_socket be able to tolerate failures

[secnet.git] / comm-common.h

diff --git a/comm-common.h b/comm-common.h
index 77ac840899c5ee2e21379456c632aac14c9b1348..835d056b5d5117e8e0f99a6ee02c165bc06ee2dc 100644 (file)
--- a/comm-common.h
+++ b/comm-common.h
@@ -4,6 +4,8 @@
 
 #include "secnet.h"
 
+/*----- for all comms -----*/
+
 struct comm_notify_entry {
     comm_notify_fn *fn;
     void *state;
@@ -56,4 +58,43 @@ void comm_apply(struct commcommon *cc, void *st);
      *   //    dict_t *dict = <construction dictionary argument>;
      */
 
+/*----- for udp-based comms -----*/
+
+#define UDP_MAX_SOCKETS 3 /* 2 ought to do really */
+
+struct udpsock {
+    union iaddr addr;
+    int fd;
+};
+
+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 udpcommon {
+    struct commcommon cc;
+    int port;
+    string_t authbind;
+    bool_t use_proxy;
+    union iaddr proxy;
+};
+
+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_socks_register(struct udpcommon *uc, struct udpsocks *socks);
+
+#define UDP_APPLY_STANDARD(st,uc,desc)                                 \
+    (uc)->use_proxy=False;                                             \
+    (uc)->authbind=dict_read_string(d,"authbind",False,"udp",(uc)->cc.loc); \
+    (uc)->port=dict_read_number(d,"port",True,"udp",(uc)->cc.loc,0)
+    /* void UDP_APPLY_STANDARD(SOMETHING *st, struct udpcommon *uc,
+     *                         const char *desc);
+     *   // Expects in scope:  dict_t *d=...;   as from COMM_APPLY_STANDARD
+     */
+
 #endif /*COMM_COMMON_H*/