Changeset 23063 in vbox

Timestamp:

Sep 16, 2009 12:03:00 PM (15 years ago)

Author:

vboxsync

Message:

VBoxNetAdpCtl.cpp: a todo + some nitpicking.

File:

• trunk/src/apps/adpctl/VBoxNetAdpCtl.cpp (modified) (9 diffs)

trunk/src/apps/adpctl/VBoxNetAdpCtl.cpp

@@ -25 +25 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -37 +36 @@
 #endif
 
-/* @todo Error codes must be moved to some header file */
-#define ADPCTLERR_NO_CTL_DEV 3
-#define ADPCTLERR_IOCTL_FAILED 4
-
-/* @todo These are duplicates from src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h */
+/** @todo Error codes must be moved to some header file */
+#define ADPCTLERR_BAD_NAME         2
+#define ADPCTLERR_NO_CTL_DEV       3
+#define ADPCTLERR_IOCTL_FAILED     4
+
+/** @todo These are duplicates from src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h */
 #define VBOXNETADP_CTL_DEV_NAME    "/dev/vboxnetctl"
 #define VBOXNETADP_NAME            "vboxnet"
@@ -95 +95 @@
             break;
         case 0: /* Child process. */
+            /** @todo use execve like below? */
             if (execv(VBOXADPCTL_IFCONFIG_PATH, (char * const*)argv) == -1)
                 rc = EXIT_FAILURE;
@@ -149 +150 @@
     {
         int cbSkipWS = strspn(szBuf, " \t");
-#if 0 /* Don't use this! assert() breaks the mac build. Use IPRT or be a rectangular building thing. */
-        assert(cbSkipWS < 20);
-#endif
         char *pszWord = strtok(szBuf + cbSkipWS, " ");
         /* We are concerned with IPv6 address lines only. */
@@ -205 +203 @@
     int iAdapterIndex = -1;
 
-    if (sscanf(pcszNameIn, "vboxnet%d", &iAdapterIndex) != 1
+    if (   strlen(pcszNameIn) >= VBOXNETADP_MAX_NAME_LEN
+        || sscanf(pcszNameIn, "vboxnet%d", &iAdapterIndex) != 1
         || iAdapterIndex < 0 || iAdapterIndex > 99 )
     {
         fprintf(stderr, "Setting configuration for %s is not supported.\n", pcszNameIn);
-        return 2;
+        return ADPCTLERR_BAD_NAME;
     }
     sprintf(pszNameOut, "vboxnet%d", iAdapterIndex);
@@ -215 +214 @@
     {
         fprintf(stderr, "Invalid adapter name %s.\n", pcszNameIn);
-        return 2;
+        return ADPCTLERR_BAD_NAME;
     }
 
@@ -266 +265 @@
                 if (rc)
                     return rc;
+                memset(&Req, '\0', sizeof(Req));
                 snprintf(Req.szName, sizeof(Req.szName), "%s", szAdapterName);
                 return doIOCtl(VBOXNETADP_CTL_REMOVE, &Req);
@@ -273 +273 @@
             if (strcmp("add", argv[1]) == 0)
             {
+                memset(&Req, '\0', sizeof(Req));
                 rc = doIOCtl(VBOXNETADP_CTL_ADD, &Req);
                 if (rc == 0)
@@ -326 +327 @@
     return rc;
 }
+