socsvn commit: r308188 - soc2016/yuanxunzhang/head/usr.sbin/eaps

[yuanxunzhang at FreeBSD.org]

Author: yuanxunzhang
Date: Mon Aug 22 17:52:15 2016
New Revision: 308188
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=308188

Log:
  EAPS: add check domain exists

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

Modified: soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c
==============================================================================
--- soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c	Mon Aug 22 16:39:51 2016	(r308187)
+++ soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c	Mon Aug 22 17:52:15 2016	(r308188)
@@ -101,6 +101,8 @@
 static void set_eaps_priority(int, char **, int);
 static void set_eaps_hellotime(int, char **, int);
 static void set_eaps_failtime(int, char **, int);
+static void set_eaps_primary_port(int, char **, int);
+static void set_eaps_secondary_port(int, char **, int);
 static void usage(const char *);
 void load_module(const char *);
 
@@ -138,6 +140,12 @@
 		case K_FAILTIME:
 			set_eaps_failtime(argc, argv, s);
 			break;
+		case K_PRIMARY:
+			set_eaps_primary_port(argc, argv, s);
+			break;
+		case K_SECONDARY:
+			set_eaps_secondary_port(argc, argv, s);
+			break;
 		}
 	usage(*argv);
 	return retval;
@@ -290,6 +298,12 @@
 		err(1, "EAPS domain name is NULL!");
 	} 
 
+	// check if eaps domain exists
+	if (0 == if_nametoindex(domain_name))
+	{
+		errx(1, "EAPS domain %s does not exist", domain_name);
+	}
+
 	char *priority = *(++argv);
 	printf("Debug print: set priority mode is %s!\n", priority);
 
@@ -386,6 +400,28 @@
 }
 
 static void
+set_eaps_primary_port(int argc, char **argv, int s)
+{
+	int error = 0;
+
+	struct eaps_state es;
+	bzero(&es, sizeof(es));
+
+	char *domain_name = *(++argv);
+
+	// check eaps domain name
+	if (domain_name == NULL) {
+		err(1, "EAPS domain name is NULL!");
+	} 
+}
+
+static void
+set_eaps_secondary_port(int argc, char **argv, int s)
+{
+
+}
+
+static void
 usage(const char *cp)
 {
 	if (cp != NULL)

Modified: soc2016/yuanxunzhang/head/usr.sbin/eaps/keywords
==============================================================================
--- soc2016/yuanxunzhang/head/usr.sbin/eaps/keywords	Mon Aug 22 16:39:51 2016	(r308187)
+++ soc2016/yuanxunzhang/head/usr.sbin/eaps/keywords	Mon Aug 22 17:52:15 2016	(r308188)
@@ -8,3 +8,5 @@
 priority
 hellotime
 failtime
+primary
+secondary