Merge pull request #17 from theonemcdonald/devel

Refactored global variables and reorganized function includes

Author: rcmcdonald91

extra/images/screen2.PNG

@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	pfSense-pkg-WireGuard
-PORTVERSION=	0.0.4
-PORREVISION=	1
+PORTVERSION=	0.0.5
+PORREVISION=	0
 CATEGORIES=	net
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -56,10 +56,15 @@ do-install:
 		${STAGEDIR}${PREFIX}/pkg/wireguard
 	${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/wireguard/wg_api.inc \
 		${STAGEDIR}${PREFIX}/pkg/wireguard
+	${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/wireguard/wg_globals.inc \
+		${STAGEDIR}${PREFIX}/pkg/wireguard
+	${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/wireguard/wg_install.inc \
+		${STAGEDIR}${PREFIX}/pkg/wireguard
 	${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/wireguard/wg_extras.inc \
 		${STAGEDIR}${PREFIX}/pkg/wireguard
 	${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/wireguard/wg_validate.inc \
 		${STAGEDIR}${PREFIX}/pkg/wireguard
+
 	${INSTALL_DATA} -m 0755 ${FILESDIR}${PREFIX}/pkg/wireguard/etc/rc.bootstrap_wireguard \
 		${STAGEDIR}${PREFIX}/pkg/wireguard/etc
 

extra/images/screen3.PNG

@@ -27,7 +27,7 @@ require_once('config.inc');
 // WireGuard includes
 require_once('/usr/local/pkg/wireguard/wg.inc');
 
-// Nice to have someoutput when running manually after system startup for testing
+// Nice to have some output when running manually after system startup for testing
 $run_verbose = true;
 
 if (platform_booting()) {
@@ -38,8 +38,7 @@ if (platform_booting()) {
 
 }
 
-// Destroy first to supersede any lo placeholder interfaces after startup 
-wg_configure_from_confs($wgconfpath, true, $run_verbose);
+wg_configure($run_verbose);
 
 if (platform_booting()) {
 

extra/images/screen6.PNG

@@ -24,14 +24,16 @@
 require_once('globals.inc');
 require_once('config.inc');
 
+// This file absolutely cannot be dependent on the package! It must standalone and only depend on pfSense includes
+
 // This is a hack to get text onto the console during booting from a php-cgi script
 function print_message($message) {
 
 	$message = gettext($message);
 
-    $message = escapeshellarg($message);
+    	$message = escapeshellarg($message);
 
-    // printf is a shell builtin 
+    	// printf is a shell builtin 
 	exec("printf {$message} >&2");
 
 }
@@ -57,9 +59,9 @@ foreach ($if_list as $realif => $name) {
 
 	if (substr($realif, 0, 2) == "wg") {
 
-		exec("/sbin/ifconfig {$ifname}" . $verbose_pipe . " || ifconfig lo create name {$ifname}");
+		exec("(/sbin/ifconfig {$ifname} || /sbin/ifconfig lo create name {$ifname})" . $verbose_pipe);
 
-		exec("/sbin/ifconfig {$ifname} group wg");
+		exec("/sbin/ifconfig {$ifname} group wg" . $verbose_pipe);
 
 	}