MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-05-03 08:20:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rework failure path in httpd_stream_file()

Browse Source 
Kill code duplication, make it all clearer.
This commit is contained in:
Julien BLACHE 2010-02-02 21:04:35 +01:00
parent f0239951e1
commit 825569dc88
1 changed files with 27 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/httpd.c
View File

@ -364,8 +364,7 @@ httpd_stream_file(struct evhttp_request *req, int id)
{ {
evhttp_send_error(req, 500, "Cannot stream radio station"); evhttp_send_error(req, 500, "Cannot stream radio station");
free_mfi(mfi, 0); goto out_free_mfi;
return;
} }
st = (struct stream_ctx *)malloc(sizeof(struct stream_ctx)); st = (struct stream_ctx *)malloc(sizeof(struct stream_ctx));
@ -375,10 +374,10 @@ httpd_stream_file(struct evhttp_request *req, int id)
evhttp_send_error(req, HTTP_SERVUNAVAIL, "Internal Server Error"); evhttp_send_error(req, HTTP_SERVUNAVAIL, "Internal Server Error");
free_mfi(mfi, 0); goto out_free_mfi;
return;
} }
memset(st, 0, sizeof(struct stream_ctx)); memset(st, 0, sizeof(struct stream_ctx));
st->fd = -1;
transcode = transcode_needed(req->input_headers, mfi->codectype); transcode = transcode_needed(req->input_headers, mfi->codectype);
@ -387,7 +386,6 @@ httpd_stream_file(struct evhttp_request *req, int id)
DPRINTF(E_INFO, L_HTTPD, "Preparing to transcode %s\n", mfi->path); DPRINTF(E_INFO, L_HTTPD, "Preparing to transcode %s\n", mfi->path);
stream_cb = stream_chunk_xcode_cb; stream_cb = stream_chunk_xcode_cb;
st->fd = -1;
st->xcode = transcode_setup(mfi, &st->size); st->xcode = transcode_setup(mfi, &st->size);
if (!st->xcode) if (!st->xcode)
@ -396,9 +394,7 @@ httpd_stream_file(struct evhttp_request *req, int id)
evhttp_send_error(req, HTTP_SERVUNAVAIL, "Internal Server Error"); evhttp_send_error(req, HTTP_SERVUNAVAIL, "Internal Server Error");
free(st); goto out_free_st;
free_mfi(mfi, 0);
return;
} }
if (!evhttp_find_header(req->output_headers, "Content-Type")) if (!evhttp_find_header(req->output_headers, "Content-Type"))
@ -416,9 +412,7 @@ httpd_stream_file(struct evhttp_request *req, int id)
evhttp_send_error(req, HTTP_SERVUNAVAIL, "Internal Server Error"); evhttp_send_error(req, HTTP_SERVUNAVAIL, "Internal Server Error");
free(st); goto out_free_st;
free_mfi(mfi, 0);
return;
} }
stream_cb = stream_chunk_raw_cb; stream_cb = stream_chunk_raw_cb;
@ -430,10 +424,7 @@ httpd_stream_file(struct evhttp_request *req, int id)
evhttp_send_error(req, HTTP_NOTFOUND, "Not Found"); evhttp_send_error(req, HTTP_NOTFOUND, "Not Found");
free(st->buf); goto out_cleanup;
free(st);
free_mfi(mfi, 0);
return;
} }
ret = stat(mfi->path, &sb); ret = stat(mfi->path, &sb);
@ -443,11 +434,7 @@ httpd_stream_file(struct evhttp_request *req, int id)
evhttp_send_error(req, HTTP_NOTFOUND, "Not Found"); evhttp_send_error(req, HTTP_NOTFOUND, "Not Found");
close(st->fd); goto out_cleanup;
free(st->buf);
free(st);
free_mfi(mfi, 0);
return;
} }
st->size = sb.st_size; st->size = sb.st_size;
@ -458,11 +445,7 @@ httpd_stream_file(struct evhttp_request *req, int id)
evhttp_send_error(req, HTTP_BADREQUEST, "Bad Request"); evhttp_send_error(req, HTTP_BADREQUEST, "Bad Request");
close(st->fd); goto out_cleanup;
free(st->buf);
free(st);
free_mfi(mfi, 0);
return;
} }
st->offset = offset; st->offset = offset;
st->end_offset = end_offset; st->end_offset = end_offset;
@ -505,16 +488,7 @@ httpd_stream_file(struct evhttp_request *req, int id)
evhttp_clear_headers(req->output_headers); evhttp_clear_headers(req->output_headers);
evhttp_send_error(req, HTTP_SERVUNAVAIL, "Internal Server Error"); evhttp_send_error(req, HTTP_SERVUNAVAIL, "Internal Server Error");
if (transcode) goto out_cleanup;
transcode_cleanup(st->xcode);
else
{
free(st->buf);
close(st->fd);
}
free(st);
free_mfi(mfi, 0);
return;
} }
ret = evbuffer_expand(st->evbuf, STREAM_CHUNK_SIZE); ret = evbuffer_expand(st->evbuf, STREAM_CHUNK_SIZE);
@ -525,17 +499,7 @@ httpd_stream_file(struct evhttp_request *req, int id)
evhttp_clear_headers(req->output_headers); evhttp_clear_headers(req->output_headers);
evhttp_send_error(req, HTTP_SERVUNAVAIL, "Internal Server Error"); evhttp_send_error(req, HTTP_SERVUNAVAIL, "Internal Server Error");
if (transcode) goto out_cleanup;
transcode_cleanup(st->xcode);
else
{
free(st->buf);
close(st->fd);
}
evbuffer_free(st->evbuf);
free(st);
free_mfi(mfi, 0);
return;
} }
evutil_timerclear(&tv); evutil_timerclear(&tv);
@ -549,17 +513,7 @@ httpd_stream_file(struct evhttp_request *req, int id)
evhttp_clear_headers(req->output_headers); evhttp_clear_headers(req->output_headers);
evhttp_send_error(req, HTTP_SERVUNAVAIL, "Internal Server Error"); evhttp_send_error(req, HTTP_SERVUNAVAIL, "Internal Server Error");
if (transcode) goto out_cleanup;
transcode_cleanup(st->xcode);
else
{
free(st->buf);
close(st->fd);
}
evbuffer_free(st->evbuf);
free(st);
free_mfi(mfi, 0);
return;
} }
st->id = mfi->id; st->id = mfi->id;
@ -626,6 +580,22 @@ httpd_stream_file(struct evhttp_request *req, int id)
DPRINTF(E_INFO, L_HTTPD, "Kicking off streaming for %s\n", mfi->path); DPRINTF(E_INFO, L_HTTPD, "Kicking off streaming for %s\n", mfi->path);
free_mfi(mfi, 0); free_mfi(mfi, 0);
return;
out_cleanup:
if (st->evbuf)
evbuffer_free(st->evbuf);
if (st->xcode)
transcode_cleanup(st->xcode);
if (st->buf)
free(st->buf);
if (st->fd > 0)
close(st->fd);
out_free_st:
free(st);
out_free_mfi:
free_mfi(mfi, 0);
} }
/* Thread: httpd */ /* Thread: httpd */