parse forward hostToVm and vmToHost ports

Author: baslr

lib/parser.js

@@ -58,7 +58,7 @@ class Parser {
     // net
     if (hw.net) {
       const net = hw.net;
-      this.net(net.macAddr, net.nic, net.mode, net.opts);
+      this.net(net.macAddr, net.nic, net.mode, net);
     } // if
 
     if (st.noShutdown) { this.noShutdown(); }
@@ -178,15 +178,29 @@ class Parser {
    *  N E T
    * 
    */
-  net(macAddr, card='rtl8139', mode='host', opts) {
+  net(macAddr, card='rtl8139', mode='host', opts = {}) {
     if ('host' === mode || 'darwin' === osType) {
       let ext = 'user';
-      if (opts) {
-        ext = opts.fwds.reduce( (prev, fwd) => {
-          return `${prev},hostfwd=tcp:${fwd.hostIp}:${fwd.hostPort}-${opts.guestIp}:${fwd.guestPort}`;
-        }, `${ext},dhcpstart=${opts.guestIp}`);
+
+      if (opts.hostToVmPortFwd || opts.vmToHostPortFwd) {
+        ext = `${ext},dhcpstart=${opts.guestIp}`;
+
+        if (opts.hostToVmPortFwd) {
+          ext = opts.hostToVmPortFwd.reduce( (prev, fwd) => {
+            return `${prev},hostfwd=tcp:${fwd.hostIp}:${fwd.hostPort}-${opts.guestIp}:${fwd.guestPort}`;
+          }, ext);
+        } // if
+
+        // guestfwd=tcp:10.0.2.100:1234-tcp:10.10.1.1:4321
+        if (opts.vmToHostPortFwd) {
+          ext = opts.vmToHostPortFwd.reduce( (prev, fwd) => {
+            return `${prev},guestfwd=tcp:${opts.guestIp}:${fwd.guestPort}-${fwd.hostIp}:${fwd.hostPort}`;
+          }, ext);
+        } // if
       } // if
+
       return this.pushArg('-net', `nic,model=${card},macaddr=${macAddr}`, '-net', ext);
+
     } else if ('bridged' === mode || 'bridge' === mode) {
       return this.pushArg('-net', `nic,model=${card},macaddr=${macAddr}`, '-net', 'tap');
     } // else if

tests.js

@@ -49,7 +49,11 @@ const tests = [
 
 // net
 ,['net', ['myMacAddr', 'myCard', 'user'], ['-net', 'nic,model=myCard,macaddr=myMacAddr', '-net', 'user']]
-,['net', ['myMacAddr', 'myCard', 'user', {guestIp:'gIp',fwds:[{hostIp:'hIp',hostPort:'hPort', guestPort:'gPort'}]}], ['-net', 'nic,model=myCard,macaddr=myMacAddr', '-net', 'user,dhcpstart=gIp,hostfwd=tcp:hIp:hPort-gIp:gPort']]
+,['net', ['myMacAddr', 'myCard', 'user', {guestIp:'gIp',hostToVmPortFwd:[{hostIp:'hIp',hostPort:'hPort', guestPort:'gPort'}]}], ['-net', 'nic,model=myCard,macaddr=myMacAddr', '-net', 'user,dhcpstart=gIp,hostfwd=tcp:hIp:hPort-gIp:gPort']]
+,['net', ['myMacAddr', 'myCard', 'user', {guestIp:'gIp',vmToHostPortFwd:[{hostIp:'hIp',hostPort:'hPort', guestPort:'gPort'}]}], ['-net', 'nic,model=myCard,macaddr=myMacAddr', '-net', 'user,dhcpstart=gIp,guestfwd=tcp:gIp:gPort-hIp:hPort']]
+
+,['net', ['myMacAddr', 'myCard', 'user', {guestIp:'gIp',hostToVmPortFwd:[{hostIp:'hIp',hostPort:'hPort', guestPort:'gPort'}],
+                                                        vmToHostPortFwd:[{hostIp:'hIp',hostPort:'hPort', guestPort:'gPort'}]}], ['-net', 'nic,model=myCard,macaddr=myMacAddr', '-net', 'user,dhcpstart=gIp,hostfwd=tcp:hIp:hPort-gIp:gPort,guestfwd=tcp:gIp:gPort-hIp:hPort']]
 
 
 // drives