-extern bool id_h(struct connection_t *, const char *);
-extern bool metakey_h(struct connection_t *, const char *);
-extern bool challenge_h(struct connection_t *, const char *);
-extern bool chal_reply_h(struct connection_t *, const char *);
-extern bool ack_h(struct connection_t *, const char *);
-extern bool status_h(struct connection_t *, const char *);
-extern bool error_h(struct connection_t *, const char *);
-extern bool termreq_h(struct connection_t *, const char *);
-extern bool ping_h(struct connection_t *, const char *);
-extern bool pong_h(struct connection_t *, const char *);
-extern bool add_subnet_h(struct connection_t *, const char *);
-extern bool del_subnet_h(struct connection_t *, const char *);
-extern bool add_edge_h(struct connection_t *, const char *);
-extern bool del_edge_h(struct connection_t *, const char *);
-extern bool key_changed_h(struct connection_t *, const char *);
-extern bool req_key_h(struct connection_t *, const char *);
-extern bool ans_key_h(struct connection_t *, const char *);
-extern bool tcppacket_h(struct connection_t *, const char *);
-extern bool sptps_tcppacket_h(struct connection_t *, const char *);
-extern bool control_h(struct connection_t *, const char *);
-extern bool udp_info_h(struct connection_t *, const char *);
-extern bool mtu_info_h(struct connection_t *, const char *);
+extern bool id_h(struct connection_t *c, const char *request);
+extern bool metakey_h(struct connection_t *c, const char *request);
+extern bool challenge_h(struct connection_t *c, const char *request);
+extern bool chal_reply_h(struct connection_t *c, const char *request);
+extern bool ack_h(struct connection_t *c, const char *request);
+extern bool status_h(struct connection_t *c, const char *request);
+extern bool error_h(struct connection_t *c, const char *request);
+extern bool termreq_h(struct connection_t *c, const char *request);
+extern bool ping_h(struct connection_t *c, const char *request);
+extern bool pong_h(struct connection_t *c, const char *request);
+extern bool add_subnet_h(struct connection_t *c, const char *request);
+extern bool del_subnet_h(struct connection_t *c, const char *request);
+extern bool add_edge_h(struct connection_t *c, const char *request);
+extern bool del_edge_h(struct connection_t *c, const char *request);
+extern bool key_changed_h(struct connection_t *c, const char *request);
+extern bool req_key_h(struct connection_t *c, const char *request);
+extern bool ans_key_h(struct connection_t *c, const char *request);
+extern bool tcppacket_h(struct connection_t *c, const char *request);
+extern bool sptps_tcppacket_h(struct connection_t *c, const char *request);
+extern bool control_h(struct connection_t *c, const char *request);
+extern bool udp_info_h(struct connection_t *c, const char *request);
+extern bool mtu_info_h(struct connection_t *c, const char *request);