projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bond: Revalidate flows when bond_is_tcp_hash() changes;
[openvswitch]
/
debian
/
ovs-monitor-ipsec
diff --git
a/debian/ovs-monitor-ipsec
b/debian/ovs-monitor-ipsec
index 07ad3982377204a31ea279b8d9c27ee64584fe14..febd5691d3ebdb4caed920cd835bc3be25995eed 100755
(executable)
--- a/
debian/ovs-monitor-ipsec
+++ b/
debian/ovs-monitor-ipsec
@@
-1,5
+1,5
@@
#!/usr/bin/python
#!/usr/bin/python
-# Copyright (c) 2009, 2010 Nicira Networks
+# Copyright (c) 2009, 2010
, 2011
Nicira Networks
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-116,6
+116,9
@@
path certificate "%s";
self.psk_hosts = {}
self.cert_hosts = {}
self.psk_hosts = {}
self.cert_hosts = {}
+ if not os.path.isdir(self.cert_dir):
+ os.mkdir(self.cert_dir)
+
# Clean out stale peer certs from previous runs
for ovs_cert in glob.glob("%s/ovs-*.pem" % self.cert_dir):
try:
# Clean out stale peer certs from previous runs
for ovs_cert in glob.glob("%s/ovs-*.pem" % self.cert_dir):
try:
@@
-317,9
+320,9
@@
class IPsec:
self.call_setkey("spdflush;")
def spd_add(self, local_ip, remote_ip):
self.call_setkey("spdflush;")
def spd_add(self, local_ip, remote_ip):
- cmds = ("spdadd %s %s gre -P out ipsec esp/transport//
default
;\n" %
+ cmds = ("spdadd %s %s gre -P out ipsec esp/transport//
require
;\n" %
(local_ip, remote_ip))
(local_ip, remote_ip))
- cmds += ("spdadd %s %s gre -P in ipsec esp/transport//
default
;" %
+ cmds += ("spdadd %s %s gre -P in ipsec esp/transport//
require
;" %
(remote_ip, local_ip))
self.call_setkey(cmds)
(remote_ip, local_ip))
self.call_setkey(cmds)
@@
-447,8
+450,6
@@
def main(argv):
"(use --help for help)\n" % ovs.util.PROGRAM_NAME)
sys.exit(1)
"(use --help for help)\n" % ovs.util.PROGRAM_NAME)
sys.exit(1)
- ovs.daemon.die_if_already_running()
-
remote = args[0]
idl = ovs.db.idl.Idl(remote, "Open_vSwitch", monitor_uuid_schema_cb)
remote = args[0]
idl = ovs.db.idl.Idl(remote, "Open_vSwitch", monitor_uuid_schema_cb)