projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added UML network socket handling.
[tinc]
/
src
/
protocol_auth.c
diff --git
a/src/protocol_auth.c
b/src/protocol_auth.c
index
920324f
..
214d4dd
100644
(file)
--- a/
src/protocol_auth.c
+++ b/
src/protocol_auth.c
@@
-1,7
+1,7
@@
/*
protocol_auth.c -- handle the meta-protocol, authentication
/*
protocol_auth.c -- handle the meta-protocol, authentication
- Copyright (C) 1999-200
3 Ivo Timmermans <ivo@o2w.nl
>,
- 2000-200
3 Guus Sliepen <guus@sliepen.eu
.org>
+ Copyright (C) 1999-200
4 Ivo Timmermans <ivo@tinc-vpn.org
>,
+ 2000-200
4 Guus Sliepen <guus@tinc-vpn
.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-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_auth.c,v 1.1.4.29 2003/11/10 22:31:53 guus Exp
$
+ $Id$
*/
#include "system.h"
*/
#include "system.h"
@@
-476,18
+476,10
@@
bool send_ack(connection_t *c)
if((get_config_bool(lookup_config(c->config_tree, "TCPOnly"), &choice) && choice) || myself->options & OPTION_TCPONLY)
c->options |= OPTION_TCPONLY | OPTION_INDIRECT;
if((get_config_bool(lookup_config(c->config_tree, "TCPOnly"), &choice) && choice) || myself->options & OPTION_TCPONLY)
c->options |= OPTION_TCPONLY | OPTION_INDIRECT;
- choice = false;
- get_config_bool(lookup_config(config_tree, "Opaque"), &choice);
- get_config_bool(lookup_config(c->config_tree, "Opaque"), &choice);
- c->status.opaque = choice;
+ if((get_config_bool(lookup_config(c->config_tree, "PMTUDiscovery"), &choice) && choice) || myself->options & OPTION_PMTU_DISCOVERY)
+ c->options |= OPTION_PMTU_DISCOVERY;
- if(c->status.opaque)
- c->options |= OPTION_INDIRECT;
-
- choice = false;
- get_config_bool(lookup_config(config_tree, "Strict"), &choice);
- get_config_bool(lookup_config(c->config_tree, "Strict"), &choice);
- c->status.strict = choice;
+ get_config_int(lookup_config(c->config_tree, "Weight"), &c->estimated_weight);
return send_request(c, "%d %s %d %lx", ACK, myport, c->estimated_weight, c->options);
}
return send_request(c, "%d %s %d %lx", ACK, myport, c->estimated_weight, c->options);
}
@@
-501,6
+493,15
@@
static void send_everything(connection_t *c)
/* Send all known subnets and edges */
/* Send all known subnets and edges */
+ if(tunnelserver) {
+ for(node = myself->subnet_tree->head; node; node = node->next) {
+ s = node->data;
+ send_add_subnet(c, s);
+ }
+
+ return;
+ }
+
for(node = node_tree->head; node; node = node->next) {
n = node->data;
for(node = node_tree->head; node; node = node->next) {
n = node->data;
@@
-520,7
+521,7
@@
bool ack_h(connection_t *c)
{
char hisport[MAX_STRING_SIZE];
char *hisaddress, *dummy;
{
char hisport[MAX_STRING_SIZE];
char *hisaddress, *dummy;
- int weight;
+ int weight
, mtu
;
long int options;
node_t *n;
long int options;
node_t *n;
@@
-555,6
+556,12
@@
bool ack_h(connection_t *c)
c->node = n;
c->options |= options;
c->node = n;
c->options |= options;
+ if(get_config_int(lookup_config(c->config_tree, "PMTU"), &mtu) && mtu < n->mtu)
+ n->mtu = mtu;
+
+ if(get_config_int(lookup_config(myself->connection->config_tree, "PMTU"), &mtu) && mtu < n->mtu)
+ n->mtu = mtu;
+
/* Activate this connection */
c->allow_request = ALL;
/* Activate this connection */
c->allow_request = ALL;
@@
-565,8
+572,7
@@
bool ack_h(connection_t *c)
/* Send him everything we know */
/* Send him everything we know */
- if(!c->status.opaque)
- send_everything(c);
+ send_everything(c);
/* Create an edge_t for this connection */
/* Create an edge_t for this connection */
@@
-586,10
+592,10
@@
bool ack_h(connection_t *c)
/* Notify everyone of the new edge */
/* Notify everyone of the new edge */
- if(c->status.opaque)
- send_add_edge(broadcast, c->edge);
- else
+ if(tunnelserver)
send_add_edge(c, c->edge);
send_add_edge(c, c->edge);
+ else
+ send_add_edge(broadcast, c->edge);
/* Run MST and SSSP algorithms */
/* Run MST and SSSP algorithms */