along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: protocol.c,v 1.28.4.43 2000/10/20 15:34:37 guus Exp $
+ $Id: protocol.c,v 1.28.4.46 2000/10/28 21:05:18 guus Exp $
*/
#include "config.h"
}
else
{
- if(debug_lvl > DEBUG_PROTOCOL)
+ if(debug_lvl >= DEBUG_PROTOCOL)
syslog(LOG_DEBUG, _("Got %s from %s (%s)"),
request_name[request], cl->name, cl->hostname);
}
{
if((old = lookup_id(cl->name)))
{
- if(debug_lvl > DEBUG_CONNECTIONS)
+ if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Uplink %s (%s) is already in our connection list"), cl->name, cl->hostname);
cl->status.outgoing = 0;
old->status.outgoing = 1;
cl->hischallenge = xmalloc(len);
cp
+ /* Seed the PRNG with urandom (can't afford to block) */
+
+ RAND_load_file("/dev/urandom", 1024);
+
/* Copy random data to the buffer */
RAND_bytes(cl->hischallenge, len);
+ cl->hischallenge[0] &= 0x7F; /* Somehow if the first byte is more than 0xD0 or something like that, decryption fails... */
+
+ if(debug_lvl >= DEBUG_SCARY_THINGS)
+ {
+ bin2hex(cl->hischallenge, buffer, len);
+ buffer[len*2] = '\0';
+ syslog(LOG_DEBUG, _("Generated random challenge (unencrypted): %s"), buffer);
+ }
+
/* Encrypt the random data */
if(RSA_public_encrypt(len, cl->hischallenge, buffer, cl->rsa_key, RSA_NO_PADDING) != len) /* NO_PADDING because the message size equals the RSA key size and it is totally random */
return -1;
}
+ if(debug_lvl >= DEBUG_SCARY_THINGS)
+ {
+ bin2hex(cl->mychallenge, buffer, len);
+ buffer[len*2] = '\0';
+ syslog(LOG_DEBUG, _("Received random challenge (unencrypted): %s"), buffer);
+ }
+
free(buffer);
/* Rest is done by send_chal_reply() */
if(memcmp(hishash, myhash, SHA_DIGEST_LENGTH))
{
syslog(LOG_ERR, _("Intruder: wrong challenge reply from %s (%s)"), cl->name, cl->hostname);
+ if(debug_lvl >= DEBUG_SCARY_THINGS)
+ {
+ bin2hex(myhash, hishash, SHA_DIGEST_LENGTH);
+ hishash[SHA_DIGEST_LENGTH*2] = '\0';
+ syslog(LOG_DEBUG, _("Expected challenge reply: %s"), hishash);
+ }
free(hishash);
return -1;
}
+
free(hishash);
/* Identity has now been positively verified.
int ack_h(conn_list_t *cl)
{
- conn_list_t *old;
+ conn_list_t *old, *p;
+ subnet_t *s;
cp
/* Okay, before we active the connection, we check if there is another entry
in the connection list with the same name. If so, it presumably is an
while((old = lookup_id(cl->name)))
{
- if(debug_lvl > DEBUG_CONNECTIONS)
+ if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Removing old entry for %s at %s in favour of new connection from %s"),
cl->name, old->hostname, cl->hostname);
old->status.active = 0;
terminate_connection(old);
}
+ /* Notify others of this connection */
+
+ for(p = conn_list; p; p = p->next)
+ if(p->status.active)
+ send_add_host(p, cl);
+
/* Activate this connection */
cl->allow_request = ALL;
cl->status.active = 1;
+ cl->nexthop = cl;
- if(debug_lvl > DEBUG_CONNECTIONS)
+ if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), cl->name, cl->hostname);
- /* Exchange information about other tinc daemons */
-
-/* FIXME: reprogram this.
- notify_others(cl, NULL, send_add_host);
- notify_one(cl);
-*/
- upstreamindex = 0;
+cp
+ if(!cl->status.outgoing)
+ send_ack(cl);
+ /* Send him our subnets */
+
+ for(s = myself->subnets; s; s = s->next)
+ send_add_subnet(cl, s);
cp
- if(cl->status.outgoing)
- return 0;
- else
- return send_ack(cl);
+ return 0;
}
/* Address and subnet information exchange */
-int send_add_subnet(conn_list_t *cl, conn_list_t *other, subnet_t *subnet)
+int send_add_subnet(conn_list_t *cl, subnet_t *subnet)
{
int x;
char *netstr;
cp
x = send_request(cl, "%d %s %s", ADD_SUBNET,
- other->name, netstr = net2str(subnet));
+ subnet->owner->name, netstr = net2str(subnet));
free(netstr);
cp
return x;
conn_list_t *owner;
subnet_t *subnet, *old;
cp
- if(sscanf(cl->buffer, "%*d %as %as", &name, &subnetstr) != 3)
+ if(sscanf(cl->buffer, "%*d %as %as", &name, &subnetstr) != 2)
{
syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s)"), cl->name, cl->hostname);
free(name); free(subnetstr);
return 0;
}
-int send_del_subnet(conn_list_t *cl, conn_list_t *other, subnet_t *subnet)
+int send_del_subnet(conn_list_t *cl, subnet_t *subnet)
{
+ int x;
+ char *netstr;
+cp
+ netstr = net2str(subnet);
+ x = send_request(cl, "%d %s %s", DEL_SUBNET, subnet->owner->name, netstr);
+ free(netstr);
cp
- return send_request(cl, "%d %s %s", DEL_SUBNET, other->name, net2str(subnet));
+ return x;
}
int del_subnet_h(conn_list_t *cl)
{
if((new->address == old->address) && (new->port == old->port))
{
- if(debug_lvl > DEBUG_CONNECTIONS)
+ 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)
+ if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Removing old entry for %s (%s)"),
old->name, old->hostname);
old->status.active = 0;
/* Fill in rest of conn_list structure */
- new->myuplink = cl;
+ new->nexthop = cl;
new->status.active = 1;
/* Hook it up into the conn_list */
return -1;
}
- if(debug_lvl > DEBUG_STATUS)
+ if(debug_lvl >= DEBUG_STATUS)
{
syslog(LOG_NOTICE, _("Status message from %s (%s): %s: %s"),
cl->name, cl->hostname, status_text[statusno], statusstring);
return -1;
}
- if(debug_lvl > DEBUG_ERROR)
+ if(debug_lvl >= DEBUG_ERROR)
{
syslog(LOG_NOTICE, _("Error message from %s (%s): %s: %s"),
cl->name, cl->hostname, strerror(errno), errorstring);
keylength = strlen(pktkey);
+/* Don't do this... yet
if((keylength%2) || (keylength <= 0))
{
syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s) origin %s: invalid key"),
keylength /= 2;
hex2bin(pktkey, pktkey, keylength);
BF_set_key(cl->cipher_pktkey, keylength, pktkey);
+*/
+
+ cl->status.validkey = 1;
+ cl->status.waitingforkey = 0;
}
else
{
projects / tinc / blobdiff