X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=comm-common.h;h=6dad9ef6c52e7010e9cf669959ad538d300cfd8e;hb=b7886fd46ab05c97b8a072e497903622bd1d5290;hp=aa757e1eee851ab52240fab32f0ad4ab4b06581d;hpb=32654a316b5925914f5e5f481971d47f9728edab;p=secnet.git

diff --git a/comm-common.h b/comm-common.h
index aa757e1..6dad9ef 100644
--- a/comm-common.h
+++ b/comm-common.h
@@ -77,6 +77,7 @@ struct udpsocks {
     /* private for udp_socks_* */
     struct udpcommon *uc; /* link to parent, for cfg, notify list, etc. */
     struct poll_interest *interest;
+    const char *desc;
 };
 
 struct udpcommon {
@@ -89,25 +90,31 @@ struct udpcommon {
 
 bool_t udp_make_socket(struct udpcommon *uc, struct udpsock *us,
 		       int failmsgclass);
-  /* Fills in us->fd.  Logs any errors with lg_[v]perror. */
+  /* Caller should have filled in ->addr.  Fills in us->fd,
+     ->experienced; updates ->addr.  Logs any errors with lg_[v]perror. */
+bool_t udp_import_socket(struct udpcommon *uc, struct udpsock *us,
+			 int failmsgclass, int fd);
+  /* Like udp_make_socket, but caller provides fd.  fd is not closed
+     on error */
 
 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,
+			  struct udpsocks *socks, 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_register(struct udpcommon *uc, struct udpsocks *socks,
+			const char *desc);
 void udp_socks_deregister(struct udpcommon *uc, struct udpsocks *socks);
 void udp_socks_childpersist(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)
+    (uc)->port=dict_read_number(d,"port",False,"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