projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Make sure correct information is supplied for both old kernels (with
[tinc]
/
src
/
protocol.c
diff --git
a/src/protocol.c
b/src/protocol.c
index
97b51b4
..
cd63ad0
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.8
4 2001/03/02 11:25:5
6 guus Exp $
+ $Id: protocol.c,v 1.28.4.8
7 2001/05/07 19:08:4
6 guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-119,7
+119,7
@@
int receive_request(connection_t *cl)
cp
if(sscanf(cl->buffer, "%d", &request) == 1)
{
cp
if(sscanf(cl->buffer, "%d", &request) == 1)
{
- if((request < 0) || (request >
255
) || (request_handlers[request] == NULL))
+ if((request < 0) || (request >
= LAST
) || (request_handlers[request] == NULL))
{
syslog(LOG_ERR, _("Unknown request from %s (%s)"),
cl->name, cl->hostname);
{
syslog(LOG_ERR, _("Unknown request from %s (%s)"),
cl->name, cl->hostname);
@@
-325,6
+325,7
@@
cp
subnet = (subnet_t *)node->data;
send_add_subnet(cl, subnet);
}
subnet = (subnet_t *)node->data;
send_add_subnet(cl, subnet);
}
+
/* And send him all the hosts and their subnets we know... */
for(node = connection_tree->head; node; node = node->next)
/* And send him all the hosts and their subnets we know... */
for(node = connection_tree->head; node; node = node->next)
@@
-644,7
+645,7
@@
int send_add_subnet(connection_t *cl, subnet_t *subnet)
char *netstr;
char *owner;
cp
char *netstr;
char *owner;
cp
- if(
cl->options
& OPTION_INDIRECT)
+ if(
(cl->options | myself->options | subnet->owner->options)
& OPTION_INDIRECT)
owner = myself->name;
else
owner = subnet->owner->name;
owner = myself->name;
else
owner = subnet->owner->name;
@@
-810,7
+811,7
@@
cp
int send_add_host(connection_t *cl, connection_t *other)
{
cp
int send_add_host(connection_t *cl, connection_t *other)
{
cp
- if(!(
cl->options
& OPTION_INDIRECT))
+ if(!(
(cl->options | myself->options | other->options)
& OPTION_INDIRECT))
return send_request(cl, "%d %s %lx:%d %lx", ADD_HOST,
other->name, other->address, other->port, other->options);
else
return send_request(cl, "%d %s %lx:%d %lx", ADD_HOST,
other->name, other->address, other->port, other->options);
else
@@
-904,7
+905,7
@@
cp
int send_del_host(connection_t *cl, connection_t *other)
{
cp
int send_del_host(connection_t *cl, connection_t *other)
{
cp
- if(!(
cl->options
& OPTION_INDIRECT))
+ if(!(
(cl->options | myself->options)
& OPTION_INDIRECT))
return send_request(cl, "%d %s %lx:%d %lx", DEL_HOST,
other->name, other->address, other->port, other->options);
else
return send_request(cl, "%d %s %lx:%d %lx", DEL_HOST,
other->name, other->address, other->port, other->options);
else
@@
-914,7
+915,7
@@
cp
int del_host_h(connection_t *cl)
{
char name[MAX_STRING_SIZE];
int del_host_h(connection_t *cl)
{
char name[MAX_STRING_SIZE];
- ip_t address;
+ ip
v4
_t address;
port_t port;
long int options;
connection_t *old, *p;
port_t port;
long int options;
connection_t *old, *p;
@@
-1126,7
+1127,8
@@
cp
from->status.validkey = 0;
from->status.waitingforkey = 0;
from->status.validkey = 0;
from->status.waitingforkey = 0;
- send_key_changed(from, cl);
+ if(!(from->options | cl->options | myself->options) & OPTION_INDIRECT)
+ send_key_changed(from, cl);
cp
return 0;
}
cp
return 0;
}
@@
-1264,7
+1266,7
@@
cp
int send_tcppacket(connection_t *cl, vpn_packet_t *packet)
{
int x;
int send_tcppacket(connection_t *cl, vpn_packet_t *packet)
{
int x;
-
+cp
x = send_request(cl->nexthop, "%d %hd", PACKET, packet->len);
if(x)
x = send_request(cl->nexthop, "%d %hd", PACKET, packet->len);
if(x)
@@
-1278,8
+1280,8
@@
int tcppacket_h(connection_t *cl)
vpn_packet_t packet;
char *p;
int todo, x;
vpn_packet_t packet;
char *p;
int todo, x;
-
- if(sscanf(cl->buffer, "%*d %hd", packet.len) != 1)
+cp
+ if(sscanf(cl->buffer, "%*d %hd",
&
packet.len) != 1)
{
syslog(LOG_ERR, _("Got bad PACKET from %s (%s)"), cl->name, cl->hostname);
return -1;
{
syslog(LOG_ERR, _("Got bad PACKET from %s (%s)"), cl->name, cl->hostname);
return -1;
@@
-1289,7
+1291,7
@@
int tcppacket_h(connection_t *cl)
p = packet.data;
todo = packet.len;
p = packet.data;
todo = packet.len;
-
+
while(todo)
{
x = read(cl->meta_socket, p, todo);
while(todo)
{
x = read(cl->meta_socket, p, todo);
@@
-1299,7
+1301,7
@@
int tcppacket_h(connection_t *cl)
if(x==0)
syslog(LOG_NOTICE, _("Connection closed by %s (%s)"), cl->name, cl->hostname);
else
if(x==0)
syslog(LOG_NOTICE, _("Connection closed by %s (%s)"), cl->name, cl->hostname);
else
- if(errno==EINTR
)
+ if(errno==EINTR
|| errno==EAGAIN) /* FIXME: select() or poll() or reimplement this evil hack */
continue;
else
syslog(LOG_ERR, _("Error during reception of PACKET from %s (%s): %m"), cl->name, cl->hostname);
continue;
else
syslog(LOG_ERR, _("Error during reception of PACKET from %s (%s): %m"), cl->name, cl->hostname);
@@
-1311,7
+1313,9
@@
int tcppacket_h(connection_t *cl)
p += x;
}
p += x;
}
- return receive_packet(cl, &packet);
+ receive_packet(cl, &packet);
+cp
+ return 0;
}
/* Jumptable for the request handlers */
}
/* Jumptable for the request handlers */