dany/luasocket
1
0
Fork 0
mirror of https://github.com/lunarmodules/luasocket.git synced 2024-12-26 04:28:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

updated error messages, less error prone, platform independent

Browse Source
This commit is contained in:
Thijs Schreijer 2015-03-03 21:17:06 +01:00
parent 76ed24fe8a
commit d3ed08616b
3 changed files with 78 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/pierror.h Normal file
View File

@ -0,0 +1,28 @@
#ifndef PIERROR_H
#define PIERROR_H
/*=========================================================================*\
* Error messages
* Defines platform independent error messages
\*=========================================================================*/
#define PIE_HOST_NOT_FOUND "host not found"
#define PIE_ADDRINUSE "address already in use"
#define PIE_ISCONN "already connected"
#define PIE_ACCESS "permission denied"
#define PIE_CONNREFUSED "connection refused"
#define PIE_CONNABORTED "closed"
#define PIE_CONNRESET "closed"
#define PIE_TIMEDOUT "timeout"
#define PIE_AGAIN "temporary failure in name resolution"
#define PIE_BADFLAGS "invalid value for ai_flags"
#define PIE_BADHINTS "invalid value for hints"
#define PIE_FAIL "non-recoverable failure in name resolution"
#define PIE_FAMILY "ai_family not supported"
#define PIE_MEMORY "memory allocation failure"
#define PIE_NONAME "host or service not provided, or not known"
#define PIE_OVERFLOW "argument buffer overflow"
#define PIE_PROTOCOL "resolved protocol is unknown"
#define PIE_SERVICE "service not supported for socket type"
#define PIE_SOCKTYPE "ai_socktype not supported"
#endif

40
src/usocket.c
View File

