From owner-svn-soc-all@FreeBSD.ORG Wed Jun 10 21:03:43 2015 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EB77FD2B for ; Wed, 10 Jun 2015 21:03:43 +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 D9F5810D1 for ; Wed, 10 Jun 2015 21:03:43 +0000 (UTC) (envelope-from roam@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5AL3hWe004677 for ; Wed, 10 Jun 2015 21:03:43 GMT (envelope-from roam@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5AL3h6w004443 for svn-soc-all@FreeBSD.org; Wed, 10 Jun 2015 21:03:43 GMT (envelope-from roam@FreeBSD.org) Date: Wed, 10 Jun 2015 21:03:43 GMT Message-Id: <201506102103.t5AL3h6w004443@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: r286924 - soc2015/roam/ng_ayiya 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, 10 Jun 2015 21:03:44 -0000 Author: roam Date: Wed Jun 10 21:03:42 2015 New Revision: 286924 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=286924 Log: Use the NG_* macros for member access. ObQuote: "Cause you can look but you can't touch" Modified: soc2015/roam/ng_ayiya/ng_ayiya.c Modified: soc2015/roam/ng_ayiya/ng_ayiya.c ============================================================================== --- soc2015/roam/ng_ayiya/ng_ayiya.c Wed Jun 10 20:43:07 2015 (r286923) +++ soc2015/roam/ng_ayiya/ng_ayiya.c Wed Jun 10 21:03:42 2015 (r286924) @@ -109,13 +109,13 @@ "\t\"name\":\t\"%s\",\n" "\t\"has_secret\":\t%s,\n" "\t\"hooks\": {\n", - node->nd_ID, node->nd_name, + NG_NODE_ID(node), NG_NODE_NAME(node), priv->secrethash? "true": "false"); else sbuf_printf(sb, "Node [%x] %s\n" "Secret hash %sset\n", - node->nd_ID, node->nd_name, + NG_NODE_ID(node), NG_NODE_NAME(node), priv->secrethash? "": "not "); for (int idx = 0; idx < AYIYA_HOOK_LAST; idx++) { @@ -134,7 +134,7 @@ "\t\t\t\"type\":\t\"%s\"\n" "\t\t}%s\n", hname, NG_HOOK_NAME(hook), - peer->nd_ID, peer->nd_name, + NG_NODE_ID(peer), NG_NODE_NAME(peer), peer->nd_type->name, idx < AYIYA_HOOK_LAST - 1? ",": ""); else @@ -142,7 +142,7 @@ "Hook '%s' (%s) connected to node " "[%x] '%s' of type '%s'.\n", NG_HOOK_NAME(hook), hname, - peer->nd_ID, peer->nd_name, + NG_NODE_ID(peer), NG_NODE_NAME(peer), peer->nd_type->name); } else { if (json)