#include <sys/ioctl.h>
#include "byte-order.h"
+#include "daemon.h"
+#include "dirs.h"
#include "dpif-linux.h"
#include "hash.h"
#include "hmap.h"
struct list *list;
struct shash_node *shash_node;
- shash_node = shash_find_data(&netdev_vport_notifiers, poll_name);
+ shash_node = shash_find(&netdev_vport_notifiers, poll_name);
if (!shash_node) {
list = xmalloc(sizeof *list);
list_init(list);
|| !strcmp(node->name, "private_key")
|| !strcmp(node->name, "use_ssl_cert"))) {
/* Ignore options not used by the netdev. */
- } else if (is_gre && (!strcmp(node->name, "key") &&
- !strcmp(node->name, "in_key") &&
+ } else if (is_gre && (!strcmp(node->name, "key") ||
+ !strcmp(node->name, "in_key") ||
!strcmp(node->name, "out_key"))) {
/* Handled separately below. */
} else {
}
if (is_ipsec) {
+ char *file_name = xasprintf("%s/%s", ovs_rundir(),
+ "ovs-monitor-ipsec.pid");
+ pid_t pid = read_pidfile(file_name);
+ free(file_name);
+ if (pid < 0) {
+ VLOG_WARN("%s: IPsec requires the ovs-monitor-ipsec daemon",
+ name);
+ return EINVAL;
+ }
+
if (shash_find(args, "peer_cert") && shash_find(args, "psk")) {
VLOG_WARN("%s: cannot define both 'peer_cert' and 'psk'", name);
return EINVAL;