Overview
Comment: | Add -[remoteAddress] to OFTCPSocket. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
04dc76c8c3a56365a3dce3115770d69a |
User & Date: | js on 2010-04-11 17:55:39 |
Other Links: | manifest | tags |
Context
2010-04-11
| ||
18:04 | Fix +[stringWithPath:] test on Win32 (it's \ there, not /!). check-in: 0bde0871bc user: js tags: trunk | |
17:55 | Add -[remoteAddress] to OFTCPSocket. check-in: 04dc76c8c3 user: js tags: trunk | |
17:43 | Don't require OFCopying protocol for the thread's object. check-in: e5240d68e8 user: js tags: trunk | |
Changes
Modified src/OFTCPSocket.h from [f3e771c9da] to [337485173f].
︙ | ︙ | |||
70 71 72 73 74 75 76 77 | */ - (OFTCPSocket*)accept; /** * Enable or disable keep alives for the connection. */ - enableKeepAlives: (BOOL)enable; @end | > > > > > > > | 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 | */ - (OFTCPSocket*)accept; /** * Enable or disable keep alives for the connection. */ - enableKeepAlives: (BOOL)enable; /** * Returns the remote address of the socket. Only works with accepted sockets! * * \return The remote address as a string. */ - (OFString*)remoteAddress; @end |
Modified src/OFTCPSocket.m from [605f8714f2] to [0f7c2e2900].
︙ | ︙ | |||
11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | #include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> #if !defined(HAVE_THREADSAFE_GETADDRINFO) && !defined(_WIN32) # include <netinet/in.h> #endif #import "OFTCPSocket.h" #import "OFString.h" #import "OFExceptions.h" #import "macros.h" | > > > | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | #include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> #include <assert.h> #if !defined(HAVE_THREADSAFE_GETADDRINFO) && !defined(_WIN32) # include <netinet/in.h> # include <arpa/inet.h> #endif #import "OFTCPSocket.h" #import "OFString.h" #import "OFExceptions.h" #import "macros.h" |
︙ | ︙ | |||
92 93 94 95 96 97 98 | #else BOOL connected = NO; struct hostent *he; struct servent *se; struct sockaddr_in addr; uint16_t port; char **ip; | | | | | | | | | | | | | | | 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 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 | #else BOOL connected = NO; struct hostent *he; struct servent *se; struct sockaddr_in addr; uint16_t port; char **ip; # ifdef OF_THREADS OFDataArray *addrlist; addrlist = [[OFDataArray alloc] initWithItemSize: sizeof(char**)]; [mutex lock]; # endif if ((he = gethostbyname([node cString])) == NULL) { # ifdef OF_THREADS [addrlist release]; [mutex unlock]; # endif @throw [OFAddressTranslationFailedException newWithClass: isa node: node service: service]; } 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 [addrlist release]; [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 || (sock = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) { # ifdef OF_THREADS [addrlist release]; [mutex unlock]; # endif @throw [OFConnectionFailedException newWithClass: isa node: node service: service]; } # ifdef OF_THREADS @try { for (ip = he->h_addr_list; *ip != NULL; ip++) [addrlist addItem: ip]; /* Add the terminating NULL */ [addrlist addItem: ip]; } @catch (OFException *e) { [addrlist release]; @throw e; } @finally { [mutex unlock]; } for (ip = [addrlist cArray]; *ip != NULL; ip++) { # else for (ip = he->h_addr_list; *ip != NULL; ip++) { # endif memcpy(&addr.sin_addr.s_addr, *ip, he->h_length); if (connect(sock, (struct sockaddr*)&addr, sizeof(addr)) == -1) continue; connected = YES; break; } # ifdef OF_THREADS [addrlist release]; # endif if (!connected) { close(sock); sock = INVALID_SOCKET; } #endif |
︙ | ︙ | |||
239 240 241 242 243 244 245 | freeaddrinfo(res); #else struct hostent *he; struct servent *se; struct sockaddr_in addr; uint16_t port; | | | | | | | | | | | | 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 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 294 295 296 297 298 299 300 301 302 303 304 305 | 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]; # endif @throw [OFAddressTranslationFailedException newWithClass: isa node: node service: service]; } 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 |
︙ | ︙ | |||
365 366 367 368 369 370 371 372 373 374 375 376 377 378 | int v = enable; if (setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (char*)&v, sizeof(v))) @throw [OFSetOptionFailedException newWithClass: isa]; return self; } - close { if (sock == INVALID_SOCKET) @throw [OFNotConnectedException newWithClass: isa]; close(sock); | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 | int v = enable; if (setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (char*)&v, sizeof(v))) @throw [OFSetOptionFailedException newWithClass: isa]; return self; } - (OFString*)remoteAddress { if (saddr == NULL || saddr_len == 0) @throw [OFInvalidArgumentException newWithClass: isa selector: _cmd]; #ifdef HAVE_THREADSAFE_GETADDRINFO char *node = [self allocMemoryWithSize: NI_MAXHOST]; @try { if (getnameinfo(saddr, saddr_len, node, NI_MAXHOST, NULL, 0, NI_NUMERICHOST)) @throw [OFAddressTranslationFailedException newWithClass: isa]; return [OFString stringWithCString: node]; } @finally { [self freeMemory: node]; } /* Get rid of a warning, never reached anyway */ assert(0); #else char *node; # ifdef OF_THREADS [mutex lock]; @try { # endif node = inet_ntoa(((struct sockaddr_in*)saddr)->sin_addr); if (node == NULL) @throw [OFAddressTranslationFailedException newWithClass: isa]; return [OFString stringWithCString: node]; # ifdef OF_THREADS } @finally { [mutex unlock]; } /* Get rid of a warning, never reached anyway */ assert(0); # endif #endif } - close { if (sock == INVALID_SOCKET) @throw [OFNotConnectedException newWithClass: isa]; close(sock); |
︙ | ︙ |
Modified tests/OFTCPSocketTests.m from [0def59b121] to [a3ffe30f8b].
︙ | ︙ | |||
53 54 55 56 57 58 59 60 61 62 63 64 65 66 | TEST(@"-[connectToService:onNode:]", [client connectToService: service onNode: @"localhost"]) TEST(@"-[accept]", (accepted = [server accept])) TEST(@"-[writeString:]", [client writeString: @"Hello!"]) TEST(@"-[readNBytes:intoBuffer:]", [accepted readNBytes: 6 intoBuffer: buf] && !memcmp(buf, "Hello!", 6)) [pool drain]; | > > > | 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | TEST(@"-[connectToService:onNode:]", [client connectToService: service onNode: @"localhost"]) TEST(@"-[accept]", (accepted = [server accept])) TEST(@"-[remoteAddress]", [[accepted remoteAddress] isEqual: @"127.0.0.1"]) TEST(@"-[writeString:]", [client writeString: @"Hello!"]) TEST(@"-[readNBytes:intoBuffer:]", [accepted readNBytes: 6 intoBuffer: buf] && !memcmp(buf, "Hello!", 6)) [pool drain]; |
︙ | ︙ |