denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updown: remove description of unsupported PLUTO_ variables

Browse Source 
These have been set by pluto, but are not by charons updown plugin.
This commit is contained in:
Martin Willi
2013-08-08 14:48:32 +02:00
parent 3b6d8855e8
commit 881e9a7e2e
3 changed files with 6 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/_updown/_updown.in
-26
View File
@@ -41,10 +41,6 @@
# is the name of the connection for which we are # is the name of the connection for which we are
# routing. # routing.
# #
# PLUTO_NEXT_HOP
# is the next hop to which packets bound for the peer
# must be sent.
#
# PLUTO_INTERFACE # PLUTO_INTERFACE
# is the name of the ipsec interface to be used. # is the name of the ipsec interface to be used.
# #
@@ -66,15 +62,6 @@
# host's own IP address / max (where max is 32 for # host's own IP address / max (where max is 32 for
# IPv4 and 128 for IPv6). # IPv4 and 128 for IPv6).
# #
# PLUTO_MY_CLIENT_NET
# is the IP address of our client net. If the client
# is just the host, this will be the host's own IP
# address.
#
# PLUTO_MY_CLIENT_MASK
# is the mask for our client net. If the client is
# just the host, this will be 255.255.255.255.
#
# PLUTO_MY_SOURCEIP # PLUTO_MY_SOURCEIP
# PLUTO_MY_SOURCEIP4_$i # PLUTO_MY_SOURCEIP4_$i
# PLUTO_MY_SOURCEIP6_$i # PLUTO_MY_SOURCEIP6_$i
@@ -96,25 +83,12 @@
# PLUTO_PEER_ID # PLUTO_PEER_ID
# is the ID of our peer. # is the ID of our peer.
# #
# PLUTO_PEER_CA
# is the CA which issued the cert of our peer.
#
# PLUTO_PEER_CLIENT # PLUTO_PEER_CLIENT
# is the IP address / count of the peer's client sub- # is the IP address / count of the peer's client sub-
# net. If the client is just the peer, this will be # net. If the client is just the peer, this will be
# the peer's own IP address / max (where max is 32 # the peer's own IP address / max (where max is 32
# for IPv4 and 128 for IPv6). # for IPv4 and 128 for IPv6).
# #
# PLUTO_PEER_CLIENT_NET
# is the IP address of the peer's client net. If the
# client is just the peer, this will be the peer's
# own IP address.
#
# PLUTO_PEER_CLIENT_MASK
# is the mask for the peer's client net. If the
# client is just the peer, this will be
# 255.255.255.255.
#
# PLUTO_PEER_PROTOCOL # PLUTO_PEER_PROTOCOL
# is the IP protocol that will be transported. # is the IP protocol that will be transported.
# #
src/_updown_espmark/_updown_espmark
+6 -32
View File
@@ -5,12 +5,12 @@
# Copyright (C) 2003-2004 Tuomo Soini # Copyright (C) 2003-2004 Tuomo Soini
# Copyright (C) 2002-2004 Michael Richardson # Copyright (C) 2002-2004 Michael Richardson
# Copyright (C) 2005 Andreas Steffen <[email protected]> # Copyright (C) 2005 Andreas Steffen <[email protected]>
# #
# This program is free software; you can redistribute it and/or modify it # 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 the # under the terms of the GNU General Public License as published by the
# Free Software Foundation; either version 2 of the License, or (at your # Free Software Foundation; either version 2 of the License, or (at your
# option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>. # option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
# #
# This program is distributed in the hope that it will be useful, but # This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
@@ -44,10 +44,6 @@
# is the name of the connection for which we are # is the name of the connection for which we are
# routing. # routing.
# #
# PLUTO_NEXT_HOP
# is the next hop to which packets bound for the peer
# must be sent.
#
# PLUTO_INTERFACE # PLUTO_INTERFACE
# is the name of the ipsec interface to be used. # is the name of the ipsec interface to be used.
# #
@@ -63,15 +59,6 @@
# host's own IP address / max (where max is 32 for # host's own IP address / max (where max is 32 for
# IPv4 and 128 for IPv6). # IPv4 and 128 for IPv6).
# #
# PLUTO_MY_CLIENT_NET
# is the IP address of our client net. If the client
# is just the host, this will be the host's own IP
# address.
#
# PLUTO_MY_CLIENT_MASK
# is the mask for our client net. If the client is
# just the host, this will be 255.255.255.255.
#
# PLUTO_MY_SOURCEIP # PLUTO_MY_SOURCEIP
# if non-empty, then the source address for the route will be # if non-empty, then the source address for the route will be
# set to this IP address. # set to this IP address.
@@ -89,25 +76,12 @@
# PLUTO_PEER_ID # PLUTO_PEER_ID
# is the ID of our peer. # is the ID of our peer.
# #
# PLUTO_PEER_CA
# is the CA which issued the cert of our peer.
#
# PLUTO_PEER_CLIENT # PLUTO_PEER_CLIENT
# is the IP address / count of the peer's client sub- # is the IP address / count of the peer's client sub-
# net. If the client is just the peer, this will be # net. If the client is just the peer, this will be
# the peer's own IP address / max (where max is 32 # the peer's own IP address / max (where max is 32
# for IPv4 and 128 for IPv6). # for IPv4 and 128 for IPv6).
# #
# PLUTO_PEER_CLIENT_NET
# is the IP address of the peer's client net. If the
# client is just the peer, this will be the peer's
# own IP address.
#
# PLUTO_PEER_CLIENT_MASK
# is the mask for the peer's client net. If the
# client is just the peer, this will be
# 255.255.255.255.
#
# PLUTO_PEER_PROTOCOL # PLUTO_PEER_PROTOCOL
# is the IP protocol that will be transported. # is the IP protocol that will be transported.
# #
@@ -235,7 +209,7 @@ doroute() {
case "$PLUTO_PEER_CLIENT_NET/$PLUTO_PEER_CLIENT_MASK" in case "$PLUTO_PEER_CLIENT_NET/$PLUTO_PEER_CLIENT_MASK" in
"0.0.0.0/0.0.0.0") "0.0.0.0/0.0.0.0")
# opportunistic encryption work around # opportunistic encryption work around
# need to provide route that eclipses default, without # need to provide route that eclipses default, without
# replacing it. # replacing it.
it="ip route $1 0.0.0.0/1 $parms2 $parms3 && it="ip route $1 0.0.0.0/1 $parms2 $parms3 &&
ip route $1 128.0.0.0/1 $parms2 $parms3" ip route $1 128.0.0.0/1 $parms2 $parms3"
@@ -255,7 +229,7 @@ doroute() {
fi fi
return $st return $st
} }
# define ESP mark # define ESP mark
ESP_MARK=50 ESP_MARK=50
@@ -295,7 +269,7 @@ prepare-host:*|prepare-client:*)
# delete possibly-existing route (preliminary to adding a route) # delete possibly-existing route (preliminary to adding a route)
case "$PLUTO_PEER_CLIENT_NET/$PLUTO_PEER_CLIENT_MASK" in case "$PLUTO_PEER_CLIENT_NET/$PLUTO_PEER_CLIENT_MASK" in
"0.0.0.0/0.0.0.0") "0.0.0.0/0.0.0.0")
# need to provide route that eclipses default, without # need to provide route that eclipses default, without
# replacing it. # replacing it.
parms1="0.0.0.0/1" parms1="0.0.0.0/1"
parms2="128.0.0.0/1" parms2="128.0.0.0/1"
@@ -314,7 +288,7 @@ prepare-host:*|prepare-client:*)
oops="silent error, exit status $status" oops="silent error, exit status $status"
fi fi
case "$oops" in case "$oops" in
*'RTNETLINK answers: No such process'*) *'RTNETLINK answers: No such process'*)
# This is what route (currently -- not documented!) gives # This is what route (currently -- not documented!) gives
# for "could not find such a route". # for "could not find such a route".
oops= oops=
src/libcharon/plugins/updown/updown_listener.c
-1
View File
@@ -303,7 +303,6 @@ METHOD(listener_t, child_updown, bool,
(my_ts->get_type(my_ts) == TS_IPV6_ADDR_RANGE); (my_ts->get_type(my_ts) == TS_IPV6_ADDR_RANGE);
/* build the command with all env variables. /* build the command with all env variables.
* TODO: PLUTO_PEER_CA and PLUTO_NEXT_HOP are currently missing
*/ */
snprintf(command, sizeof(command), snprintf(command, sizeof(command),
"2>&1 " "2>&1 "