Merge branch 'test-timing'
This commit is contained in:
commit
310b583925
|
@ -1,12 +1,6 @@
|
|||
carol::ipsec status 2> /dev/null::home.*ESTABLISHED.*carol@strongswan.org.*moon.strongswan.org::YES
|
||||
moon:: ipsec status 2> /dev/null::rw.*ESTABLISHED.*moon.strongswan.org.*carol@strongswan.org::YES
|
||||
carol::ipsec status 2> /dev/null::home.*INSTALLED, TUNNEL::YES
|
||||
moon:: ipsec status 2> /dev/null::rw.*INSTALLED, TUNNEL::YES
|
||||
carol::ipsec statusall 2> /dev/null::IKE proposal: SERPENT_CBC_256/HMAC_SHA2_512_256::YES
|
||||
moon:: ipsec statusall 2> /dev/null::IKE proposal: SERPENT_CBC_256/HMAC_SHA2_512_256::YES
|
||||
carol::ping -c 1 -s 120 -p deadbeef PH_IP_ALICE::128 bytes from PH_IP_ALICE: icmp_req=1::YES
|
||||
carol::ipsec statusall 2> /dev/null::SERPENT_CBC_256/HMAC_SHA2_512_256,::YES
|
||||
moon:: ipsec statusall 2> /dev/null::SERPENT_CBC_256/HMAC_SHA2_512_256,::YES
|
||||
carol::swanctl --list-sas --raw 2> /dev/null::home.*version=1 state=ESTABLISHED local-host=192.168.0.100 local-port=500 local-id=carol@strongswan.org remote-host=192.168.0.1 remote-port=500 remote-id=moon.strongswan.org initiator=yes.*encr-alg=SERPENT_CBC encr-keysize=256 integ-alg=HMAC_SHA2_512_256 prf-alg=PRF_HMAC_SHA2_512 dh-group=MODP_4096.*child-sas.*home.*state=INSTALLED mode=TUNNEL protocol=ESP.*encr-alg=SERPENT_CBC encr-keysize=256 integ-alg=HMAC_SHA2_512_256.*local-ts=\[192.168.0.100/32] remote-ts=\[10.1.0.0/16]::YES
|
||||
moon::swanctl --list-sas --raw 2> /dev/null::rw.*version=1 state=ESTABLISHED local-host=192.168.0.1 local-port=500 local-id=moon.strongswan.org remote-host=192.168.0.100 remote-port=500 remote-id=carol@strongswan.org.*encr-alg=SERPENT_CBC encr-keysize=256 integ-alg=HMAC_SHA2_512_256 prf-alg=PRF_HMAC_SHA2_512 dh-group=MODP_4096.*child-sas.*net.*state=INSTALLED mode=TUNNEL protocol=ESP.*encr-alg=SERPENT_CBC encr-keysize=256 integ-alg=HMAC_SHA2_512_256.*local-ts=\[10.1.0.0/16] remote-ts=\[192.168.0.100/32]::YES
|
||||
carol::ip xfrm state::enc cbc(serpent)::YES
|
||||
moon:: ip xfrm state::enc cbc(serpent)::YES
|
||||
moon::tcpdump::IP carol.strongswan.org > moon.strongswan.org: ESP.*length 216::YES
|
||||
|
|
|
@ -1,21 +0,0 @@
|
|||
# /etc/ipsec.conf - strongSwan IPsec configuration file
|
||||
|
||||
config setup
|
||||
|
||||
conn %default
|
||||
ikelifetime=60m
|
||||
keylife=20m
|
||||
rekeymargin=3m
|
||||
keyingtries=1
|
||||
keyexchange=ikev1
|
||||
ike=serpent256-sha512-modp4096!
|
||||
esp=serpent256-sha512!
|
||||
|
||||
conn home
|
||||
left=PH_IP_CAROL
|
||||
leftcert=carolCert.pem
|
||||
leftid=carol@strongswan.org
|
||||
right=PH_IP_MOON
|
||||
rightsubnet=10.1.0.0/16
|
||||
rightid=@moon.strongswan.org
|
||||
auto=add
|
|
@ -1,8 +1,11 @@
|
|||
# /etc/strongswan.conf - strongSwan configuration file
|
||||
|
||||
charon {
|
||||
load = curl pem pkcs1 gcrypt nonce x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
|
||||
send_vendor_id = yes
|
||||
load = nonce pem pkcs1 gcrypt hmac x509 revocation curl vici kernel-netlink socket-default
|
||||
|
||||
dh_exponent_ansi_x9_42 = no
|
||||
start-scripts {
|
||||
creds = /usr/local/sbin/swanctl --load-creds
|
||||
conns = /usr/local/sbin/swanctl --load-conns
|
||||
}
|
||||
send_vendor_id = yes
|
||||
}
|
||||
|
|
|
@ -0,0 +1,26 @@
|
|||
connections {
|
||||
|
||||
home {
|
||||
local_addrs = 192.168.0.100
|
||||
remote_addrs = 192.168.0.1
|
||||
|
||||
local {
|
||||
auth = pubkey
|
||||
certs = carolCert.pem
|
||||
id = carol@strongswan.org
|
||||
}
|
||||
remote {
|
||||
auth = pubkey
|
||||
id = moon.strongswan.org
|
||||
}
|
||||
children {
|
||||
home {
|
||||
remote_ts = 10.1.0.0/16
|
||||
|
||||
esp_proposals = serpent256-sha512
|
||||
}
|
||||
}
|
||||
version = 1
|
||||
proposals = serpent256-sha512-modp4096
|
||||
}
|
||||
}
|
|
@ -1,21 +0,0 @@
|
|||
# /etc/ipsec.conf - strongSwan IPsec configuration file
|
||||
|
||||
config setup
|
||||
|
||||
conn %default
|
||||
ikelifetime=60m
|
||||
keylife=20m
|
||||
rekeymargin=3m
|
||||
keyingtries=1
|
||||
keyexchange=ikev1
|
||||
ike=serpent256-sha512-modp4096!
|
||||
esp=serpent256-sha512!
|
||||
|
||||
conn rw
|
||||
left=PH_IP_MOON
|
||||
leftcert=moonCert.pem
|
||||
leftid=@moon.strongswan.org
|
||||
leftsubnet=10.1.0.0/16
|
||||
right=%any
|
||||
rightid=carol@strongswan.org
|
||||
auto=add
|
|
@ -1,8 +1,11 @@
|
|||
# /etc/strongswan.conf - strongSwan configuration file
|
||||
|
||||
charon {
|
||||
load = curl pem pkcs1 gcrypt nonce x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
|
||||
send_vendor_id = yes
|
||||
load = nonce pem pkcs1 gcrypt hmac x509 revocation vici kernel-netlink socket-default
|
||||
|
||||
dh_exponent_ansi_x9_42 = no
|
||||
start-scripts {
|
||||
creds = /usr/local/sbin/swanctl --load-creds
|
||||
conns = /usr/local/sbin/swanctl --load-conns
|
||||
}
|
||||
send_vendor_id = yes
|
||||
}
|
||||
|
|
|
@ -0,0 +1,24 @@
|
|||
connections {
|
||||
|
||||
rw {
|
||||
local_addrs = 192.168.0.1
|
||||
|
||||
local {
|
||||
auth = pubkey
|
||||
certs = moonCert.pem
|
||||
id = moon.strongswan.org
|
||||
}
|
||||
remote {
|
||||
auth = pubkey
|
||||
}
|
||||
children {
|
||||
net {
|
||||
local_ts = 10.1.0.0/16
|
||||
|
||||
esp_proposals = serpent256-sha512
|
||||
}
|
||||
}
|
||||
version = 1
|
||||
proposals = serpent256-sha512-modp4096
|
||||
}
|
||||
}
|
|
@ -1,2 +1,2 @@
|
|||
moon::ipsec stop
|
||||
carol::ipsec stop
|
||||
moon::service charon stop
|
||||
carol::service charon stop
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
carol::ipsec start
|
||||
moon::ipsec start
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
moon::service charon start 2> /dev/null
|
||||
carol::service charon start 2> /dev/null
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
carol::swanctl --initiate --child home 2> /dev/null
|
||||
|
|
|
@ -20,3 +20,6 @@ TCPDUMPHOSTS="moon"
|
|||
#
|
||||
IPSECHOSTS="moon carol"
|
||||
|
||||
# charon controlled by swanctl
|
||||
#
|
||||
SWANCTL=1
|
||||
|
|
|
@ -1,12 +1,6 @@
|
|||
carol::ipsec status 2> /dev/null::home.*ESTABLISHED.*carol@strongswan.org.*moon.strongswan.org::YES
|
||||
moon:: ipsec status 2> /dev/null::rw.*ESTABLISHED.*moon.strongswan.org.*carol@strongswan.org::YES
|
||||
carol::ipsec status 2> /dev/null::home.*INSTALLED, TUNNEL::YES
|
||||
moon:: ipsec status 2> /dev/null::rw.*INSTALLED, TUNNEL::YES
|
||||
carol::ipsec statusall 2> /dev/null::IKE proposal: TWOFISH_CBC_256/HMAC_SHA2_512_256::YES
|
||||
moon:: ipsec statusall 2> /dev/null::IKE proposal: TWOFISH_CBC_256/HMAC_SHA2_512_256::YES
|
||||
carol::ping -c 1 -s 120 -p deadbeef PH_IP_ALICE::128 bytes from PH_IP_ALICE: icmp_req=1::YES
|
||||
carol::ipsec statusall 2> /dev/null::TWOFISH_CBC_256/HMAC_SHA2_512_256,::YES
|
||||
moon:: ipsec statusall 2> /dev/null::TWOFISH_CBC_256/HMAC_SHA2_512_256,::YES
|
||||
carol::swanctl --list-sas --raw 2> /dev/null::home.*version=1 state=ESTABLISHED local-host=192.168.0.100 local-port=500 local-id=carol@strongswan.org remote-host=192.168.0.1 remote-port=500 remote-id=moon.strongswan.org initiator=yes.*encr-alg=TWOFISH_CBC encr-keysize=256 integ-alg=HMAC_SHA2_512_256 prf-alg=PRF_HMAC_SHA2_512 dh-group=MODP_4096.*child-sas.*home.*state=INSTALLED mode=TUNNEL protocol=ESP.*encr-alg=TWOFISH_CBC encr-keysize=256 integ-alg=HMAC_SHA2_512_256.*local-ts=\[192.168.0.100/32] remote-ts=\[10.1.0.0/16]::YES
|
||||
moon::swanctl --list-sas --raw 2> /dev/null::rw.*version=1 state=ESTABLISHED local-host=192.168.0.1 local-port=500 local-id=moon.strongswan.org remote-host=192.168.0.100 remote-port=500 remote-id=carol@strongswan.org.*encr-alg=TWOFISH_CBC encr-keysize=256 integ-alg=HMAC_SHA2_512_256 prf-alg=PRF_HMAC_SHA2_512 dh-group=MODP_4096.*child-sas.*net.*state=INSTALLED mode=TUNNEL protocol=ESP.*encr-alg=TWOFISH_CBC encr-keysize=256 integ-alg=HMAC_SHA2_512_256.*local-ts=\[10.1.0.0/16] remote-ts=\[192.168.0.100/32]::YES
|
||||
carol::ip xfrm state::enc cbc(twofish)::YES
|
||||
moon:: ip xfrm state::enc cbc(twofish)::YES
|
||||
moon::tcpdump::IP carol.strongswan.org > moon.strongswan.org: ESP.*length 216::YES
|
||||
|
|
|
@ -1,21 +0,0 @@
|
|||
# /etc/ipsec.conf - strongSwan IPsec configuration file
|
||||
|
||||
config setup
|
||||
|
||||
conn %default
|
||||
ikelifetime=60m
|
||||
keylife=20m
|
||||
rekeymargin=3m
|
||||
keyingtries=1
|
||||
keyexchange=ikev1
|
||||
ike=twofish256-sha512-modp4096!
|
||||
esp=twofish256-sha512!
|
||||
|
||||
conn home
|
||||
left=PH_IP_CAROL
|
||||
leftcert=carolCert.pem
|
||||
leftid=carol@strongswan.org
|
||||
right=PH_IP_MOON
|
||||
rightsubnet=10.1.0.0/16
|
||||
rightid=@moon.strongswan.org
|
||||
auto=add
|
|
@ -1,8 +1,11 @@
|
|||
# /etc/strongswan.conf - strongSwan configuration file
|
||||
|
||||
charon {
|
||||
load = curl pem pkcs1 gcrypt nonce x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
|
||||
send_vendor_id = yes
|
||||
load = nonce pem pkcs1 gcrypt hmac x509 revocation curl vici kernel-netlink socket-default
|
||||
|
||||
dh_exponent_ansi_x9_42 = no
|
||||
start-scripts {
|
||||
creds = /usr/local/sbin/swanctl --load-creds
|
||||
conns = /usr/local/sbin/swanctl --load-conns
|
||||
}
|
||||
send_vendor_id = yes
|
||||
}
|
||||
|
|
|
@ -0,0 +1,26 @@
|
|||
connections {
|
||||
|
||||
home {
|
||||
local_addrs = 192.168.0.100
|
||||
remote_addrs = 192.168.0.1
|
||||
|
||||
local {
|
||||
auth = pubkey
|
||||
certs = carolCert.pem
|
||||
id = carol@strongswan.org
|
||||
}
|
||||
remote {
|
||||
auth = pubkey
|
||||
id = moon.strongswan.org
|
||||
}
|
||||
children {
|
||||
home {
|
||||
remote_ts = 10.1.0.0/16
|
||||
|
||||
esp_proposals = twofish256-sha512
|
||||
}
|
||||
}
|
||||
version = 1
|
||||
proposals = twofish256-sha512-modp4096
|
||||
}
|
||||
}
|
|
@ -1,21 +0,0 @@
|
|||
# /etc/ipsec.conf - strongSwan IPsec configuration file
|
||||
|
||||
config setup
|
||||
|
||||
conn %default
|
||||
ikelifetime=60m
|
||||
keylife=20m
|
||||
rekeymargin=3m
|
||||
keyingtries=1
|
||||
keyexchange=ikev1
|
||||
ike=twofish256-sha512-modp4096!
|
||||
esp=twofish256-sha512!
|
||||
|
||||
conn rw
|
||||
left=PH_IP_MOON
|
||||
leftcert=moonCert.pem
|
||||
leftid=@moon.strongswan.org
|
||||
leftsubnet=10.1.0.0/16
|
||||
right=%any
|
||||
rightid=carol@strongswan.org
|
||||
auto=add
|
|
@ -1,8 +1,11 @@
|
|||
# /etc/strongswan.conf - strongSwan configuration file
|
||||
|
||||
charon {
|
||||
load = curl pem pkcs1 gcrypt nonce x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
|
||||
send_vendor_id = yes
|
||||
load = nonce pem pkcs1 gcrypt hmac x509 revocation vici kernel-netlink socket-default
|
||||
|
||||
dh_exponent_ansi_x9_42 = no
|
||||
start-scripts {
|
||||
creds = /usr/local/sbin/swanctl --load-creds
|
||||
conns = /usr/local/sbin/swanctl --load-conns
|
||||
}
|
||||
send_vendor_id = yes
|
||||
}
|
||||
|
|
|
@ -0,0 +1,24 @@
|
|||
connections {
|
||||
|
||||
rw {
|
||||
local_addrs = 192.168.0.1
|
||||
|
||||
local {
|
||||
auth = pubkey
|
||||
certs = moonCert.pem
|
||||
id = moon.strongswan.org
|
||||
}
|
||||
remote {
|
||||
auth = pubkey
|
||||
}
|
||||
children {
|
||||
net {
|
||||
local_ts = 10.1.0.0/16
|
||||
|
||||
esp_proposals = twofish256-sha512
|
||||
}
|
||||
}
|
||||
version = 1
|
||||
proposals = twofish256-sha512-modp4096
|
||||
}
|
||||
}
|
|
@ -1,2 +1,2 @@
|
|||
moon::ipsec stop
|
||||
carol::ipsec stop
|
||||
moon::service charon stop
|
||||
carol::service charon stop
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
carol::ipsec start
|
||||
moon::ipsec start
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
moon::service charon start 2> /dev/null
|
||||
carol::service charon start 2> /dev/null
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
carol::swanctl --initiate --child home 2> /dev/null
|
||||
|
|
|
@ -20,3 +20,6 @@ TCPDUMPHOSTS="moon"
|
|||
#
|
||||
IPSECHOSTS="moon carol"
|
||||
|
||||
# charon controlled by swanctl
|
||||
#
|
||||
SWANCTL=1
|
||||
|
|
|
@ -2,5 +2,6 @@ moon::iptables-restore < /etc/iptables.rules
|
|||
carol::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
dave::expect-connection home
|
||||
carol::ipsec up home
|
||||
dave::expect-connection home
|
||||
dave::ipsec up home
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
moon::ipsec start
|
||||
moon::iptables-restore < /etc/iptables.rules
|
||||
carol::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::ipsec start
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
|
|
|
@ -4,7 +4,8 @@ dave::iptables-restore < /etc/iptables.rules
|
|||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
dave::expect-connection home
|
||||
carol::ipsec up home
|
||||
dave::expect-connection home
|
||||
dave::ipsec up home
|
||||
|
|
|
@ -4,7 +4,8 @@ dave::iptables-restore < /etc/iptables.rules
|
|||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
dave::expect-connection home
|
||||
carol::ipsec up home
|
||||
dave::expect-connection home
|
||||
dave::ipsec up home
|
||||
|
|
|
@ -2,5 +2,6 @@ moon::iptables-restore < /etc/iptables.rules
|
|||
carol::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
|
|
|
@ -2,5 +2,6 @@ moon::iptables-restore < /etc/iptables.rules
|
|||
carol::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
|
|
|
@ -2,5 +2,6 @@ moon::iptables-restore < /etc/iptables.rules
|
|||
carol::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
carol::ipsec start
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
carol::iptables-restore < /etc/iptables.rules
|
||||
dave::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::ipsec start
|
||||
moon::expect-connection rw-carol
|
||||
carol::expect-connection home
|
||||
dave::expect-connection home
|
||||
carol::ipsec up home
|
||||
dave::expect-connection home
|
||||
dave::ipsec up home
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
carol::iptables-restore < /etc/iptables.rules
|
||||
dave::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::ipsec start
|
||||
moon::expect-connection rw-carol
|
||||
carol::expect-connection home
|
||||
dave::expect-connection home
|
||||
carol::ipsec up home
|
||||
dave::expect-connection home
|
||||
dave::ipsec up home
|
||||
|
|
|
@ -5,7 +5,8 @@ moon::iptables -t nat -A POSTROUTING -o eth0 -s 10.1.0.0/16 -p tcp -j SNAT --to-
|
|||
sun::iptables -t nat -A POSTROUTING -o eth0 -s 10.2.0.0/16 -p tcp -j SNAT --to-source PH_IP_SUN:2000-2100
|
||||
sun::iptables -t nat -A PREROUTING -i eth0 -s PH_IP_MOON -p udp -j DNAT --to-destination PH_IP_BOB
|
||||
sun::ip route add 10.1.0.0/16 via PH_IP_BOB
|
||||
alice::ipsec start
|
||||
bob::ipsec start
|
||||
alice::ipsec start
|
||||
bob::expect-connection nat-t
|
||||
alice::expect-connection nat-t
|
||||
alice::ipsec up nat-t
|
||||
|
|
|
@ -4,7 +4,8 @@ moon::iptables -t nat -A POSTROUTING -o eth0 -s 10.1.0.0/16 -p udp -j SNAT --to-
|
|||
moon::iptables -t nat -A POSTROUTING -o eth0 -s 10.1.0.0/16 -p tcp -j SNAT --to-source PH_IP_MOON:2000-2100
|
||||
sun::iptables -t nat -A POSTROUTING -o eth0 -s 10.2.0.0/16 -p tcp -j SNAT --to-source PH_IP_SUN:2000-2100
|
||||
sun::iptables -t nat -A PREROUTING -i eth0 -s PH_IP_MOON -p udp -j DNAT --to-destination PH_IP_BOB
|
||||
alice::ipsec start
|
||||
bob::ipsec start
|
||||
alice::ipsec start
|
||||
bob::expect-connection nat-t
|
||||
alice::expect-connection nat-t
|
||||
alice::ipsec up nat-t
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
carol::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::ipsec start
|
||||
moon::expect-connection carol
|
||||
carol::expect-connection moon
|
||||
carol::ipsec up moon
|
||||
carol::iptables -D INPUT -i eth0 -p udp --dport 500 --sport 500 -j ACCEPT
|
||||
|
|
|
@ -2,6 +2,7 @@ carol::iptables-restore < /etc/iptables.rules
|
|||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::ipsec start
|
||||
carol::expect-connection moon
|
||||
moon::expect-connection carol
|
||||
moon::ipsec up carol
|
||||
moon::sleep 0.5
|
||||
|
|
|
@ -6,7 +6,8 @@ dave::iptables-restore < /etc/iptables.rules
|
|||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::ipsec start
|
||||
moon::expect-connection carol
|
||||
carol::expect-connection moon
|
||||
dave::expect-connection moon
|
||||
carol::ipsec up moon
|
||||
dave::expect-connection moon
|
||||
dave::ipsec up moon
|
||||
|
|
|
@ -2,5 +2,6 @@ moon::iptables-restore < /etc/iptables.rules
|
|||
carol::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
|
|
|
@ -2,5 +2,6 @@ moon::iptables-restore < /etc/iptables.rules
|
|||
carol::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
|
|
|
@ -2,5 +2,6 @@ moon::iptables-restore < /etc/iptables.rules
|
|||
carol::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
|
|
|
@ -2,5 +2,6 @@ moon::iptables-restore < /etc/iptables.rules
|
|||
carol::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
carol::ipsec start
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
|
|
|
@ -2,5 +2,6 @@ moon::iptables-restore < /etc/iptables.rules
|
|||
carol::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
sun::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
sun::ipsec start
|
||||
moon::ipsec start
|
||||
sun::expect-connection host-host
|
||||
moon::expect-connection host-host
|
||||
moon::ipsec up host-host
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
sun::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
sun::ipsec start
|
||||
moon::ipsec start
|
||||
sun::expect-connection host-host
|
||||
moon::expect-connection host-host
|
||||
moon::ipsec up host-host
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
sun::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
sun::ipsec start
|
||||
moon::ipsec start
|
||||
sun::expect-connection host-host
|
||||
moon::expect-connection host-host
|
||||
moon::ipsec up host-host
|
||||
|
|
|
@ -10,6 +10,7 @@ dave::iptables-restore < /etc/iptables.rules
|
|||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
dave::expect-connection home
|
||||
|
|
|
@ -1,9 +1,10 @@
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
carol::iptables-restore < /etc/iptables.rules
|
||||
dave::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
dave::expect-connection home
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::ipsec start
|
||||
moon::expect-connection alice
|
||||
carol::expect-connection alice
|
||||
dave::expect-connection venus
|
||||
moon::expect-connection venus
|
||||
moon::ipsec up alice
|
||||
moon::ipsec up venus
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::ipsec start
|
||||
moon::expect-connection venus
|
||||
carol::expect-connection alice
|
||||
carol::ipsec up alice
|
||||
dave::expect-connection venus
|
||||
|
|
|
@ -1,11 +1,10 @@
|
|||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::ipsec start
|
||||
carol::expect-connection alice
|
||||
moon::expect-connection venus
|
||||
carol::expect-connection venus
|
||||
carol::ipsec up alice
|
||||
carol::ipsec up venus
|
||||
dave::expect-connection alice
|
||||
dave::expect-connection venus
|
||||
dave::ipsec up venus
|
||||
dave::ipsec up alice
|
||||
|
|
|
@ -3,9 +3,10 @@ venus::iptables-restore < /etc/iptables.rules
|
|||
sun::iptables-restore < /etc/iptables.rules
|
||||
moon::iptables -t nat -A POSTROUTING -o eth0 -s 10.1.0.0/16 -p udp -j SNAT --to-source PH_IP_MOON:1024-1100
|
||||
moon::iptables -t nat -A POSTROUTING -o eth0 -s 10.1.0.0/16 -p tcp -j SNAT --to-source PH_IP_MOON:2000-2100
|
||||
sun::ipsec start
|
||||
alice::ipsec start
|
||||
venus::ipsec start
|
||||
sun::ipsec start
|
||||
sun::expect-connection nat-t
|
||||
alice::expect-connection nat-t
|
||||
alice::ipsec up nat-t
|
||||
venus::expect-connection nat-t
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
sun::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
sun::ipsec start
|
||||
moon::ipsec start
|
||||
sun::expect-connection net-net
|
||||
moon::expect-connection net-net
|
||||
moon::ipsec up net-net
|
||||
|
|
|
@ -2,5 +2,6 @@ moon::iptables-restore < /etc/iptables.rules
|
|||
sun::iptables-restore < /etc/iptables.rules
|
||||
sun::ipsec start
|
||||
moon::ipsec start
|
||||
sun::expect-connection net-net
|
||||
moon::expect-connection net-net
|
||||
moon::ipsec up net-net
|
||||
|
|
|
@ -2,5 +2,6 @@ moon::iptables-restore < /etc/iptables.rules
|
|||
sun::iptables-restore < /etc/iptables.rules
|
||||
sun::ipsec start
|
||||
moon::ipsec start
|
||||
sun::expect-connection net-net
|
||||
moon::expect-connection net-net
|
||||
moon::ipsec up net-net
|
||||
|
|
|
@ -2,5 +2,6 @@ moon::iptables-restore < /etc/iptables.rules
|
|||
sun::iptables-restore < /etc/iptables.rules
|
||||
sun::ipsec start
|
||||
moon::ipsec start
|
||||
sun::expect-connection net-net
|
||||
moon::expect-connection net-net
|
||||
moon::ipsec up net-net
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
sun::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
sun::ipsec start
|
||||
moon::ipsec start
|
||||
sun::expect-connection net-net
|
||||
moon::expect-connection net-net
|
||||
moon::ipsec up net-net
|
||||
|
|
|
@ -1,9 +1,10 @@
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
carol::iptables-restore < /etc/iptables.rules
|
||||
dave::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
dave::expect-connection home
|
||||
|
|
|
@ -1,9 +1,10 @@
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
carol::iptables-restore < /etc/iptables.rules
|
||||
dave::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::ipsec start
|
||||
moon::expect-connection rw-carol
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
dave::expect-connection home
|
||||
|
|
|
@ -1,9 +1,10 @@
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
carol::iptables-restore < /etc/iptables.rules
|
||||
dave::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::ipsec start
|
||||
moon::expect-connection rw-carol
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
dave::expect-connection home
|
||||
|
|
|
@ -15,5 +15,6 @@ moon::scp /etc/ipsec.d/certs/selfCert.der carol:/etc/ipsec.d/certs/peerCert.der
|
|||
moon::scp carol:/etc/ipsec.d/certs/selfCert.der /etc/ipsec.d/certs/peerCert.der
|
||||
moon::ipsec reload
|
||||
carol::ipsec reload
|
||||
moon::expect-connection carol
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
|
|
|
@ -2,7 +2,7 @@ moon::ipsec stop
|
|||
carol::ipsec stop
|
||||
dave::ipsec stop
|
||||
venus::cat /var/state/dhcp/dhcpd.leases
|
||||
venus::/etc/init.d/isc-dhcp-server stop 2> /dev/null
|
||||
venus::service isc-dhcp-server stop 2> /dev/null
|
||||
moon::iptables-restore < /etc/iptables.flush
|
||||
carol::iptables-restore < /etc/iptables.flush
|
||||
dave::iptables-restore < /etc/iptables.flush
|
||||
|
|
|
@ -2,10 +2,11 @@ moon::iptables-restore < /etc/iptables.rules
|
|||
carol::iptables-restore < /etc/iptables.rules
|
||||
dave::iptables-restore < /etc/iptables.rules
|
||||
venus::cat /etc/dhcp/dhcpd.conf
|
||||
venus::/etc/init.d/isc-dhcp-server start 2> /dev/null
|
||||
venus::service isc-dhcp-server start 2> /dev/null
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
dave::expect-connection home
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
moon::ipsec stop
|
||||
carol::ipsec stop
|
||||
dave::ipsec stop
|
||||
venus::/etc/init.d/isc-dhcp-server stop 2> /dev/null
|
||||
venus::service isc-dhcp-server stop 2> /dev/null
|
||||
moon::iptables-restore < /etc/iptables.flush
|
||||
carol::iptables-restore < /etc/iptables.flush
|
||||
dave::iptables-restore < /etc/iptables.flush
|
||||
|
|
|
@ -2,10 +2,11 @@ moon::iptables-restore < /etc/iptables.rules
|
|||
carol::iptables-restore < /etc/iptables.rules
|
||||
dave::iptables-restore < /etc/iptables.rules
|
||||
venus::cat /etc/dhcp/dhcpd.conf
|
||||
venus::/etc/init.d/isc-dhcp-server start 2> /dev/null
|
||||
venus::service isc-dhcp-server start 2> /dev/null
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
carol::expect-connection home
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
moon::ipsec stop
|
||||
carol::ipsec stop
|
||||
dave::ipsec stop
|
||||
venus::/etc/init.d/isc-dhcp-server stop 2> /dev/null
|
||||
venus::service isc-dhcp-server stop 2> /dev/null
|
||||
moon::iptables-restore < /etc/iptables.flush
|
||||
carol::iptables-restore < /etc/iptables.flush
|
||||
dave::iptables-restore < /etc/iptables.flush
|
||||
|
|
|
@ -2,10 +2,11 @@ moon::iptables-restore < /etc/iptables.rules
|
|||
carol::iptables-restore < /etc/iptables.rules
|
||||
dave::iptables-restore < /etc/iptables.rules
|
||||
venus::cat /etc/dhcp/dhcpd.conf
|
||||
venus::/etc/init.d/isc-dhcp-server start 2> /dev/null
|
||||
venus::service isc-dhcp-server start 2> /dev/null
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
dave::expect-connection home
|
||||
|
|
|
@ -1,9 +1,10 @@
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
carol::iptables-restore < /etc/iptables.rules
|
||||
dave::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::ipsec start
|
||||
moon::expect-connection carol
|
||||
carol::expect-connection moon
|
||||
carol::ipsec up moon
|
||||
carol::iptables -D INPUT -i eth0 -p udp --dport 500 --sport 500 -j ACCEPT
|
||||
|
|
|
@ -3,9 +3,10 @@ moon::mv /etc/hosts.stale /etc/hosts
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
carol::iptables-restore < /etc/iptables.rules
|
||||
dave::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::ipsec start
|
||||
moon::expect-connection carol
|
||||
carol::expect-connection moon
|
||||
carol::ipsec up moon
|
||||
dave::expect-connection moon
|
||||
|
|
|
@ -3,9 +3,10 @@ carol::iptables-restore < /etc/iptables.rules
|
|||
dave::iptables-restore < /etc/iptables.rules
|
||||
alice::arp -d 10.1.0.30
|
||||
alice::arp -d 10.1.0.40
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::ipsec start
|
||||
moon::expect-connection rw-carol
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
dave::expect-connection home
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
dave::expect-connection home
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
sun::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
sun::ipsec start
|
||||
moon::ipsec start
|
||||
sun::expect-connection host-host
|
||||
moon::expect-connection host-host
|
||||
moon::ipsec up host-host
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
sun::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
sun::ipsec start
|
||||
moon::ipsec start
|
||||
sun::expect-connnection host-host
|
||||
moon::expect-connection host-host
|
||||
moon::ipsec up host-host
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
sun::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
sun::ipsec start
|
||||
moon::ipsec start
|
||||
sun::expect-connection host-host
|
||||
moon::expect-connection host-host
|
||||
moon::ipsec up host-host
|
||||
|
|
|
@ -2,10 +2,11 @@ moon::iptables-restore < /etc/iptables.rules
|
|||
moon::iptables -t nat -A POSTROUTING -o eth0 -s 10.1.0.0/16 -j MASQUERADE
|
||||
moon::iptables -A FORWARD -i eth1 -o eth0 -s 10.1.0.0/16 -j ACCEPT
|
||||
moon::iptables -A FORWARD -i eth0 -o eth1 -d 10.1.0.0/16 -j ACCEPT
|
||||
sun::ipsec start
|
||||
alice::ipsec start
|
||||
venus::ipsec start
|
||||
sun::ipsec start
|
||||
sun::expect-connection nat-t
|
||||
alice::expect-connection nat-t
|
||||
venus::expect-connection nat-t
|
||||
alice::ipsec up nat-t
|
||||
venus::expect-connection nat-t
|
||||
venus::ipsec up nat-t
|
||||
|
|
|
@ -4,10 +4,11 @@ sun::iptables-restore < /etc/iptables.rules
|
|||
moon::iptables -t nat -A POSTROUTING -o eth0 -s 10.1.0.0/16 -j MASQUERADE
|
||||
moon::iptables -A FORWARD -i eth1 -o eth0 -s 10.1.0.0/16 -j ACCEPT
|
||||
moon::iptables -A FORWARD -i eth0 -o eth1 -d 10.1.0.0/16 -j ACCEPT
|
||||
sun::ipsec start
|
||||
alice::ipsec start
|
||||
venus::ipsec start
|
||||
sun::ipsec start
|
||||
sun::expect-connection nat-t
|
||||
alice::expect-connection nat-t
|
||||
venus::expect-connection nat-t
|
||||
alice::ipsec up nat-t
|
||||
venus::expect-connection nat-t
|
||||
venus::ipsec up nat-t
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
sun::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
sun::ipsec start
|
||||
moon::ipsec start
|
||||
sun::expect-connection host-host
|
||||
moon::expect-connection host-host
|
||||
moon::ipsec up host-host
|
||||
|
|
|
@ -1,9 +1,10 @@
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
carol::iptables-restore < /etc/iptables.rules
|
||||
dave::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
dave::expect-connection home
|
||||
|
|
|
@ -1,9 +1,10 @@
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
carol::iptables-restore < /etc/iptables.rules
|
||||
dave::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
dave::expect-connection home
|
||||
|
|
|
@ -3,9 +3,10 @@ moon::cat /etc/db.d/ipsec.sql | sqlite3 /etc/db.d/ipsec.db
|
|||
moon::ipsec pool --add pool0 --start 10.3.0.1 --end 10.3.0.1 --timeout 48 2> /dev/null
|
||||
moon::ipsec pool --add pool1 --start 10.3.1.1 --end 10.3.1.1 --timeout 48 2> /dev/null
|
||||
moon::ipsec pool --status 2> /dev/null
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
dave::expect-connection home
|
||||
|
|
|
@ -1,9 +1,11 @@
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
carol::iptables-restore < /etc/iptables.rules
|
||||
dave::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::ipsec start
|
||||
moon::expect-connection rw
|
||||
carol::expect-connection home
|
||||
carol::ipsec up home
|
||||
dave::expect-connection home
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::ipsec start
|
||||
carol::expect-connection alice
|
||||
carol::ipsec up alice
|
||||
dave::expect-connection venus
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::ipsec start
|
||||
carol::expect-connection alice
|
||||
carol::expect-connection venus
|
||||
carol::ipsec up alice
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
moon::ipsec start
|
||||
carol::ipsec start
|
||||
dave::ipsec start
|
||||
moon::ipsec start
|
||||
|
|
|
@ -3,9 +3,10 @@ venus::iptables-restore < /etc/iptables.rules
|
|||
sun::iptables-restore < /etc/iptables.rules
|
||||
moon::iptables -t nat -A POSTROUTING -o eth0 -s 10.1.0.0/16 -p udp -j SNAT --to-source PH_IP_MOON:1024-1100
|
||||
moon::iptables -t nat -A POSTROUTING -o eth0 -s 10.1.0.0/16 -p tcp -j SNAT --to-source PH_IP_MOON:2000-2100
|
||||
sun::ipsec start
|
||||
alice::ipsec start
|
||||
venus::ipsec start
|
||||
sun::ipsec start
|
||||
sun::expect-connection nat-t
|
||||
alice::expect-connection nat-t
|
||||
alice::ipsec up nat-t
|
||||
venus::expect-connection nat-t
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
sun::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
sun::ipsec start
|
||||
moon::ipsec start
|
||||
sun::expect-connection net-net
|
||||
moon::expect-connection net-net
|
||||
moon::ipsec up net-net
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
sun::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
sun::ipsec start
|
||||
moon::ipsec start
|
||||
sun::expect-connection net-net
|
||||
moon::expect-connection net-net
|
||||
moon::ipsec up net-net
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
sun::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
sun::ipsec start
|
||||
moon::ipsec start
|
||||
sun::expect-connection net-net
|
||||
moon::expect-connection net-net
|
||||
moon::ipsec up net-net
|
||||
|
|
|
@ -2,7 +2,8 @@ moon::iptables-restore < /etc/iptables.rules
|
|||
sun::iptables-restore < /etc/iptables.rules
|
||||
moon::rm /etc/ipsec.d/cacerts/*
|
||||
sun::rm /etc/ipsec.d/cacerts/*
|
||||
moon::ipsec start
|
||||
sun::ipsec start
|
||||
moon::ipsec start
|
||||
sun::expect-connection net-net
|
||||
moon::expect-connection net-net
|
||||
moon::ipsec up net-net
|
||||
|
|
|
@ -2,7 +2,8 @@ moon::iptables-restore < /etc/iptables.rules
|
|||
sun::iptables-restore < /etc/iptables.rules
|
||||
moon::rm /etc/ipsec.d/cacerts/*
|
||||
sun::rm /etc/ipsec.d/cacerts/*
|
||||
moon::ipsec start
|
||||
sun::ipsec start
|
||||
moon::ipsec start
|
||||
sun::expect-connection net-net
|
||||
moon::expect-connection net-net
|
||||
moon::ipsec up net-net
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
sun::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
sun::ipsec start
|
||||
moon::ipsec start
|
||||
sun::expect-connection net-net
|
||||
moon::expect-connection net-net
|
||||
moon::ipsec up net-net
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
sun::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
sun::ipsec start
|
||||
moon::ipsec start
|
||||
sun::expect-connection net-net
|
||||
moon::expect-connection net-net
|
||||
moon::ipsec up net-net
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
sun::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
sun::ipsec start
|
||||
moon::ipsec start
|
||||
sun::expect-connection net-net
|
||||
moon::expect-connection net-net
|
||||
moon::ipsec up net-net
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
moon::iptables-restore < /etc/iptables.rules
|
||||
sun::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
sun::ipsec start
|
||||
moon::ipsec start
|
||||
sun::expect-connection net-net
|
||||
moon::expect-connection net-net
|
||||
moon::ipsec up net-net
|
||||
|
|
|
@ -2,7 +2,8 @@ moon::iptables-restore < /etc/iptables.rules
|
|||
sun::iptables-restore < /etc/iptables.rules
|
||||
moon::rm /etc/ipsec.d/cacerts/*
|
||||
sun::rm /etc/ipsec.d/cacerts/*
|
||||
moon::ipsec start
|
||||
sun::ipsec start
|
||||
moon::ipsec start
|
||||
sun::expect-connection net-net
|
||||
moon::expect-connection net-net
|
||||
moon::ipsec up net-net
|
||||
|
|
|
@ -2,7 +2,8 @@ moon::iptables-restore < /etc/iptables.rules
|
|||
sun::iptables-restore < /etc/iptables.rules
|
||||
moon::rm /etc/ipsec.d/cacerts/*
|
||||
sun::rm /etc/ipsec.d/cacerts/*
|
||||
moon::ipsec start
|
||||
sun::ipsec start
|
||||
moon::ipsec start
|
||||
sun::expect-connection net-net
|
||||
moon::expect-connection net-net
|
||||
moon::ipsec up net-net
|
||||
|
|
|
@ -4,7 +4,8 @@ sun::rm /etc/ipsec.d/private/sunKey.pem
|
|||
sun::rm /etc/ipsec.d/cacerts/strongswanCert.pem
|
||||
moon::iptables-restore < /etc/iptables.rules
|
||||
sun::iptables-restore < /etc/iptables.rules
|
||||
moon::ipsec start
|
||||
sun::ipsec start
|
||||
moon::ipsec start
|
||||
sun::expect-connection net-net
|
||||
moon::expect-connection net-net
|
||||
moon::ipsec up net-net
|
||||
|
|
|
@ -10,9 +10,10 @@ bob::iptables -t mangle -A OUTPUT -d PH_IP_ALICE -p icmp -j DSCP --set-dscp-clas
|
|||
bob::iptables -t mangle -A OUTPUT -d PH_IP_VENUS -p icmp -j DSCP --set-dscp-class EF
|
||||
sun::iptables -t mangle -A PREROUTING -m dscp --dscp-class BE -j MARK --set-mark 10
|
||||
sun::iptables -t mangle -A PREROUTING -m dscp --dscp-class EF -j MARK --set-mark 20
|
||||
moon::ipsec start
|
||||
sun::ipsec start
|
||||
moon::ipsec start
|
||||
sun::expect-connection dscp-ef
|
||||
moon::expect-connection dscp-be
|
||||
moon::expect-connection dscp-ef
|
||||
moon::ipsec up dscp-be
|
||||
moon::expect-connection dscp-ef
|
||||
moon::ipsec up dscp-ef
|
||||
|
|
|
@ -2,7 +2,8 @@ moon::iptables-restore < /etc/iptables.rules
|
|||
sun::iptables-restore < /etc/iptables.rules
|
||||
moon::rm /etc/ipsec.d/cacerts/*
|
||||
sun::rm /etc/ipsec.d/cacerts/*
|
||||
moon::ipsec start
|
||||
sun::ipsec start
|
||||
moon::ipsec start
|
||||
sun::expect-connection net-net
|
||||
moon::expect-connection net-net
|
||||
moon::ipsec up net-net
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue