Differences From Artifact [f110c9fc59]:
- File
src/socket.m
— part of check-in
[62e2de30b9]
at
2015-02-16 08:39:17
on branch trunk
— Explicitly pass errno to exceptions
The old behaviour where the exception would access errno directly on
creation of the exception was very fragile. The two main problems with
it were that sometimes it would pick up an errno even though none had
been set and in other cases that when the exception was created errno
had already been overridden.This also greatly increases errno handling on Win32, especially in
conjunction with sockets. It can still be improved further, though. (user: js, size: 3012) [annotate] [blame] [check-ins using]
To Artifact [a024642fe6]:
- File
src/socket.m
— part of check-in
[f18615e057]
at
2015-02-18 22:56:46
on branch trunk
— Add of_getsockname() and make use of it
of_getsockname() calls getsockname() after acquiring a mutex. This is
necessary as some implementations of getsockname() are not thread-safe. (user: js, size: 3600) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
14 15 16 17 18 19 20 | * file. */ #include "config.h" #include <errno.h> | | | > > > > > > > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 |
* file.
*/
#include "config.h"
#include <errno.h>
#import "OFException.h" /* For some E* -> WSAE* defines */
#import "OFLockFailedException.h"
#import "OFUnlockFailedException.h"
#import "socket.h"
#ifdef OF_HAVE_THREADS
# include "threading.h"
static of_once_t onceControl = OF_ONCE_INIT;
static of_mutex_t mutex;
#endif
static bool initialized = false;
static void
init(void)
{
#if defined(_WIN32)
WSADATA wsa;
if (WSAStartup(MAKEWORD(2, 0), &wsa))
return;
#elif defined(__wii__)
if (net_init() < 0)
return;
#endif
#ifdef OF_HAVE_THREADS
if (!of_mutex_new(&mutex))
return;
#endif
initialized = true;
}
bool
of_socket_init()
{
|
| ︙ | ︙ | |||
152 153 154 155 156 157 158 | case WSAEWOULDBLOCK: return EWOULDBLOCK; } return 0; #endif } | > > > > > > > > > > > > > > > > > > > > > > > > | 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 |
case WSAEWOULDBLOCK:
return EWOULDBLOCK;
}
return 0;
#endif
}
#ifndef __wii__
int
of_getsockname(int socket, struct sockaddr *restrict address,
socklen_t *restrict address_len)
{
int ret;
# ifdef OF_HAVE_THREADS
if (!of_mutex_lock(&mutex))
@throw [OFLockFailedException exception];
# endif
ret = getsockname(socket, address, address_len);
# ifdef OF_HAVE_THREADS
if (!of_mutex_unlock(&mutex))
@throw [OFUnlockFailedException exception];
# endif
return ret;
}
#endif
|