socsvn commit: r272601 - in soc2014/zkorchev/freebsd_head: sbin/ifconfig usr.bin/finger usr.bin/netstat usr.bin/sockstat

[zkorchev at FreeBSD.org]

Author: zkorchev
Date: Mon Aug 18 10:33:52 2014
New Revision: 272601
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=272601

Log:
  removed libsol key special characters

Modified:
  soc2014/zkorchev/freebsd_head/sbin/ifconfig/af_inet.c
  soc2014/zkorchev/freebsd_head/sbin/ifconfig/af_inet6.c
  soc2014/zkorchev/freebsd_head/usr.bin/finger/sprint.c
  soc2014/zkorchev/freebsd_head/usr.bin/netstat/inet.c
  soc2014/zkorchev/freebsd_head/usr.bin/netstat/route.c
  soc2014/zkorchev/freebsd_head/usr.bin/sockstat/sockstat.c

Modified: soc2014/zkorchev/freebsd_head/sbin/ifconfig/af_inet.c
==============================================================================
--- soc2014/zkorchev/freebsd_head/sbin/ifconfig/af_inet.c	Mon Aug 18 10:31:38 2014	(r272600)
+++ soc2014/zkorchev/freebsd_head/sbin/ifconfig/af_inet.c	Mon Aug 18 10:33:52 2014	(r272601)
@@ -81,7 +81,7 @@
 			sin = ifa->ifa_dstaddr ?
 				(struct sockaddr_in *)ifa->ifa_dstaddr : &null_sin;
 			inet = inet_ntoa(sin->sin_addr);
-			SOL_MAP_KEYL(&sol_stream, "-->");
+			SOL_MAP_KEYL(&sol_stream, "PPP end");
 			sol_string(&sol_stream, inet, strlen(inet));
 		}
 

Modified: soc2014/zkorchev/freebsd_head/sbin/ifconfig/af_inet6.c
==============================================================================
--- soc2014/zkorchev/freebsd_head/sbin/ifconfig/af_inet6.c	Mon Aug 18 10:31:38 2014	(r272600)
+++ soc2014/zkorchev/freebsd_head/sbin/ifconfig/af_inet6.c	Mon Aug 18 10:33:52 2014	(r272601)
@@ -238,7 +238,7 @@
 					  sizeof(addr_buf));
 #if defined(SOL_ON)
 			if (sol_format) {
-				SOL_MAP_KEYL(&sol_stream, "-->");
+				SOL_MAP_KEYL(&sol_stream, "PPP end");
 				sol_string(&sol_stream, addr_buf, strlen(addr_buf));
 			}
 			else

Modified: soc2014/zkorchev/freebsd_head/usr.bin/finger/sprint.c
==============================================================================
--- soc2014/zkorchev/freebsd_head/usr.bin/finger/sprint.c	Mon Aug 18 10:31:38 2014	(r272600)
+++ soc2014/zkorchev/freebsd_head/usr.bin/finger/sprint.c	Mon Aug 18 10:33:52 2014	(r272601)
@@ -211,7 +211,7 @@
 					}
 				}
 				else {
-					SOL_MAP_KEYL(&sol_stream, "?host");
+					SOL_MAP_KEYL(&sol_stream, "host");
 					sol_string(&sol_stream, w->host, strlen(w->host));
 				}
 			}

Modified: soc2014/zkorchev/freebsd_head/usr.bin/netstat/inet.c
==============================================================================
--- soc2014/zkorchev/freebsd_head/usr.bin/netstat/inet.c	Mon Aug 18 10:31:38 2014	(r272600)
+++ soc2014/zkorchev/freebsd_head/usr.bin/netstat/inet.c	Mon Aug 18 10:33:52 2014	(r272601)
@@ -1567,7 +1567,7 @@
 				if (icmpnames[i] != NULL)
 					sol_map_key(&sol_stream, icmpnames[i], strlen(icmpnames[i]));
 				else {
-					SOL_MAP_KEYL(&sol_stream, "#");
+					SOL_MAP_KEYL(&sol_stream, "number");
 					sol_integer(&sol_stream, i);
 					SOL_MAP_KEYL(&sol_stream, "unknown ICMP");
 				}
