Changeset 18323 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Mar 26, 2009 3:29:16 PM (16 years ago)

Author:

vboxsync

Message:

DHCP server/win: make it work again; NetFlt,Adp/win: IDC init polling

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageDHCPServer.cpp (modified) (3 diffs)

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

@@ -61 +61 @@
 static const RTGETOPTDEF g_aDHCPIPOptions[]
     = {
-        { "--netname",          'n', RTGETOPT_REQ_STRING },
-        { "-netname",           'n', RTGETOPT_REQ_STRING },     // deprecated (if removed check below)
-        { "--ifname",           'i', RTGETOPT_REQ_STRING },
-        { "-ifname",            'i', RTGETOPT_REQ_STRING },     // deprecated
+        { "--netname",          't', RTGETOPT_REQ_STRING },  /* we use 't' instead of 'n' to avoid
+                                                              * 1. the misspelled "-enable" long option to be treated as 'e' (for -enable) + 'n' (for -netname) + "<the_rest_opt>" (for net name)
+                                                              * 2. the misspelled "-netmask" to be treated as 'n' (for -netname) + "<the_rest_opt>" (for net name)
+                                                              */
+        { "-netname",           't', RTGETOPT_REQ_STRING },     // deprecated (if removed check below)
+        { "--ifname",           'f', RTGETOPT_REQ_STRING },  /* we use 'f' instead of 'i' to avoid
+                                                              * 1. the misspelled "-disable" long option to be treated as 'd' (for -disable) + 'i' (for -ifname) + "<the_rest_opt>" (for if name)
+                                                              */
+        { "-ifname",            'f', RTGETOPT_REQ_STRING },     // deprecated
         { "--ip",               'a', RTGETOPT_REQ_STRING },
         { "-ip",                'a', RTGETOPT_REQ_STRING },     // deprecated
@@ -109 +114 @@
         switch (c)
         {
-            case 'n':   // --netname
+            case 't':   // --netname
                 if(pNetName)
                     return errorSyntax(USAGE_DHCPSERVER, "You can only specify --netname once.");
@@ -119 +124 @@
                 }
             break;
-            case 'i':   // --ifname
+            case 'f':   // --ifname
                 if(pIfName)
                     return errorSyntax(USAGE_DHCPSERVER, "You can only specify --ifname once.");