aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Nehab <diego@impa.br>2015-03-03 19:20:13 -0300
committerDiego Nehab <diego@impa.br>2015-03-03 19:20:13 -0300
commit863a54cbaf7f9ca4ceb4cdcc7f99f18713fa5199 (patch)
tree9fbab852261ef92747bbd6dfcad9f39e9ca59bbe
parent892ea1791a2f2ec24c087f7bf4c9b2b8126327e0 (diff)
downloadluasocket-863a54cbaf7f9ca4ceb4cdcc7f99f18713fa5199.tar.gz
luasocket-863a54cbaf7f9ca4ceb4cdcc7f99f18713fa5199.tar.bz2
luasocket-863a54cbaf7f9ca4ceb4cdcc7f99f18713fa5199.zip
Fix cut-paste typo on PIE_HOST_NOT_FOUND.
-rw-r--r--src/usocket.c60
1 files changed, 30 insertions, 30 deletions
diff --git a/src/usocket.c b/src/usocket.c
index 0a0f5f9..99e551b 100644
--- a/src/usocket.c
+++ b/src/usocket.c
@@ -4,9 +4,9 @@
4* 4*
5* The code is now interrupt-safe. 5* The code is now interrupt-safe.
6* The penalty of calling select to avoid busy-wait is only paid when 6* The penalty of calling select to avoid busy-wait is only paid when
7* the I/O call fail in the first place. 7* the I/O call fail in the first place.
8\*=========================================================================*/ 8\*=========================================================================*/
9#include <string.h> 9#include <string.h>
10#include <signal.h> 10#include <signal.h>
11 11
12#include "socket.h" 12#include "socket.h"
@@ -73,7 +73,7 @@ int socket_waitfd(p_socket ps, int sw, p_timeout tm) {
73 73
74 74
75/*-------------------------------------------------------------------------*\ 75/*-------------------------------------------------------------------------*\
76* Initializes module 76* Initializes module
77\*-------------------------------------------------------------------------*/ 77\*-------------------------------------------------------------------------*/
78int socket_open(void) { 78int socket_open(void) {
79 /* instals a handler to ignore sigpipe or it will crash us */ 79 /* instals a handler to ignore sigpipe or it will crash us */
@@ -82,7 +82,7 @@ int socket_open(void) {
82} 82}
83 83
84/*-------------------------------------------------------------------------*\ 84/*-------------------------------------------------------------------------*\
85* Close module 85* Close module
86\*-------------------------------------------------------------------------*/ 86\*-------------------------------------------------------------------------*/
87int socket_close(void) { 87int socket_close(void) {
88 return 1; 88 return 1;
@@ -101,7 +101,7 @@ void socket_destroy(p_socket ps) {
101/*-------------------------------------------------------------------------*\ 101/*-------------------------------------------------------------------------*\
102* Select with timeout control 102* Select with timeout control
103\*-------------------------------------------------------------------------*/ 103\*-------------------------------------------------------------------------*/
104int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds, 104int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds,
105 p_timeout tm) { 105 p_timeout tm) {
106 int ret; 106 int ret;
107 do { 107 do {
@@ -120,8 +120,8 @@ int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds,
120\*-------------------------------------------------------------------------*/ 120\*-------------------------------------------------------------------------*/
121int socket_create(p_socket ps, int domain, int type, int protocol) { 121int socket_create(p_socket ps, int domain, int type, int protocol) {
122 *ps = socket(domain, type, protocol); 122 *ps = socket(domain, type, protocol);
123 if (*ps != SOCKET_INVALID) return IO_DONE; 123 if (*ps != SOCKET_INVALID) return IO_DONE;
124 else return errno; 124 else return errno;
125} 125}
126 126
127/*-------------------------------------------------------------------------*\ 127/*-------------------------------------------------------------------------*\
@@ -130,22 +130,22 @@ int socket_create(p_socket ps, int domain, int type, int protocol) {
130int socket_bind(p_socket ps, SA *addr, socklen_t len) { 130int socket_bind(p_socket ps, SA *addr, socklen_t len) {
131 int err = IO_DONE; 131 int err = IO_DONE;
132 socket_setblocking(ps); 132 socket_setblocking(ps);
133 if (bind(*ps, addr, len) < 0) err = errno; 133 if (bind(*ps, addr, len) < 0) err = errno;
134 socket_setnonblocking(ps); 134 socket_setnonblocking(ps);
135 return err; 135 return err;
136} 136}
137 137
138/*-------------------------------------------------------------------------*\ 138/*-------------------------------------------------------------------------*\
139* 139*
140\*-------------------------------------------------------------------------*/ 140\*-------------------------------------------------------------------------*/
141int socket_listen(p_socket ps, int backlog) { 141int socket_listen(p_socket ps, int backlog) {
142 int err = IO_DONE; 142 int err = IO_DONE;
143 if (listen(*ps, backlog)) err = errno; 143 if (listen(*ps, backlog)) err = errno;
144 return err; 144 return err;
145} 145}
146 146
147/*-------------------------------------------------------------------------*\ 147/*-------------------------------------------------------------------------*\
148* 148*
149\*-------------------------------------------------------------------------*/ 149\*-------------------------------------------------------------------------*/
150void socket_shutdown(p_socket ps, int how) { 150void socket_shutdown(p_socket ps, int how) {
151 shutdown(*ps, how); 151 shutdown(*ps, how);
@@ -162,7 +162,7 @@ int socket_connect(p_socket ps, SA *addr, socklen_t len, p_timeout tm) {
162 do if (connect(*ps, addr, len) == 0) return IO_DONE; 162 do if (connect(*ps, addr, len) == 0) return IO_DONE;
163 while ((err = errno) == EINTR); 163 while ((err = errno) == EINTR);
164 /* if connection failed immediately, return error code */ 164 /* if connection failed immediately, return error code */
165 if (err != EINPROGRESS && err != EAGAIN) return err; 165 if (err != EINPROGRESS && err != EAGAIN) return err;
166 /* zero timeout case optimization */ 166 /* zero timeout case optimization */
167 if (timeout_iszero(tm)) return IO_TIMEOUT; 167 if (timeout_iszero(tm)) return IO_TIMEOUT;
168 /* wait until we have the result of the connection attempt or timeout */ 168 /* wait until we have the result of the connection attempt or timeout */
@@ -177,7 +177,7 @@ int socket_connect(p_socket ps, SA *addr, socklen_t len, p_timeout tm) {
177* Accept with timeout 177* Accept with timeout
178\*-------------------------------------------------------------------------*/ 178\*-------------------------------------------------------------------------*/
179int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *len, p_timeout tm) { 179int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *len, p_timeout tm) {
180 if (*ps == SOCKET_INVALID) return IO_CLOSED; 180 if (*ps == SOCKET_INVALID) return IO_CLOSED;
181 for ( ;; ) { 181 for ( ;; ) {
182 int err; 182 int err;
183 if ((*pa = accept(*ps, addr, len)) != SOCKET_INVALID) return IO_DONE; 183 if ((*pa = accept(*ps, addr, len)) != SOCKET_INVALID) return IO_DONE;
@@ -193,7 +193,7 @@ int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *len, p_timeout
193/*-------------------------------------------------------------------------*\ 193/*-------------------------------------------------------------------------*\
194* Send with timeout 194* Send with timeout
195\*-------------------------------------------------------------------------*/ 195\*-------------------------------------------------------------------------*/
196int socket_send(p_socket ps, const char *data, size_t count, 196int socket_send(p_socket ps, const char *data, size_t count,
197 size_t *sent, p_timeout tm) 197 size_t *sent, p_timeout tm)
198{ 198{
199 int err; 199 int err;
@@ -225,14 +225,14 @@ int socket_send(p_socket ps, const char *data, size_t count,
225/*-------------------------------------------------------------------------*\ 225/*-------------------------------------------------------------------------*\
226* Sendto with timeout 226* Sendto with timeout
227\*-------------------------------------------------------------------------*/ 227\*-------------------------------------------------------------------------*/
228int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent, 228int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent,
229 SA *addr, socklen_t len, p_timeout tm) 229 SA *addr, socklen_t len, p_timeout tm)
230{ 230{
231 int err; 231 int err;
232 *sent = 0; 232 *sent = 0;
233 if (*ps == SOCKET_INVALID) return IO_CLOSED; 233 if (*ps == SOCKET_INVALID) return IO_CLOSED;
234 for ( ;; ) { 234 for ( ;; ) {
235 long put = (long) sendto(*ps, data, count, 0, addr, len); 235 long put = (long) sendto(*ps, data, count, 0, addr, len);
236 if (put >= 0) { 236 if (put >= 0) {
237 *sent = put; 237 *sent = put;
238 return IO_DONE; 238 return IO_DONE;
@@ -262,8 +262,8 @@ int socket_recv(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm
262 err = errno; 262 err = errno;
263 if (taken == 0) return IO_CLOSED; 263 if (taken == 0) return IO_CLOSED;
264 if (err == EINTR) continue; 264 if (err == EINTR) continue;
265 if (err != EAGAIN) return err; 265 if (err != EAGAIN) return err;
266 if ((err = socket_waitfd(ps, WAITFD_R, tm)) != IO_DONE) return err; 266 if ((err = socket_waitfd(ps, WAITFD_R, tm)) != IO_DONE) return err;
267 } 267 }
268 return IO_UNKNOWN; 268 return IO_UNKNOWN;
269} 269}
@@ -271,7 +271,7 @@ int socket_recv(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm
271/*-------------------------------------------------------------------------*\ 271/*-------------------------------------------------------------------------*\
272* Recvfrom with timeout 272* Recvfrom with timeout
273\*-------------------------------------------------------------------------*/ 273\*-------------------------------------------------------------------------*/
274int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got, 274int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got,
275 SA *addr, socklen_t *len, p_timeout tm) { 275 SA *addr, socklen_t *len, p_timeout tm) {
276 int err; 276 int err;
277 *got = 0; 277 *got = 0;
@@ -285,8 +285,8 @@ int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got,
285 err = errno; 285 err = errno;
286 if (taken == 0) return IO_CLOSED; 286 if (taken == 0) return IO_CLOSED;
287 if (err == EINTR) continue; 287 if (err == EINTR) continue;
288 if (err != EAGAIN) return err; 288 if (err != EAGAIN) return err;
289 if ((err = socket_waitfd(ps, WAITFD_R, tm)) != IO_DONE) return err; 289 if ((err = socket_waitfd(ps, WAITFD_R, tm)) != IO_DONE) return err;
290 } 290 }
291 return IO_UNKNOWN; 291 return IO_UNKNOWN;
292} 292}
@@ -299,7 +299,7 @@ int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got,
299* with send/recv replaced with write/read. We can't just use write/read 299* with send/recv replaced with write/read. We can't just use write/read
300* in the socket version, because behaviour when size is zero is different. 300* in the socket version, because behaviour when size is zero is different.
301\*-------------------------------------------------------------------------*/ 301\*-------------------------------------------------------------------------*/
302int socket_write(p_socket ps, const char *data, size_t count, 302int socket_write(p_socket ps, const char *data, size_t count,
303 size_t *sent, p_timeout tm) 303 size_t *sent, p_timeout tm)
304{ 304{
305 int err; 305 int err;
@@ -345,8 +345,8 @@ int socket_read(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm
345 err = errno; 345 err = errno;
346 if (taken == 0) return IO_CLOSED; 346 if (taken == 0) return IO_CLOSED;
347 if (err == EINTR) continue; 347 if (err == EINTR) continue;
348 if (err != EAGAIN) return err; 348 if (err != EAGAIN) return err;
349 if ((err = socket_waitfd(ps, WAITFD_R, tm)) != IO_DONE) return err; 349 if ((err = socket_waitfd(ps, WAITFD_R, tm)) != IO_DONE) return err;
350 } 350 }
351 return IO_UNKNOWN; 351 return IO_UNKNOWN;
352} 352}
@@ -370,7 +370,7 @@ void socket_setnonblocking(p_socket ps) {
370} 370}
371 371
372/*-------------------------------------------------------------------------*\ 372/*-------------------------------------------------------------------------*\
373* DNS helpers 373* DNS helpers
374\*-------------------------------------------------------------------------*/ 374\*-------------------------------------------------------------------------*/
375int socket_gethostbyaddr(const char *addr, socklen_t len, struct hostent **hp) { 375int socket_gethostbyaddr(const char *addr, socklen_t len, struct hostent **hp) {
376 *hp = gethostbyaddr(addr, len, AF_INET); 376 *hp = gethostbyaddr(addr, len, AF_INET);
@@ -395,7 +395,7 @@ int socket_gethostbyname(const char *addr, struct hostent **hp) {
395const char *socket_hoststrerror(int err) { 395const char *socket_hoststrerror(int err) {
396 if (err <= 0) return io_strerror(err); 396 if (err <= 0) return io_strerror(err);
397 switch (err) { 397 switch (err) {
398 case HOST_NOT_FOUND: return PIE_HOSTNOTFOUND; 398 case HOST_NOT_FOUND: return PIE_HOST_NOT_FOUND;
399 default: return hstrerror(err); 399 default: return hstrerror(err);
400 } 400 }
401} 401}
@@ -417,10 +417,10 @@ const char *socket_strerror(int err) {
417const char *socket_ioerror(p_socket ps, int err) { 417const char *socket_ioerror(p_socket ps, int err) {
418 (void) ps; 418 (void) ps;
419 return socket_strerror(err); 419 return socket_strerror(err);
420} 420}
421 421
422const char *socket_gaistrerror(int err) { 422const char *socket_gaistrerror(int err) {
423 if (err == 0) return NULL; 423 if (err == 0) return NULL;
424 switch (err) { 424 switch (err) {
425 case EAI_AGAIN: return PIE_AGAIN; 425 case EAI_AGAIN: return PIE_AGAIN;
426 case EAI_BADFLAGS: return PIE_BADFLAGS; 426 case EAI_BADFLAGS: return PIE_BADFLAGS;
@@ -437,7 +437,7 @@ const char *socket_gaistrerror(int err) {
437#endif 437#endif
438 case EAI_SERVICE: return PIE_SERVICE; 438 case EAI_SERVICE: return PIE_SERVICE;
439 case EAI_SOCKTYPE: return PIE_SOCKTYPE; 439 case EAI_SOCKTYPE: return PIE_SOCKTYPE;
440 case EAI_SYSTEM: return strerror(errno); 440 case EAI_SYSTEM: return strerror(errno);
441 default: return gai_strerror(err); 441 default: return gai_strerror(err);
442 } 442 }
443} 443}