Skip to content

rtsp: fix connection teardown races and keep serving past the connection pool #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jamp wants to merge 13 commits into
base: master
Choose a base branch
from
Open

rtsp: fix connection teardown races and keep serving past the connection pool #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1b32a27
Adding a small host test harness
Jamp Sep 29, 2026
5ecce7b
Detaching an RTSP connection once when a request is cut short
Jamp Sep 30, 2026
1e575b0
Sending RTSP responses whole on the non-blocking client socket
Jamp Sep 30, 2026
6bfd5a4
Closing the RTSP client socket exactly once
Jamp Sep 30, 2026
1a4a736
Clearing transports between RTSP clients, pacing RTCP on interleaved …
Jamp Sep 30, 2026
c3633e8
Waiting for the rest of a split interleaved packet from the RTSP client
Jamp Sep 30, 2026
4a8e755
Turning away RTSP clients beyond the connection pool without stopping…
Jamp Sep 30, 2026
9967648
Retrying the RTSP select when a signal interrupts it
Jamp Sep 30, 2026
e3f5865
Answering GET_PARAMETER keepalives instead of dropping the RTSP client
Jamp Sep 30, 2026
4f5885d
Sharing one wait budget across a split interleaved packet
Jamp Sep 30, 2026
278f5b8
Skipping RTSP request bodies so they are not parsed as the next request
Jamp Sep 30, 2026
4c32346
Shutting down an RTSP client that stops reading instead of waiting on…
Jamp Sep 30, 2026
9cecf31
Checking the NAL size before reading its header, as an empty pack has…
Jamp Oct 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
/toolchain
compile_flags.txt
divinus
/test/*_test
22 changes: 5 additions & 17 deletions src/rtsp/rtp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include <netdb.h>
#include <errno.h>
#include <fcntl.h>
#include <poll.h>

#include "rtsp_server.h"
#include "common.h"
Expand Down Expand Up @@ -38,23 +37,11 @@ struct __transfer_set_t {

static unsigned int __frame_ts_video, __frame_ts_audio;

static inline void __wait_out(int fd)
{
struct pollfd p = { .fd = fd, .events = POLLOUT };
poll(&p, 1, 100);
}

static int __tcp_flush(struct connection_item_t *con)
{
unsigned int sent = 0;
while (sent < con->tx_len) {
int r = send(con->client_fd, con->tx_buf + sent, con->tx_len - sent, 0);
if (r > 0) sent += r;
else if (r < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) { __wait_out(con->client_fd); }
else { con->tx_len = 0; return FAILURE; }
}
int ret = __tcp_send_all(con->client_fd, con->tx_buf, con->tx_len);
con->tx_len = 0;
return SUCCESS;
return ret;
}

static int __tcp_flush_each(struct list_t *e, void *v)
Expand All @@ -79,6 +66,9 @@ static int __tcp_flush_each(struct list_t *e, void *v)

static inline int __transfer_nal_h26x(struct list_head_t *trans_list, unsigned char *nalptr, size_t nalsize, char isH265)
{
/* Checked before the header is read: an empty pack comes with no data */
if (nalsize < 4) return SUCCESS;

struct nal_rtp_t rtp;
unsigned int nri = isH265 ? (nalptr[0] & 0x81) : (nalptr[0] & 0x60);
unsigned int pt = isH265 ? (nalptr[0] >> 1 & 0x3F) : (nalptr[0] & 0x1F);
Expand All @@ -94,8 +84,6 @@ static inline int __transfer_nal_h26x(struct list_head_t *trans_list, unsigned c
p_header->cc = 0;
p_header->pt = 96 & 0x7F;

if (nalsize < 4) return SUCCESS;

if (nalsize <= __RTP_MAXPAYLOADSIZE) {
/* single packet */
/* SPS, PPS, SEI is not marked */
Expand Down
Loading