Changeset 166

Timestamp:

08/03/04 17:25:03 (9 years ago)

Author:

alexcv

Message:

Removing some constants and magic numbers

Location:

trunk/wifidog/src

Files:

• wdctl.c (modified) (4 diffs)
• wdctl.h (modified) (1 diff)
• wdctl_thread.c (modified) (3 diffs)

trunk/wifidog/src/wdctl.c

@@ -82 +82 @@
 {
 
-        strncpy(config.socket, DEFAULT_SOCK, sizeof(config.socket));
+        config.socket = strdup(DEFAULT_SOCK);
+        config.command = WDCTL_UNDEF;
 }
 
@@ -104 +105 @@
             case 's':
                 if (optarg) {
-                    strncpy(config.socket, optarg, sizeof(config.socket));
+                    free(config.socket);
+                    config.socket = strdup(optarg);
                 }
                 break;
@@ -120 +122 @@
     }
 
-    config.command = WDCTL_UNDEF;
     if (strcmp(*(argv + optind), "status") == 0) {
             config.command = WDCTL_STATUS;
@@ -151 +152 @@
         /* Connect to socket */
         sock = socket(AF_UNIX, SOCK_STREAM, 0);
+        memset(&sa_un, 0, sizeof(sa_un));
         sa_un.sun_family = AF_UNIX;
-        strcpy(sa_un.sun_path, sock_name);
+        strncpy(sa_un.sun_path, sock_name, (sizeof(sa_un.sun_path) - 1));
 
         if (connect(sock, (struct sockaddr *)&sa_un, 

trunk/wifidog/src/wdctl.h

@@ -35 +35 @@
 #define WDCTL_KILL      3
 
-/** Struct is 104 char long for unix domain socket path */
-#define MAX_SOCK_NAME_LEN 103
-
 typedef struct {
-        char    socket[MAX_SOCK_NAME_LEN];
+        char    *socket;
         int     command;
         char    *param;

trunk/wifidog/src/wdctl_thread.c

@@ -74 +74 @@
         debug(LOG_DEBUG, "Starting wdctl.");
 
+        memset(&sa_un, 0, sizeof(sa_un));
         sock_name = (char *)arg;
         debug(LOG_DEBUG, "Socket name: %s", sock_name);
 
-        /* 104 is magic */
-        if (strlen(sock_name) > 103) {
+        if (strlen(sock_name) > (sizeof(sa_un.sun_path) - 1)) {
                 /* TODO: Die handler with logging.... */
                 exit(1);
@@ -93 +93 @@
 
         debug(LOG_DEBUG, "Filling sockaddr_un");
-        strcpy(sa_un.sun_path, sock_name);
+        strcpy(sa_un.sun_path, sock_name); /* XXX No size check because we
+                                            * check a few lines before. */
         sa_un.sun_family = AF_UNIX;
         
@@ -107 +108 @@
         }
 
-        if (listen(sock, 16)) {
+        if (listen(sock, 5)) {
                 debug(LOG_ERR, "Could not listen on control socket: %s",
                                 strerror(errno));