Overview
Comment: | Server support for OFTCPSocket. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
0d5b08e43e3c2ad6bda37effc0578339 |
User & Date: | js on 2008-12-07 21:58:37 |
Other Links: | manifest | tags |
Context
2008-12-08
| ||
16:47 | Use random port for test. check-in: b54cffa9db user: js tags: trunk | |
2008-12-07
| ||
21:58 | Server support for OFTCPSocket. check-in: 0d5b08e43e user: js tags: trunk | |
12:41 | OFXMLFactory: Fix FIXMEs, TODOs and possible off-by-one. check-in: 4073a31454 user: js tags: trunk | |
Changes
Modified src/OFTCPSocket.h from [bf4dc8ccc5] to [01c69a8231].
︙ | ︙ | |||
20 21 22 23 24 25 26 27 28 29 30 31 32 33 | /** * The OFTCPSocket class provides functions to create and use sockets. */ @interface OFTCPSocket: OFObject <OFStream> { int sock; } - free; /** * Connect the OFTCPSocket to the specified destination. * | > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 | /** * The OFTCPSocket class provides functions to create and use sockets. */ @interface OFTCPSocket: OFObject <OFStream> { int sock; struct sockaddr *saddr; socklen_t saddr_len; } /** * Initializes an already allocated OFTCPSocket. * * \return An initialized OFTCPSocket */ - init; - free; - setSocket: (int)socket; - setSocketAddress: (struct sockaddr*)sockaddr withLength: (socklen_t)len; /** * Connect the OFTCPSocket to the specified destination. * * \param host The host or IP to connect to * \param port The port of the host to connect to */ - connectTo: (const char*)host onPort: (uint16_t)port; /** * Bind socket to the specified address and port. * * \param host The host or IP to bind to * \param port The port to bind to * \param protocol The protocol to use (AF_INET or AF_INET6) */ - bindOn: (const char*)host withPort: (uint16_t)port andFamily: (int)family; /** * Listen on the socket. * * \param backlog Maximum length for the queue of pending connections. */ - listenWithBackLog: (int)backlog; /** * Listen on the socket. */ - listen; /** * Accept an incoming connection. */ - (OFTCPSocket*)accept; @end |
Modified src/OFTCPSocket.m from [ed0fb6187c] to [d316d7c59d].
︙ | ︙ | |||
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 | #import <string.h> #import <unistd.h> #import "OFTCPSocket.h" #import "OFExceptions.h" @implementation OFTCPSocket - free { if (sock >= 0) close(sock); return [super free]; } - connectTo: (const char*)host onPort: (uint16_t)port { struct addrinfo hints, *res, *res0; char portstr[6]; memset(&hints, 0, sizeof(struct addrinfo)); hints.ai_family = AF_UNSPEC; hints.ai_socktype = SOCK_STREAM; snprintf(portstr, 6, "%d", port); if (getaddrinfo(host, portstr, &hints, &res0)) { /* FIXME: Throw exception */ | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | 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 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 | #import <string.h> #import <unistd.h> #import "OFTCPSocket.h" #import "OFExceptions.h" @implementation OFTCPSocket - init { if ((self = [super init])) { sock = -1; saddr = NULL; saddr_len = 0; } return self; } - free { if (sock >= 0) close(sock); return [super free]; } - setSocket: (int)socket { sock = socket; return self; } - setSocketAddress: (struct sockaddr*)sockaddr withLength: (socklen_t)len { saddr = sockaddr; saddr_len = len; return self; } - connectTo: (const char*)host onPort: (uint16_t)port { struct addrinfo hints, *res, *res0; char portstr[6]; if (!port) { /* FIXME: Throw exception */ return nil; } memset(&hints, 0, sizeof(struct addrinfo)); hints.ai_family = AF_UNSPEC; hints.ai_socktype = SOCK_STREAM; snprintf(portstr, 6, "%d", port); if (getaddrinfo(host, portstr, &hints, &res0)) { /* FIXME: Throw exception */ return nil; } for (res = res0; res != NULL; res = res->ai_next) { if ((sock = socket(res->ai_family, res->ai_socktype, res->ai_protocol)) < 0) continue; |
︙ | ︙ | |||
64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 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 | if (sock < 0) { /* FIXME: Throw exception */ return nil; } return self; } - (size_t)readNBytes: (size_t)size intoBuffer: (uint8_t*)buf { ssize_t ret; if ((ret = recv(sock, buf, size, 0)) < 0) { /* FIXME: Throw exception */ return 0; } /* This is safe, as we already checked < 0 */ return ret; } - (uint8_t*)readNBytes: (size_t)size { uint8_t *ret; ret = [self getMemWithSize: size]; @try { [self readNBytes: size intoBuffer: ret]; } @catch (id exception) { [self freeMem: ret]; @throw exception; } return ret; } - (size_t)writeNBytes: (size_t)size fromBuffer: (const uint8_t*)buf { ssize_t ret; if ((ret = send(sock, buf, size, 0)) < 0) { /* FIXME: Throw exception */ return 0; } /* This is safe, as we already checked < 0 */ return ret; } - (size_t)writeCString: (const char*)str { return [self writeNBytes: strlen(str) fromBuffer: (const uint8_t*)str]; } - close { if (sock < 0) { | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 187 188 189 190 191 192 193 194 195 196 197 198 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 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 | if (sock < 0) { /* FIXME: Throw exception */ return nil; } return self; } - bindOn: (const char*)host withPort: (uint16_t)port andFamily: (int)family { struct addrinfo hints, *res; char portstr[6]; if (!port) { /* FIXME: Throw exception */ return nil; } if ((sock = socket(family, SOCK_STREAM, 0)) < 0) { /* FIXME: Throw exception */ return nil; } memset(&hints, 0, sizeof(struct addrinfo)); hints.ai_family = family; hints.ai_socktype = SOCK_STREAM; snprintf(portstr, 6, "%d", port); if (getaddrinfo(host, portstr, &hints, &res)) { /* FIXME: Throw exception */ return nil; } if (bind(sock, res->ai_addr, res->ai_addrlen) < 0) { /* FIXME: Throw exception */ freeaddrinfo(res); return nil; } freeaddrinfo(res); return self; } - listenWithBackLog: (int)backlog { if (sock < 0) { /* FIXME: Throw exception */ return nil; } if (listen(sock, backlog) < 0 ) { /* FIXME: Throw exception */ return nil; } return self; } - listen { if (sock < 0) { /* FIXME: Throw exception */ return nil; } if (listen(sock, 5) < 0 ) { /* FIXME: Throw exception */ return nil; } return self; } - (OFTCPSocket*)accept { OFTCPSocket *newsock; struct sockaddr *addr; socklen_t addrlen; int s; newsock = [OFTCPSocket new]; addrlen = sizeof(struct sockaddr); @try { addr = [newsock getMemWithSize: sizeof(struct sockaddr)]; } @catch(id e) { [newsock free]; @throw e; } if ((s = accept(sock, addr, &addrlen)) < 0) { /* FIXME: Throw exception */ return nil; } [newsock setSocket: s]; [newsock setSocketAddress: addr withLength: addrlen]; return newsock; } - (size_t)readNBytes: (size_t)size intoBuffer: (uint8_t*)buf { ssize_t ret; if (sock < 0) { /* FIXME: Throw exception */ return 0; } if ((ret = recv(sock, buf, size, 0)) < 0) { /* FIXME: Throw exception */ return 0; } /* This is safe, as we already checked < 0 */ return ret; } - (uint8_t*)readNBytes: (size_t)size { uint8_t *ret; if (sock < 0) { /* FIXME: Throw exception */ return NULL; } ret = [self getMemWithSize: size]; @try { [self readNBytes: size intoBuffer: ret]; } @catch (id exception) { [self freeMem: ret]; @throw exception; } return ret; } - (size_t)writeNBytes: (size_t)size fromBuffer: (const uint8_t*)buf { ssize_t ret; if (sock < 0) { /* FIXME: Throw exception */ return 0; } if ((ret = send(sock, buf, size, 0)) < 0) { /* FIXME: Throw exception */ return 0; } /* This is safe, as we already checked < 0 */ return ret; } - (size_t)writeCString: (const char*)str { if (sock < 0) { /* FIXME: Throw exception */ return 0; } return [self writeNBytes: strlen(str) fromBuffer: (const uint8_t*)str]; } - close { if (sock < 0) { |
︙ | ︙ |
Modified tests/OFTCPSocket/OFTCPSocket.m from [134a575aa5] to [35b6a575c0].
︙ | ︙ | |||
16 17 18 19 20 21 22 | #import "OFTCPSocket.h" #import "OFExceptions.h" int main() { @try { | > > | > > > > > > > > > > | > > > | > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > | > > | 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 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | #import "OFTCPSocket.h" #import "OFExceptions.h" int main() { @try { OFTCPSocket *server = [OFTCPSocket new]; OFTCPSocket *client = [OFTCPSocket new]; OFTCPSocket *accepted; char buf[8]; puts("== IPv4 =="); [server bindOn: "localhost" withPort: 12345 andFamily: AF_INET]; [server listen]; [client connectTo: "localhost" onPort: 12345]; accepted = [server accept]; [client writeCString: "Hallo!"]; [accepted readNBytes: 7 intoBuffer: (uint8_t*)buf]; buf[7] = 0; if (!strcmp(buf, "Hallo!")) puts("Received correct string!"); else { puts("Received INCORRECT string!"); return 1; } memset(buf, 0, 8); [accepted free]; [client close]; [server close]; puts("== IPv6 =="); [server bindOn: "localhost" withPort: 12345 andFamily: AF_INET6]; [server listen]; [client connectTo: "localhost" onPort: 12345]; accepted = [server accept]; [client writeCString: "IPv6 :)"]; [accepted readNBytes: 7 intoBuffer: (uint8_t*)buf]; buf[7] = 0; if (!strcmp(buf, "IPv6 :)")) puts("Received correct string!"); else { puts("Received INCORRECT string!"); return 1; } [accepted free]; [client close]; [server close]; } @catch(OFException *e) { printf("EXCEPTION: %s\n", [e cString]); } return 0; } |