Changeset 53 in libcf

Timestamp:

04/03/13 17:13:09 (11 years ago)

Author:

cheese

Message:

#1 remove structure for remote host information interface from socket

Location:

trunk

Files:

• include/cf_socket.h (modified) (2 diffs)
• src/cf_debug.c (modified) (3 diffs)
• src/cf_socket.c (modified) (2 diffs)
• test/socket_server.c (modified) (1 diff)

trunk/include/cf_socket.h

@@ -18 +18 @@
 /** 타임아웃을 설정하지 않음 */
 #define CF_SOCKET_NO_TIMEOUT        -1
-
-/** 호스트 정보 */
-typedef struct cf_socket_hostinfo {
-    char            address[128];   /**< 원격 호스트 주소 */
-    unsigned short  port;           /**< 원격 호스트 포트 */
-} CF_Socket_HostInfo;
 
 #ifdef __cplusplus
@@ -67 +61 @@
 
 CF_EXPORT int
-CF_Socket_Accept            (const int          sock,
-                             CF_Socket_HostInfo * host);
+CF_Socket_Accept            (const int sock);
 
 CF_EXPORT int

trunk/src/cf_debug.c

@@ -38 +38 @@
 typedef void *  CF_Debug_Ctx;
 
-/**
+/* *
  * 콜스택 데이터
  * 
@@ -44 +44 @@
  */
 typedef struct cf_debug_callStack {
-    char    file[NAME_LENGTH + 1];      /**< 파일 이름 */
-    char    function[NAME_LENGTH + 1];  /**< 함수 이름 */
-    int     line;                       /**< 라인 넘버 */
+    char    file[NAME_LENGTH + 1];      /* *< 파일 이름 */
+    char    function[NAME_LENGTH + 1];  /* *< 함수 이름 */
+    int     line;                       /* *< 라인 넘버 */
 } CF_Debug_CallStack;
 
@@ -412 +412 @@
         return CF_ERROR_DEBUG_INVALID_CTX;
 
-    for (callstack = ctx->callstack.caller ; callstack ; callstack = callstack->caller)
+    for ( callstack = ctx->callstack.caller
+        ; callstack
+        ; callstack = callstack->caller)
     {
         fprintf (fp, "#%-4d %s <%s:%d>\n",

trunk/src/cf_socket.c

@@ -482 +482 @@
  *
  * @param sock  서버 소켓
- * @param host  [옵션] 클라이언트 정보를 담을 CF_Socket_HostInfo 구조체 포인터
  *
  * @see CF_Socket_HostInfo
  */
 int
-CF_Socket_Accept (const int             sock,
-                  CF_Socket_HostInfo    * host)
+CF_Socket_Accept (const int sock)
 {
     int                 sockClient = 0;
@@ -499 +497 @@
     if (sockClient < 0)
         return CF_ERROR_SOCKET_ACCEPT;
-
-    if (host != NULL)
-    {
-        snprintf (host->address, sizeof (host->address) - 1,
-                  "%s",
-                  inet_ntoa (address.sin_addr));
-        host->port = ntohs (address.sin_port);
-    }
 
     return sockClient;

trunk/test/socket_server.c

@@ -22 +22 @@
     }
 
-    clntsock = CF_Socket_Accept (srvsock, NULL);
+    clntsock = CF_Socket_Accept (srvsock);
     if (clntsock < 0) {
         fprintf (stderr, "error : accept (%d)\n", clntsock);