From owner-svn-src-all@FreeBSD.ORG Sun Sep 8 18:27:27 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 4959A41F; Sun, 8 Sep 2013 18:27:27 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1C5E02A42; Sun, 8 Sep 2013 18:27:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r88IRQ25067579; Sun, 8 Sep 2013 18:27:26 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r88IRQT6067577; Sun, 8 Sep 2013 18:27:26 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309081827.r88IRQT6067577@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 8 Sep 2013 18:27:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r255398 - releng/9.2/usr.sbin/rtadvd X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 18:27:27 -0000 Author: des Date: Sun Sep 8 18:27:26 2013 New Revision: 255398 URL: http://svnweb.freebsd.org/changeset/base/255398 Log: MFH (r254684, r254955): fix segfault on reload. MFH (r255156): silence an error message on non-IPv6 interfaces. Approved by: re (glebius) Modified: releng/9.2/usr.sbin/rtadvd/config.c releng/9.2/usr.sbin/rtadvd/if.c Directory Properties: releng/9.2/usr.sbin/rtadvd/ (props changed) Modified: releng/9.2/usr.sbin/rtadvd/config.c ============================================================================== --- releng/9.2/usr.sbin/rtadvd/config.c Sun Sep 8 18:19:40 2013 (r255397) +++ releng/9.2/usr.sbin/rtadvd/config.c Sun Sep 8 18:27:26 2013 (r255398) @@ -296,10 +296,8 @@ rm_rainfo(struct rainfo *rai) if (rai->rai_ra_data != NULL) free(rai->rai_ra_data); - while ((pfx = TAILQ_FIRST(&rai->rai_prefix)) != NULL) { - TAILQ_REMOVE(&rai->rai_prefix, pfx, pfx_next); - free(pfx); - } + while ((pfx = TAILQ_FIRST(&rai->rai_prefix)) != NULL) + delete_prefix(pfx); while ((sol = TAILQ_FIRST(&rai->rai_soliciter)) != NULL) { TAILQ_REMOVE(&rai->rai_soliciter, sol, sol_next); free(sol); @@ -1123,9 +1121,9 @@ add_prefix(struct rainfo *rai, struct in pfx->pfx_onlinkflg = ipr->ipr_raf_onlink; pfx->pfx_autoconfflg = ipr->ipr_raf_auto; pfx->pfx_origin = PREFIX_FROM_DYNAMIC; + pfx->pfx_rainfo = rai; TAILQ_INSERT_TAIL(&rai->rai_prefix, pfx, pfx_next); - pfx->pfx_rainfo = rai; syslog(LOG_DEBUG, "<%s> new prefix %s/%d was added on %s", __func__, Modified: releng/9.2/usr.sbin/rtadvd/if.c ============================================================================== --- releng/9.2/usr.sbin/rtadvd/if.c Sun Sep 8 18:19:40 2013 (r255397) +++ releng/9.2/usr.sbin/rtadvd/if.c Sun Sep 8 18:27:26 2013 (r255398) @@ -394,8 +394,8 @@ update_ifinfo_nd_flags(struct ifinfo *if error = ioctl(s, SIOCGIFINFO_IN6, (caddr_t)&nd); if (error) { close(s); - syslog(LOG_ERR, - "<%s> ioctl() failed.", __func__); + if (errno != EPFNOSUPPORT) + syslog(LOG_ERR, "<%s> ioctl() failed.", __func__); return (1); } ifi->ifi_nd_flags = nd.ndi.flags;