mirror of
https://github.com/curl/curl.git
synced 2024-12-03 06:20:31 +08:00
7eb31c852d
- fix HTTP header parsing to report incomplete lines it buffers as consumed! - re-implement the RTP parser for interleave RTP messages for robustness. It is now keeping its state at the connection - RTSP protocol handler "readwrite" implementation now tracks if the response is before/in/after header parsing or "in" a bod by calling "Curl_http_readwrite_headers()" itself. This allows it to know when non-RTP bytes are "junk" or HEADER or BODY. - tested with #12035 and various small receive sizes where current master fails Closes #12052
81 lines
2.4 KiB
C
81 lines
2.4 KiB
C
#ifndef HEADER_CURL_RTSP_H
|
|
#define HEADER_CURL_RTSP_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
#ifdef USE_HYPER
|
|
#define CURL_DISABLE_RTSP 1
|
|
#endif
|
|
|
|
#ifndef CURL_DISABLE_RTSP
|
|
|
|
extern const struct Curl_handler Curl_handler_rtsp;
|
|
|
|
CURLcode Curl_rtsp_parseheader(struct Curl_easy *data, char *header);
|
|
|
|
#else
|
|
/* disabled */
|
|
#define Curl_rtsp_parseheader(x,y) CURLE_NOT_BUILT_IN
|
|
|
|
#endif /* CURL_DISABLE_RTSP */
|
|
|
|
typedef enum {
|
|
RTP_PARSE_SKIP,
|
|
RTP_PARSE_CHANNEL,
|
|
RTP_PARSE_LEN,
|
|
RTP_PARSE_DATA
|
|
} rtp_parse_st;
|
|
/*
|
|
* RTSP Connection data
|
|
*
|
|
* Currently, only used for tracking incomplete RTP data reads
|
|
*/
|
|
struct rtsp_conn {
|
|
struct dynbuf buf;
|
|
int rtp_channel;
|
|
size_t rtp_len;
|
|
rtp_parse_st state;
|
|
BIT(in_header);
|
|
};
|
|
|
|
/****************************************************************************
|
|
* RTSP unique setup
|
|
***************************************************************************/
|
|
struct RTSP {
|
|
/*
|
|
* http_wrapper MUST be the first element of this structure for the wrap
|
|
* logic to work. In this way, we get a cheap polymorphism because
|
|
* &(data->state.proto.rtsp) == &(data->state.proto.http) per the C spec
|
|
*
|
|
* HTTP functions can safely treat this as an HTTP struct, but RTSP aware
|
|
* functions can also index into the later elements.
|
|
*/
|
|
struct HTTP http_wrapper; /* wrap HTTP to do the heavy lifting */
|
|
|
|
long CSeq_sent; /* CSeq of this request */
|
|
long CSeq_recv; /* CSeq received */
|
|
};
|
|
|
|
|
|
#endif /* HEADER_CURL_RTSP_H */
|