Changeset 48405 in vbox

Timestamp:

Sep 10, 2013 12:22:17 PM (11 years ago)

Author:

vboxsync

Message:

NAT/Loopback mapping: changes semantically unrelated symbol ";" with more expressive "=" for map opperation.

VBoxManage natnework modify -t nat-test-1 -l "127.0.1.3=8"

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageNATNetwork.cpp (modified) (2 diffs)
• Main/idl/VirtualBox.xidl (modified) (1 diff)
• Main/src-server/NATNetworkImpl.cpp (modified) (1 diff)
• NetworkServices/DHCP/VBoxNetDHCP.cpp (modified) (1 diff)
• NetworkServices/NAT/VBoxNetLwipNAT.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageNATNetwork.cpp

@@ -390 +390 @@
             if (!vLoopback2Add.empty())
             {
-                /* we're expecting stings 127.0.0.1;5 */
+                /* we're expecting stings 127.0.0.1=5 */
                 LOOPBACK2DELETEADDITERATOR it;
                 for (it = vLoopback2Add.begin();
@@ -397 +397 @@
                 {
                     std::string address, strOffset;
-                    int pos = it->find(';');
+                    int pos = it->find('=');
                     LONG lOffset = 0;
                     Bstr bstrAddress;

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -1432 +1432 @@
     </attribute>
     <attribute name="localMappings" type="wstring" readonly="yes" safearray="yes">
-      <desc>Array of mappings (address,offset),e.g. ("127.0.1.1;4") maps 127.0.1.1 to networkid + 4. 
+      <desc>Array of mappings (address,offset),e.g. ("127.0.1.1=4") maps 127.0.1.1 to networkid + 4. 
       </desc>
     </attribute>

trunk/src/VBox/Main/src-server/NATNetworkImpl.cpp

@@ -521 +521 @@
          it != m->llNATLoopbackOffsetList.end(); ++it, ++i)
       {
-          BstrFmt bstr("%s;%d",
+          BstrFmt bstr("%s=%d",
                        (*it).strLoopbackHostAddress.c_str(),
                        (*it).u32Offset);

trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp

@@ -407 +407 @@
                 RT_ZERO(aszAddr);
                 
-                pszTerm = RTStrStr(pszLo2Off, ";");
+                pszTerm = RTStrStr(pszLo2Off, "=");
 
                 if (   pszTerm

trunk/src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp

@@ -915 +915 @@
                 RT_ZERO(aszAddr);
                 
-                pszTerm = RTStrStr(pszLo2Off, ";");
+                pszTerm = RTStrStr(pszLo2Off, "=");
 
                 if (   !pszTerm