projects
/
oweals
/
tinc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3e4829e
)
Fixes for the Forwarding option.
author
Guus Sliepen
<guus@tinc-vpn.org>
Tue, 2 Mar 2010 22:27:50 +0000
(23:27 +0100)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Tue, 2 Mar 2010 22:27:50 +0000
(23:27 +0100)
src/net_setup.c
patch
|
blob
|
history
src/route.c
patch
|
blob
|
history
diff --git
a/src/net_setup.c
b/src/net_setup.c
index 867fef9455592e5e5c0fa26e5f294517bdcdda99..70291bffe97111f5f4a30691e63c56172a669351 100644
(file)
--- a/
src/net_setup.c
+++ b/
src/net_setup.c
@@
-360,11
+360,11
@@
bool setup_myself(void) {
if(get_config_string(lookup_config(config_tree, "Forwarding"), &mode)) {
if(!strcasecmp(mode, "off"))
if(get_config_string(lookup_config(config_tree, "Forwarding"), &mode)) {
if(!strcasecmp(mode, "off"))
-
rout
ing_mode = FMODE_OFF;
+
forward
ing_mode = FMODE_OFF;
else if(!strcasecmp(mode, "internal"))
else if(!strcasecmp(mode, "internal"))
-
rout
ing_mode = FMODE_INTERNAL;
+
forward
ing_mode = FMODE_INTERNAL;
else if(!strcasecmp(mode, "kernel"))
else if(!strcasecmp(mode, "kernel"))
-
rout
ing_mode = FMODE_KERNEL;
+
forward
ing_mode = FMODE_KERNEL;
else {
logger(LOG_ERR, "Invalid forwarding mode!");
return false;
else {
logger(LOG_ERR, "Invalid forwarding mode!");
return false;
diff --git
a/src/route.c
b/src/route.c
index 4e7f7e585db410c41f733a582aae7c2540064e43..853b7f5b1acb5a916ec1657131c598e26768b4ec 100644
(file)
--- a/
src/route.c
+++ b/
src/route.c
@@
-844,7
+844,7
@@
static void route_mac(node_t *source, vpn_packet_t *packet) {
}
void route(node_t *source, vpn_packet_t *packet) {
}
void route(node_t *source, vpn_packet_t *packet) {
- if(forwarding_mode == FMODE_KERNEL) {
+ if(forwarding_mode == FMODE_KERNEL
&& source != myself
) {
send_packet(myself, packet);
return;
}
send_packet(myself, packet);
return;
}