Date: Wed, 10 Jun 2015 21:03:43 GMT From: roam@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r286924 - soc2015/roam/ng_ayiya Message-ID: <201506102103.t5AL3h6w004443@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506102103.t5AL3h6w004443>