#include "coverage.h"
#include "socket-util.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
#include "openvswitch/vlog.h"
VLOG_DEFINE_THIS_MODULE(rtbsd);
}
}
- list_push_back(&all_notifiers, ¬ifier->node);
+ ovs_list_push_back(&all_notifiers, ¬ifier->node);
notifier->cb = cb;
notifier->aux = aux;
OVS_EXCLUDED(rtbsd_mutex)
{
ovs_mutex_lock(&rtbsd_mutex);
- list_remove(¬ifier->node);
- if (list_is_empty(&all_notifiers)) {
+ ovs_list_remove(¬ifier->node);
+ if (ovs_list_is_empty(&all_notifiers)) {
close(notify_sock);
notify_sock = -1;
}
int retval;
msg.ifm_type = RTM_IFINFO;
- msg.ifm_version = RTM_VERSION; //XXX check if necessary
+ msg.ifm_version = RTM_VERSION; /* XXX Check if necessary. */
/* read from PF_ROUTE socket */
retval = read(notify_sock, (char *)&msg, sizeof(msg));
case RTM_IFINFO:
/* Since RTM_IFANNOUNCE messages are smaller than RTM_IFINFO
* messages, the same buffer may be used. */
+#ifndef __MACH__ /* OS X does not implement RTM_IFANNOUNCE */
case RTM_IFANNOUNCE:
+#endif
rtbsd_report_change(&msg);
break;
default:
{
struct rtbsd_notifier *notifier;
struct rtbsd_change change;
+#ifndef __MACH__
const struct if_announcemsghdr *ahdr;
+#endif
COVERAGE_INC(rtbsd_changed);
- change.msg_type = msg->ifm_type; //XXX
- change.master_ifindex = 0; //XXX
+ change.msg_type = msg->ifm_type; /* XXX */
+ change.master_ifindex = 0; /* XXX */
switch (msg->ifm_type) {
case RTM_IFINFO:
change.if_index = msg->ifm_index;
if_indextoname(msg->ifm_index, change.if_name);
break;
+#ifndef __MACH__ /* OS X does not implement RTM_IFANNOUNCE */
case RTM_IFANNOUNCE:
ahdr = (const struct if_announcemsghdr *) msg;
change.if_index = ahdr->ifan_index;
strncpy(change.if_name, ahdr->ifan_name, IF_NAMESIZE);
break;
+#endif
}
LIST_FOR_EACH (notifier, node, &all_notifiers) {