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

[yuanxunzhang at FreeBSD.org]

Author: yuanxunzhang
Date: Mon Aug 22 10:58:18 2016
New Revision: 308166
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=308166

Log:
  EAPS: change the type of variable

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

Modified: soc2016/yuanxunzhang/head/sys/net/eaps.h
==============================================================================
--- soc2016/yuanxunzhang/head/sys/net/eaps.h	Mon Aug 22 10:39:09 2016	(r308165)
+++ soc2016/yuanxunzhang/head/sys/net/eaps.h	Mon Aug 22 10:58:18 2016	(r308166)
@@ -41,8 +41,8 @@
 	uint8_t         status;            /* enable or disable eaps */
 	uint8_t         mode;              /* switch mode for a node: transit or master, default transit */
 	uint8_t         priority;          /* EAPS domain priority high or normal */
-	uint16_t        hellotime;         /* hello time is set by master node for sending health check message */
-	uint16_t        failtime;          /* fail time is set by master node for waiting before the failtimer expires */
+	int32_t        hellotime;         /* hello time is set by master node for sending health check message */
+	int32_t        failtime;          /* fail time is set by master node for waiting before the failtimer expires */
 };
 
 /*

Modified: soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c
==============================================================================
--- soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c	Mon Aug 22 10:39:09 2016	(r308165)
+++ soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c	Mon Aug 22 10:58:18 2016	(r308166)
@@ -320,7 +320,7 @@
 		err(1, "EAPS domain name is NULL!");
 	} 
 
-	int16_t hellotime = atoi(*(++argv));
+	int32_t hellotime = atoi(*(++argv));
 	printf("Debug print: set_eaps_hellotime %d!\n", hellotime);
 
 	// hellotime must be greater than 0
@@ -352,7 +352,7 @@
 		err(1, "EAPS domain name is NULL!");
 	} 
 
-	int16_t failtime = atoi(*(++argv));
+	int32_t failtime = atoi(*(++argv));
 	printf("Debug print: set_eaps_failtime %d!\n", failtime);
 
 	// get current value of hellotime, because failtime must be greater than hellotime

Modified: soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.h
==============================================================================
--- soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.h	Mon Aug 22 10:39:09 2016	(r308165)
+++ soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.h	Mon Aug 22 10:58:18 2016	(r308166)
@@ -47,9 +47,10 @@
 	uint8_t         status;            /* enable or disable eaps */
 	uint8_t         mode;              /* switch mode for a node: transit or master, default transit */
 	uint8_t         priority;          /* EAPS domain priority high or normal */
-	uint16_t        hellotime;         /* hello time is set by master node for sending health check message */
-	uint16_t        failtime;          /* fail time is set by master node for waiting before the failtimer expires */
+	int32_t        hellotime;         /* hello time is set by master node for sending health check message */
+	int32_t        failtime;          /* fail time is set by master node for waiting before the failtimer expires */
 };
+
 /*
  * EAPS ring status states (active or not active)
  */