Overview
| Comment: | Close socket before throwing an exception when bind fails. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
ebf57f48918d28651e5e873e3be2ef1c |
| User & Date: | js on 2010-04-02 14:18:33 |
| Other Links: | manifest | tags |
Context
|
2010-04-02
| ||
| 15:58 | Use open() / read() / write() instead of fopen() / fread() / fwrite(). check-in: 5f4f207266 user: js tags: trunk | |
| 14:18 | Close socket before throwing an exception when bind fails. check-in: ebf57f4891 user: js tags: trunk | |
|
2010-04-01
| ||
| 23:51 | Add support for ObjFW-RT, the ObjFW Objective C runtime. check-in: 8c2755723a user: js tags: trunk | |
Changes
Modified src/OFTCPSocket.h from [d46a3d4e4d] to [f3e771c9da].
| ︙ | ︙ | |||
42 43 44 45 46 47 48 | onNode: (OFString*)node; /** * Bind socket on the specified node and service. * * \param service The service to bind * \param node The node to bind to | | | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 |
onNode: (OFString*)node;
/**
* Bind socket on the specified node and service.
*
* \param service The service to bind
* \param node The node to bind to
* \param family The family to use (AF_INET for IPv4 or AF_INET6 for IPv6)
*/
- bindService: (OFString*)service
onNode: (OFString*)node
withFamily: (int)family;
/**
* Listen on the socket.
|
| ︙ | ︙ |
Modified src/OFTCPSocket.m from [a1e625fc7a] to [f1cb5070ac].
| ︙ | ︙ | |||
199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 |
- bindService: (OFString*)service
onNode: (OFString*)node
withFamily: (int)family
{
if (sock != INVALID_SOCKET)
@throw [OFAlreadyConnectedException newWithClass: isa];
if ((sock = socket(family, SOCK_STREAM, 0)) == INVALID_SOCKET)
@throw [OFBindFailedException newWithClass: isa
node: node
service: service
family: family];
#ifdef HAVE_THREADSAFE_GETADDRINFO
struct addrinfo hints, *res;
memset(&hints, 0, sizeof(struct addrinfo));
hints.ai_family = family;
hints.ai_socktype = SOCK_STREAM;
| > > > > > > > > | > > > > > < < < < < < | 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 |
- bindService: (OFString*)service
onNode: (OFString*)node
withFamily: (int)family
{
if (sock != INVALID_SOCKET)
@throw [OFAlreadyConnectedException newWithClass: isa];
#ifndef HAVE_THREADSAFE_GETADDRINFO
if (family != AF_INET)
@throw [OFBindFailedException newWithClass: isa
node: node
service: service
family: family];
#endif
if ((sock = socket(family, SOCK_STREAM, 0)) == INVALID_SOCKET)
@throw [OFBindFailedException newWithClass: isa
node: node
service: service
family: family];
#ifdef HAVE_THREADSAFE_GETADDRINFO
struct addrinfo hints, *res;
memset(&hints, 0, sizeof(struct addrinfo));
hints.ai_family = family;
hints.ai_socktype = SOCK_STREAM;
if (getaddrinfo([node cString], [service cString], &hints, &res)) {
close(sock);
sock = INVALID_SOCKET;
@throw [OFAddressTranslationFailedException
newWithClass: isa
node: node
service: service];
}
if (bind(sock, res->ai_addr, res->ai_addrlen) == -1) {
freeaddrinfo(res);
close(sock);
sock = INVALID_SOCKET;
@throw [OFBindFailedException newWithClass: isa
node: node
service: service
family: family];
}
freeaddrinfo(res);
#else
struct hostent *he;
struct servent *se;
struct sockaddr_in addr;
uint16_t port;
#ifdef OF_THREADS
[mutex lock];
#endif
if ((he = gethostbyname([node cString])) == NULL) {
#ifdef OF_THREADS
[mutex unlock];
|
| ︙ | ︙ | |||
261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 |
if ((se = getservbyname([service cString], "TCP")) != NULL)
port = se->s_port;
else if ((port = OF_BSWAP16_IF_LE(strtol([service cString], NULL,
10))) == 0) {
#ifdef OF_THREADS
[mutex unlock];
#endif
@throw [OFAddressTranslationFailedException
newWithClass: isa
node: node
service: service];
}
memset(&addr, 0, sizeof(addr));
addr.sin_family = AF_INET;
addr.sin_port = port;
if (he->h_addrtype != AF_INET || he->h_addr_list[0] == NULL) {
#ifdef OF_THREADS
[mutex unlock];
#endif
@throw [OFAddressTranslationFailedException
newWithClass: isa
node: node
service: service];
}
memcpy(&addr.sin_addr.s_addr, he->h_addr_list[0], he->h_length);
#ifdef OF_THREADS
[mutex unlock];
#endif
| > > > > | > > > | 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 |
if ((se = getservbyname([service cString], "TCP")) != NULL)
port = se->s_port;
else if ((port = OF_BSWAP16_IF_LE(strtol([service cString], NULL,
10))) == 0) {
#ifdef OF_THREADS
[mutex unlock];
#endif
close(sock);
sock = INVALID_SOCKET;
@throw [OFAddressTranslationFailedException
newWithClass: isa
node: node
service: service];
}
memset(&addr, 0, sizeof(addr));
addr.sin_family = AF_INET;
addr.sin_port = port;
if (he->h_addrtype != AF_INET || he->h_addr_list[0] == NULL) {
#ifdef OF_THREADS
[mutex unlock];
#endif
close(sock);
sock = INVALID_SOCKET;
@throw [OFAddressTranslationFailedException
newWithClass: isa
node: node
service: service];
}
memcpy(&addr.sin_addr.s_addr, he->h_addr_list[0], he->h_length);
#ifdef OF_THREADS
[mutex unlock];
#endif
if (bind(sock, (struct sockaddr*)&addr, sizeof(addr)) == -1) {
close(sock);
sock = INVALID_SOCKET;
@throw [OFBindFailedException newWithClass: isa
node: node
service: service
family: family];
}
#endif
return self;
}
- listenWithBackLog: (int)backlog
{
|
| ︙ | ︙ |