socsvn commit: r307678 - in soc2016/yuanxunzhang/head: sys/net usr.sbin/eaps

[yuanxunzhang at FreeBSD.org]

Author: yuanxunzhang
Date: Mon Aug 15 19:20:20 2016
New Revision: 307678
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=307678

Log:
  EAPS: query eaps domian status

Modified:
  soc2016/yuanxunzhang/head/sys/net/eaps.c
  soc2016/yuanxunzhang/head/sys/net/eaps.h
  soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c
  soc2016/yuanxunzhang/head/usr.sbin/eaps/keywords

Modified: soc2016/yuanxunzhang/head/sys/net/eaps.c
==============================================================================
--- soc2016/yuanxunzhang/head/sys/net/eaps.c	Mon Aug 15 18:55:33 2016	(r307677)
+++ soc2016/yuanxunzhang/head/sys/net/eaps.c	Mon Aug 15 19:20:20 2016	(r307678)
@@ -198,7 +198,8 @@
 	int error = 0;
 
 	switch (cmd) {
-		
+	case SIOCSEAPSDOMAIN:	
+		printf("Debug print: Delete eaps domain!\n");
 		break;
 	default:
 		error = ether_ioctl(ifp, cmd, data);

Modified: soc2016/yuanxunzhang/head/sys/net/eaps.h
==============================================================================
--- soc2016/yuanxunzhang/head/sys/net/eaps.h	Mon Aug 15 18:55:33 2016	(r307677)
+++ soc2016/yuanxunzhang/head/sys/net/eaps.h	Mon Aug 15 19:20:20 2016	(r307678)
@@ -44,10 +44,12 @@
 	u_char			sc_defaddr[6];	/* Default MAC address */ 
 };
 
-/* eaps ring information */
+/* 
+* eaps ring information 
+*/
 struct eaps_reqall {
 	char			eaps_ifname[IFNAMSIZ];	/* name of the eaps */
-	uint8_t			eaps_state;             /* state of eaps * /
+	uint8_t			eaps_state;             /* state of eaps */
 	uint8_t         enable_state;           /* enable or disable eaps ring */
 };
 

Modified: soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c
==============================================================================
--- soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c	Mon Aug 15 18:55:33 2016	(r307677)
+++ soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c	Mon Aug 15 19:20:20 2016	(r307678)
@@ -67,7 +67,7 @@
 int	keyword(const char *);
 static void	create_domain(int, char **, int);
 static void delete_domain(int, char **, int);
-static void eaps_status(int, char **, int);
+static void show_eaps_status(int, char **, int);
 static void usage(const char *);
 void load_module(const char *);
 
@@ -86,12 +86,13 @@
 		switch (keyword(*argv)) {
 		case K_CREATE:
 			create_domain(argc, argv, s);
-
+			break;
 		case K_DELETE:
 			delete_domain(argc, argv, s);
-
+			break;
 		case K_DISPLAY:
-			eaps_status(argc, argv, s);
+			show_eaps_status(argc, argv, s);
+			break;
 		}
 	usage(*argv);
 	return retval;
@@ -164,17 +165,21 @@
 }
 
 static void
-eaps_status(int argc, char **argv, int s)
+show_eaps_status(int argc, char **argv, int s)
 {
-	int error = 0;
-	
+	struct eaps_reqall er;
+	bzero(&ro, sizeof(ro));
+
+	char *domain_name = *(++argv);
+
 	// check eaps domain name
 	if (domain_name == NULL) {
 		err(1, "EAPS domain name is NULL!");
 	} 
 
-
-	exit(error);
+	strlcpy(er.eaps_ifname, domain_name, sizeof(er.eaps_ifname));
+	if (ioctl(s, SIOCSEAPSDOMAIN, &er) < 0)
+		err(1, "SIOCSEAPSDOMAIN");
 }
 
 static void

Modified: soc2016/yuanxunzhang/head/usr.sbin/eaps/keywords
==============================================================================
--- soc2016/yuanxunzhang/head/usr.sbin/eaps/keywords	Mon Aug 15 18:55:33 2016	(r307677)
+++ soc2016/yuanxunzhang/head/usr.sbin/eaps/keywords	Mon Aug 15 19:20:20 2016	(r307678)
@@ -3,4 +3,4 @@
 
 create
 delete
-display
+show