- /* Check if the owner of the new subnet is in the connection list */
-
- if(!(owner = lookup_id(name))
- {
- syslog(LOG_ERR, _("Got ADD_SUBNET for %s from %s (%s) which is not in our connection list"),
- name, cl->name, cl->hostname);
- free(name);
- return -1;
- }
-
- /* If everything is correct, add the subnet to the list of the owner */
-cp
- return subnet_add(owner, subnet);
-}
-
-int send_del_subnet(conn_list_t *cl, conn_list_t *other, subnet_t *subnet)
-{
-cp
- return send_request(cl, "%d %s %s", DEL_SUBNET, other->name, net2str(subnet));
-}
-
-int del_subnet_h(conn_list_t *cl)
-{
- char *subnetstr;
- char *name;
- conn_list_t *owner;
- subnet_t *subnet, *old;
-cp
- if(sscanf(cl->buffer, "%*d %as %as", &name, &subnetstr) != 3)
- {
- syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s)"), cl->name, cl->hostname);
- free(name); free(subnetstr);
- return -1;
- }
-
- /* Check if owner name is a valid */
-
- if(!check_id(name))
- {
- syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid identity name"), cl->name, cl->hostname);
- free(name); free(subnetstr);
- return -1;
- }
-
- /* Check if subnet string is valid */
-
- if((subnet = str2net(subnetstr)) == -1)
- {
- syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid subnet string"), cl->name, cl->hostname);
- free(name); free(subnetstr);
- return -1;
- }
-
- free(subnetstr);
-
- /* Check if somebody tries to add a subnet of ourself */
-
- if(!strcmp(name, myself->name))
- {
- syslog(LOG_ERR, _("Warning: got DEL_SUBNET from %s (%s) for ourself, restarting"),
- cl->name, cl->hostname);
- free(name);
- sighup = 1;
- return 0;
- }
-
- /* Check if the owner of the new subnet is in the connection list */
-
- if(!(owner = lookup_id(name))
- {
- syslog(LOG_ERR, _("Got DEL_SUBNET for %s from %s (%s) which is not in our connection list"),
- name, cl->name, cl->hostname);
- free(name);
- return -1;
- }
-
- /* If everything is correct, add the subnet to the list of the owner */
-cp
- return subnet_del(owner, subnet);
-}
-
-/* New and closed connections notification */
-
-int send_add_host(conn_list_t *cl, conn_list_t *other)
-{
-cp
- return send_request(cl, "%d %s %s %lx:%d %lx", ADD_HOST,
- myself->name, other->name, other->real_ip, other->port, other->options);
-}
-
-int add_host_h(conn_list_t *cl)
-{
- char *sender;
- conn_list_t *old, *new, *hisuplink;
-cp
- new = new_conn_list();
-
- if(sscanf(cl->buffer, "%*d %as %as %lx:%d %lx", &sender, &new->name, &new->address, &new->port, &new->options) != 5)
- {
- syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s)"), cl->name, cl->hostname);
- return -1;
- }
-
- /* Check if identity is a valid name */
-
- if(!check_id(new->name) || !check_id(sender))
- {
- syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): invalid identity name"), cl->name, cl->hostname);
- free(sender);
- return -1;
- }
-
- /* Check if somebody tries to add ourself */
-
- if(!strcmp(new->name, myself->name))
- {
- syslog(LOG_ERR, _("Warning: got ADD_HOST from %s (%s) for ourself, restarting"), cl->name, cl->hostname);
- sighup = 1;
- free(sender);
- return 0;
- }
-
- /* We got an ADD_HOST from ourself!? */
-
- if(!strcmp(sender, myself->name))
- {
- syslog(LOG_ERR, _("Warning: got ADD_HOST from %s (%s) from ourself, restarting"), cl->name, cl->hostname);
- sighup = 1;
- free(sender);
- return 0;
- }
-
- /* Lookup his uplink */
-
- if(!(new->hisuplink = lookup_id(sender))
- {
- syslog(LOG_ERR, _("Got ADD_HOST from %s (%s) with origin %s which is not in our connection list"),
- sender, cl->name, cl->hostname);
- free(sender);
- return -1;
- }
-
- free(sender);
-
- /* Fill in more of the new conn_list structure */
-
- new->hostname = hostlookup(htonl(new->real_ip));
-
- /* Check if the new host already exists in the connnection list */
-
- if((old = lookup_id(new->name)))
- {
- if((new->real_ip == old->real_ip) && (new->port == old->port))
- {
- if(debug_lvl > DEBUG_CONNECTIONS)
- syslog(LOG_NOTICE, _("Got duplicate ADD_HOST for %s (%s) from %s (%s)"),
- old->name, old->hostname, new->name, new->hostname);
- return 0;
- }
- else
- {
- if(debug_lvl > DEBUG_CONNECTIONS)
- syslog(LOG_NOTICE, _("Removing old entry for %s (%s)"),
- old->name, old->hostname);
- old->status.active = 0;
- terminate_connection(old);
- }
- }
-
- /* Fill in rest of conn_list structure */
-
- new->myuplink = cl;
- new->status.active = 1;
-
- /* Hook it up into the conn_list */
-
- conn_list_add(conn_list, new);
-
- /* Tell the rest about the new host */
-
- notify_others(new, cl, send_add_host);
-
-cp
- return 0;
-}
-
-int send_del_host(conn_list_t *cl, conn_list_t *other)
-{
-cp
- return send_request(cl, "%d %s %s %lx:%d %lx", DEL_HOST,
- myself->name, other->name, other->real_ip, other->port, other->options);
-}
-
-int del_host_h(conn_list_t *cl)
-{
- char *name;
- char *sender;
- ip_t address;
- port_t port;
- int options;
- conn_list_t *old, *hisuplink;
-
-cp
- if(sscanf(cl->buffer, "%*d %as %as %lx:%d %lx", &sender, &name, &address, &port, &options) != 5)
- {
- syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s)"),
- cl->name, cl->hostname);
- return -1;
- }
-
- /* Check if identity is a valid name */
-
- if(!check_id(name) || !check_id(sender))
- {
- syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s): invalid identity name"), cl->name, cl->hostname);
- free(name); free(sender);
- return -1;
- }
-
- /* Check if somebody tries to delete ourself */
-
- if(!strcmp(name, myself->name))
- {
- syslog(LOG_ERR, _("Warning: got DEL_HOST from %s (%s) for ourself, restarting"),
- cl->name, cl->hostname);
- free(name); free(sender);
- sighup = 1;
- return 0;
- }
-
- /* We got an ADD_HOST from ourself!? */
-
- if(!strcmp(sender, myself->name))
- {
- syslog(LOG_ERR, _("Warning: got DEL_HOST from %s (%s) from ourself, restarting"), cl->name, cl->hostname);
- sighup = 1;
- free(name); free(sender);
- return 0;
- }
-
- /* Lookup his uplink */
-
- if(!(hisuplink = lookup_id(sender))
- {
- syslog(LOG_ERR, _("Got DEL_HOST from %s (%s) with origin %s which is not in our connection list"),
- cl->name, cl->hostname, sender);
- free(name); free(sender);
- return -1;
- }
-
- free(sender);
-
- /* Check if the new host already exists in the connnection list */
-
- if(!(old = lookup_id(name)))
- {
- syslog(LOG_ERR, _("Got DEL_HOST from %s (%s) for %s which is not in our connection list"),
- name, cl->name, cl->hostname);
- free(name);
- return -1;
- }
-
- /* Check if the rest matches */
-
- if(address!=old->address || port!=old->port || options!=old->options || hisuplink!=old->hisuplink || cl!=old->myuplink)
- {
- syslog(LOG_WARNING, _("Got DEL_HOST from %s (%s) for %s which doesn't match"), cl->name, cl->hostname, old->name);
- return 0;
- }
-
- /* Ok, since EVERYTHING seems to check out all right, delete it */
-
- old->status.termreq = 1;
- old->status.active = 0;
-
- terminate_connection(old);
-cp
- return 0;
-}
-
-/* Status and error notification routines */
-
-int send_status(conn_list_t *cl, int statusno, char *statusstring)
-{
-cp
- if(!statusstring)
- statusstring = status_text[statusno];
-cp
- return send_request(cl, "%d %d %s", STATUS, statusno, statusstring);
-}
-
-int status_h(conn_list_t *cl)
-{
- int statusno;
- char *statusstring;
-cp
- if(sscanf(cl->buffer, "%*d %d %as", &statusno, &statusstring) != 2)
- {
- syslog(LOG_ERR, _("Got bad STATUS from %s (%s)"),
- cl->name, cl->hostname);
- return -1;
- }
-
- if(debug_lvl > DEBUG_STATUS)
- {
- syslog(LOG_NOTICE, _("Status message from %s (%s): %s: %s"),
- cl->name, cl->hostname, status_text[statusno], statusstring);
- }
-
-cp
- free(statusstring);
- return 0;
-}
-
-int send_error(conn_list_t *cl, int errno, char *errstring)
-{
-cp
- if(!errstring)
- errstring = strerror(errno);
- return send_request(cl, "%d %d %s", ERROR, errno, errstring);
+ // Prevent user from accessing the table directly to always have bound checks
+ static const request_entry_t request_entries[] = {
+ [ID] = {id_h, "ID"},
+ [METAKEY] = {metakey_h, "METAKEY"},
+ [CHALLENGE] = {challenge_h, "CHALLENGE"},
+ [CHAL_REPLY] = {chal_reply_h, "CHAL_REPLY"},
+ [ACK] = {ack_h, "ACK"},
+ [STATUS] = {NULL, "STATUS"},
+ [ERROR] = {NULL, "ERROR"},
+ [TERMREQ] = {termreq_h, "TERMREQ"},
+ [PING] = {ping_h, "PING"},
+ [PONG] = {pong_h, "PONG"},
+ [ADD_SUBNET] = {add_subnet_h, "ADD_SUBNET"},
+ [DEL_SUBNET] = {del_subnet_h, "DEL_SUBNET"},
+ [ADD_EDGE] = {add_edge_h, "ADD_EDGE"},
+ [DEL_EDGE] = {del_edge_h, "DEL_EDGE"},
+ [KEY_CHANGED] = {key_changed_h, "KEY_CHANGED"},
+ [REQ_KEY] = {req_key_h, "REQ_KEY"},
+ [ANS_KEY] = {ans_key_h, "ANS_KEY"},
+ [PACKET] = {tcppacket_h, "PACKET"},
+ [CONTROL] = {control_h, "CONTROL"},
+ /* Not "real" requests yet */
+ [REQ_PUBKEY] = {NULL, "REQ_PUBKEY"},
+ [ANS_PUBKEY] = {NULL, "ANS_PUBKEY"},
+ [SPTPS_PACKET] = {sptps_tcppacket_h, "SPTPS_PACKET"},
+ [UDP_INFO] = {udp_info_h, "UDP_INFO"},
+ [MTU_INFO] = {mtu_info_h, "MTU_INFO"},
+ };
+ return &request_entries[req];
+}
+
+static int past_request_compare(const past_request_t *a, const past_request_t *b) {
+ return strcmp(a->request, b->request);
+}
+
+static void free_past_request(past_request_t *r) {
+ if(r) {
+ free((char *)r->request);
+ free(r);
+ }