Replace netio XML with new version for testing.

1 files changed, 73 insertions, 47 deletions

diff --git a/packages/netio.xml b/packages/netio.xml
index 43cc4a58..3343b8be 100644
--- a/packages/netio.xml
+++ b/packages/netio.xml
@@ -1,49 +1,75 @@
-<packagegui>
-	<name>netio</name>
-	<version>1.14</version>
-	<title>netio: Client</title>
-	<donotsave>true</donotsave>
-	<preoutput>yes</preoutput>
-	<menu>
+<?xml version="1.0" encoding="utf-8" ?>
+<package>
+	<nosync/>
+	<info>
 		<name>netio</name>
-		<tooltiptext>Run netio in client or server mode.</tooltiptext>
-		<section>Diagnostics</section>
-		<configfile>netio.xml</configfile>
-	</menu>
-	<tabs>
-		<tab>
-			<text>Client</text>
-			<url>/pkg_edit.php?xml=netio.xml</url>
-			<active/>
-		</tab>
-		<tab>
-			<text>Server</text>
-			<url>/pkg_edit.php?xml=netioserver.xml</url>
-		</tab>
-	</tabs>
-	<additional_files_needed>
-		<item>http://www.pfsense.com/packages/config/netioserver.xml</item>
-	</additional_files_needed>
-	<fields>
-		<field>
-			<fielddescr>Server</fielddescr>
-			<fieldname>hostname</fieldname>
-			<description>Enter the IP address or hostname that netio will connect to.</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fielddescr>Port</fielddescr>
-			<fieldname>port</fieldname>
-			<description>Enter the port that netio will connect to. (default 18767)</description>
-			<type>input</type>
-		</field>
-	</fields>
-	<custom_add_php_command>
-		mwexec("killall netio");
-		$netio_options = "";
-		if($_POST['port'] != "") $netio_options .= " -p {$_POST['port']}";
-		$netio_options .= $_POST['hostname'];
-		system("/usr/local/bin/netio " . $netio_options);
-	</custom_add_php_command>
-</packagegui>
+		<descr>This is a network benchmark for DOS, OS/2 2.x, Windows NT/2000 and Unix. It measures the net throughput of a network via NetBIOS and/or TCP/IP protocols (Unix and DOS only support TCP/IP) using various different packet sizes.</descr>
+		<category>Network Management</category>
+		<version>1.14</version>
+		<status>ALPHA</status>
+	</info>
+	<files>
+		<file>
+			<type>package</type>
+			<location>http://ftp2.freebsd.org/pub/FreeBSD/ports/i386/packages-6-current/All/netio-1.14.tbz</location>
+		</file>
+		<file>
+			<type>configfile</type>
+			<location>http://www.pfsense.com/packages/config/netioserver.xml</location>
+		</file>
+	</files>
+	<services>
+		<service>
+			<name>netio</name>
+			<executable>netio</executable>
+		</service>
+	</services>
+	<gui>
+		<title>netio: Client</title>
+		<donotsave>true</donotsave>
+		<preoutput>yes</preoutput>
+		<menus>
+			<menu>
+				<name>netio</name>
+				<tooltiptext>Run netio in client or server mode.</tooltiptext>
+				<section>Diagnostics</section>
+				<configfile>netio.xml</configfile>
+			</menu>
+		</menus>
+		<tabs>
+			<tab>
+				<text>Client</text>
+				<url>/pkg_edit.php?xml=netio.xml</url>
+				<active/>
+			</tab>
+			<tab>
+				<text>Server</text>
+				<url>/pkg_edit.php?xml=netioserver.xml</url>
+			</tab>
+		</tabs>
+		<fields>
+			<field>
+				<fielddescr>Server</fielddescr>
+				<fieldname>hostname</fieldname>
+				<description>Enter the IP address or hostname that netio will connect to.</description>
+				<type>input</type>
+			</field>
+			<field>
+				<fielddescr>Port</fielddescr>
+				<fieldname>port</fieldname>
+				<description>Enter the port that netio will connect to. (default 18767)</description>
+				<type>input</type>
+			</field>
+		</fields>
+	</gui>
+	<commands>
+		<add_commands>
+			stop_service("netio");
+			$netio_options = "";
+			if($_POST['port'] != "") $netio_options .= " -p {$_POST['port']}";
+			$netio_options .= $_POST['hostname'];
+			system("/usr/local/bin/netio " . $netio_options);
+		</add_commands>
+	</commands>
+</package>