projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed changelog
[tinc]
/
src
/
protocol.c
diff --git
a/src/protocol.c
b/src/protocol.c
index
20a2fc3
..
20f6644
100644
(file)
--- a/
src/protocol.c
+++ b/
src/protocol.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
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.
36 2000/09/26 14:06:06
guus Exp $
+ $Id: protocol.c,v 1.28.4.
42 2000/10/16 19:04:47
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-52,42
+52,42
@@
int check_id(char *id)
int i;
for (i = 0; i < strlen(id); i++)
int i;
for (i = 0; i < strlen(id); i++)
- {
- if(!isalpha(id[i]) && id[i] != '_')
- {
- return 0;
- }
- }
-
- return 1;
+ if(!isalnum(id[i]) && id[i] != '_')
+ return -1;
+
+ return 0;
}
/* Generic request routines - takes care of logging and error detection as well */
}
/* Generic request routines - takes care of logging and error detection as well */
-int send_request(conn_list_t *cl, const char *format,
int request, /*args*/
...)
+int send_request(conn_list_t *cl, const char *format, ...)
{
va_list args;
{
va_list args;
- char buffer[MAXBUFSIZE
+1
];
- int len;
+ char buffer[MAXBUFSIZE];
+ int len
, request
;
cp
/* Use vsnprintf instead of vasprintf: faster, no memory fragmentation, cleanup is automatic,
and there is a limit on the input buffer anyway */
cp
/* Use vsnprintf instead of vasprintf: faster, no memory fragmentation, cleanup is automatic,
and there is a limit on the input buffer anyway */
- va_start(args, request);
- len = vsnprintf(buffer, MAXBUFSIZE+1, format, args);
+ va_start(args, format);
+ len = vsnprintf(buffer, MAXBUFSIZE, format, args);
+ request = va_arg(args, int);
va_end(args);
va_end(args);
- if(len < 0 || len > MAXBUFSIZE)
+ if(len < 0 || len > MAXBUFSIZE
-1
)
{
syslog(LOG_ERR, _("Output buffer overflow while sending %s to %s (%s)"), request_name[request], cl->name, cl->hostname);
return -1;
}
{
syslog(LOG_ERR, _("Output buffer overflow while sending %s to %s (%s)"), request_name[request], cl->name, cl->hostname);
return -1;
}
+ len++;
+
if(debug_lvl >= DEBUG_PROTOCOL)
syslog(LOG_DEBUG, _("Sending %s to %s (%s)"), request_name[request], cl->name, cl->hostname);
if(debug_lvl >= DEBUG_PROTOCOL)
syslog(LOG_DEBUG, _("Sending %s to %s (%s)"), request_name[request], cl->name, cl->hostname);
+
cp
cp
- return send_meta(cl, buffer, len
gth
);
+ return send_meta(cl, buffer, len);
}
int receive_request(conn_list_t *cl)
}
int receive_request(conn_list_t *cl)
@@
-155,14
+155,16
@@
cp
int send_id(conn_list_t *cl)
{
cp
int send_id(conn_list_t *cl)
{
cp
- return send_request(cl, "%d %s %d %lx", ID, myself->name, myself->protocol_version, myself->options);
+ cl->allow_request = CHALLENGE;
+cp
+ return send_request(cl, "%d %s %d %lx %hd", ID, myself->name, myself->protocol_version, myself->options, myself->port);
}
int id_h(conn_list_t *cl)
{
conn_list_t *old;
cp
}
int id_h(conn_list_t *cl)
{
conn_list_t *old;
cp
- if(sscanf(cl->buffer, "%*d %as %d %lx
", &cl->name, &cl->protocol_version, &cl->options) != 3
)
+ if(sscanf(cl->buffer, "%*d %as %d %lx
%hd", &cl->name, &cl->protocol_version, &cl->options, &cl->port) != 4
)
{
syslog(LOG_ERR, _("Got bad ID from %s"), cl->hostname);
return -1;
{
syslog(LOG_ERR, _("Got bad ID from %s"), cl->hostname);
return -1;
@@
-179,7
+181,7
@@
cp
/* Check if identity is a valid name */
/* Check if identity is a valid name */
- if(
!
check_id(cl->name))
+ if(check_id(cl->name))
{
syslog(LOG_ERR, _("Peer %s uses invalid identity name"), cl->hostname);
return -1;
{
syslog(LOG_ERR, _("Peer %s uses invalid identity name"), cl->hostname);
return -1;
@@
-187,7
+189,7
@@
cp
/* Load information about peer */
/* Load information about peer */
- if(
!read_id
(cl))
+ if(
read_host_config
(cl))
{
syslog(LOG_ERR, _("Peer %s had unknown identity (%s)"), cl->hostname, cl->name);
return -1;
{
syslog(LOG_ERR, _("Peer %s had unknown identity (%s)"), cl->hostname, cl->name);
return -1;
@@
-211,10
+213,6
@@
cp
return 0;
}
}
return 0;
}
}
-
- /* Send a challenge to verify the identity */
-
- cl->allow_request = CHAL_REPLY;
cp
return send_challenge(cl);
}
cp
return send_challenge(cl);
}
@@
-227,15
+225,15
@@
cp
if(!cl->hischallenge)
cl->hischallenge = xmalloc(CHAL_LENGTH);
if(!cl->hischallenge)
cl->hischallenge = xmalloc(CHAL_LENGTH);
-
+cp
/* Copy random data to the buffer */
RAND_bytes(cl->hischallenge, CHAL_LENGTH);
/* Copy random data to the buffer */
RAND_bytes(cl->hischallenge, CHAL_LENGTH);
-
+cp
/* Convert the random data to a hexadecimal formatted string */
/* Convert the random data to a hexadecimal formatted string */
- bin2hex(cl->hischallenge,
buffer,
CHAL_LENGTH);
- buffer[
keylength
*2] = '\0';
+ bin2hex(cl->hischallenge,
buffer,
CHAL_LENGTH);
+ buffer[
CHAL_LENGTH
*2] = '\0';
/* Send the challenge */
/* Send the challenge */
@@
-313,7
+311,7
@@
int chal_reply_h(conn_list_t *cl)
char *hishash;
char myhash[SHA_DIGEST_LENGTH];
cp
char *hishash;
char myhash[SHA_DIGEST_LENGTH];
cp
- if(sscanf(cl->buffer, "%*d %as", &hishash) !=
2
)
+ if(sscanf(cl->buffer, "%*d %as", &hishash) !=
1
)
{
syslog(LOG_ERR, _("Got bad CHAL_REPLY from %s (%s)"), cl->name, cl->hostname);
free(hishash);
{
syslog(LOG_ERR, _("Got bad CHAL_REPLY from %s (%s)"), cl->name, cl->hostname);
free(hishash);
@@
-339,7
+337,7
@@
cp
/* Verify the incoming hash with the calculated hash */
/* Verify the incoming hash with the calculated hash */
- if(
!
memcmp(hishash, myhash, SHA_DIGEST_LENGTH))
+ if(memcmp(hishash, myhash, SHA_DIGEST_LENGTH))
{
syslog(LOG_ERR, _("Intruder: wrong challenge reply from %s (%s)"), cl->name, cl->hostname);
free(hishash);
{
syslog(LOG_ERR, _("Intruder: wrong challenge reply from %s (%s)"), cl->name, cl->hostname);
free(hishash);
@@
-354,19
+352,15
@@
cp
*/
cp
if(cl->status.outgoing)
*/
cp
if(cl->status.outgoing)
- {
- cl->allow_request = ACK;
return send_ack(cl);
return send_ack(cl);
- }
else
else
- {
- cl->allow_request = CHALLENGE;
return send_id(cl);
return send_id(cl);
- }
}
int send_ack(conn_list_t *cl)
{
}
int send_ack(conn_list_t *cl)
{
+cp
+ cl->allow_request = ACK;
cp
return send_request(cl, "%d", ACK);
}
cp
return send_request(cl, "%d", ACK);
}
@@
-399,9
+393,10
@@
cp
/* Exchange information about other tinc daemons */
/* Exchange information about other tinc daemons */
+/* FIXME: reprogram this.
notify_others(cl, NULL, send_add_host);
notify_one(cl);
notify_others(cl, NULL, send_add_host);
notify_one(cl);
-
+*/
upstreamindex = 0;
cp
upstreamindex = 0;
cp
@@
-441,7
+436,7
@@
cp
/* Check if owner name is a valid */
/* Check if owner name is a valid */
- if(
!
check_id(name))
+ if(check_id(name))
{
syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s): invalid identity name"), cl->name, cl->hostname);
free(name); free(subnetstr);
{
syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s): invalid identity name"), cl->name, cl->hostname);
free(name); free(subnetstr);
@@
-450,7
+445,7
@@
cp
/* Check if subnet string is valid */
/* Check if subnet string is valid */
- if(
(subnet = str2net(subnetstr)) == -1
)
+ if(
!(subnet = str2net(subnetstr))
)
{
syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s): invalid subnet string"), cl->name, cl->hostname);
free(name); free(subnetstr);
{
syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s): invalid subnet string"), cl->name, cl->hostname);
free(name); free(subnetstr);
@@
-472,7
+467,7
@@
cp
/* Check if the owner of the new subnet is in the connection list */
/* Check if the owner of the new subnet is in the connection list */
- if(!(owner = lookup_id(name))
+ 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);
{
syslog(LOG_ERR, _("Got ADD_SUBNET for %s from %s (%s) which is not in our connection list"),
name, cl->name, cl->hostname);
@@
-481,8
+476,10
@@
cp
}
/* If everything is correct, add the subnet to the list of the owner */
}
/* If everything is correct, add the subnet to the list of the owner */
+
+ subnet_add(owner, subnet);
cp
cp
- return
subnet_add(owner, subnet)
;
+ 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, conn_list_t *other, subnet_t *subnet)
@@
-507,7
+504,7
@@
cp
/* Check if owner name is a valid */
/* Check if owner name is a valid */
- if(
!
check_id(name))
+ 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);
{
syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid identity name"), cl->name, cl->hostname);
free(name); free(subnetstr);
@@
-516,7
+513,7
@@
cp
/* Check if subnet string is valid */
/* Check if subnet string is valid */
- if(
(subnet = str2net(subnetstr)) == -1
)
+ if(
!(subnet = str2net(subnetstr))
)
{
syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid subnet string"), cl->name, cl->hostname);
free(name); free(subnetstr);
{
syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid subnet string"), cl->name, cl->hostname);
free(name); free(subnetstr);
@@
-538,7
+535,7
@@
cp
/* Check if the owner of the new subnet is in the connection list */
/* Check if the owner of the new subnet is in the connection list */
- if(!(owner = lookup_id(name))
+ 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);
{
syslog(LOG_ERR, _("Got DEL_SUBNET for %s from %s (%s) which is not in our connection list"),
name, cl->name, cl->hostname);
@@
-546,9
+543,11
@@
cp
return -1;
}
return -1;
}
- /* If everything is correct, add the subnet to the list of the owner */
+ /* If everything is correct, delete the subnet from the list of the owner */
+
+ subnet_del(subnet);
cp
cp
- return
subnet_del(owner, subnet)
;
+ return
0
;
}
/* New and closed connections notification */
}
/* New and closed connections notification */
@@
-557,7
+556,7
@@
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,
{
cp
return send_request(cl, "%d %s %s %lx:%d %lx", ADD_HOST,
- myself->name, other->name, other->
real_ip
, other->port, other->options);
+ myself->name, other->name, other->
address
, other->port, other->options);
}
int add_host_h(conn_list_t *cl)
}
int add_host_h(conn_list_t *cl)
@@
-575,7
+574,7
@@
cp
/* Check if identity is a valid name */
/* Check if identity is a valid name */
- if(
!check_id(new->name) || !
check_id(sender))
+ 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);
{
syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): invalid identity name"), cl->name, cl->hostname);
free(sender);
@@
-604,7
+603,7
@@
cp
/* Lookup his uplink */
/* Lookup his uplink */
- if(!(new->hisuplink = lookup_id(sender))
+ 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);
{
syslog(LOG_ERR, _("Got ADD_HOST from %s (%s) with origin %s which is not in our connection list"),
sender, cl->name, cl->hostname);
@@
-616,13
+615,13
@@
cp
/* Fill in more of the new conn_list structure */
/* Fill in more of the new conn_list structure */
- new->hostname = hostlookup(htonl(new->
real_ip
));
+ new->hostname = hostlookup(htonl(new->
address
));
/* Check if the new host already exists in the connnection list */
if((old = lookup_id(new->name)))
{
/* 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((new->
address == old->address
) && (new->port == old->port))
{
if(debug_lvl > DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Got duplicate ADD_HOST for %s (%s) from %s (%s)"),
{
if(debug_lvl > DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Got duplicate ADD_HOST for %s (%s) from %s (%s)"),
@@
-649,9
+648,9
@@
cp
conn_list_add(conn_list, new);
/* Tell the rest about the new host */
conn_list_add(conn_list, new);
/* Tell the rest about the new host */
-
+/* FIXME: reprogram this.
notify_others(new, cl, send_add_host);
notify_others(new, cl, send_add_host);
-
+*/
cp
return 0;
}
cp
return 0;
}
@@
-660,7
+659,7
@@
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,
{
cp
return send_request(cl, "%d %s %s %lx:%d %lx", DEL_HOST,
- myself->name, other->name, other->
real_ip
, other->port, other->options);
+ myself->name, other->name, other->
address
, other->port, other->options);
}
int del_host_h(conn_list_t *cl)
}
int del_host_h(conn_list_t *cl)
@@
-682,7
+681,7
@@
cp
/* Check if identity is a valid name */
/* Check if identity is a valid name */
- if(
!check_id(name) || !
check_id(sender))
+ 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);
{
syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s): invalid identity name"), cl->name, cl->hostname);
free(name); free(sender);
@@
-712,7
+711,7
@@
cp
/* Lookup his uplink */
/* Lookup his uplink */
- if(!(hisuplink = lookup_id(sender))
+ 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);
{
syslog(LOG_ERR, _("Got DEL_HOST from %s (%s) with origin %s which is not in our connection list"),
cl->name, cl->hostname, sender);
@@
-799,12
+798,12
@@
int error_h(conn_list_t *cl)
cp
if(sscanf(cl->buffer, "%*d %d %as", &errno, &errorstring) != 2)
{
cp
if(sscanf(cl->buffer, "%*d %d %as", &errno, &errorstring) != 2)
{
- syslog(LOG_ERR, _("Got bad
error
from %s (%s)"),
+ syslog(LOG_ERR, _("Got bad
ERROR
from %s (%s)"),
cl->name, cl->hostname);
return -1;
}
cl->name, cl->hostname);
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);
{
syslog(LOG_NOTICE, _("Error message from %s (%s): %s: %s"),
cl->name, cl->hostname, strerror(errno), errorstring);
@@
-938,7
+937,7
@@
cp
if(!strcmp(to_id, myself->name))
{
if(!strcmp(to_id, myself->name))
{
- send_ans_key(myself, from, myself->
datakey->
key);
+ send_ans_key(myself, from, myself->
cipher_pkt
key);
}
else
{
}
else
{
@@
-957,20
+956,20
@@
cp
return 0;
}
return 0;
}
-int send_ans_key(conn_list_t *from, conn_list_t *to, char *
data
key)
+int send_ans_key(conn_list_t *from, conn_list_t *to, char *
pkt
key)
{
cp
return send_request(to->nexthop, "%d %s %s %s", ANS_KEY,
{
cp
return send_request(to->nexthop, "%d %s %s %s", ANS_KEY,
- from->name, to->name,
data
key);
+ from->name, to->name,
pkt
key);
}
int ans_key_h(conn_list_t *cl)
{
}
int ans_key_h(conn_list_t *cl)
{
- char *from_id, *to_id, *
data
key;
+ char *from_id, *to_id, *
pkt
key;
int keylength;
conn_list_t *from, *to;
cp
int keylength;
conn_list_t *from, *to;
cp
- if(sscanf(cl->buffer, "%*d %as %as %as", &from_id, &to_id, &
data
key) != 3)
+ if(sscanf(cl->buffer, "%*d %as %as %as", &from_id, &to_id, &
pkt
key) != 3)
{
syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s)"),
cl->name, cl->hostname);
{
syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s)"),
cl->name, cl->hostname);
@@
-981,7
+980,7
@@
cp
{
syslog(LOG_ERR, _("Got ANS_KEY from %s (%s) origin %s which does not exist in our connection list"),
cl->name, cl->hostname, from_id);
{
syslog(LOG_ERR, _("Got ANS_KEY from %s (%s) origin %s which does not exist in our connection list"),
cl->name, cl->hostname, from_id);
- free(from_id); free(to_id); free(
data
key);
+ free(from_id); free(to_id); free(
pkt
key);
return -1;
}
return -1;
}
@@
-991,18
+990,18
@@
cp
{
/* It is for us, convert it to binary and set the key with it. */
{
/* It is for us, convert it to binary and set the key with it. */
- keylength = strlen(
data
key);
+ keylength = strlen(
pkt
key);
if((keylength%2) || (keylength <= 0))
{
syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s) origin %s: invalid key"),
cl->name, cl->hostname, from->name);
if((keylength%2) || (keylength <= 0))
{
syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s) origin %s: invalid key"),
cl->name, cl->hostname, from->name);
- free(from_id); free(to_id); free(
data
key);
+ free(from_id); free(to_id); free(
pkt
key);
return -1;
}
keylength /= 2;
return -1;
}
keylength /= 2;
- hex2bin(
datakey, data
key, keylength);
- BF_set_key(cl->
datakey, keylength, data
key);
+ hex2bin(
pktkey, pkt
key, keylength);
+ BF_set_key(cl->
cipher_pktkey, keylength, pkt
key);
}
else
{
}
else
{
@@
-1010,13
+1009,13
@@
cp
{
syslog(LOG_ERR, _("Got ANS_KEY from %s (%s) destination %s which does not exist in our connection list"),
cl->name, cl->hostname, to_id);
{
syslog(LOG_ERR, _("Got ANS_KEY from %s (%s) destination %s which does not exist in our connection list"),
cl->name, cl->hostname, to_id);
- free(from_id); free(to_id); free(
data
key);
+ free(from_id); free(to_id); free(
pkt
key);
return -1;
}
return -1;
}
- send_ans_key(from, to,
data
key);
+ send_ans_key(from, to,
pkt
key);
}
}
- free(from_id); free(to_id); free(
data
key);
+ free(from_id); free(to_id); free(
pkt
key);
cp
return 0;
}
cp
return 0;
}
@@
-1042,3
+1041,15
@@
char (*request_name[]) = {
"ADD_SUBNET", "DEL_SUBNET",
"KEY_CHANGED", "REQ_KEY", "ANS_KEY",
};
"ADD_SUBNET", "DEL_SUBNET",
"KEY_CHANGED", "REQ_KEY", "ANS_KEY",
};
+
+/* Status strings */
+
+char (*status_text[]) = {
+ "Warning",
+};
+
+/* Error strings */
+
+char (*error_text[]) = {
+ "Error",
+};