@ -10,6 +10,7 @@
#include <signal.h> #include <signal.h>
#include "socket.h" #include "socket.h"
#include "pierror.h"
/*-------------------------------------------------------------------------*\ /*-------------------------------------------------------------------------*\
* Wait for readable/writable/connected socket with timeout * Wait for readable/writable/connected socket with timeout
@ -394,7 +395,7 @@ int socket_gethostbyname(const char *addr, struct hostent **hp) {
const char *socket_hoststrerror(int err) { const char *socket_hoststrerror(int err) {
if (err <= 0) return io_strerror(err); if (err <= 0) return io_strerror(err);
switch (err) { switch (err) {
case HOST_NOT_FOUND: return "host not found"; case HOST_NOT_FOUND: return PIE_HOSTNOTFOUND;
default: return hstrerror(err); default: return hstrerror(err);
} }
} }
@ -402,13 +403,13 @@ const char *socket_hoststrerror(int err) {
const char *socket_strerror(int err) { const char *socket_strerror(int err) {
if (err <= 0) return io_strerror(err); if (err <= 0) return io_strerror(err);
switch (err) { switch (err) {
case EADDRINUSE: return "address already in use"; case EADDRINUSE: return PIE_ADDRINUSE;
case EISCONN: return "already connected"; case EISCONN: return PIE_ISCONN;
case EACCES: return "permission denied"; case EACCES: return PIE_ACCESS;
case ECONNREFUSED: return "connection refused"; case ECONNREFUSED: return PIE_CONNREFUSED;
case ECONNABORTED: return "closed"; case ECONNABORTED: return PIE_CONNABORTED;
case ECONNRESET: return "closed"; case ECONNRESET: return PIE_CONNRESET;
case ETIMEDOUT: return "timeout"; case ETIMEDOUT: return PIE_TIMEDOUT;
default: return strerror(err); default: return strerror(err);
} }
} }
@ -421,22 +422,21 @@ const char *socket_ioerror(p_socket ps, int err) {
const char *socket_gaistrerror(int err) { const char *socket_gaistrerror(int err) {
if (err == 0) return NULL; if (err == 0) return NULL;
switch (err) { switch (err) {
case EAI_AGAIN: return "temporary failure in name resolution"; case EAI_AGAIN: return PIE_AGAIN;
case EAI_BADFLAGS: return "invalid value for ai_flags"; case EAI_BADFLAGS: return PIE_BADFLAGS;
#ifdef EAI_BADHINTS #ifdef EAI_BADHINTS
case EAI_BADHINTS: return "invalid value for hints"; case EAI_BADHINTS: return PIE_BADHINTS;
#endif #endif
case EAI_FAIL: return "non-recoverable failure in name resolution"; case EAI_FAIL: return PIE_FAIL;
case EAI_FAMILY: return "ai_family not supported"; case EAI_FAMILY: return PIE_FAMILY;
case EAI_MEMORY: return "memory allocation failure"; case EAI_MEMORY: return PIE_MEMORY;
case EAI_NONAME: case EAI_NONAME: return PIE_NONAME;
return "host or service not provided, or not known"; case EAI_OVERFLOW: return PIE_OVERFLOW;
case EAI_OVERFLOW: return "argument buffer overflow";
#ifdef EAI_PROTOCOL #ifdef EAI_PROTOCOL
case EAI_PROTOCOL: return "resolved protocol is unknown"; case EAI_PROTOCOL: return PIE_PROTOCOL;
#endif #endif
case EAI_SERVICE: return "service not supported for socket type"; case EAI_SERVICE: return PIE_SERVICE;
case EAI_SOCKTYPE: return "ai_socktype not supported"; case EAI_SOCKTYPE: return PIE_SOCKTYPE;
case EAI_SYSTEM: return strerror(errno); case EAI_SYSTEM: return strerror(errno);
default: return gai_strerror(err); default: return gai_strerror(err);
} }

61
src/wsocket.c
View File

@ -8,6 +8,7 @@
#include <string.h> #include <string.h>
#include "socket.h" #include "socket.h"
#include "pierror.h"
/* WinSock doesn't have a strerror... */ /* WinSock doesn't have a strerror... */
static const char *wstrerror(int err); static const char *wstrerror(int err);
@ -330,7 +331,7 @@ int socket_gethostbyname(const char *addr, struct hostent **hp) {
const char *socket_hoststrerror(int err) { const char *socket_hoststrerror(int err) {
if (err <= 0) return io_strerror(err); if (err <= 0) return io_strerror(err);
switch (err) { switch (err) {
case WSAHOST_NOT_FOUND: return "host not found"; case WSAHOST_NOT_FOUND: return PIE_HOST_NOT_FOUND;
default: return wstrerror(err); default: return wstrerror(err);
} }
} }
@ -338,13 +339,13 @@ const char *socket_hoststrerror(int err) {
const char *socket_strerror(int err) { const char *socket_strerror(int err) {
if (err <= 0) return io_strerror(err); if (err <= 0) return io_strerror(err);
switch (err) { switch (err) {
case WSAEADDRINUSE: return "address already in use"; case WSAEADDRINUSE: return PIE_ADDRINUSE;
case WSAECONNREFUSED: return "connection refused"; case WSAECONNREFUSED : return PIE_CONNREFUSED;
case WSAEISCONN: return "already connected"; case WSAEISCONN: return PIE_ISCONN;
case WSAEACCES: return "permission denied"; case WSAEACCES: return PIE_ACCESS;
case WSAECONNABORTED: return "closed"; case WSAECONNABORTED: return PIE_CONNABORTED;
case WSAECONNRESET: return "closed"; case WSAECONNRESET: return PIE_CONNRESET;
case WSAETIMEDOUT: return "timeout"; case WSAETIMEDOUT: return PIE_TIMEDOUT;
default: return wstrerror(err); default: return wstrerror(err);
} }
} }
@ -357,7 +358,7 @@ const char *socket_ioerror(p_socket ps, int err) {
static const char *wstrerror(int err) { static const char *wstrerror(int err) {
switch (err) { switch (err) {
case WSAEINTR: return "Interrupted function call"; case WSAEINTR: return "Interrupted function call";
case WSAEACCES: return "Permission denied"; case WSAEACCES: return PIE_ACCESS; // "Permission denied";
case WSAEFAULT: return "Bad address"; case WSAEFAULT: return "Bad address";
case WSAEINVAL: return "Invalid argument"; case WSAEINVAL: return "Invalid argument";
case WSAEMFILE: return "Too many open files"; case WSAEMFILE: return "Too many open files";
@ -370,24 +371,23 @@ static const char *wstrerror(int err) {
case WSAEPROTOTYPE: return "Protocol wrong type for socket"; case WSAEPROTOTYPE: return "Protocol wrong type for socket";
case WSAENOPROTOOPT: return "Bad protocol option"; case WSAENOPROTOOPT: return "Bad protocol option";
case WSAEPROTONOSUPPORT: return "Protocol not supported"; case WSAEPROTONOSUPPORT: return "Protocol not supported";
case WSAESOCKTNOSUPPORT: return "Socket type not supported"; case WSAESOCKTNOSUPPORT: return PIE_SOCKTYPE; // "Socket type not supported";
case WSAEOPNOTSUPP: return "Operation not supported"; case WSAEOPNOTSUPP: return "Operation not supported";
case WSAEPFNOSUPPORT: return "Protocol family not supported"; case WSAEPFNOSUPPORT: return "Protocol family not supported";
case WSAEAFNOSUPPORT: case WSAEAFNOSUPPORT: return PIE_FAMILY; // "Address family not supported by protocol family";
return "Address family not supported by protocol family"; case WSAEADDRINUSE: return PIE_ADDRINUSE; // "Address already in use";
case WSAEADDRINUSE: return "Address already in use";
case WSAEADDRNOTAVAIL: return "Cannot assign requested address"; case WSAEADDRNOTAVAIL: return "Cannot assign requested address";
case WSAENETDOWN: return "Network is down"; case WSAENETDOWN: return "Network is down";
case WSAENETUNREACH: return "Network is unreachable"; case WSAENETUNREACH: return "Network is unreachable";
case WSAENETRESET: return "Network dropped connection on reset"; case WSAENETRESET: return "Network dropped connection on reset";
case WSAECONNABORTED: return "Software caused connection abort"; case WSAECONNABORTED: return "Software caused connection abort";
case WSAECONNRESET: return "Connection reset by peer"; case WSAECONNRESET: return PIE_CONNRESET; // "Connection reset by peer";
case WSAENOBUFS: return "No buffer space available"; case WSAENOBUFS: return "No buffer space available";
case WSAEISCONN: return "Socket is already connected"; case WSAEISCONN: return PIE_ISCONN; // "Socket is already connected";
case WSAENOTCONN: return "Socket is not connected"; case WSAENOTCONN: return "Socket is not connected";
case WSAESHUTDOWN: return "Cannot send after socket shutdown"; case WSAESHUTDOWN: return "Cannot send after socket shutdown";
case WSAETIMEDOUT: return "Connection timed out"; case WSAETIMEDOUT: return PIE_TIMEDOUT; // "Connection timed out";
case WSAECONNREFUSED: return "Connection refused"; case WSAECONNREFUSED: return PIE_CONNREFUSED; // "Connection refused";
case WSAEHOSTDOWN: return "Host is down"; case WSAEHOSTDOWN: return "Host is down";
case WSAEHOSTUNREACH: return "No route to host"; case WSAEHOSTUNREACH: return "No route to host";
case WSAEPROCLIM: return "Too many processes"; case WSAEPROCLIM: return "Too many processes";
@ -396,9 +396,9 @@ static const char *wstrerror(int err) {
case WSANOTINITIALISED: case WSANOTINITIALISED:
return "Successful WSAStartup not yet performed"; return "Successful WSAStartup not yet performed";
case WSAEDISCON: return "Graceful shutdown in progress"; case WSAEDISCON: return "Graceful shutdown in progress";
case WSAHOST_NOT_FOUND: return "Host not found"; case WSAHOST_NOT_FOUND: return PIE_HOST_NOT_FOUND; // "Host not found";
case WSATRY_AGAIN: return "Nonauthoritative host not found"; case WSATRY_AGAIN: return "Nonauthoritative host not found";
case WSANO_RECOVERY: return "Nonrecoverable name lookup error"; case WSANO_RECOVERY: return PIE_FAIL; // "Nonrecoverable name lookup error";
case WSANO_DATA: return "Valid name, no data record of requested type"; case WSANO_DATA: return "Valid name, no data record of requested type";
default: return "Unknown error"; default: return "Unknown error";
} }
@ -407,24 +407,23 @@ static const char *wstrerror(int err) {
const char *socket_gaistrerror(int err) { const char *socket_gaistrerror(int err) {
if (err == 0) return NULL; if (err == 0) return NULL;
switch (err) { switch (err) {
case EAI_AGAIN: return "temporary failure in name resolution"; case EAI_AGAIN: return PIE_AGAIN;
case EAI_BADFLAGS: return "invalid value for ai_flags"; case EAI_BADFLAGS: return PIE_BADFLAGS;
#ifdef EAI_BADHINTS #ifdef EAI_BADHINTS
case EAI_BADHINTS: return "invalid value for hints"; case EAI_BADHINTS: return PIE_BADHINTS;
#endif #endif
case EAI_FAIL: return "non-recoverable failure in name resolution"; case EAI_FAIL: return PIE_FAIL;
case EAI_FAMILY: return "ai_family not supported"; case EAI_FAMILY: return PIE_FAMILY;
case EAI_MEMORY: return "memory allocation failure"; case EAI_MEMORY: return PIE_MEMORY;
case EAI_NONAME: case EAI_NONAME: return PIE_NONAME;
return "host or service not provided, or not known";
#ifdef EAI_OVERFLOW #ifdef EAI_OVERFLOW
case EAI_OVERFLOW: return "argument buffer overflow"; case EAI_OVERFLOW: return PIE_OVERFLOW;
#endif #endif
#ifdef EAI_PROTOCOL #ifdef EAI_PROTOCOL
case EAI_PROTOCOL: return "resolved protocol is unknown"; case EAI_PROTOCOL: return PIE_PROTOCOL;
#endif #endif
case EAI_SERVICE: return "service not supported for socket type"; case EAI_SERVICE: return PIE_SERVICE;
case EAI_SOCKTYPE: return "ai_socktype not supported"; case EAI_SOCKTYPE: return PIE_SOCKTYPE;
#ifdef EAI_SYSTEM #ifdef EAI_SYSTEM
case EAI_SYSTEM: return strerror(errno); case EAI_SYSTEM: return strerror(errno);
#endif #endif