MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-15 08:45:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update evrtsp based on evhttp 1.4.14b

Browse Source 
Up from 1.4.10.
This commit is contained in:
Julien BLACHE 2010-07-23 17:44:20 +02:00
parent e376a5c5ad
commit 09485b0ed8
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/evrtsp/rtsp.c
View File

@ -104,7 +104,7 @@
#define NI_NUMERICHOST 1 #define NI_NUMERICHOST 1
#define NI_NUMERICSERV 2 #define NI_NUMERICSERV 2
int static int
fake_getnameinfo(const struct sockaddr *sa, size_t salen, char *host, fake_getnameinfo(const struct sockaddr *sa, size_t salen, char *host,
size_t hostlen, char *serv, size_t servlen, int flags) size_t hostlen, char *serv, size_t servlen, int flags)
{ {
@ -349,14 +349,12 @@ static void
evrtsp_make_header_request(struct evrtsp_connection *evcon, evrtsp_make_header_request(struct evrtsp_connection *evcon,
struct evrtsp_request *req) struct evrtsp_request *req)
{ {
char line[1024];
const char *method; const char *method;
/* Generate request line */ /* Generate request line */
method = evrtsp_method(req->type); method = evrtsp_method(req->type);
evutil_snprintf(line, sizeof(line), "%s %s RTSP/%d.%d\r\n", evbuffer_add_printf(evcon->output_buffer, "%s %s RTSP/%d.%d\r\n",
method, req->uri, req->major, req->minor); method, req->uri, req->major, req->minor);
evbuffer_add(evcon->output_buffer, line, strlen(line));
/* Content-Length is mandatory, absent means 0 */ /* Content-Length is mandatory, absent means 0 */
if ((EVBUFFER_LENGTH(req->output_buffer) > 0) if ((EVBUFFER_LENGTH(req->output_buffer) > 0)
@ -372,15 +370,13 @@ evrtsp_make_header_request(struct evrtsp_connection *evcon,
void void
evrtsp_make_header(struct evrtsp_connection *evcon, struct evrtsp_request *req) evrtsp_make_header(struct evrtsp_connection *evcon, struct evrtsp_request *req)
{ {
char line[1024];
struct evkeyval *header; struct evkeyval *header;
evrtsp_make_header_request(evcon, req); evrtsp_make_header_request(evcon, req);
TAILQ_FOREACH(header, req->output_headers, next) { TAILQ_FOREACH(header, req->output_headers, next) {
evutil_snprintf(line, sizeof(line), "%s: %s\r\n", evbuffer_add_printf(evcon->output_buffer, "%s: %s\r\n",
header->key, header->value); header->key, header->value);
evbuffer_add(evcon->output_buffer, line, strlen(line));
} }
evbuffer_add(evcon->output_buffer, "\r\n", 2); evbuffer_add(evcon->output_buffer, "\r\n", 2);
@ -584,8 +580,8 @@ evrtsp_read_body(struct evrtsp_connection *evcon, struct evrtsp_request *req)
} else if (EVBUFFER_LENGTH(buf) >= req->ntoread) { } else if (EVBUFFER_LENGTH(buf) >= req->ntoread) {
/* Completed content length */ /* Completed content length */
evbuffer_add(req->input_buffer, EVBUFFER_DATA(buf), evbuffer_add(req->input_buffer, EVBUFFER_DATA(buf),
req->ntoread); (size_t)req->ntoread);
evbuffer_drain(buf, req->ntoread); evbuffer_drain(buf, (size_t)req->ntoread);
req->ntoread = 0; req->ntoread = 0;
evrtsp_connection_done(evcon); evrtsp_connection_done(evcon);
return; return;
@ -630,6 +626,7 @@ evrtsp_read(int fd, short what, void *arg)
return; return;
} else if (n == 0) { } else if (n == 0) {
/* Connection closed */ /* Connection closed */
evcon->state = EVCON_DISCONNECTED;
evrtsp_connection_done(evcon); evrtsp_connection_done(evcon);
return; return;
} }
@ -870,14 +867,13 @@ evrtsp_parse_response_line(struct evrtsp_request *req, char *line)
{ {
char *protocol; char *protocol;
char *number; char *number;
char *readable; const char *readable = "";
protocol = strsep(&line, " "); protocol = strsep(&line, " ");
if (line == NULL) if (line == NULL)
return (-1); return (-1);
number = strsep(&line, " "); number = strsep(&line, " ");
if (line == NULL) if (line != NULL)
return (-1);
readable = line; readable = line;
if (strcmp(protocol, "RTSP/1.0") == 0) { if (strcmp(protocol, "RTSP/1.0") == 0) {
@ -1498,6 +1494,11 @@ evrtsp_send(struct evrtsp_request *req, struct evbuffer *databuf)
{ {
struct evrtsp_connection *evcon = req->evcon; struct evrtsp_connection *evcon = req->evcon;
if (evcon == NULL) {
evrtsp_request_free(req);
return;
}
assert(TAILQ_FIRST(&evcon->requests) == req); assert(TAILQ_FIRST(&evcon->requests) == req);
/* xxx: not sure if we really should expose the data buffer this way */ /* xxx: not sure if we really should expose the data buffer this way */