From owner-svn-soc-all@freebsd.org Wed Aug 19 15:56:27 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 42C2B9BE696 for ; Wed, 19 Aug 2015 15:56:27 +0000 (UTC) (envelope-from roam@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3072C1FFF for ; Wed, 19 Aug 2015 15:56:27 +0000 (UTC) (envelope-from roam@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t7JFuRZQ077125 for ; Wed, 19 Aug 2015 15:56:27 GMT (envelope-from roam@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t7JFuQRS077121 for svn-soc-all@FreeBSD.org; Wed, 19 Aug 2015 15:56:26 GMT (envelope-from roam@FreeBSD.org) Date: Wed, 19 Aug 2015 15:56:26 GMT Message-Id: <201508191556.t7JFuQRS077121@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to roam@FreeBSD.org using -f From: roam@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r289928 - soc2015/roam MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Aug 2015 15:56:27 -0000 Author: roam Date: Wed Aug 19 15:56:26 2015 New Revision: 289928 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289928 Log: Makefile: add a ayiya-server test target Modified: soc2015/roam/Makefile Modified: soc2015/roam/Makefile ============================================================================== --- soc2015/roam/Makefile Wed Aug 19 15:56:23 2015 (r289927) +++ soc2015/roam/Makefile Wed Aug 19 15:56:26 2015 (r289928) @@ -38,6 +38,8 @@ RM?= rm -rf MKDIR?= mkdir -p +SUDO?= sudo + down: cd ${.CURDIR}/ng_ayiya && ${MAKE} down @@ -66,3 +68,25 @@ distclean: ${RM} $D/ cd $S && ${MAKE} cleandir && ${MAKE} cleandir + +shutdown: + ${SUDO} ngctl list | awk "/Type: ayiya/ { print \$$2 }" | while read node; do \ + ${SUDO} ngctl shutdown "$$node:inet6" || true; \ + ${SUDO} ngctl shutdown "$$node:"; \ + done + +ayiya-server: + @if [ -z "${TUNNELSFILE}" ] || [ -z "${LISTENADDR}" ]; then \ + printf "\n\nYou must specify the path to the tic-tunnels.txt file in the TUNNELSFILE variable and the IPv4 address to listen on in the LISTENADDR variable\n\n"; \ + false; \ + fi + + ${MAKE} -C ${.CURDIR} obj + ${MAKE} -C ${.CURDIR} depend + ${MAKE} -C ${.CURDIR} + + ${MAKE} -C ${.CURDIR} shutdown + ${SUDO} ${MAKE} -C ${.CURDIR}/ng_ayiya unload || true + ${SUDO} ${MAKE} -C ${.CURDIR}/ng_ayiya load + + cd ${.CURDIR} && ${SUDO} `${MAKE} -C ${.CURDIR}/ayiya_listen -V .OBJDIR`/ayiya_listen -v -a "${LISTENADDR}" -t "${TUNNELSFILE}" -v