Changeset 165

Timestamp:

08/03/04 17:15:01 (9 years ago)

Author:

alexcv

Message:

replaced magic constant with correct computed value

Location:

trunk/wifidog/src

Files:

• wdctl.c (modified) (1 diff)
• wdctl_thread.c (modified) (1 diff)

trunk/wifidog/src/wdctl.c

@@ -153 +153 @@
         sa_un.sun_family = AF_UNIX;
         strcpy(sa_un.sun_path, sock_name);
-        /* XXX Again, the + 2 is magical on OS X.... */
+
         if (connect(sock, (struct sockaddr *)&sa_un, 
-                                strlen(sa_un.sun_path) + 2)) {
+                        strlen(sa_un.sun_path) + sizeof(sa_un.sun_family))) {
                 fprintf(stderr, "wdctl: Error: %s\n", strerror(errno));
                 exit(1);

trunk/wifidog/src/wdctl_thread.c

@@ -98 +98 @@
         debug(LOG_DEBUG, "Binding socket (%s) (%d)", sa_un.sun_path,
                         strlen(sock_name));
+        
         /* Which to use, AF_UNIX, PF_UNIX, AF_LOCAL, PF_LOCAL? */
-        /* XXX That +2 seems to be needed in OS X. Not sure why. */
-        if (bind(sock, (struct sockaddr *)&sa_un, strlen(sock_name) + 2)) {
+        if (bind(sock, (struct sockaddr *)&sa_un, strlen(sock_name) 
+                                + sizeof(sa_un.sun_family))) {
                 debug(LOG_ERR, "Could not bind control socket: %s",
                                 strerror(errno));