Differences From Artifact [c7a38bf638]:
- File
src/OFTCPSocket.h
— part of check-in
[6fbc3b18c7]
at
2024-10-27 22:27:20
on branch trunk
— Allow strings to contain \0
In order to not accidentally have C strings with \0, an
OFInvalidEncodingException is thrown when trying to get a C string for a
string that contains \0.In order to get a C string with \0 anyway, a new method
-[insecureCStringWithEncoding:] is added. (user: js, size: 8784) [annotate] [blame] [check-ins using]
To Artifact [a5332f3211]:
- File
src/OFTCPSocket.h
— part of check-in
[4e763857b8]
at
2024-10-28 23:46:55
on branch mptcp
— Initial MPTCP implementation for macOS/iOS
Unfortunately, I haven't found a way to reliably check if a connection
is using MPTCP on macOS/iOS yet, so -[usesMPTCP] always returns false
for now. In my tests with SIOCGCONNINFO, the flags were always 0. (user: js, size: 9082) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
85 86 87 88 89 90 91 |
@interface OFTCPSocket: OFStreamSocket
{
OFString *_Nullable _SOCKS5Host;
uint16_t _SOCKS5Port;
#ifdef OF_WII
uint16_t _port;
#endif
| > | | 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 |
@interface OFTCPSocket: OFStreamSocket
{
OFString *_Nullable _SOCKS5Host;
uint16_t _SOCKS5Port;
#ifdef OF_WII
uint16_t _port;
#endif
uintptr_t _flags; /* Change to a smaller type on ABI bump */
OF_RESERVE_IVARS(OFTCPSocket, 3)
}
#ifdef OF_HAVE_CLASS_PROPERTIES
@property (class, nullable, copy, nonatomic) OFString *SOCKS5Host;
@property (class, nonatomic) uint16_t SOCKS5Port;
#endif
|
| ︙ | ︙ | |||
118 119 120 121 122 123 124 125 126 127 128 129 130 131 | * * @throw OFGetOptionFailedException The option could not be retrieved * @throw OFSetOptionFailedException The option could not be set */ @property (nonatomic) bool canDelaySendingSegments; #endif /** * @brief The host to use as a SOCKS5 proxy. */ @property OF_NULLABLE_PROPERTY (copy, nonatomic) OFString *SOCKS5Host; /** * @brief The port to use on the SOCKS5 proxy. | > > > > > > > > | 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 | * * @throw OFGetOptionFailedException The option could not be retrieved * @throw OFSetOptionFailedException The option could not be set */ @property (nonatomic) bool canDelaySendingSegments; #endif /** * @brief Whether the socket uses MPTCP. * * If you want to use MPTCP, set this to true before connecting or binding. * After connecting or binding, this returns whether MPTCP was used. */ @property (nonatomic) bool usesMPTCP; /** * @brief The host to use as a SOCKS5 proxy. */ @property OF_NULLABLE_PROPERTY (copy, nonatomic) OFString *SOCKS5Host; /** * @brief The port to use on the SOCKS5 proxy. |
| ︙ | ︙ |