hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added os2 nwio

Browse Source
This commit is contained in:
hyung-hwan
2012-05-01 01:36:18 +00:00
parent 3e4194cca8
commit 77f384498d
1 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
qse/lib/cmn/nwio.c
View File

@ -30,8 +30,9 @@
# include <sys/socket.h> # include <sys/socket.h>
# include <netinet/in.h> # include <netinet/in.h>
# include <nerrno.h> # include <nerrno.h>
# pragma library("tcpip32.lib")
#elif defined(__DOS__) #elif defined(__DOS__)
/* TODO: */ /* TODO: consider watt-32 */
#else #else
# include "syscall.h" # include "syscall.h"
# include <sys/socket.h> # include <sys/socket.h>
@ -45,6 +46,12 @@ enum
STATUS_UDP_CONNECT = (1 << 0) STATUS_UDP_CONNECT = (1 << 0)
}; };
static qse_ssize_t socket_output (
qse_tio_t* tio, qse_tio_cmd_t cmd, void* buf, qse_size_t size);
static qse_ssize_t socket_input (
qse_tio_t* tio, qse_tio_cmd_t cmd, void* buf, qse_size_t size);
#if defined(AF_INET)
union sockaddr_t union sockaddr_t
{ {
struct sockaddr_in in4; struct sockaddr_in in4;
@ -52,12 +59,7 @@ union sockaddr_t
struct sockaddr_in6 in6; struct sockaddr_in6 in6;
#endif #endif
}; };
#endif
static qse_ssize_t socket_input (
qse_tio_t* tio, qse_tio_cmd_t cmd, void* buf, qse_size_t size);
static qse_ssize_t socket_output (
qse_tio_t* tio, qse_tio_cmd_t cmd, void* buf, qse_size_t size);
static int nwad_to_sockaddr (const qse_nwad_t* nwad, int* family, void* addr) static int nwad_to_sockaddr (const qse_nwad_t* nwad, int* family, void* addr)
{ {
@ -67,6 +69,7 @@ static int nwad_to_sockaddr (const qse_nwad_t* nwad, int* family, void* addr)
{ {
case QSE_NWAD_IN4: case QSE_NWAD_IN4:
{ {
#if defined(AF_INET)
struct sockaddr_in* in; struct sockaddr_in* in;
in = (struct sockaddr_in*)addr; in = (struct sockaddr_in*)addr;
@ -77,6 +80,7 @@ static int nwad_to_sockaddr (const qse_nwad_t* nwad, int* family, void* addr)
in->sin_family = AF_INET; in->sin_family = AF_INET;
in->sin_addr.s_addr = nwad->u.in4.addr.value; in->sin_addr.s_addr = nwad->u.in4.addr.value;
in->sin_port = nwad->u.in4.port; in->sin_port = nwad->u.in4.port;
#endif
break; break;
} }
@ -170,27 +174,8 @@ static qse_nwio_errnum_t syserr_to_errnum (int e)
#elif defined(__DOS__) #elif defined(__DOS__)
static qse_nwio_errnum_t syserr_to_errnum (int e) static qse_nwio_errnum_t syserr_to_errnum (int e)
{ {
switch (e) /* TODO: */
{
case ENOMEM:
return QSE_NWIO_ENOMEM;
case EINVAL:
return QSE_NWIO_EINVAL;
case EACCES:
return QSE_NWIO_EACCES;
case ENOENT:
return QSE_NWIO_ENOENT;
case EEXIST:
return QSE_NWIO_EEXIST;
default:
return QSE_NWIO_ESYSERR; return QSE_NWIO_ESYSERR;
}
} }
#else #else
static qse_nwio_errnum_t syserr_to_errnum (int e) static qse_nwio_errnum_t syserr_to_errnum (int e)
@ -289,8 +274,10 @@ void qse_nwio_close (qse_nwio_t* nwio)
int qse_nwio_init ( int qse_nwio_init (
qse_nwio_t* nwio, qse_mmgr_t* mmgr, const qse_nwad_t* nwad, int flags) qse_nwio_t* nwio, qse_mmgr_t* mmgr, const qse_nwad_t* nwad, int flags)
{ {
#if defined(AF_INET)
union sockaddr_t addr; union sockaddr_t addr;
#ifdef HAVE_SOCKLEN_T #endif
#if defined(HAVE_SOCKLEN_T)
socklen_t addrlen; socklen_t addrlen;
#else #else
int addrlen; int addrlen;
@ -303,6 +290,7 @@ int qse_nwio_init (
nwio->flags = flags; nwio->flags = flags;
nwio->errnum = QSE_NWIO_ENOERR; nwio->errnum = QSE_NWIO_ENOERR;
#if defined(AF_INET)
tmp = nwad_to_sockaddr (nwad, &family, &addr); tmp = nwad_to_sockaddr (nwad, &family, &addr);
if (tmp <= -1) if (tmp <= -1)
{ {
@ -314,6 +302,7 @@ int qse_nwio_init (
if (flags & QSE_NWIO_TCP) type = SOCK_STREAM; if (flags & QSE_NWIO_TCP) type = SOCK_STREAM;
else if (flags & QSE_NWIO_UDP) type = SOCK_DGRAM; else if (flags & QSE_NWIO_UDP) type = SOCK_DGRAM;
else else
#endif
{ {
nwio->errnum = QSE_NWIO_EINVAL; nwio->errnum = QSE_NWIO_EINVAL;
return -1; return -1;
@ -711,7 +700,7 @@ reread:
if (nwio->status & STATUS_UDP_CONNECT) if (nwio->status & STATUS_UDP_CONNECT)
{ {
union sockaddr_t addr; union sockaddr_t addr;
#ifdef HAVE_SOCKLEN_T #if defined(HAVE_SOCKLEN_T)
socklen_t addrlen; socklen_t addrlen;
#else #else
int addrlen; int addrlen;