Changeset 18023 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 17, 2009 1:48:59 PM (16 years ago)

Author:

vboxsync

Message:

Dhcp->DHCP

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxManage.cpp (modified) (1 diff)
• VBoxManage.h (modified) (1 diff)
• VBoxManageDHCPServer.cpp (moved) (moved from trunk/src/VBox/Frontends/VBoxManage/VBoxManageDhcpServer.cpp ) (4 diffs)
• VBoxManageList.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

@@ -60 +60 @@
         VBoxInternalManage.cpp \
         VBoxManageHostonly.cpp \
-        VBoxManageDhcpServer.cpp \
+        VBoxManageDHCPServer.cpp \
         $(if $(VBOX_WITH_GUEST_PROPS),VBoxManageGuestProp.cpp) \
         VBoxManageSVN.cpp

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

@@ -1726 +1726 @@
         { "export",           handleExportAppliance },
         { "hostonlyif",       handleHostonlyIf },
-        { "dhcpserver",       handleDhcpServer},
+        { "dhcpserver",       handleDHCPServer},
         { NULL,               NULL }
     };

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h

@@ -194 +194 @@
 
 /* VBoxManageHostonly.cpp */
-int handleDhcpServer(HandlerArg *a);
+int handleDHCPServer(HandlerArg *a);
 
 #endif /* !VBOX_ONLY_DOCS */

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

@@ -235 +235 @@
     }
 
-    ComPtr<IDhcpServer> svr;
-    rc = a->virtualBox->FindDhcpServerByName(NetName.mutableRaw(), svr.asOutParam());
+    ComPtr<IDHCPServer> svr;
+    rc = a->virtualBox->FindDHCPServerByNetworkName(NetName.mutableRaw(), svr.asOutParam());
     if(enmCode == OP_ADD)
     {
@@ -242 +242 @@
             return errorArgument("dhcp server already exists");
 
-        CHECK_ERROR(a->virtualBox, CreateDhcpServer(NetName.mutableRaw(), svr.asOutParam()));
+        CHECK_ERROR(a->virtualBox, CreateDHCPServer(NetName.mutableRaw(), svr.asOutParam()));
         if(FAILED(rc))
             return errorArgument("failed to create server");
@@ -267 +267 @@
     else
     {
-        CHECK_ERROR(a->virtualBox, RemoveDhcpServer(svr));
+        CHECK_ERROR(a->virtualBox, RemoveDHCPServer(svr));
         if(FAILED(rc))
             return errorArgument("failed to remove server");
@@ -276 +276 @@
 
 
-int handleDhcpServer(HandlerArg *a)
+int handleDHCPServer(HandlerArg *a)
 {
     int result = 0;

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

@@ -765 +765 @@
         case LISTDHCPSERVERS:
         {
-            com::SafeIfaceArray<IDhcpServer> svrs;
-            CHECK_ERROR(a->virtualBox, COMGETTER(DhcpServers)(ComSafeArrayAsOutParam (svrs)));
+            com::SafeIfaceArray<IDHCPServer> svrs;
+            CHECK_ERROR(a->virtualBox, COMGETTER(DHCPServers)(ComSafeArrayAsOutParam (svrs)));
             for (size_t i = 0; i < svrs.size(); ++ i)
             {
-                ComPtr<IDhcpServer> svr = svrs[i];
+                ComPtr<IDHCPServer> svr = svrs[i];
                 Bstr netName;
                 svr->COMGETTER(NetworkName)(netName.asOutParam());