X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/c72d679d2344a22f55889da6932754986fc0a7b9..1fc8a4acb3ef658696038c9c4bd3c155fbc27ac3:/comm-common.h

diff --git a/comm-common.h b/comm-common.h
index 6dad9ef..ebb71b8 100644
--- a/comm-common.h
+++ b/comm-common.h
@@ -1,3 +1,21 @@
+/*
+ * This file is part of secnet.
+ * See README for full list of copyright holders.
+ *
+ * secnet is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version d of the License, or
+ * (at your option) any later version.
+ * 
+ * secnet is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with secnet; if not, see
+ * https://www.gnu.org/licenses/gpl.html.
+ */
 
 #ifndef COMM_COMMON_H
 #define COMM_COMMON_H
@@ -22,6 +40,8 @@ struct commcommon { /* must be first so that void* is comm_common* */
     struct buffer_if *rbuf;
 };
 
+struct comm_clientinfo *comm_clientinfo_ignore(void *state, dict_t*,
+					       struct cloc cloc);
 void comm_request_notify(void *commst, void *nst, comm_notify_fn *fn);
 void comm_release_notify(void *commst, void *nst, comm_notify_fn *fn);
 
@@ -34,9 +54,10 @@ bool_t comm_notify(struct comm_notify_list *notify, struct buffer_if *buf,
 void comm_apply(struct commcommon *cc, void *st);
 
 #define COMM_APPLY(st,cc,prefix,desc,loc)		\
-    (st)=safe_malloc(sizeof(*(st)), desc "_apply");	\
+    NEW(st);						\
     (cc)->loc=loc;					\
     (cc)->cl.description=desc;				\
+    (cc)->ops.clientinfo=comm_clientinfo_ignore;	\
     (cc)->ops.sendmsg=prefix##sendmsg;			\
     (cc)->ops.addr_to_string=prefix##addr_to_string;	\
     comm_apply((cc),(st))
@@ -103,7 +124,7 @@ void udp_destroy_socket(struct udpcommon *uc, struct udpsock *us);
 const char *af_name(int af);
 void udp_sock_experienced(struct log_if *lg, struct udpcommon *uc,
 			  struct udpsocks *socks, struct udpsock *us,
-			  bool_t recvsend, int af /* 0 means any */,
+			  const union iaddr *dest, int af /* 0 means any */,
 			  int r, int errnoval);
 
 void udp_socks_register(struct udpcommon *uc, struct udpsocks *socks,