Add two new generic control messages, NGM_ASCII2BINARY and

NGM_BINARY2ASCII, which convert control messages to ASCII and back.
This allows control messages to be sent and received in ASCII form
using ngctl(8), which makes ngctl a lot more useful.

This also allows all the type-specific debugging code in libnetgraph
to go away -- instead, we just ask the node itself to do the ASCII
translation for us.

Currently, all generic control messages are supported, as well as
messages associated with the following node types: async, cisco,
ksocket, and ppp.

See /usr/share/examples/netgraph/ngctl for an example of using this.

Also give ngctl(8) the ability to print out incoming data and
control messages at any time.  Eventually nghook(8) may be subsumed.

Several other misc. bug fixes.

Reviewed by:	julian

1 files changed, 28 insertions, 11 deletions

diff --git a/sys/netgraph/ng_cisco.h b/sys/netgraph/ng_cisco.h
index 559cc14e6bb4..a51dbfaff06e 100644
--- a/sys/netgraph/ng_cisco.h
+++ b/sys/netgraph/ng_cisco.h
@@ -56,21 +56,38 @@
 
 /* Netgraph commands */
 enum {
-	/* This takes two struct in_addr's: the IP address and netmask */
-	NGM_CISCO_SET_IPADDR = 1,
-
-	/* This is both received and *sent* by this node (to the "inet"
-	   peer). The reply contains the same info as NGM_CISCO_SET_IPADDR. */
-	NGM_CISCO_GET_IPADDR,
+	NGM_CISCO_SET_IPADDR = 1,	/* requires a struct ng_cisco_ipaddr */
+	NGM_CISCO_GET_IPADDR,		/* returns a struct ng_cisco_ipaddr */
+	NGM_CISCO_GET_STATUS,		/* returns a struct ng_cisco_stat */
+};
 
-	/* This returns a struct ngciscostat (see below) */
-	NGM_CISCO_GET_STATUS,
+struct ng_cisco_ipaddr {
+	struct in_addr	ipaddr;		/* IP address */
+	struct in_addr	netmask;	/* Netmask */
 };
 
-struct ngciscostat {
-	u_int32_t   seq_retries;		/* # unack'd retries */
-	u_int32_t   keepalive_period;	/* in seconds */
+/* Keep this in sync with the above structure definition */
+#define NG_CISCO_IPADDR_TYPE_INFO	{			\
+	{							\
+	  { "ipaddr",		&ng_parse_ipaddr_type	},	\
+	  { "netmask",		&ng_parse_ipaddr_type	},	\
+	  { NULL },						\
+	}							\
+}
+
+struct ng_cisco_stats {
+	u_int32_t   seqRetries;		/* # unack'd retries */
+	u_int32_t   keepAlivePeriod;	/* in seconds */
 };
 
+/* Keep this in sync with the above structure definition */
+#define NG_CISCO_STATS_TYPE_INFO	{			\
+	{							\
+	  { "seqRetries",	&ng_parse_int32_type	},	\
+	  { "keepAlivePeriod",	&ng_parse_int32_type	},	\
+	  { NULL },						\
+	}							\
+}
+
 #endif /* _NETGRAPH_CISCO_H_ */