From 6728be820a128cf1e54c9cc4690c5c58f9264156 Mon Sep 17 00:00:00 2001 From: Gildas Bazin Date: Sun, 4 Dec 2005 20:37:47 +0000 Subject: [PATCH] * modules/access/rtsp/rtsp.c: fixed major bug in realrtsp access. Some incoming data would occasionally be dropped. --- modules/access/rtsp/rtsp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/access/rtsp/rtsp.c b/modules/access/rtsp/rtsp.c index 94de904f60..a6dd04d3c2 100644 --- a/modules/access/rtsp/rtsp.c +++ b/modules/access/rtsp/rtsp.c @@ -399,7 +399,7 @@ int rtsp_read_data( rtsp_client_t *rtsp, char *buffer, unsigned int size ) if( size >= 4 ) { - i= rtsp->pf_read( rtsp->p_userdata, buffer, 4 ); + i = rtsp->pf_read( rtsp->p_userdata, buffer, 4 ); if( i < 4 ) return i; if( buffer[0]=='S' && buffer[1]=='E' && buffer[2]=='T' && @@ -417,13 +417,13 @@ int rtsp_read_data( rtsp_client_t *rtsp, char *buffer, unsigned int size ) if( !strncasecmp( rest, "Cseq:", 5 ) ) sscanf( rest, "%*s %u", &seq ); - } while( strlen(rest) != 0 ); - + } while( *rest ); free( rest ); + if( seq < 0 ) { fprintf(stderr, "warning: cseq not recognized!\n"); - seq=1; + seq = 1; } /* lets make the server happy */ @@ -433,7 +433,7 @@ int rtsp_read_data( rtsp_client_t *rtsp, char *buffer, unsigned int size ) rtsp_put( rtsp, rest ); rtsp_put( rtsp, "" ); free( rest ); - rtsp->pf_read( rtsp->p_userdata, buffer, size ); + i = rtsp->pf_read( rtsp->p_userdata, buffer, size ); } else { @@ -441,7 +441,7 @@ int rtsp_read_data( rtsp_client_t *rtsp, char *buffer, unsigned int size ) i += 4; } } - else i= rtsp->pf_read( rtsp->p_userdata, buffer, size ); + else i = rtsp->pf_read( rtsp->p_userdata, buffer, size ); //fprintf( stderr, "<< %d of %d bytes\n", i, size ); -- 2.39.2