{
termreq_t tmp;
cp
+ memset(&tmp, 0, sizeof(tmp));
tmp.type = TERMREQ;
tmp.vpn_ip = myself->vpn_ip;
{
termreq_t tmp;
cp
+ memset(&tmp, 0, sizeof(tmp));
tmp.type = PINGTIMEOUT;
tmp.vpn_ip = myself->vpn_ip;
{
del_host_t tmp;
cp
+ memset(&tmp, 0, sizeof(tmp));
tmp.type = DEL_HOST;
tmp.vpn_ip = new_host->vpn_ip;
{
add_host_t tmp;
cp
+ memset(&tmp, 0, sizeof(tmp));
tmp.type = ADD_HOST;
tmp.real_ip = new_host->real_ip;
tmp.vpn_ip = new_host->vpn_ip;
{
key_changed_t tmp;
cp
+ memset(&tmp, 0, sizeof(tmp));
tmp.type = KEY_CHANGED;
tmp.from = src->vpn_ip;
{
basic_info_t tmp;
cp
+ memset(&tmp, 0, sizeof(tmp));
tmp.type = BASIC_INFO;
tmp.protocol = PROT_CURRENT;
{
passphrase_t tmp;
cp
+ memset(&tmp, 0, sizeof(tmp));
tmp.type = PASSPHRASE;
encrypt_passphrase(&tmp);
public_key_t *tmp;
cp
tmp = (public_key_t*)xmalloc(strlen(my_public_key_base36)+sizeof(*tmp));
+ memset(tmp, 0, sizeof(*tmp));
tmp->type = PUBLIC_KEY;
tmp->len = strlen(my_public_key_base36);
strcpy(&tmp->key, my_public_key_base36);
calculate_t *tmp;
cp
tmp = xmalloc(strlen(k)+sizeof(*tmp));
+ memset(tmp, 0, sizeof(*tmp));
tmp->type = CALCULATE;
tmp->len = strlen(k);
strcpy(&tmp->key, k);
conn_list_t *fw;
cp
tmp = xmalloc(sizeof(*tmp));
+ memset(tmp, 0, sizeof(*tmp));
tmp->type = REQ_KEY;
tmp->to = to;
tmp->from = myself->vpn_ip;
conn_list_t *fw;
cp
tmp = xmalloc(sizeof(*tmp)+strlen(my_public_key_base36));
+ memset(tmp, 0, sizeof(*tmp));
tmp->type = ANS_KEY;
tmp->to = to;
tmp->from = myself->vpn_ip;
tmp->expiry = my_key_expiry;
tmp->len = strlen(my_public_key_base36);
- strcpy(&tmp->key, my_public_key_base36);
+ strcpy(&(tmp->key), my_public_key_base36);
fw = lookup_conn(to);
if(!fw)
- {
- syslog(LOG_ERR, "Attempting to send key answer to " IP_ADDR_S ", which does not exist?",
- IP_ADDR_V(to));
- return -1;
- }
-
- if(debug_lvl > 2)
+ {
+ syslog(LOG_ERR, "Attempting to send key answer to " IP_ADDR_S ", which does not exist?",
+ IP_ADDR_V(to));
+ return -1;
+ }
+
+cp
+ if(debug_lvl > 2)
syslog(LOG_DEBUG, "Sending public key to " IP_ADDR_S,
IP_ADDR_V(fw->nexthop->vpn_ip));
+cp
if(write(fw->nexthop->meta_socket, tmp, sizeof(*tmp)+tmp->len) < 0)
{
syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
The incoming request handlers
*/
-int basic_info_h(conn_list_t *cl, unsigned char *d, int len)
+int basic_info_h(conn_list_t *cl)
{
- basic_info_t *tmp = (basic_info_t*)d;
+ basic_info_t tmp;
cp
- cl->protocol_version = tmp->protocol;
- cl->port = tmp->portnr;
- cl->vpn_ip = tmp->vpn_ip;
- cl->vpn_mask = tmp->vpn_mask;
+ if(read(cl->meta_socket, &((char*)(&tmp))[1], sizeof(tmp)-1) <= 0)
+ {
+ syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
+ return -1;
+ }
+
+ cl->protocol_version = tmp.protocol;
+ cl->port = tmp.portnr;
+ cl->vpn_ip = tmp.vpn_ip;
+ cl->vpn_mask = tmp.vpn_mask;
if(cl->protocol_version < PROT_CURRENT)
{
return 0;
}
-int passphrase_h(conn_list_t *cl, unsigned char *d, int len)
+int passphrase_h(conn_list_t *cl)
{
- passphrase_t *tmp = (passphrase_t*)d;
+ char unused;
+ unsigned short int len;
cp
- cl->pp = xmalloc(tmp->len+3);
- memcpy(cl->pp, tmp, tmp->len+3);
+ if(read(cl->meta_socket, &unused, sizeof(unused)) <= 0)
+ {
+ syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
+ return -1;
+ }
+ if(read(cl->meta_socket, &len, sizeof(len)) <= 0)
+ {
+ syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
+ return -1;
+ }
+
+ cl->pp = xmalloc(len+4);
+
+ cl->pp->len = len;
+ if(read(cl->meta_socket, &(cl->pp->phrase), len) <= 0)
+ {
+ syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
+ return -1;
+ }
+
if(debug_lvl > 2)
- syslog(LOG_DEBUG, "got PASSPHRASE(%hd,...)", cl->pp->len);
+ syslog(LOG_DEBUG, "got PASSPHRASE(%hd,...)", len);
if(cl->status.outgoing)
send_passphrase(cl);
return 0;
}
-int public_key_h(conn_list_t *cl, unsigned char *d, int len)
+int public_key_h(conn_list_t *cl)
{
char *g_n;
- public_key_t *tmp = (public_key_t*)d;
+ unsigned short int len;
+ char unused;
cp
- if(debug_lvl > 2)
- syslog(LOG_DEBUG, "got PUBLIC_KEY(%hd,%s)", tmp->len, &tmp->key);
+ if(read(cl->meta_socket, &unused, sizeof(unused)) <= 0)
+ {
+ syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
+ return -1;
+ }
+ if(read(cl->meta_socket, &len, sizeof(len)) <= 0)
+ {
+ syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
+ return -1;
+ }
- g_n = xmalloc(tmp->len+1);
- strcpy(g_n, &tmp->key);
+ g_n = xmalloc(len+2);
+
+ if(read(cl->meta_socket, g_n, len+2) <= 0)
+ {
+ syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
+ return -1;
+ }
+
+ if(debug_lvl > 2)
+ syslog(LOG_DEBUG, "got PUBLIC_KEY(%hd,%s)", len, g_n);
if(verify_passphrase(cl, g_n))
{
return 0;
}
-int ack_h(conn_list_t *cl, unsigned char *d, int len)
+int ack_h(conn_list_t *cl)
{
cp
if(debug_lvl > 2)
cl->status.active = 1;
syslog(LOG_NOTICE, "Connection with %s activated.", cl->hostname);
-
- /*
- === FIXME ===
- Now I'm going to cheat. The meta protocol is actually
- a stream of requests, that may come in in the same TCP
- packet. This is the only place that it will happen,
- though.
- I may change it in the future, if it appears that this
- is not retainable.
- */
- if(len > 1) /* An ADD_HOST follows */
- {
- if(request_handlers[d[1]] == NULL)
- syslog(LOG_ERR, "Unknown request %d.", d[1]);
- if(request_handlers[d[1]](cl, d + 1, len - 1) < 0)
- return -1;
- }
cp
return 0;
}
-int termreq_h(conn_list_t *cl, unsigned char *d, int len)
+int termreq_h(conn_list_t *cl)
{
cp
syslog(LOG_NOTICE, IP_ADDR_S " wants to quit", IP_ADDR_V(cl->vpn_ip));
return 0;
}
-int timeout_h(conn_list_t *cl, unsigned char *d, int len)
+int timeout_h(conn_list_t *cl)
{
cp
syslog(LOG_NOTICE, IP_ADDR_S " says it's gotten a timeout from us", IP_ADDR_V(cl->vpn_ip));
return 0;
}
-int del_host_h(conn_list_t *cl, unsigned char *d, int len)
+int del_host_h(conn_list_t *cl)
{
- del_host_t *tmp = (del_host_t*)d;
+ del_host_t tmp;
conn_list_t *fw;
cp
+ if(read(cl->meta_socket, &((char*)(&tmp))[1], sizeof(tmp)-1) <= 0)
+ {
+ syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
+ return -1;
+ }
+
if(debug_lvl > 2)
syslog(LOG_DEBUG, "got DEL_HOST for " IP_ADDR_S,
- IP_ADDR_V(tmp->vpn_ip));
+ IP_ADDR_V(tmp.vpn_ip));
- if(!(fw = lookup_conn(tmp->vpn_ip)))
+ if(!(fw = lookup_conn(tmp.vpn_ip)))
{
syslog(LOG_ERR, "Somebody wanted to delete " IP_ADDR_S " which does not exist?",
- IP_ADDR_V(tmp->vpn_ip));
+ IP_ADDR_V(tmp.vpn_ip));
return 0;
}
return 0;
}
-int ping_h(conn_list_t *cl, unsigned char *d, int len)
+int ping_h(conn_list_t *cl)
{
cp
if(debug_lvl > 3)
return 0;
}
-int pong_h(conn_list_t *cl, unsigned char *d, int len)
+int pong_h(conn_list_t *cl)
{
cp
if(debug_lvl > 3)
return 0;
}
-int add_host_h(conn_list_t *cl, unsigned char *d, int len)
+int add_host_h(conn_list_t *cl)
{
- add_host_t *tmp = (add_host_t*)d;
+ add_host_t tmp;
conn_list_t *ncn, *fw;
cp
+ if(read(cl->meta_socket, &((char*)(&tmp))[1], sizeof(tmp)-1) <= 0)
+ {
+ syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
+ return -1;
+ }
+
if(debug_lvl > 2)
syslog(LOG_DEBUG, "Add host request from " IP_ADDR_S, IP_ADDR_V(cl->vpn_ip));
if(debug_lvl > 3)
syslog(LOG_DEBUG, "got ADD_HOST(" IP_ADDR_S "," IP_ADDR_S ",%hd)",
- IP_ADDR_V(tmp->vpn_ip), IP_ADDR_V(tmp->vpn_mask), tmp->portnr);
+ IP_ADDR_V(tmp.vpn_ip), IP_ADDR_V(tmp.vpn_mask), tmp.portnr);
/*
Suggestion of Hans Bayle
*/
- if((fw = lookup_conn(tmp->vpn_ip)))
+ if((fw = lookup_conn(tmp.vpn_ip)))
{
notify_others(fw, cl, send_add_host);
return 0;
}
ncn = new_conn_list();
- ncn->real_ip = tmp->real_ip;
- ncn->vpn_ip = tmp->vpn_ip;
- ncn->vpn_mask = tmp->vpn_mask;
- ncn->port = tmp->portnr;
- ncn->hostname = hostlookup(tmp->real_ip);
+ ncn->real_ip = tmp.real_ip;
+ ncn->vpn_ip = tmp.vpn_ip;
+ ncn->vpn_mask = tmp.vpn_mask;
+ ncn->port = tmp.portnr;
+ ncn->hostname = hostlookup(tmp.real_ip);
ncn->nexthop = cl;
ncn->next = conn_list;
conn_list = ncn;
ncn->status.active = 1;
notify_others(ncn, cl, send_add_host);
-
- /*
- again, i'm cheating here. see the comment in ack_h.
- Naughty zarq! Now you see what cheating will get you... [GS]
- */
- if(len > sizeof(*tmp)) /* Another ADD_HOST follows */
- {
- if(request_handlers[d[sizeof(*tmp)]] == NULL)
- syslog(LOG_ERR, "Unknown request %d.", d[sizeof(*tmp)]);
- if(request_handlers[d[sizeof(*tmp)]](cl, d + sizeof(*tmp), len - sizeof(*tmp)) < 0)
- return -1;
- }
cp
return 0;
}
-int req_key_h(conn_list_t *cl, unsigned char *d, int len)
+int req_key_h(conn_list_t *cl)
{
- key_req_t *tmp = (key_req_t*)d;
+ key_req_t tmp;
conn_list_t *fw;
cp
+ if(read(cl->meta_socket, &((char*)(&tmp))[1], sizeof(tmp)-1) <= 0)
+ {
+ syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
+ return -1;
+ }
+
if(debug_lvl > 2)
syslog(LOG_DEBUG, "got REQ_KEY from " IP_ADDR_S " for " IP_ADDR_S,
- IP_ADDR_V(tmp->from), IP_ADDR_V(tmp->to));
+ IP_ADDR_V(tmp.from), IP_ADDR_V(tmp.to));
- if((tmp->to & myself->vpn_mask) == (myself->vpn_ip & myself->vpn_mask))
+ if((tmp.to & myself->vpn_mask) == (myself->vpn_ip & myself->vpn_mask))
{ /* hey! they want something from ME! :) */
- send_key_answer(cl, tmp->from);
+ send_key_answer(cl, tmp.from);
return 0;
}
- fw = lookup_conn(tmp->to);
+ fw = lookup_conn(tmp.to);
if(!fw)
- {
- syslog(LOG_ERR, "Attempting to forward key request to " IP_ADDR_S ", which does not exist?",
- IP_ADDR_V(tmp->to));
- return -1;
- }
+ {
+ syslog(LOG_ERR, "Attempting to forward key request to " IP_ADDR_S ", which does not exist?",
+ IP_ADDR_V(tmp.to));
+ return -1;
+ }
if(debug_lvl > 3)
syslog(LOG_DEBUG, "Forwarding request for public key to " IP_ADDR_S,
IP_ADDR_V(fw->nexthop->vpn_ip));
- if(write(fw->nexthop->meta_socket, tmp, sizeof(*tmp)) < 0)
+
+ tmp.type = REQ_KEY;
+ tmp.key = 0;
+ if(write(fw->nexthop->meta_socket, &tmp, sizeof(tmp)) < 0)
{
syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
return -1;
return 0;
}
-void set_keys(conn_list_t *cl, key_req_t *k)
+void set_keys(conn_list_t *cl, key_req_t *k, char *key)
{
char *ek;
cp
cl->public_key->length = k->len;
cl->public_key->expiry = k->expiry;
cl->public_key->key = xmalloc(k->len + 1);
- strcpy(cl->public_key->key, &(k->key));
+ strcpy(cl->public_key->key, key);
- ek = make_shared_key(&(k->key));
+ ek = make_shared_key(key);
if(!cl->key)
{
cl->key = xmalloc(sizeof(*cl->key));
cp
}
-int ans_key_h(conn_list_t *cl, unsigned char *d, int len)
+int ans_key_h(conn_list_t *cl)
{
- key_req_t *tmp = (key_req_t*)d;
+ key_req_t tmp;
conn_list_t *fw, *gk;
+ char *key;
cp
+ if(read(cl->meta_socket, &((char*)(&tmp))[1], sizeof(tmp) - 3) <= 0)
+ {
+ syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
+ return -1;
+ }
+
+ syslog(LOG_DEBUG, "%08lx %08lx %d %hd", tmp.from, tmp.to, tmp.expiry, tmp.len);
+ key = xmalloc(tmp.len);
+
+ if(read(cl->meta_socket, key, tmp.len + 2) <= 0)
+ {
+ syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
+ return -1;
+ }
+ syslog(LOG_DEBUG, "%s", key);
+
if(debug_lvl > 3)
syslog(LOG_DEBUG, "got ANS_KEY from " IP_ADDR_S " for " IP_ADDR_S,
- IP_ADDR_V(tmp->from), IP_ADDR_V(tmp->to));
+ IP_ADDR_V(tmp.from), IP_ADDR_V(tmp.to));
- if(tmp->to == myself->vpn_ip)
+ if(tmp.to == myself->vpn_ip)
{ /* hey! that key's for ME! :) */
if(debug_lvl > 2)
syslog(LOG_DEBUG, "Yeah! key arrived. Now do something with it.");
- gk = lookup_conn(tmp->from);
+ gk = lookup_conn(tmp.from);
if(!gk)
{
syslog(LOG_ERR, "Receiving key from " IP_ADDR_S ", which does not exist?",
- IP_ADDR_V(tmp->from));
+ IP_ADDR_V(tmp.from));
return -1;
}
- set_keys(gk, tmp);
+ set_keys(gk, &tmp, key);
gk->status.validkey = 1;
gk->status.waitingforkey = 0;
flush_queues(gk);
return 0;
}
- fw = lookup_conn(tmp->to);
+ fw = lookup_conn(tmp.to);
if(!fw)
- {
- syslog(LOG_ERR, "Attempting to forward key to " IP_ADDR_S ", which does not exist?",
- IP_ADDR_V(tmp->to));
- return -1;
- }
+ {
+ syslog(LOG_ERR, "Attempting to forward key to " IP_ADDR_S ", which does not exist?",
+ IP_ADDR_V(tmp.to));
+ return -1;
+ }
if(debug_lvl > 2)
syslog(LOG_DEBUG, "Forwarding public key to " IP_ADDR_S,
IP_ADDR_V(fw->nexthop->vpn_ip));
- if(write(fw->nexthop->meta_socket, tmp, sizeof(*tmp)+tmp->len) < 0)
+ tmp.type = ANS_KEY;
+ if(write(fw->nexthop->meta_socket, &tmp, sizeof(tmp) -2) < 0)
+ {
+ syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
+ return -1;
+ }
+ if(write(fw->nexthop->meta_socket, key, tmp.len + 1) < 0)
{
syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
return -1;
return 0;
}
-int key_changed_h(conn_list_t *cl, unsigned char *d, int len)
+int key_changed_h(conn_list_t *cl)
{
- key_changed_t *tmp = (key_changed_t*)d;
+ key_changed_t tmp;
conn_list_t *ik;
cp
+ if(read(cl->meta_socket, &((char*)(&tmp))[1], sizeof(tmp)-1) <= 0)
+ {
+ syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
+ return -1;
+ }
+
if(debug_lvl > 2)
syslog(LOG_DEBUG, "got KEY_CHANGED from " IP_ADDR_S,
- IP_ADDR_V(tmp->from));
+ IP_ADDR_V(tmp.from));
- ik = lookup_conn(tmp->from);
+ ik = lookup_conn(tmp.from);
if(!ik)
{
syslog(LOG_ERR, "Got changed key from " IP_ADDR_S ", which does not exist?",
- IP_ADDR_V(tmp->from));
+ IP_ADDR_V(tmp.from));
return -1;
}
return 0;
}
-int (*request_handlers[256])(conn_list_t*, unsigned char*, int) = {
+int (*request_handlers[256])(conn_list_t*) = {
0, ack_h, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
projects / tinc / blobdiff