Overview
Comment: | OFSCTPSocket: Add support for packet flags |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | sctp |
Files: | files | file ages | folders |
SHA3-256: |
c4c40e01a8ab470bc874f9392bc479f8 |
User & Date: | js on 2024-05-01 23:14:36 |
Other Links: | branch diff | manifest | tags |
Context
2024-05-01
| ||
23:23 | OFSCTPSocket: Rename packet to message check-in: 816c13da9b user: js tags: sctp | |
23:14 | OFSCTPSocket: Add support for packet flags check-in: c4c40e01a8 user: js tags: sctp | |
21:39 | GitHub Actions: Install libsctp-dev on Ubuntu check-in: 3c91319201 user: js tags: sctp | |
Changes
Modified src/OFRunLoop+Private.h from [cbf691cb8e] to [7785e31575].
︙ | ︙ | |||
136 137 138 139 140 141 142 143 144 145 146 147 148 149 | block: (nullable OFSCTPSocketAsyncReceiveBlock)block # endif delegate: (nullable id <OFSCTPSocketDelegate>)delegate; + (void)of_addAsyncSendForSCTPSocket: (OFSCTPSocket *)socket data: (OFData *)data streamID: (uint16_t)streamID PPID: (uint32_t)PPID mode: (OFRunLoopMode)mode # ifdef OF_HAVE_BLOCKS block: (nullable OFSCTPSocketAsyncSendDataBlock)block # endif delegate: (nullable id <OFSCTPSocketDelegate>)delegate; # endif + (void)of_cancelAsyncRequestsForObject: (id)object mode: (OFRunLoopMode)mode; | > | 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 | block: (nullable OFSCTPSocketAsyncReceiveBlock)block # endif delegate: (nullable id <OFSCTPSocketDelegate>)delegate; + (void)of_addAsyncSendForSCTPSocket: (OFSCTPSocket *)socket data: (OFData *)data streamID: (uint16_t)streamID PPID: (uint32_t)PPID flags: (OFSCTPPacketFlags)flags mode: (OFRunLoopMode)mode # ifdef OF_HAVE_BLOCKS block: (nullable OFSCTPSocketAsyncSendDataBlock)block # endif delegate: (nullable id <OFSCTPSocketDelegate>)delegate; # endif + (void)of_cancelAsyncRequestsForObject: (id)object mode: (OFRunLoopMode)mode; |
︙ | ︙ |
Modified src/OFRunLoop.m from [77c2b10223] to [99717b7858].
︙ | ︙ | |||
220 221 222 223 224 225 226 227 228 229 230 231 232 233 | @public # ifdef OF_HAVE_BLOCKS OFSCTPSocketAsyncSendDataBlock _block; # endif OFData *_data; uint16_t _streamID; uint32_t _PPID; } @end # endif #endif @implementation OFRunLoopState - (instancetype)init | > | 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 | @public # ifdef OF_HAVE_BLOCKS OFSCTPSocketAsyncSendDataBlock _block; # endif OFData *_data; uint16_t _streamID; uint32_t _PPID; OFSCTPPacketFlags _flags; } @end # endif #endif @implementation OFRunLoopState - (instancetype)init |
︙ | ︙ | |||
1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 | # ifdef OF_HAVE_SCTP @implementation OFRunLoopSCTPReceiveQueueItem - (bool)handleObject: (id)object { size_t length; uint16_t streamID; uint32_t PPID; id exception = nil; @try { length = [object receiveIntoBuffer: _buffer length: _length streamID: &streamID | > | > | | > > | 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 | # ifdef OF_HAVE_SCTP @implementation OFRunLoopSCTPReceiveQueueItem - (bool)handleObject: (id)object { size_t length; uint16_t streamID; uint32_t PPID; OFSCTPPacketFlags flags; id exception = nil; @try { length = [object receiveIntoBuffer: _buffer length: _length streamID: &streamID PPID: &PPID flags: &flags]; } @catch (id e) { length = 0; exception = e; } # ifdef OF_HAVE_BLOCKS if (_block != NULL) return _block(length, streamID, PPID, flags, exception); else { # endif if (![_delegate respondsToSelector: @selector(socket: didReceiveIntoBuffer:length:streamID:PPID:flags: exception:)]) return false; return [_delegate socket: object didReceiveIntoBuffer: _buffer length: length streamID: streamID PPID: PPID flags: flags exception: exception]; # ifdef OF_HAVE_BLOCKS } # endif } # ifdef OF_HAVE_BLOCKS |
︙ | ︙ | |||
1089 1090 1091 1092 1093 1094 1095 | id exception = nil; OFData *newData, *oldData; @try { [object sendBuffer: _data.items length: _data.count * _data.itemSize streamID: _streamID | | > | | > | 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 | id exception = nil; OFData *newData, *oldData; @try { [object sendBuffer: _data.items length: _data.count * _data.itemSize streamID: _streamID PPID: _PPID flags: _flags]; } @catch (id e) { exception = e; } # ifdef OF_HAVE_BLOCKS if (_block != NULL) { newData = _block(exception); if (newData == nil) return false; oldData = _data; _data = [newData copy]; [oldData release]; return true; } else { # endif if (![_delegate respondsToSelector: @selector(socket: didSendData:streamID:PPID:flags:exception:)]) return false; newData = [_delegate socket: object didSendData: _data streamID: _streamID PPID: _PPID flags: _flags exception: exception]; if (newData == nil) return false; oldData = _data; _data = [newData copy]; |
︙ | ︙ | |||
1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 | QUEUE_ITEM } + (void)of_addAsyncSendForSCTPSocket: (OFSCTPSocket *)sock data: (OFData *)data streamID: (uint16_t)streamID PPID: (uint32_t)PPID mode: (OFRunLoopMode)mode # ifdef OF_HAVE_BLOCKS block: (OFSCTPSocketAsyncSendDataBlock)block # endif delegate: (id <OFSCTPSocketDelegate>)delegate { NEW_WRITE(OFRunLoopSCTPSendQueueItem, sock, mode) queueItem->_delegate = [delegate retain]; # ifdef OF_HAVE_BLOCKS queueItem->_block = [block copy]; # endif queueItem->_data = [data copy]; queueItem->_streamID = streamID; queueItem->_PPID = PPID; QUEUE_ITEM } # endif # undef NEW_READ # undef NEW_WRITE # undef QUEUE_ITEM | > > | 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 | QUEUE_ITEM } + (void)of_addAsyncSendForSCTPSocket: (OFSCTPSocket *)sock data: (OFData *)data streamID: (uint16_t)streamID PPID: (uint32_t)PPID flags: (OFSCTPPacketFlags)flags mode: (OFRunLoopMode)mode # ifdef OF_HAVE_BLOCKS block: (OFSCTPSocketAsyncSendDataBlock)block # endif delegate: (id <OFSCTPSocketDelegate>)delegate { NEW_WRITE(OFRunLoopSCTPSendQueueItem, sock, mode) queueItem->_delegate = [delegate retain]; # ifdef OF_HAVE_BLOCKS queueItem->_block = [block copy]; # endif queueItem->_data = [data copy]; queueItem->_streamID = streamID; queueItem->_PPID = PPID; queueItem->_flags = flags; QUEUE_ITEM } # endif # undef NEW_READ # undef NEW_WRITE # undef QUEUE_ITEM |
︙ | ︙ |
Modified src/OFSCTPSocket.h from [e2ee8e466d] to [ec4a2962e7].
︙ | ︙ | |||
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 | OF_ASSUME_NONNULL_BEGIN /** @file */ @class OFSCTPSocket; @class OFString; #ifdef OF_HAVE_BLOCKS /** * @brief A block which is called when the socket connected. * * @param exception An exception which occurred while connecting the socket or * `nil` on success */ typedef void (^OFSCTPSocketAsyncConnectBlock)(id _Nullable exception); /** * @brief A block which is called when a packet has been received. * * @param length The length of the packet * @param streamID The stream ID for the message * @param PPID The Payload Protocol Identifier for the message * @param exception An exception which occurred while receiving or `nil` on * success * @return A bool whether the same block should be used for the next receive */ typedef bool (^OFSCTPSocketAsyncReceiveBlock)(size_t length, uint16_t streamID, | > > > > > > > > > | | 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 | OF_ASSUME_NONNULL_BEGIN /** @file */ @class OFSCTPSocket; @class OFString; /** * @brief Flags for an SCTP packet. */ typedef enum { /** The packet is sent / received out of order. */ OFSCTPPacketUnordered = 1 } OFSCTPPacketFlags; #ifdef OF_HAVE_BLOCKS /** * @brief A block which is called when the socket connected. * * @param exception An exception which occurred while connecting the socket or * `nil` on success */ typedef void (^OFSCTPSocketAsyncConnectBlock)(id _Nullable exception); /** * @brief A block which is called when a packet has been received. * * @param length The length of the packet * @param streamID The stream ID for the message * @param PPID The Payload Protocol Identifier for the message * @param flags Flags for the packet * @param exception An exception which occurred while receiving or `nil` on * success * @return A bool whether the same block should be used for the next receive */ typedef bool (^OFSCTPSocketAsyncReceiveBlock)(size_t length, uint16_t streamID, uint32_t PPID, OFSCTPPacketFlags flags, id _Nullable exception); /** * @brief A block which is called when a packet has been sent. * * @param exception An exception which occurred while reading or `nil` on * success * @return The data to repeat the send with or nil if it should not repeat |
︙ | ︙ | |||
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 | * @brief This method is called when a packet has been received. * * @param socket The sequenced packet socket which received a packet * @param buffer The buffer the packet has been written to * @param length The length of the packet * @param streamID The stream ID for the message * @param PPID The Payload Protocol Identifier for the message * @param exception An exception that occurred while receiving, or nil on * success * @return A bool whether the same block should be used for the next receive */ - (bool)socket: (OFSCTPSocket *)socket didReceiveIntoBuffer: (void *)buffer length: (size_t)length streamID: (uint16_t)streamID PPID: (uint32_t)PPID exception: (nullable id)exception; /** * @brief This method is called when a packet has been sent. * * @param socket The sequenced packet socket which sent a packet * @param data The data which was sent * @param streamID The stream ID for the message * @param PPID The Payload Protocol Identifier for the message * @param exception An exception that occurred while sending, or nil on success * @return The data to repeat the send with or nil if it should not repeat */ - (nullable OFData *)socket: (OFSCTPSocket *)socket didSendData: (OFData *)data streamID: (uint16_t)streamID PPID: (uint32_t)PPID exception: (nullable id)exception; @end /** * @class OFSCTPSocket OFSCTPSocket.h ObjFW/OFSCTPSocket.h * * @brief A class which provides methods to create and use SCTP sockets in | > > > > | 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 126 127 128 129 130 131 132 133 134 135 136 | * @brief This method is called when a packet has been received. * * @param socket The sequenced packet socket which received a packet * @param buffer The buffer the packet has been written to * @param length The length of the packet * @param streamID The stream ID for the message * @param PPID The Payload Protocol Identifier for the message * @param flags Flags for the packet * @param exception An exception that occurred while receiving, or nil on * success * @return A bool whether the same block should be used for the next receive */ - (bool)socket: (OFSCTPSocket *)socket didReceiveIntoBuffer: (void *)buffer length: (size_t)length streamID: (uint16_t)streamID PPID: (uint32_t)PPID flags: (OFSCTPPacketFlags)flags exception: (nullable id)exception; /** * @brief This method is called when a packet has been sent. * * @param socket The sequenced packet socket which sent a packet * @param data The data which was sent * @param streamID The stream ID for the message * @param PPID The Payload Protocol Identifier for the message * @param flags Flags for the packet * @param exception An exception that occurred while sending, or nil on success * @return The data to repeat the send with or nil if it should not repeat */ - (nullable OFData *)socket: (OFSCTPSocket *)socket didSendData: (OFData *)data streamID: (uint16_t)streamID PPID: (uint32_t)PPID flags: (OFSCTPPacketFlags)flags exception: (nullable id)exception; @end /** * @class OFSCTPSocket OFSCTPSocket.h ObjFW/OFSCTPSocket.h * * @brief A class which provides methods to create and use SCTP sockets in |
︙ | ︙ | |||
223 224 225 226 227 228 229 230 231 232 233 234 235 236 | * * If the buffer is too small, the packet is truncated. * * @param buffer The buffer to write the packet to * @param length The length of the buffer * @param streamID The stream ID for the message * @param PPID The Payload Protocol Identifier for the message * @return The length of the received packet * @throw OFReadFailedException Receiving failed * @throw OFNotOpenException The socket is not open */ - (size_t)receiveIntoBuffer: (void *)buffer length: (size_t)length streamID: (nullable uint16_t *)streamID | > | > | 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 | * * If the buffer is too small, the packet is truncated. * * @param buffer The buffer to write the packet to * @param length The length of the buffer * @param streamID The stream ID for the message * @param PPID The Payload Protocol Identifier for the message * @param flags Flags for the packet * @return The length of the received packet * @throw OFReadFailedException Receiving failed * @throw OFNotOpenException The socket is not open */ - (size_t)receiveIntoBuffer: (void *)buffer length: (size_t)length streamID: (nullable uint16_t *)streamID PPID: (nullable uint32_t *)PPID flags: (nullable OFSCTPPacketFlags *)flags; /** * @brief Asynchronously receives a packet with stream ID and PPID and stores * it into the specified buffer. * * If the buffer is too small, the packet is truncated. * |
︙ | ︙ | |||
307 308 309 310 311 312 313 314 315 316 317 318 319 | /** * @brief Sends the specified packet on the specified stream. * * @param buffer The buffer to send as a packet * @param length The length of the buffer * @param streamID The stream ID for the message * @param PPID The Payload Protocol Identifier for the message * @throw OFWriteFailedException Sending failed * @throw OFNotOpenException The socket is not open */ - (void)sendBuffer: (const void *)buffer length: (size_t)length streamID: (uint16_t)streamID | > | > > | > > > > > > > | 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 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 | /** * @brief Sends the specified packet on the specified stream. * * @param buffer The buffer to send as a packet * @param length The length of the buffer * @param streamID The stream ID for the message * @param PPID The Payload Protocol Identifier for the message * @param flags Flags for the packet * @throw OFWriteFailedException Sending failed * @throw OFNotOpenException The socket is not open */ - (void)sendBuffer: (const void *)buffer length: (size_t)length streamID: (uint16_t)streamID PPID: (uint32_t)PPID flags: (OFSCTPPacketFlags)flags; /** * @brief Asynchronously sends the specified packet on the specified stream. * * @param data The data to send as a packet * @param streamID The stream ID for the message * @param PPID The Payload Protocol Identifier for the message * @param flags Flags for the packet */ - (void)asyncSendData: (OFData *)data streamID: (uint16_t)streamID PPID: (uint32_t)PPID flags: (OFSCTPPacketFlags)flags; /** * @brief Asynchronously sends the specified packet on the specified stream. * * @param data The data to send as a packet * @param streamID The stream ID for the message * @param PPID The Payload Protocol Identifier for the message * @param flags Flags for the packet * @param runLoopMode The run loop mode in which to perform the asynchronous * send */ - (void)asyncSendData: (OFData *)data streamID: (uint16_t)streamID PPID: (uint32_t)PPID flags: (OFSCTPPacketFlags)flags runLoopMode: (OFRunLoopMode)runLoopMode; #ifdef OF_HAVE_BLOCKS /** * @brief Asynchronously sends the specified packet on the specified stream. * * @param data The data to send as a packet * @param streamID The stream ID for the message * @param PPID The Payload Protocol Identifier for the message * @param flags Flags for the packet * @param block The block to call when the packet has been sent. It should * return the data for the next send with the same callback or nil * if it should not repeat. */ - (void)asyncSendData: (OFData *)data streamID: (uint16_t)streamID PPID: (uint32_t)PPID flags: (OFSCTPPacketFlags)flags block: (OFSCTPSocketAsyncSendDataBlock)block; /** * @brief Asynchronously sends the specified packet on the specified stream. * * @param data The data to send as a packet * @param streamID The stream ID for the message * @param PPID The Payload Protocol Identifier for the message * @param flags Flags for the packet * @param runLoopMode The run loop mode in which to perform the asynchronous * send * @param block The block to call when the packet has been sent. It should * return the data for the next send with the same callback or nil * if it should not repeat. */ - (void)asyncSendData: (OFData *)data streamID: (uint16_t)streamID PPID: (uint32_t)PPID flags: (OFSCTPPacketFlags)flags runLoopMode: (OFRunLoopMode)runLoopMode block: (OFSCTPSocketAsyncSendDataBlock)block; #endif @end OF_ASSUME_NONNULL_END |
Modified src/OFSCTPSocket.m from [0b73208e8d] to [4b227c3bdd].
︙ | ︙ | |||
344 345 346 347 348 349 350 | #endif - (size_t)receiveIntoBuffer: (void *)buffer length: (size_t)length { return [self receiveIntoBuffer: buffer length: length streamID: NULL | | > > | 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 | #endif - (size_t)receiveIntoBuffer: (void *)buffer length: (size_t)length { return [self receiveIntoBuffer: buffer length: length streamID: NULL PPID: NULL flags: NULL]; } - (size_t)receiveIntoBuffer: (void *)buffer length: (size_t)length streamID: (uint16_t *)streamID PPID: (uint32_t *)PPID flags: (OFSCTPPacketFlags *)flags { ssize_t ret; struct iovec iov = { .iov_base = buffer, .iov_len = length }; struct sctp_rcvinfo rcvinfo; |
︙ | ︙ | |||
386 387 388 389 390 391 392 393 394 395 396 397 398 399 | if (PPID != NULL) { if (infotype == SCTP_RECVV_RCVINFO && rcvinfoSize >= (socklen_t)sizeof(rcvinfo)) *PPID = rcvinfo.rcv_ppid; else *PPID = 0; } return ret; } - (void)asyncReceiveWithInfoIntoBuffer: (void *)buffer length: (size_t)length { | > > > > > > > > > | 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 | if (PPID != NULL) { if (infotype == SCTP_RECVV_RCVINFO && rcvinfoSize >= (socklen_t)sizeof(rcvinfo)) *PPID = rcvinfo.rcv_ppid; else *PPID = 0; } if (flags != NULL) { *flags = 0; if (infotype == SCTP_RECVV_RCVINFO && rcvinfoSize >= (socklen_t)sizeof(rcvinfo) && rcvinfo.rcv_flags & SCTP_UNORDERED) *flags |= OFSCTPPacketUnordered; } return ret; } - (void)asyncReceiveWithInfoIntoBuffer: (void *)buffer length: (size_t)length { |
︙ | ︙ | |||
440 441 442 443 444 445 446 | block: block delegate: nil]; } #endif - (void)sendBuffer: (const void *)buffer length: (size_t)length { | | > | > > | 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 | block: block delegate: nil]; } #endif - (void)sendBuffer: (const void *)buffer length: (size_t)length { [self sendBuffer: buffer length: length streamID: 0 PPID: 0 flags: 0]; } - (void)sendBuffer: (const void *)buffer length: (size_t)length streamID: (uint16_t)streamID PPID: (uint32_t)PPID flags: (OFSCTPPacketFlags)flags { ssize_t bytesWritten; struct iovec iov = { .iov_base = (void *)buffer, .iov_len = length }; struct sctp_sndinfo sndinfo = { .snd_sid = streamID, .snd_ppid = PPID, .snd_flags = ((flags & OFSCTPPacketUnordered) ? SCTP_UNORDERED : 0), }; if (_socket == OFInvalidSocketHandle) @throw [OFNotOpenException exceptionWithObject: self]; if (length > SSIZE_MAX) @throw [OFOutOfRangeException exception]; |
︙ | ︙ | |||
482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 | bytesWritten: bytesWritten errNo: 0]; } - (void)asyncSendData: (OFData *)data streamID: (uint16_t)streamID PPID: (uint32_t)PPID { [self asyncSendData: data streamID: streamID PPID: PPID runLoopMode: OFDefaultRunLoopMode]; } - (void)asyncSendData: (OFData *)data streamID: (uint16_t)streamID PPID: (uint32_t)PPID runLoopMode: (OFRunLoopMode)runLoopMode { [OFRunLoop of_addAsyncSendForSCTPSocket: self data: data streamID: streamID PPID: PPID mode: runLoopMode # ifdef OF_HAVE_BLOCKS block: NULL # endif delegate: _delegate]; } #ifdef OF_HAVE_BLOCKS - (void)asyncSendData: (OFData *)data streamID: (uint16_t)streamID PPID: (uint32_t)PPID block: (OFSequencedPacketSocketAsyncSendDataBlock)block { [self asyncSendData: data streamID: streamID PPID: PPID runLoopMode: OFDefaultRunLoopMode block: block]; } - (void)asyncSendData: (OFData *)data streamID: (uint16_t)streamID PPID: (uint32_t)PPID runLoopMode: (OFRunLoopMode)runLoopMode block: (OFSequencedPacketSocketAsyncSendDataBlock)block { [OFRunLoop of_addAsyncSendForSCTPSocket: self data: data streamID: streamID PPID: PPID mode: runLoopMode block: block delegate: nil]; } #endif - (void)setCanDelaySendingPackets: (bool)canDelaySendingPackets | > > > > > > > > | 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 | bytesWritten: bytesWritten errNo: 0]; } - (void)asyncSendData: (OFData *)data streamID: (uint16_t)streamID PPID: (uint32_t)PPID flags: (OFSCTPPacketFlags)flags { [self asyncSendData: data streamID: streamID PPID: PPID flags: flags runLoopMode: OFDefaultRunLoopMode]; } - (void)asyncSendData: (OFData *)data streamID: (uint16_t)streamID PPID: (uint32_t)PPID flags: (OFSCTPPacketFlags)flags runLoopMode: (OFRunLoopMode)runLoopMode { [OFRunLoop of_addAsyncSendForSCTPSocket: self data: data streamID: streamID PPID: PPID flags: flags mode: runLoopMode # ifdef OF_HAVE_BLOCKS block: NULL # endif delegate: _delegate]; } #ifdef OF_HAVE_BLOCKS - (void)asyncSendData: (OFData *)data streamID: (uint16_t)streamID PPID: (uint32_t)PPID flags: (OFSCTPPacketFlags)flags block: (OFSequencedPacketSocketAsyncSendDataBlock)block { [self asyncSendData: data streamID: streamID PPID: PPID flags: flags runLoopMode: OFDefaultRunLoopMode block: block]; } - (void)asyncSendData: (OFData *)data streamID: (uint16_t)streamID PPID: (uint32_t)PPID flags: (OFSCTPPacketFlags)flags runLoopMode: (OFRunLoopMode)runLoopMode block: (OFSequencedPacketSocketAsyncSendDataBlock)block { [OFRunLoop of_addAsyncSendForSCTPSocket: self data: data streamID: streamID PPID: PPID flags: flags mode: runLoopMode block: block delegate: nil]; } #endif - (void)setCanDelaySendingPackets: (bool)canDelaySendingPackets |
︙ | ︙ |
Modified src/test/OTAssert.h from [41f0812f71] to [ce8ac14d43].
︙ | ︙ | |||
40 41 42 43 44 45 46 | * @brief Asserts that the specified condition is true. * * @param condition The condition to check * @param ... An optional format string to print if the assertion failed, * followed by optional arguments */ #define OTAssertTrue(condition, ...) \ | | | | 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 | * @brief Asserts that the specified condition is true. * * @param condition The condition to check * @param ... An optional format string to print if the assertion failed, * followed by optional arguments */ #define OTAssertTrue(condition, ...) \ OTAssert((condition) == true, ## __VA_ARGS__) /** * @brief Asserts that the specified condition is false. * * @param condition The condition to check * @param ... An optional format string to print if the assertion failed, * followed by optional arguments */ #define OTAssertFalse(condition, ...) \ OTAssert((condition) == false, ## __VA_ARGS__) /** * @brief Asserts that the two values are equal. * * @param a The value to check * @param b The expected value * @param ... An optional format string to print if the assertion failed, |
︙ | ︙ |
Modified tests/OFSCTPSocketTests.m from [24a1134449] to [edc2aaa24d].
︙ | ︙ | |||
32 33 34 35 36 37 38 39 40 41 42 43 44 45 | - (void)testSCTPSocket { OFSCTPSocket *server, *client, *accepted; OFSocketAddress address; char buffer[6]; uint16_t streamID; uint32_t PPID; server = [OFSCTPSocket socket]; client = [OFSCTPSocket socket]; @try { address = [server bindToHost: @"127.0.0.1" port: 0]; } @catch (OFBindSocketFailedException *e) { | > | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 | - (void)testSCTPSocket { OFSCTPSocket *server, *client, *accepted; OFSocketAddress address; char buffer[6]; uint16_t streamID; uint32_t PPID; OFSCTPPacketFlags flags; server = [OFSCTPSocket socket]; client = [OFSCTPSocket socket]; @try { address = [server bindToHost: @"127.0.0.1" port: 0]; } @catch (OFBindSocketFailedException *e) { |
︙ | ︙ | |||
56 57 58 59 60 61 62 | [client connectToHost: @"127.0.0.1" port: OFSocketAddressIPPort(&address)]; accepted = [server accept]; OTAssertEqualObjects(OFSocketAddressString(accepted.remoteAddress), @"127.0.0.1"); | | > > > > | > > | 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 | [client connectToHost: @"127.0.0.1" port: OFSocketAddressIPPort(&address)]; accepted = [server accept]; OTAssertEqualObjects(OFSocketAddressString(accepted.remoteAddress), @"127.0.0.1"); [client sendBuffer: "Hello!" length: 6 streamID: 1 PPID: 1234 flags: OFSCTPPacketUnordered]; [accepted receiveIntoBuffer: buffer length: 6 streamID: &streamID PPID: &PPID flags: &flags]; OTAssertEqual(memcmp(buffer, "Hello!", 6), 0); OTAssertEqual(streamID, 1); OTAssertEqual(PPID, 1234); OTAssertTrue(flags & OFSCTPPacketUnordered); } @end |