# HG changeset patch # User rtogni # Date 1168378345 0 # Node ID f0040ff1ba401771fac92f60d05d219b594c3c52 # Parent 4cdc4b2cd3da696cd0e654bb711404126e810a62 Don't drop last rdt packet on eof diff -r 4cdc4b2cd3da -r f0040ff1ba40 stream/librtsp/rtsp_session.c --- a/stream/librtsp/rtsp_session.c Tue Jan 09 20:02:13 2007 +0000 +++ b/stream/librtsp/rtsp_session.c Tue Jan 09 21:32:25 2007 +0000 @@ -208,6 +208,8 @@ (char *) (this->real_session->recv + this->real_session->recv_read); int fill = this->real_session->recv_size - this->real_session->recv_read; + if(this->real_session->rdteof) + return -1; if (len < 0) return 0; if (this->real_session->recv_size < 0) return -1; while (to_copy > fill) { @@ -218,8 +220,10 @@ this->real_session->recv_read = 0; this->real_session->recv_size = real_get_rdt_chunk (this->s, (char **)&(this->real_session->recv)); - if (this->real_session->recv_size < 0) - return -1; + if (this->real_session->recv_size < 0) { + this->real_session->rdteof = 1; + this->real_session->recv_size = 0; + } source = (char *) this->real_session->recv; fill = this->real_session->recv_size; diff -r 4cdc4b2cd3da -r f0040ff1ba40 stream/realrtsp/real.c --- a/stream/realrtsp/real.c Tue Jan 09 20:02:13 2007 +0000 +++ b/stream/realrtsp/real.c Tue Jan 09 21:32:25 2007 +0000 @@ -649,6 +649,7 @@ real_rtsp_session = malloc (sizeof (struct real_rtsp_session_t)); real_rtsp_session->recv = xbuffer_init (BUF_SIZE); + real_rtsp_session->rdteof = 0; return real_rtsp_session; } diff -r 4cdc4b2cd3da -r f0040ff1ba40 stream/realrtsp/real.h --- a/stream/realrtsp/real.h Tue Jan 09 20:02:13 2007 +0000 +++ b/stream/realrtsp/real.h Tue Jan 09 21:32:25 2007 +0000 @@ -45,6 +45,8 @@ uint8_t header[HEADER_SIZE]; int header_len; int header_read; + + int rdteof; }; int real_get_rdt_chunk(rtsp_t *rtsp_session, char **buffer);