dany/luasocket
1
0
Fork 0
mirror of https://github.com/lunarmodules/luasocket.git synced 2025-04-06 00:46:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make the API more accessible by publishing constants

Browse Source
This commit is contained in:
Jonas Wielicki 2013-07-31 14:25:23 +02:00 committed by Thijs
parent e178b1e018
commit 26fd89be84
9 changed files with 85 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/buffer.h
View File

@ -18,6 +18,7 @@
#include "luasocket.h"
#include "io.h"
#include "timeout.h"
#include "common.h"
/* buffer size in bytes */
#define BUF_SIZE 8192
@ -37,13 +38,13 @@ typedef t_buffer *p_buffer;
#pragma GCC visibility push(hidden)
#endif
int buffer_open(lua_State *L);
void buffer_init(p_buffer buf, p_io io, p_timeout tm);
int buffer_meth_getstats(lua_State *L, p_buffer buf);
int buffer_meth_setstats(lua_State *L, p_buffer buf);
int buffer_meth_send(lua_State *L, p_buffer buf);
int buffer_meth_receive(lua_State *L, p_buffer buf);
int buffer_isempty(p_buffer buf);
LUASOCKET_API int buffer_open(lua_State *L);
LUASOCKET_API void buffer_init(p_buffer buf, p_io io, p_timeout tm);
LUASOCKET_API int buffer_meth_getstats(lua_State *L, p_buffer buf);
LUASOCKET_API int buffer_meth_setstats(lua_State *L, p_buffer buf);
LUASOCKET_API int buffer_meth_send(lua_State *L, p_buffer buf);
LUASOCKET_API int buffer_meth_receive(lua_State *L, p_buffer buf);
LUASOCKET_API int buffer_isempty(p_buffer buf);
#ifndef _WIN32
#pragma GCC visibility pop

16
src/common.h Normal file
View File

@ -0,0 +1,16 @@
#ifndef LUASOCKET_COMMON_H
#define LUASOCKET_COMMON_H
#ifndef LUASOCKET_API
#define LUASOCKET_API extern
#endif
#ifndef UNIX_API
#define UNIX_API extern
#endif
#ifndef MIME_API
#define MIME_API extern
#endif
#endif

5
src/io.h
View File

