projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Never remove items from cmdline_conf.
[tinc]
/
src
/
proxy.c
diff --git
a/src/proxy.c
b/src/proxy.c
index
227be4a
..
ba48218
100644
(file)
--- a/
src/proxy.c
+++ b/
src/proxy.c
@@
-1,6
+1,6
@@
/*
proxy.c -- Proxy handling functions.
/*
proxy.c -- Proxy handling functions.
- Copyright (C) 2015 Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2015
-2017
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
@@
-174,7
+174,7
@@
bool send_proxyrequest(connection_t *c) {
}
case PROXY_EXEC:
}
case PROXY_EXEC:
-
return true
;
+
abort()
;
default:
logger(LOG_ERR, "Unknown proxy type");
default:
logger(LOG_ERR, "Unknown proxy type");
@@
-194,6
+194,8
@@
int receive_proxy_meta(connection_t *c, int start, int lenin) {
ifdebug(CONNECTIONS) logger(LOG_DEBUG, "Proxy request granted");
c->allow_request = ID;
ifdebug(CONNECTIONS) logger(LOG_DEBUG, "Proxy request granted");
c->allow_request = ID;
+ c->status.proxy_passed = true;
+ send_id(c);
return 8;
} else {
logger(LOG_ERR, "Proxy request rejected");
return 8;
} else {
logger(LOG_ERR, "Proxy request rejected");
@@
-249,6
+251,8
@@
int receive_proxy_meta(connection_t *c, int start, int lenin) {
} else {
ifdebug(CONNECTIONS) logger(LOG_DEBUG, "Proxy request granted");
c->allow_request = ID;
} else {
ifdebug(CONNECTIONS) logger(LOG_DEBUG, "Proxy request granted");
c->allow_request = ID;
+ c->status.proxy_passed = true;
+ send_id(c);
return replen;
}
return replen;
}
@@
-275,6
+279,8
@@
int receive_proxy_meta(connection_t *c, int start, int lenin) {
logger(LOG_DEBUG, "Proxy request granted");
replen = p + 1 - c->buffer;
c->allow_request = ID;
logger(LOG_DEBUG, "Proxy request granted");
replen = p + 1 - c->buffer;
c->allow_request = ID;
+ c->status.proxy_passed = true;
+ send_id(c);
return replen;
} else {
p = memchr(c->buffer, '\n', c->buflen);
return replen;
} else {
p = memchr(c->buffer, '\n', c->buflen);