Changeset 46 in libcf for trunk/include/cf_socket.h

Timestamp:

03/29/13 14:40:25 (11 years ago)

Author:

cheese

Message:

#1 change timeout mechanism from setting socket option to using select

File:

• trunk/include/cf_socket.h (modified) (2 diffs)

trunk/include/cf_socket.h

@@ -13 +13 @@
 
 #include "cf_base.h"
+
 #include <stddef.h>
 
-#ifdef _WIN32
-# include <WinSock2.h>
-#else
-# include <netinet/in.h>
-# include <sys/socket.h>
-# include <arpa/inet.h>
-# include <netdb.h>
-# include <unistd.h>
-#endif
+/** 타임아웃을 설정하지 않음 */
+#define CF_SOCKET_NO_TIMEOUT        -1
 
-#ifdef _WIN32
-typedef int socklen_t;
-#endif // #ifdef _WIN32
+/** 호스트 정보 */
+typedef struct cf_socket_hostinfo {
+    char            address[128];   /**< 원격 호스트 주소 */
+    unsigned short  port;           /**< 원격 호스트 포트 */
+} CF_Socket_HostInfo;
 
 #ifdef __cplusplus
@@ -34 +30 @@
 
 CF_EXPORT CF_BOOL
-CF_Socket_IsInitialized (void);
+CF_Socket_IsInitialized     (void);
 
 CF_EXPORT int
-CF_Socket_Initialize    (void);
+CF_Socket_Initialize        (void);
 
 CF_EXPORT int
-CF_Socket_Finalize      (void);
+CF_Socket_Finalize          (void);
 
 CF_EXPORT int
-CF_Socket_Close         (const int sock);
+CF_Socket_Close             (const int sock);
 
 CF_EXPORT int
-CF_Socket_SetOption     (const int      sock,
-                         const int      optname,
-                         const void     * optval,
-                         const size_t   optlen);
+CF_Socket_SetOption         (const int      sock,
+                             const int      optname,
+                             const void     * optval,
+                             const size_t   optlen);
 
 CF_EXPORT int
-CF_Socket_GetOption     (const int  sock,
-                         const int  optname,
-                         void       * optval,
-                         size_t     * optlen);
+CF_Socket_GetOption         (const int  sock,
+                             const int  optname,
+                             void       * optval,
+                             size_t     * optlen);
 
 CF_EXPORT int
-CF_Socket_SetTimeout    (const int  sock,
-                         const int  timeout);
+CF_Socket_Connect           (const char             * ip,
+                             const unsigned short   port);
 
 CF_EXPORT int
-CF_Socket_Connect       (const char             * ip,
-                         const unsigned short   port);
+CF_Socket_ConnectTimeout    (const char             * ip,
+                             const unsigned short   port,
+                             const int              timeout);
 
 CF_EXPORT int
-CF_Socket_Server        (const unsigned short   port,
-                         const int              backlog);
+CF_Socket_Server            (const unsigned short   port,
+                             const int              backlog);
 
 CF_EXPORT int
-CF_Socket_Accept        (const int          sock,
-                         struct sockaddr_in * address);
+CF_Socket_Accept            (const int          sock,
+                             CF_Socket_HostInfo * host);
 
 CF_EXPORT int
-CF_Socket_Send          (const int  sock,
-                         const void * buf,
-                         const int  len);
+CF_Socket_Send              (const int  sock,
+                             const void * buf,
+                             const int  len);
 
 CF_EXPORT int
-CF_Socket_Recv          (const int  sock,
-                         void       * buf,
-                         const int  len);
+CF_Socket_SendTimeout       (const int  sock,
+                             const void * buf,
+                             const int  len,
+                             const int  timeout);
+
+CF_EXPORT int
+CF_Socket_Recv              (const int  sock,
+                             void       * buf,
+                             const int  len);
+
+CF_EXPORT int
+CF_Socket_RecvTimeout       (const int  sock,
+                             void       * buf,
+                             const int  len,
+                             const int  timeout);
 
 #ifdef __cplusplus