Differences From Artifact [4b227c3bdd]:
- File src/OFSCTPSocket.m — part of check-in [c4c40e01a8] at 2024-05-01 23:14:36 on branch sctp — OFSCTPSocket: Add support for packet flags (user: js, size: 14476) [annotate] [blame] [check-ins using]
To Artifact [908828903c]:
- File
src/OFSCTPSocket.m
— part of check-in
[816c13da9b]
at
2024-05-01 23:23:46
on branch sctp
— OFSCTPSocket: Rename packet to message
Let's use the proper terminology for the protocol. (user: js, size: 14466) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
352 353 354 355 356 357 358 | flags: NULL]; } - (size_t)receiveIntoBuffer: (void *)buffer length: (size_t)length streamID: (uint16_t *)streamID PPID: (uint32_t *)PPID | | | 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 | flags: NULL]; } - (size_t)receiveIntoBuffer: (void *)buffer length: (size_t)length streamID: (uint16_t *)streamID PPID: (uint32_t *)PPID flags: (OFSCTPMessageFlags *)flags { ssize_t ret; struct iovec iov = { .iov_base = buffer, .iov_len = length }; struct sctp_rcvinfo rcvinfo; |
︙ | ︙ | |||
395 396 397 398 399 400 401 | if (flags != NULL) { *flags = 0; if (infotype == SCTP_RECVV_RCVINFO && rcvinfoSize >= (socklen_t)sizeof(rcvinfo) && rcvinfo.rcv_flags & SCTP_UNORDERED) | | | 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 | if (flags != NULL) { *flags = 0; if (infotype == SCTP_RECVV_RCVINFO && rcvinfoSize >= (socklen_t)sizeof(rcvinfo) && rcvinfo.rcv_flags & SCTP_UNORDERED) *flags |= OFSCTPMessageUnordered; } return ret; } - (void)asyncReceiveWithInfoIntoBuffer: (void *)buffer length: (size_t)length |
︙ | ︙ | |||
458 459 460 461 462 463 464 | [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 | | | | 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 | [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: (OFSCTPMessageFlags)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 & OFSCTPMessageUnordered) ? SCTP_UNORDERED : 0), }; if (_socket == OFInvalidSocketHandle) @throw [OFNotOpenException exceptionWithObject: self]; if (length > SSIZE_MAX) @throw [OFOutOfRangeException exception]; |
︙ | ︙ | |||
496 497 498 499 500 501 502 | bytesWritten: bytesWritten errNo: 0]; } - (void)asyncSendData: (OFData *)data streamID: (uint16_t)streamID PPID: (uint32_t)PPID | | | | | | | | | | | 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 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 | bytesWritten: bytesWritten errNo: 0]; } - (void)asyncSendData: (OFData *)data streamID: (uint16_t)streamID PPID: (uint32_t)PPID flags: (OFSCTPMessageFlags)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: (OFSCTPMessageFlags)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: (OFSCTPMessageFlags)flags block: (OFSCTPSocketAsyncSendDataBlock)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: (OFSCTPMessageFlags)flags runLoopMode: (OFRunLoopMode)runLoopMode block: (OFSCTPSocketAsyncSendDataBlock)block { [OFRunLoop of_addAsyncSendForSCTPSocket: self data: data streamID: streamID PPID: PPID flags: flags mode: runLoopMode block: block delegate: nil]; } #endif - (void)setCanDelaySendingMessages: (bool)canDelaySendingMessages { int v = !canDelaySendingMessages; if (setsockopt(_socket, IPPROTO_SCTP, SCTP_NODELAY, (char *)&v, (socklen_t)sizeof(v)) != 0) @throw [OFSetOptionFailedException exceptionWithObject: self errNo: _OFSocketErrNo()]; } - (bool)canDelaySendingMessages { int v; socklen_t len = sizeof(v); if (getsockopt(_socket, IPPROTO_SCTP, SCTP_NODELAY, (char *)&v, &len) != 0 || len != sizeof(v)) @throw [OFGetOptionFailedException exceptionWithObject: self errNo: _OFSocketErrNo()]; return !v; } @end |