@ -14,6 +14,7 @@
\*=========================================================================*/
#include "luasocket.h"
#include "timeout.h"
#include "common.h"
/* IO error codes */
enum {
@ -60,8 +61,8 @@ typedef t_io *p_io;
#pragma GCC visibility push(hidden)
#endif
void io_init(p_io io, p_send send, p_recv recv, p_error error, void *ctx);
const char *io_strerror(int err);
LUASOCKET_API void io_init(p_io io, p_send send, p_recv recv, p_error error, void *ctx);
LUASOCKET_API const char *io_strerror(int err);
#ifndef _WIN32
#pragma GCC visibility pop

51
src/socket.h
View File

@ -10,6 +10,7 @@
* creates a interface compatible with the io.h module.
\*=========================================================================*/
#include "io.h"
#include "common.h"
/*=========================================================================*\
* Platform specific compatibilization
@ -40,31 +41,31 @@ typedef struct sockaddr SA;
#pragma GCC visibility push(hidden)
#endif
int socket_waitfd(p_socket ps, int sw, p_timeout tm);
int socket_open(void);
int socket_close(void);
void socket_destroy(p_socket ps);
int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds, p_timeout tm);
int socket_create(p_socket ps, int domain, int type, int protocol);
int socket_bind(p_socket ps, SA *addr, socklen_t addr_len);
int socket_listen(p_socket ps, int backlog);
void socket_shutdown(p_socket ps, int how);
int socket_connect(p_socket ps, SA *addr, socklen_t addr_len, p_timeout tm);
int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *addr_len, p_timeout tm);
int socket_send(p_socket ps, const char *data, size_t count, size_t *sent, p_timeout tm);
int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent, SA *addr, socklen_t addr_len, p_timeout tm);
int socket_recv(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm);
int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got, SA *addr, socklen_t *addr_len, p_timeout tm);
int socket_write(p_socket ps, const char *data, size_t count, size_t *sent, p_timeout tm);
int socket_read(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm);
void socket_setblocking(p_socket ps);
void socket_setnonblocking(p_socket ps);
int socket_gethostbyaddr(const char *addr, socklen_t len, struct hostent **hp);
int socket_gethostbyname(const char *addr, struct hostent **hp);
const char *socket_hoststrerror(int err);
const char *socket_strerror(int err);
const char *socket_ioerror(p_socket ps, int err);
const char *socket_gaistrerror(int err);
LUASOCKET_API int socket_waitfd(p_socket ps, int sw, p_timeout tm);
LUASOCKET_API int socket_open(void);
LUASOCKET_API int socket_close(void);
LUASOCKET_API void socket_destroy(p_socket ps);
LUASOCKET_API int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds, p_timeout tm);
LUASOCKET_API int socket_create(p_socket ps, int domain, int type, int protocol);
LUASOCKET_API int socket_bind(p_socket ps, SA *addr, socklen_t addr_len);
LUASOCKET_API int socket_listen(p_socket ps, int backlog);
LUASOCKET_API void socket_shutdown(p_socket ps, int how);
LUASOCKET_API int socket_connect(p_socket ps, SA *addr, socklen_t addr_len, p_timeout tm);
LUASOCKET_API int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *addr_len, p_timeout tm);
LUASOCKET_API int socket_send(p_socket ps, const char *data, size_t count, size_t *sent, p_timeout tm);
LUASOCKET_API int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent, SA *addr, socklen_t addr_len, p_timeout tm);
LUASOCKET_API int socket_recv(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm);
LUASOCKET_API int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got, SA *addr, socklen_t *addr_len, p_timeout tm);
LUASOCKET_API int socket_write(p_socket ps, const char *data, size_t count, size_t *sent, p_timeout tm);
LUASOCKET_API int socket_read(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm);
LUASOCKET_API void socket_setblocking(p_socket ps);
LUASOCKET_API void socket_setnonblocking(p_socket ps);
LUASOCKET_API int socket_gethostbyaddr(const char *addr, socklen_t len, struct hostent **hp);
LUASOCKET_API int socket_gethostbyname(const char *addr, struct hostent **hp);
LUASOCKET_API const char *socket_hoststrerror(int err);
LUASOCKET_API const char *socket_strerror(int err);
LUASOCKET_API const char *socket_ioerror(p_socket ps, int err);
LUASOCKET_API const char *socket_gaistrerror(int err);
#ifndef _WIN32
#pragma GCC visibility pop

19
src/timeout.h
View File

@ -5,6 +5,7 @@
* LuaSocket toolkit
\*=========================================================================*/
#include "luasocket.h"
#include "common.h"
/* timeout control structure */
typedef struct t_timeout_ {
@ -18,18 +19,18 @@ typedef t_timeout *p_timeout;
#pragma GCC visibility push(hidden)
#endif
void timeout_init(p_timeout tm, double block, double total);
double timeout_get(p_timeout tm);
double timeout_getstart(p_timeout tm);
double timeout_getretry(p_timeout tm);
p_timeout timeout_markstart(p_timeout tm);
LUASOCKET_API void timeout_init(p_timeout tm, double block, double total);
LUASOCKET_API double timeout_get(p_timeout tm);
LUASOCKET_API double timeout_getstart(p_timeout tm);
LUASOCKET_API double timeout_getretry(p_timeout tm);
LUASOCKET_API p_timeout timeout_markstart(p_timeout tm);
double timeout_gettime(void);
LUASOCKET_API double timeout_gettime(void);
int timeout_open(lua_State *L);
LUASOCKET_API int timeout_open(lua_State *L);
int timeout_meth_settimeout(lua_State *L, p_timeout tm);
int timeout_meth_gettimeout(lua_State *L, p_timeout tm);
LUASOCKET_API int timeout_meth_settimeout(lua_State *L, p_timeout tm);
LUASOCKET_API int timeout_meth_gettimeout(lua_State *L, p_timeout tm);
#ifndef _WIN32
#pragma GCC visibility pop

6
src/usocket.c
View File

@ -20,9 +20,6 @@
#ifndef SOCKET_SELECT
#include <sys/poll.h>
#define WAITFD_R POLLIN
#define WAITFD_W POLLOUT
#define WAITFD_C (POLLIN|POLLOUT)
int socket_waitfd(p_socket ps, int sw, p_timeout tm) {
int ret;
struct pollfd pfd;
@ -41,9 +38,6 @@ int socket_waitfd(p_socket ps, int sw, p_timeout tm) {
}
#else
#define WAITFD_R 1
#define WAITFD_W 2
#define WAITFD_C (WAITFD_R|WAITFD_W)
int socket_waitfd(p_socket ps, int sw, p_timeout tm) {
int ret;

16
src/usocket.h
View File

@ -56,4 +56,20 @@ typedef struct sockaddr_storage t_sockaddr_storage;
#define SOCKET_INVALID (-1)
#ifndef SOCKET_SELECT
#include <sys/poll.h>
#define WAITFD_R POLLIN
#define WAITFD_W POLLOUT
#define WAITFD_C (POLLIN|POLLOUT)
#else
#define WAITFD_R 1
#define WAITFD_W 2
#define WAITFD_C (WAITFD_R|WAITFD_W)
#endif
#endif /* USOCKET_H */

4
src/wsocket.c
View File

@ -42,10 +42,6 @@ int socket_close(void) {
/*-------------------------------------------------------------------------*\
* Wait for readable/writable/connected socket with timeout
\*-------------------------------------------------------------------------*/
#define WAITFD_R 1
#define WAITFD_W 2
#define WAITFD_E 4
#define WAITFD_C (WAITFD_E|WAITFD_W)
int socket_waitfd(p_socket ps, int sw, p_timeout tm) {
int ret;

5
src/wsocket.h
View File

@ -30,4 +30,9 @@ typedef t_socket *p_socket;
#define AI_NUMERICSERV (0)
#endif
#define WAITFD_R 1
#define WAITFD_W 2
#define WAITFD_E 4
#define WAITFD_C (WAITFD_E|WAITFD_W)
#endif /* WSOCKET_H */