Implement datachannel close #24
Conversation
Sets SCTP_RESET_STREAMS on the socket to close the datachannel.
mo3rfan
force-pushed
the
datachannel_close
branch
from
cf74be8 to
6f98e0e
Compare
chadnickbok
left a comment
chadnickbok
left a comment
There was a problem hiding this comment.
Great work, thank you so much. A few things I'd like cleaned up before its time to merge.
I'll try to take some time this evening to more thoroughly review and test out this PR.
src/SCTPWrapper.cpp
Outdated
| SPDLOG_TRACE(logger, "OnNotification(type=SCTP_STREAM_RESET_EVENT)"); | ||
| struct sctp_stream_reset_event reset_event; | ||
| reset_event = notify->sn_strreset_event; | ||
| for (int i = 1; i < 2; i++) { |
There was a problem hiding this comment.
Lets drop the for here - we're only closing one data channel at a time.
Alternatively, if the sctp_stream_reset_event can actually hold multiple streams to reset, lets loop across all of them.
There was a problem hiding this comment.
The event could hold multiple streams as it's a list. I would ideally want to loop across each of them, but I'm not sure how to do that without knowing the size.
|
|
||
| std::shared_ptr<Logger> logger = GetLogger("rtcdcpp.PeerConnection"); | ||
| public: | ||
| void ResetSCTPStream(uint16_t stream_id); |
There was a problem hiding this comment.
I'd like to hide the specifics of resetting streams inside the DataChannel - the PeerConnection here is meant to be a somewhat close mirror of the Javascript DataChannel API, which doesn't expose SCTP directly.
There was a problem hiding this comment.
I agree! I shouldn't expose this. Will fix soon.
There was a problem hiding this comment.
Fixed in 91db2d4. Let me know if this is okay.
src/SCTPWrapper.cpp
Outdated
| logger->info("Outgoing stream_id#{} have been reset, calling onClose CB", streamid); | ||
| const uint8_t dc_close_data = DC_TYPE_CLOSE; | ||
| const uint8_t *dc_close_ptr = &dc_close_data; | ||
| OnMsgReceived(dc_close_ptr, sizeof(dc_close_ptr), streamid + 1, PPID_CONTROL); |
Also fixes the function prototype.
This is computed from strreset_length field from sctp_stream_reset_event struct. This field is the total length in bytes of the delivered event, including the header. https://tools.ietf.org/html/rfc6525#section-6.1.1
* Heap allocation of struct and free it soon after * Simplified 'len'
2 participants
No description provided.