Date: Mon, 25 Jul 2011 06:31:04 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r224303 - user/hrs/ipv6/usr.sbin/rtadvd Message-ID: <201107250631.p6P6V4EW041317@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Mon Jul 25 06:31:04 2011 New Revision: 224303 URL: http://svn.freebsd.org/changeset/base/224303 Log: Fix an abnormal termination caused by twice of "rtadvctl disable". Modified: user/hrs/ipv6/usr.sbin/rtadvd/control_server.c Modified: user/hrs/ipv6/usr.sbin/rtadvd/control_server.c ============================================================================== --- user/hrs/ipv6/usr.sbin/rtadvd/control_server.c Mon Jul 25 01:42:51 2011 (r224302) +++ user/hrs/ipv6/usr.sbin/rtadvd/control_server.c Mon Jul 25 06:31:04 2011 (r224303) @@ -51,6 +51,7 @@ #include "pathnames.h" #include "rtadvd.h" #include "if.h" +#include "config.h" #include "control.h" #include "control_server.h" #include "timer.h" @@ -611,7 +612,16 @@ cmsg_setprop_disable(struct ctrl_msg_pl return (1); } - ifi->ifi_persist = 0; + if (ifi->ifi_persist == 1) { + ifi->ifi_persist = 0; + rm_ifinfo(ifi); + + /* MC leaving needed here */ + sock_mc_leave(&sock, ifi->ifi_ifindex); + + set_do_reload_ifname(ifi->ifi_ifname); + set_do_reload(0); + } return (0); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107250631.p6P6V4EW041317>