projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid calling time(NULL).
[tinc]
/
src
/
protocol_auth.c
diff --git
a/src/protocol_auth.c
b/src/protocol_auth.c
index
21cfc52
..
ba5db2e
100644
(file)
--- a/
src/protocol_auth.c
+++ b/
src/protocol_auth.c
@@
-139,7
+139,7
@@
bool send_id(connection_t *c) {
minor = myself->connection->protocol_minor;
}
minor = myself->connection->protocol_minor;
}
- if(proxytype)
+ if(proxytype
&& c->outgoing
)
if(!send_proxyrequest(c))
return false;
if(!send_proxyrequest(c))
return false;
@@
-160,10
+160,10
@@
bool id_h(connection_t *c, const char *request) {
if(name[0] == '^' && !strcmp(name + 1, controlcookie)) {
c->status.control = true;
c->allow_request = CONTROL;
if(name[0] == '^' && !strcmp(name + 1, controlcookie)) {
c->status.control = true;
c->allow_request = CONTROL;
- c->last_ping_time =
time(NULL)
+ 3600;
+ c->last_ping_time =
now.tv_sec
+ 3600;
- free(c->name);
-
c->name = xstrdup("<control>");
+ free(c->name);
+ c->name = xstrdup("<control>");
return send_request(c, "%d %d %d", ACK, TINC_CTL_VERSION_CURRENT, getpid());
}
return send_request(c, "%d %d %d", ACK, TINC_CTL_VERSION_CURRENT, getpid());
}
@@
-248,7
+248,7
@@
bool send_metakey(connection_t *c) {
if(!cipher_open_blowfish_ofb(&c->outcipher))
return false;
if(!cipher_open_blowfish_ofb(&c->outcipher))
return false;
-
+
if(!digest_open_sha1(&c->outdigest, -1))
return false;
if(!digest_open_sha1(&c->outdigest, -1))
return false;
@@
-302,7
+302,7
@@
bool send_metakey(connection_t *c) {
cipher_get_nid(&c->outcipher),
digest_get_nid(&c->outdigest), c->outmaclength,
c->outcompression, hexkey);
cipher_get_nid(&c->outcipher),
digest_get_nid(&c->outdigest), c->outmaclength,
c->outcompression, hexkey);
-
+
c->status.encryptout = true;
return result;
}
c->status.encryptout = true;
return result;
}