Overview
Comment: | Add OFSocket base class. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
0110aec5c0275fd6ecf2ed735a0e3abb |
User & Date: | js on 2009-05-07 16:08:14 |
Other Links: | manifest | tags |
Context
2009-05-13
| ||
17:58 | Also release pools that are on top of the pool being released. check-in: 4f4f619d84 user: js tags: trunk | |
2009-05-07
| ||
16:08 | Add OFSocket base class. check-in: 0110aec5c0 user: js tags: trunk | |
12:55 | Add - data for OFArray. check-in: eb6aafad32 user: js tags: trunk | |
Changes
Modified src/Makefile from [a595eca1c8] to [3088946f4b].
︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 | OFHashes.m \ OFIterator.m \ OFList.m \ OFMutableString.m \ OFNumber.m \ OFObject.m \ ${OFPLUGIN_M} \ OFStream.m \ OFString.m \ OFTCPSocket.m \ OFThread.m \ OFXMLFactory.m \ ${ASPRINTF_C} | > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | OFHashes.m \ OFIterator.m \ OFList.m \ OFMutableString.m \ OFNumber.m \ OFObject.m \ ${OFPLUGIN_M} \ OFSocket.m \ OFStream.m \ OFString.m \ OFTCPSocket.m \ OFThread.m \ OFXMLFactory.m \ ${ASPRINTF_C} |
︙ | ︙ |
Added src/OFSocket.h version [2df5bc02b8].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 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 | /* * Copyright (c) 2008 - 2009 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ /* * Headers for UNIX systems */ #ifndef _WIN32 #include <sys/types.h> #include <sys/socket.h> #include <netdb.h> #endif #import "OFStream.h" /* * Headers for Win32 * * These must be imported after objc/Object and thus OFObject! */ #ifdef _WIN32 #define _WIN32_WINNT 0x0501 #include <winsock2.h> #include <ws2tcpip.h> #endif /** * The OFTCPSocket class provides functions to create and use sockets. */ @interface OFSocket: OFStream { #ifndef _WIN32 int sock; #else SOCKET sock; #endif struct sockaddr *saddr; socklen_t saddr_len; } /** * Enables/disables non-blocking I/O. */ - setBlocking: (BOOL)enable; @end |
Added src/OFSocket.m version [84d000978b].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 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 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 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 | /* * Copyright (c) 2008 - 2009 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "config.h" #include <string.h> #include <fcntl.h> #import "OFSocket.h" #import "OFExceptions.h" #ifndef INVALID_SOCKET #define INVALID_SOCKET -1 #endif @implementation OFSocket #ifdef _WIN32 + initialize { WSADATA wsa; if (WSAStartup(MAKEWORD(2, 0), &wsa)) @throw [OFInitializationFailedException newWithClass: self]; return self; } #endif - init { self = [super init]; sock = INVALID_SOCKET; saddr = NULL; saddr_len = 0; return self; } - (size_t)readNBytes: (size_t)size intoBuffer: (char*)buf { ssize_t ret; if (sock == INVALID_SOCKET) @throw [OFNotConnectedException newWithClass: isa]; switch ((ret = recv(sock, buf, size, 0))) { case 0: @throw [OFNotConnectedException newWithClass: isa]; case -1: @throw [OFReadFailedException newWithClass: isa andSize: size]; } /* This is safe, as we already checked < 1 */ return ret; } - (size_t)writeNBytes: (size_t)size fromBuffer: (const char*)buf { ssize_t ret; if (sock == INVALID_SOCKET) @throw [OFNotConnectedException newWithClass: isa]; if ((ret = send(sock, buf, size, 0)) == -1) @throw [OFWriteFailedException newWithClass: isa andSize: size]; /* This is safe, as we already checked for -1 */ return ret; } - (size_t)writeCString: (const char*)str { if (sock == INVALID_SOCKET) @throw [OFNotConnectedException newWithClass: isa]; return [self writeNBytes: strlen(str) fromBuffer: str]; } - setBlocking: (BOOL)enable { #ifndef _WIN32 int flags; if ((flags = fcntl(sock, F_GETFL)) == -1) @throw [OFSetOptionFailedException newWithClass: isa]; if (enable) flags &= ~O_NONBLOCK; else flags |= O_NONBLOCK; if (fcntl(sock, F_SETFL, flags) == -1) @throw [OFSetOptionFailedException newWithClass: isa]; #else u_long v = enable; if (ioctlsocket(sock, FIONBIO, &v) == SOCKET_ERROR) @throw [OFSetOptionFailedException newWithClass: isa]; #endif return self; } @end |
Modified src/OFStream.m from [2bd6cd6bda] to [37d8c8f6d5].
︙ | ︙ | |||
142 143 144 145 146 147 148 | { @throw [OFNotImplementedException newWithClass: isa andSelector: _cmd]; } - (size_t)writeCString: (const char*)str { | | | | 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 | { @throw [OFNotImplementedException newWithClass: isa andSelector: _cmd]; } - (size_t)writeCString: (const char*)str { return [self writeNBytes: strlen(str) fromBuffer: str]; } - (size_t)getCache: (char**)ptr { if (ptr != NULL) *ptr = cache; |
︙ | ︙ |
Modified src/OFTCPSocket.h from [5f9ebf21be] to [2683abb6c9].
1 2 3 4 5 6 7 8 9 10 11 | /* * Copyright (c) 2008 - 2009 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ | < < < < < < < < < < < | < < < < < < < < < < < | < < < < < < < < < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | /* * Copyright (c) 2008 - 2009 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "OFSocket.h" /** * The OFTCPSocket class provides functions to create and use sockets. */ @interface OFTCPSocket: OFSocket {} /** * \return A new autoreleased OFTCPSocket */ + tcpSocket; /** * Initializes an already allocated OFTCPSocket. |
︙ | ︙ | |||
93 94 95 96 97 98 99 | /** * Accept an incoming connection. * \return An autoreleased OFTCPSocket for the accepted connection. */ - (OFTCPSocket*)accept; | < < < < < | 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | /** * Accept an incoming connection. * \return An autoreleased OFTCPSocket for the accepted connection. */ - (OFTCPSocket*)accept; /** * Enable or disable keep alives for the connection. */ - enableKeepAlives: (BOOL)enable; /** * Closes the socket. */ - close; @end |
Modified src/OFTCPSocket.m from [cec4aee89e] to [6d74cb7c82].
︙ | ︙ | |||
8 9 10 11 12 13 14 | * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "config.h" #include <stdio.h> | < < < < < < < < < < < < < < | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "config.h" #include <stdio.h> #include <string.h> #include <unistd.h> #import "OFTCPSocket.h" #import "OFExceptions.h" #ifndef INVALID_SOCKET #define INVALID_SOCKET -1 #endif @implementation OFTCPSocket + tcpSocket { return [[[OFTCPSocket alloc] init] autorelease]; } - init { self = [super init]; sock = INVALID_SOCKET; saddr = NULL; saddr_len = 0; |
︙ | ︙ | |||
202 203 204 205 206 207 208 | newsock->sock = s; newsock->saddr = addr; newsock->saddr_len = addrlen; return newsock; } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 188 189 190 191 192 193 194 195 196 197 198 199 200 201 | newsock->sock = s; newsock->saddr = addr; newsock->saddr_len = addrlen; return newsock; } - enableKeepAlives: (BOOL)enable { int v = enable; if (setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (char*)&v, sizeof(v))) @throw [OFSetOptionFailedException newWithClass: isa]; |
︙ | ︙ |
Modified tests/OFTCPSocket/OFTCPSocket.m from [0a9413e7c2] to [a265aae238].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | /* * Copyright (c) 2008 - 2009 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "config.h" #include <stdlib.h> #include <string.h> #include <time.h> #import "OFTCPSocket.h" #import "OFExceptions.h" | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | /* * Copyright (c) 2008 - 2009 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include <time.h> #import "OFTCPSocket.h" #import "OFExceptions.h" |
︙ | ︙ |