meta-flow: Correctly set destination MAC in mf_set_flow_value().
[sliver-openvswitch.git] / debian / ovs-monitor-ipsec
index fc69268..70063f8 100755 (executable)
@@ -220,7 +220,6 @@ path certificate "%s";
         f.write(vals["peer_cert"])
         f.close()
 
-
         self.cert_hosts[host] = vals
         self.commit()
 
@@ -463,6 +462,7 @@ def main():
             if rec.type == "ipsec_gre":
                 name = rec.name
                 options = rec.options
+                peer_cert_name = "ovs-%s.pem" % (options.get("remote_ip"))
                 entry = {
                     "remote_ip": options.get("remote_ip"),
                     "local_ip": options.get("local_ip", "0.0.0.0/0"),
@@ -470,6 +470,7 @@ def main():
                     "private_key": options.get("private_key"),
                     "use_ssl_cert": options.get("use_ssl_cert"),
                     "peer_cert": options.get("peer_cert"),
+                    "peer_cert_file": Racoon.cert_dir + "/" + peer_cert_name,
                     "psk": options.get("psk")}
 
                 if entry["peer_cert"] and entry["psk"]:
@@ -487,11 +488,8 @@ def main():
                         vlog.warn("no valid SSL entry for %s" % name)
                         continue
 
-                    peer_cert_name = "ovs-%s.pem" % (options.get("remote_ip"))
                     entry["certificate"] = ssl_cert[0]
                     entry["private_key"] = ssl_cert[1]
-                    entry["peer_cert_file"] = (Racoon.cert_dir + "/" +
-                                                            peer_cert_name)
 
                 new_interfaces[name] = entry