@@ -1594,7 +1594,7 @@
 				if (icmpnames[i] != NULL)
 					sol_map_key(&sol_stream, icmpnames[i], strlen(icmpnames[i]));
 				else {
-					SOL_MAP_KEYL(&sol_stream, "#");
+					SOL_MAP_KEYL(&sol_stream, "number");
 					sol_integer(&sol_stream, i);
 					SOL_MAP_KEYL(&sol_stream, "unknown ICMP");
 				}

Modified: soc2014/zkorchev/freebsd_head/usr.bin/netstat/route.c
==============================================================================
--- soc2014/zkorchev/freebsd_head/usr.bin/netstat/route.c	Mon Aug 18 10:31:38 2014	(r272600)
+++ soc2014/zkorchev/freebsd_head/usr.bin/netstat/route.c	Mon Aug 18 10:33:52 2014	(r272601)
@@ -624,7 +624,7 @@
 			printf("%6.6s %8.8lx : %8.8lx", nbuf, (u_long)rnode.rn_left, (u_long)rnode.rn_right);
 		}
 	}
-	SOL_MAP_KEYL(&sol_stream, "arr?"); // TODO what is this?
+	SOL_MAP_KEYL(&sol_stream, "radix_mask");
 	sol_array_start(&sol_stream);
 	while (rm) {
 		if (kget(rm, rmask) != 0)
@@ -633,11 +633,13 @@
 #if defined(SOL_ON)
 		if (sol_format)
 		{
+			sol_map_start(&sol_stream);
+
 			SOL_MAP_KEYL(&sol_stream, "mk");
 			sol_uinteger(&sol_stream, (u_long)rm);
 
-			SOL_MAP_KEYL(&sol_stream, "int?"); // TODO what is this field?
-			sol_integer(&sol_stream, -1 - rmask.rm_bit);
+			SOL_MAP_KEYL(&sol_stream, "bits");
+			sol_uinteger(&sol_stream, -1 - rmask.rm_bit);
 
 			if (rmask.rm_refs) {
 				SOL_MAP_KEYL(&sol_stream, "refs");
@@ -648,7 +650,7 @@
 			if (rmask.rm_flags & RNF_NORMAL) {
 				struct radix_node rnode_aux;
 				sol_boolean(&sol_stream, 1);
-				SOL_MAP_KEYL(&sol_stream, "str?"); // TODO what is this field?
+				SOL_MAP_KEYL(&sol_stream, "mask");
 				if (kget(rmask.rm_leaf, rnode_aux) == 0)
 					p_sockaddr(kgetsa((struct sockaddr *)rnode_aux.rn_mask),
 						NULL, 0, -1);
@@ -656,11 +658,13 @@
 					p_sockaddr(NULL, NULL, 0, -1);
 			} else {
 				sol_boolean(&sol_stream, 0);
-				SOL_MAP_KEYL(&sol_stream, "str?"); // TODO what is this field?
+				SOL_MAP_KEYL(&sol_stream, "mask");
 				p_sockaddr(kgetsa((struct sockaddr *)rmask.rm_mask),
 					NULL, 0, -1);
 			}
 			rm = rmask.rm_mklist;
+
+			sol_map_end(&sol_stream);
 		}
 		else
 #endif

Modified: soc2014/zkorchev/freebsd_head/usr.bin/sockstat/sockstat.c
==============================================================================
--- soc2014/zkorchev/freebsd_head/usr.bin/sockstat/sockstat.c	Mon Aug 18 10:31:38 2014	(r272600)
+++ soc2014/zkorchev/freebsd_head/usr.bin/sockstat/sockstat.c	Mon Aug 18 10:33:52 2014	(r272601)
@@ -662,13 +662,12 @@
 				break;
 			}
 			/* client */
+			SOL_MAP_KEYL(&sol_stream, "connected");
 			p = *(void **)&s->faddr;
 			if (p == NULL) {
-				SOL_MAP_KEYL(&sol_stream, "connected");
 				sol_boolean(&sol_stream, 0);
 				break;
 			}
-			SOL_MAP_KEYL(&sol_stream, "->");
 			for (hash = 0; hash < HASHSIZE; ++hash) {
 				for (s = sockhash[hash]; s != NULL; s = s->next)
 					if (s->pcb == p)