comm: Provide udp_socks_deregister

polypath is going to want this.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/comm-common.h b/comm-common.h
index 835d056b5d5117e8e0f99a6ee02c165bc06ee2dc..ed6a86b44b7bd7a801bf98d2d71c13b24b9ac4a3 100644 (file)
--- a/comm-common.h
+++ b/comm-common.h
@@ -72,6 +72,7 @@ struct udpsocks {
     struct udpsock socks[UDP_MAX_SOCKETS];
     /* private for udp_socks_* */
     struct udpcommon *uc; /* link to parent, for cfg, notify list, etc. */
     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 {
 };
 
 struct udpcommon {


@@ -87,6 +88,7 @@ bool_t udp_make_socket(struct udpcommon *uc, struct udpsock *us,
   /* Fills in us->fd.  Logs any errors with lg_[v]perror. */
 
 void udp_socks_register(struct udpcommon *uc, struct udpsocks *socks);
   /* Fills in us->fd.  Logs any errors with lg_[v]perror. */
 
 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;                                             \
 
 #define UDP_APPLY_STANDARD(st,uc,desc)                                 \
     (uc)->use_proxy=False;                                             \

diff --git a/udp.c b/udp.c
index 8f0bb8bde3fdeb33b46c2f7bb2b3cd46d6c4505e..a58690e274bb3d06d8e6d9ee1cc23f8a3f20b07d 100644 (file)
--- a/udp.c
+++ b/udp.c
@@ -288,7 +288,14 @@ failed:
 void udp_socks_register(struct udpcommon *uc, struct udpsocks *socks)
 {
     socks->uc=uc;
 void udp_socks_register(struct udpcommon *uc, struct udpsocks *socks)
 {
     socks->uc=uc;

-    register_for_poll(socks,udp_socks_beforepoll,udp_socks_afterpoll,"udp");
+    socks->interest=
+       register_for_poll(socks,udp_socks_beforepoll,udp_socks_afterpoll,"udp");
+}
+
+void udp_socks_deregister(struct udpcommon *uc, struct udpsocks *socks)
+{
+    socks->uc=uc;
+    deregister_for_poll(socks->interest);

 }
 
 static void udp_phase_hook(void *sst, uint32_t new_phase)
 }
 
 static void udp_phase_hook(void *sst, uint32_t new_phase)