X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/e0d2e637f0931a4a3c897abbc4e38a3f357ba3d4..86420bb75f19f628ffd2d8ff9964e59ed99e3187:/site.c

diff --git a/site.c b/site.c
index b83919c..dcac0ba 100644
--- a/site.c
+++ b/site.c
@@ -305,6 +305,7 @@ struct site {
     uint32_t mtu_target;
     struct netlink_if *netlink;
     struct comm_if **comms;
+    struct comm_clientinfo **commclientinfos;
     int ncomms;
     struct resolver_if *resolver;
     struct log_if *log;
@@ -1183,6 +1184,22 @@ static void dump_packet(struct site *st, struct buffer_if *buf,
 	       ok?"":" - fail");
 }
 
+static bool_t comm_addr_sendmsg(struct site *st,
+				const struct comm_addr *dest,
+				struct buffer_if *buf)
+{
+    int i;
+    struct comm_clientinfo *commclientinfo = 0;
+
+    for (i=0; i < st->ncomms; i++) {
+	if (st->comms[i] == dest->comm) {
+	    commclientinfo = st->commclientinfos[i];
+	    break;
+	}
+    }
+    return dest->comm->sendmsg(dest->comm->st, buf, dest, commclientinfo);
+}
+
 static uint32_t site_status(void *st)
 {
     return 0;
@@ -1610,7 +1627,7 @@ static void generate_send_prod(struct site *st,
     slog(st,LOG_SETUP_INIT,"prodding peer for key exchange");
     st->allow_send_prod=0;
     generate_prod(st,&st->scratch);
-    bool_t ok = source->comm->sendmsg(source->comm->st, &st->scratch, source);
+    bool_t ok = comm_addr_sendmsg(st, source, &st->scratch);
     dump_packet(st,&st->scratch,source,False,ok);
 }
 
@@ -2026,6 +2043,14 @@ static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context,
 
     GET_CLOSURE_LIST("comm",comms,ncomms,CL_COMM);
 
+    NEW_ARY(st->commclientinfos, st->ncomms);
+    dict_t *comminfo = dict_read_dict(dict,"comm-info",False,"site",loc);
+    for (i=0; i<st->ncomms; i++) {
+	st->commclientinfos[i] =
+	    !comminfo ? 0 :
+	    st->comms[i]->clientinfo(st->comms[i],comminfo,loc);
+    }
+
     st->resolver=find_cl_if(dict,"resolver",CL_RESOLVER,True,"site",loc);
     st->log=find_cl_if(dict,"log",CL_LOG,True,"site",loc);
     st->random=find_cl_if(dict,"random",CL_RANDOMSRC,True,"site",loc);
@@ -2359,8 +2384,7 @@ void transport_xmit(struct site *st, transport_peers *peers,
     int nfailed=0;
     for (slot=0; slot<peers->npeers; slot++) {
 	transport_peer *peer=&peers->peers[slot];
-	bool_t ok =
-	    peer->addr.comm->sendmsg(peer->addr.comm->st, buf, &peer->addr);
+	bool_t ok = comm_addr_sendmsg(st, &peer->addr, buf);
 	if (candebug)
 	    dump_packet(st, buf, &peer->addr, False, ok);
 	if (!ok) {