Changeset 11df21

Timestamp:

09/29/08 10:16:31 (4 years ago)

Author:

Tomash Brechko <tomash.brechko@…>

Branches:

master

Children:

46fd4a

Parents:

6fee7e

git-author:

Tomash Brechko <tomash.brechko@…> (09/27/08 17:47:23)

git-committer:

Tomash Brechko <tomash.brechko@…> (09/29/08 10:16:31)

Message:

Prepare the code for Win32 support.

Files:

• MANIFEST (modified) (1 diff)
• src/client.c (modified) (1 diff)
• src/connect.c (modified) (5 diffs)
• src/socket_posix.c (added)
• src/socket_posix.h (added)

MANIFEST

@@ -34 +34 @@
 src/dispatch_key.c
 src/dispatch_key.h
+src/socket_posix.c
+src/socket_posix.h

src/client.c

@@ -28 +28 @@
 #include "dispatch_key.h"
 #include <stdlib.h>
-#include <unistd.h>
-#include <sys/uio.h>
 #include <string.h>
 #include <stdio.h>
-#include <errno.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+#include <sys/uio.h>
 #include <signal.h>
 #include <time.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
+#include "socket_posix.h"
 
 

src/connect.c

@@ -1 +1 @@
 /*
-  Copyright (C) 2007 Tomash Brechko.  All rights reserved.
+  Copyright (C) 2007-2008 Tomash Brechko.  All rights reserved.
 
   When used to build Perl module:
@@ -23 +23 @@
 
 #include "connect.h"
+#include <string.h>
 #include <netdb.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-
-
-/*
-  http://www.opengroup.org/onlinepubs/009695399/basedefs/sys/un.h.html
-  says 92 is a rather safe value.
-*/
-#define SAFE_UNIX_PATH_MAX  92
+#include "socket_posix.h"
 
 
@@ -71 +58 @@
   for (a = addr; a != NULL; a = a->ai_next)
     {
-      int flags;
       fd_set write_set;
       int socket_error;
@@ -80 +66 @@
         break;
 
-      flags = fcntl(fd, F_GETFL);
-      res = fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+      res = set_nonblock(fd);
       if (res != 0)
         {
@@ -137 +122 @@
 client_connect_unix(const char *path, size_t path_len)
 {
-  int fd, res, flags;
-  struct sockaddr_un s_unix;
-
-  if (path_len >= SAFE_UNIX_PATH_MAX)
-    return -1;
-
-  fd = socket(PF_UNIX, SOCK_STREAM, 0);
-  if (fd == -1)
-    return -1;
-
-  s_unix.sun_family = AF_UNIX;
-  memcpy(s_unix.sun_path, path, path_len);
-  s_unix.sun_path[path_len] = '\0';
-
-  res = connect(fd, (const struct sockaddr *) &s_unix, sizeof(s_unix));
-  if (res != 0)
-    return -1;
-
-  flags = fcntl(fd, F_GETFL);
-  res = fcntl(fd, F_SETFL, flags | O_NONBLOCK);
-  if (res != 0)
-    return -1;
-
-  return fd;
+  return connect_unix(path, path_len);
 }