projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in comment
[tinc]
/
src
/
protocol_auth.c
diff --git
a/src/protocol_auth.c
b/src/protocol_auth.c
index
f309a40
..
52afa09
100644
(file)
--- a/
src/protocol_auth.c
+++ b/
src/protocol_auth.c
@@
-1,7
+1,7
@@
/*
protocol_auth.c -- handle the meta-protocol, authentication
Copyright (C) 1999-2005 Ivo Timmermans,
/*
protocol_auth.c -- handle the meta-protocol, authentication
Copyright (C) 1999-2005 Ivo Timmermans,
- 2000-201
3
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-201
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
@@
-38,9
+38,9
@@
#include "netutl.h"
#include "node.h"
#include "prf.h"
#include "netutl.h"
#include "node.h"
#include "prf.h"
-#include "process.h"
#include "protocol.h"
#include "rsa.h"
#include "protocol.h"
#include "rsa.h"
+#include "script.h"
#include "sptps.h"
#include "utils.h"
#include "xalloc.h"
#include "sptps.h"
#include "utils.h"
#include "xalloc.h"
@@
-672,7
+672,8
@@
bool send_ack(connection_t *c) {
if(choice)
c->options |= OPTION_CLAMP_MSS;
if(choice)
c->options |= OPTION_CLAMP_MSS;
- get_config_int(lookup_config(c->config_tree, "Weight"), &c->estimated_weight);
+ if(!get_config_int(lookup_config(c->config_tree, "Weight"), &c->estimated_weight))
+ get_config_int(lookup_config(config_tree, "Weight"), &c->estimated_weight);
return send_request(c, "%d %s %d %x", ACK, myport, c->estimated_weight, (c->options & 0xffffff) | (experimental ? (PROT_MINOR << 24) : 0));
}
return send_request(c, "%d %s %d %x", ACK, myport, c->estimated_weight, (c->options & 0xffffff) | (experimental ? (PROT_MINOR << 24) : 0));
}