WIP DNS bugfixes and debugging

[secnet.git] / udp.c

diff --git a/udp.c b/udp.c
index f4206642fc15f44f1de6606bd970c6e2449797f4..14311353472e7a7b65783e716519203135206162 100644 (file)
--- a/udp.c
+++ b/udp.c
@@ -34,6 +34,11 @@ struct notify_list {
     struct notify_list *next;
 };
 
+struct peer_config {
+    string_t address; /* DNS name for bootstrapping, optional */
+    int remoteport; /* Port for bootstrapping, optional */
+};
+
 struct udp {
     closure_t cl;
     struct comm_if ops;
@@ -44,6 +49,7 @@ struct udp {
     string_t authbind;
     struct buffer_if *rbuf;
     struct notify_list *notify;
+    struct resolver_if *resolver;
     bool_t use_proxy;
     struct sockaddr_in proxy;
 };
@@ -68,10 +74,69 @@ static const char *addr_to_string(void *commst, const struct comm_addr *ca) {
     la.sin_port=htons(st->port);
 
     snprintf(sbuf, sizeof(sbuf), "udp:%s-%s",
-            saddr_to_string(&la), saddr_to_string(&ca->sin));
+            saddr_to_string(&la), saddr_to_string(&ca->priv.sin));
     return sbuf;
 }
 
+struct peer_addr_cst {
+    struct udp *udp;
+    struct peer_config *cfg;
+    comm_peer_addr_answer_fn *cb;
+    void *cst;
+};
+
+static void *peer_addr_config(void *commst, dict_t *dict, struct cloc loc,
+                             cstring_t desc)
+{
+    struct peer_config *cfg;
+    cfg=safe_malloc(sizeof(*cfg),"peer addr config");
+    cfg->address=dict_read_string(dict, "address",False,desc,loc);
+    if (cfg->address)
+       cfg->remoteport=dict_read_number(dict,"port",True,desc,loc,0);
+    else cfg->remoteport=0;
+    if (cfg->address)
+       return cfg;
+    free(cfg);
+    return NULL;
+}
+
+static void peer_resolve_callback(void *sst, struct in_addr *address)
+{
+    struct peer_addr_cst *pacst=sst;
+    struct udp *st=pacst->udp;
+    struct peer_config *cfg=pacst->cfg;
+    struct comm_addr ca;
+    if (address) {
+       FILLZERO(ca);
+       ca.comm=&st->ops;
+       ca.priv.sin.sin_family=AF_INET;
+       ca.priv.sin.sin_port=htons(cfg->remoteport);
+       ca.priv.sin.sin_addr=*address;
+       pacst->cb(pacst->cst,&ca);
+    } else {
+       pacst->cb(pacst->cst,0);
+    }
+    free(pacst);
+}
+
+static bool_t peer_addr_request(void *commst, void *from_peer_config,
+                               comm_peer_addr_answer_fn *cb, void *cst)
+{
+    struct udp *st=commst;
+    struct peer_config *cfg=from_peer_config;
+    struct peer_addr_cst *pacst;
+    pacst=safe_malloc(sizeof(*pacst),"udp peer addr request cst");
+    pacst->udp=st;
+    pacst->cfg=cfg;
+    pacst->cb=cb;
+    pacst->cst=cst;
+    bool_t ok=st->resolver->request(st->resolver->st,cfg->address,
+                                   peer_resolve_callback,pacst);
+    if (!ok)
+       free(pacst);
+    return ok;
+}
+
 static int udp_beforepoll(void *state, struct pollfd *fds, int *nfds_io,
                          int *timeout_io)
 {
@@ -125,7 +190,7 @@ static void udp_afterpoll(void *state, struct pollfd *fds, int nfds)
                    struct comm_addr ca;
                    FILLZERO(ca);
                    ca.comm=&st->ops;
-                   ca.sin=from;
+                   ca.priv.sin=from;
                    if (n->fn(n->state, st->rbuf, &ca)) {
                        done=True;
                        break;
@@ -194,14 +259,14 @@ static bool_t udp_sendmsg(void *commst, struct buffer_if *buf,
 
     if (st->use_proxy) {
        sa=buf->start-8;
-       memcpy(sa,&dest->sin.sin_addr,4);
+       memcpy(sa,&dest->priv.sin.sin_addr,4);
        memset(sa+4,0,4);
-       memcpy(sa+6,&dest->sin.sin_port,2);
+       memcpy(sa+6,&dest->priv.sin.sin_port,2);
        sendto(st->fd,sa,buf->size+8,0,(struct sockaddr *)&st->proxy,
               sizeof(st->proxy));
     } else {
        sendto(st->fd, buf->start, buf->size, 0,
-              (struct sockaddr *)&dest->sin, sizeof(dest->sin));
+              (struct sockaddr *)&dest->priv.sin, sizeof(dest->priv.sin));
     }
 
     return True;
@@ -293,6 +358,8 @@ static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context,
     st->ops.request_notify=request_notify;
     st->ops.release_notify=release_notify;
     st->ops.sendmsg=udp_sendmsg;
+    st->ops.peer_addr_config=peer_addr_config;
+    st->ops.peer_addr_request=peer_addr_request;
     st->ops.addr_to_string=addr_to_string;
     st->port=0;
     st->use_proxy=False;
@@ -326,6 +393,7 @@ static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context,
        st->proxy.sin_port=htons(i->data.number);
        st->ops.min_start_pad=8;
     }
+    st->resolver=find_cl_if(d,"resolver",CL_RESOLVER,True,"comm",loc);
 
     add_hook(PHASE_GETRESOURCES,udp_phase_hook,st);