projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve starting/stopping tincd using tincctl.
[tinc]
/
src
/
protocol_auth.c
diff --git
a/src/protocol_auth.c
b/src/protocol_auth.c
index
3fd80c4
..
88c6255
100644
(file)
--- a/
src/protocol_auth.c
+++ b/
src/protocol_auth.c
@@
-65,7
+65,7
@@
static bool send_proxyrequest(connection_t *c) {
memcpy(s4req + 2, &c->address.in.sin_port, 2);
memcpy(s4req + 4, &c->address.in.sin_addr, 4);
if(proxyuser)
memcpy(s4req + 2, &c->address.in.sin_port, 2);
memcpy(s4req + 4, &c->address.in.sin_addr, 4);
if(proxyuser)
-
strcpy(s4req + 8, proxyuser
);
+
memcpy(s4req + 8, proxyuser, strlen(proxyuser)
);
s4req[sizeof s4req - 1] = 0;
c->tcplen = 8;
return send_meta(c, s4req, sizeof s4req);
s4req[sizeof s4req - 1] = 0;
c->tcplen = 8;
return send_meta(c, s4req, sizeof s4req);
@@
-83,10
+83,10
@@
static bool send_proxyrequest(connection_t *c) {
s5req[i++] = 2;
s5req[i++] = 1;
s5req[i++] = strlen(proxyuser);
s5req[i++] = 2;
s5req[i++] = 1;
s5req[i++] = strlen(proxyuser);
-
strcpy(s5req + i, proxyuser
);
+
memcpy(s5req + i, proxyuser, strlen(proxyuser)
);
i += strlen(proxyuser);
s5req[i++] = strlen(proxypass);
i += strlen(proxyuser);
s5req[i++] = strlen(proxypass);
-
strcpy(s5req + i, proxypass
);
+
memcpy(s5req + i, proxypass, strlen(proxypass)
);
i += strlen(proxypass);
c->tcplen += 2;
} else {
i += strlen(proxypass);
c->tcplen += 2;
} else {
@@
-506,7
+506,7
@@
bool send_ack(connection_t *c) {
get_config_int(lookup_config(c->config_tree, "Weight"), &c->estimated_weight);
get_config_int(lookup_config(c->config_tree, "Weight"), &c->estimated_weight);
- return send_request(c, "%d %s %d %x", ACK, myport, c->estimated_weight, (c->options & 0xffffff) | (
PROT_MINOR << 24
));
+ return send_request(c, "%d %s %d %x", ACK, myport, c->estimated_weight, (c->options & 0xffffff) | (
experimental ? (PROT_MINOR << 24) : 0
));
}
static void send_everything(connection_t *c) {
}
static void send_everything(connection_t *c) {
@@
-626,9
+626,6
@@
bool ack_h(connection_t *c, const char *request) {
c->options &= ~OPTION_CLAMP_MSS;
}
c->options &= ~OPTION_CLAMP_MSS;
}
- if(c->protocol_minor > 0)
- c->node->status.ecdh = true;
-
/* Activate this connection */
c->allow_request = ALL;
/* Activate this connection */
c->allow_request = ALL;