- Refactoring the interface list. It now supports dynamically

  added/removed interfaces in a more consistent manner and reloading
  the configuration file.

- Add initial support for control socket.  RA information in the
  daemon can be obtained by rtadvctl(8) instead of SIGUSR1 in a similar
  manner to ifconfig(8).  The information dump has been removed in favor of it.

  (reload the configuration file)
  # rtadvctl reload

  (show RA messages being sent on each interfaces)
  # rtadvctl show
  em0: flags=<UP,CONFIGURED,PERSIST> status=<RA_SEND> mtu 1280
        DefaultLifetime: 30m
        MinAdvInterval/MaxAdvInterval: 3m20s/3m20s
        AdvLinkMTU: <none>, Flags: O, Preference: medium
        ReachableTime: 0s, RetransTimer: 0s, CurHopLimit: 64
        AdvIfPrefixes: yes

  (show RA messages being sent only on em0)
  # rtadvctl show em0

  (rtadvctl -v show provides additional information)
  # rtadvctl -v show em0
  em0: flags=<UP,CONFIGURED,PERSIST> status=<RA_SEND> mtu 1280
        DefaultLifetime: 30m
        MinAdvInterval/MaxAdvInterval: 3m20s/3m20s
        AdvLinkMTU: <none>, Flags: O, Preference: medium
        ReachableTime: 0s, RetransTimer: 0s, CurHopLimit: 64
        AdvIfPrefixes: yes
        Prefixes (1):
          2001:db8:1::/64 (CONFIG, vltime=30d, pltime=7d, flags=LA)
        RDNSS entries:
          2001:db8:1::128 (ltime=2m40s)

  (stop rtadvd)
  # rtadvctl shutdown

  A remaining issue when reloading the configuration file is that
  during that period rtadvd cannot communicate with rtadvctl due to some
  additional RA sending for graceful shutdown.  This will be fixed later.

1 files changed, 131 insertions, 0 deletions

diff --git a/usr.sbin/rtadvd/control_client.c b/usr.sbin/rtadvd/control_client.c
new file mode 100644
index 0000000..a78bcc9
--- /dev/null
+++ b/usr.sbin/rtadvd/control_client.c
@@ -0,0 +1,131 @@
+/*-
+ * Copyright (C) 2011 Hiroki Sato <hrs@FreeBSD.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ *
+ */
+
+#include <sys/queue.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/un.h>
+#include <sys/uio.h>
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <netinet/in.h>
+#include <netinet/icmp6.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <netdb.h>
+#include <unistd.h>
+#include <signal.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <syslog.h>
+
+#include "pathnames.h"
+#include "rtadvd.h"
+#include "if.h"
+#include "control.h"
+#include "control_client.h"
+
+int
+cmsg_handler_client(int fd, int state, char *buf_orig)
+{
+	char buf[CM_MSG_MAXLEN];
+	struct ctrl_msg_hdr *cm;
+	struct ctrl_msg_hdr *cm_orig;
+	int error;
+	char *msg;
+	char *msg_orig;
+
+	syslog(LOG_DEBUG, "<%s> enter", __func__);
+
+	memset(buf, 0, sizeof(buf));
+	cm = (struct ctrl_msg_hdr *)buf;
+	cm_orig = (struct ctrl_msg_hdr *)buf_orig;
+	msg = (char *)buf + sizeof(*cm);
+	msg_orig = (char *)buf_orig + sizeof(*cm_orig);
+
+	if (cm_orig->cm_len > CM_MSG_MAXLEN) {
+		syslog(LOG_DEBUG, "<%s> msg too long", __func__);
+		close(fd);
+		return (-1);
+	}
+	cm->cm_type = cm_orig->cm_type;
+	if (cm_orig->cm_len > sizeof(*cm_orig)) {
+		memcpy(msg, msg_orig, cm_orig->cm_len - sizeof(*cm));
+		cm->cm_len = cm_orig->cm_len;
+	}
+	while (state != CM_STATE_EOM) {
+		syslog(LOG_DEBUG, "<%s> state = %d", __func__, state);
+
+		switch (state) {
+		case CM_STATE_INIT:
+			state = CM_STATE_EOM;
+			break;
+		case CM_STATE_MSG_DISPATCH:
+			cm->cm_version = CM_VERSION;
+			error = cmsg_send(fd, buf);
+			if (error)
+				syslog(LOG_WARNING,
+				    "<%s> cmsg_send()", __func__);
+			state = CM_STATE_ACK_WAIT;
+			break;
+		case CM_STATE_ACK_WAIT:
+			error = cmsg_recv(fd, buf);
+			if (error) {
+				syslog(LOG_ERR,
+				    "<%s> cmsg_recv()", __func__);
+				close(fd);
+				return (-1);
+			}
+			switch (cm->cm_type) {
+			case CM_TYPE_ACK:
+				syslog(LOG_DEBUG,
+				    "<%s> CM_TYPE_ACK", __func__);
+				break;
+			case CM_TYPE_ERR:
+				syslog(LOG_DEBUG,
+				    "<%s> CM_TYPE_ERR", __func__);
+				close(fd);
+				return (-1);
+			default:
+				syslog(LOG_DEBUG,
+				    "<%s> unknown status", __func__);
+				close(fd);
+				return (-1);
+			}
+			memcpy(buf_orig, buf, cm->cm_len);
+			state = CM_STATE_EOM;
+			break;
+		}
+	}
+	close(fd);
+	return (0);
+}