mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-31 22:25:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not prefix internal function rtsp_exec.

Browse source 
Change port to be 16 bits
Do not free stuff on closure as this happens further up the stack.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/coling@2410 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Colin Guthrie 2008-05-11 16:40:26 +00:00
parent eca94fee59
commit 9216684691
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/modules/rtp/rtsp_client.c
View file

@ -70,13 +70,13 @@ struct pa_rtsp_client {
char *localip; char *localip;
char *url; char *url;
uint32_t port; uint16_t port;
uint32_t cseq; uint32_t cseq;
char *session; char *session;
char *transport; char *transport;
}; };
static int pa_rtsp_exec(pa_rtsp_client* c, const char* cmd, static int rtsp_exec(pa_rtsp_client* c, const char* cmd,
const char* content_type, const char* content, const char* content_type, const char* content,
int expect_response, int expect_response,
pa_headerlist* headers) { pa_headerlist* headers) {
@ -193,7 +193,7 @@ static void headers_read(pa_rtsp_client *c) {
while ((token = pa_split(c->transport, delimiters, &token_state))) { while ((token = pa_split(c->transport, delimiters, &token_state))) {
if ((pc = strstr(token, "="))) { if ((pc = strstr(token, "="))) {
if (0 == strncmp(token, "server_port", 11)) { if (0 == strncmp(token, "server_port", 11)) {
pa_atou(pc+1, &c->port); pa_atou(pc+1, (uint32_t*)(&c->port));
pa_xfree(token); pa_xfree(token);
break; break;
} }
@ -227,9 +227,6 @@ static void line_callback(pa_ioline *line, const char *s, void *userdata) {
pa_assert(c->callback); pa_assert(c->callback);
if (!s) { if (!s) {
pa_ioline_unref(c->ioline);
c->ioline = NULL;
pa_rtsp_disconnect(c);
c->callback(c, STATE_DISCONNECTED, NULL, c->userdata); c->callback(c, STATE_DISCONNECTED, NULL, c->userdata);
return; return;
} }
@ -442,7 +439,7 @@ int pa_rtsp_announce(pa_rtsp_client *c, const char* sdp) {
return -1; return -1;
c->state = STATE_ANNOUNCE; c->state = STATE_ANNOUNCE;
return pa_rtsp_exec(c, "ANNOUNCE", "application/sdp", sdp, 1, NULL); return rtsp_exec(c, "ANNOUNCE", "application/sdp", sdp, 1, NULL);
} }
@ -456,7 +453,7 @@ int pa_rtsp_setup(pa_rtsp_client* c) {
pa_headerlist_puts(headers, "Transport", "RTP/AVP/TCP;unicast;interleaved=0-1;mode=record"); pa_headerlist_puts(headers, "Transport", "RTP/AVP/TCP;unicast;interleaved=0-1;mode=record");
c->state = STATE_SETUP; c->state = STATE_SETUP;
rv = pa_rtsp_exec(c, "SETUP", NULL, NULL, 1, headers); rv = rtsp_exec(c, "SETUP", NULL, NULL, 1, headers);
pa_headerlist_free(headers); pa_headerlist_free(headers);
return rv; return rv;
} }
@ -477,7 +474,7 @@ int pa_rtsp_record(pa_rtsp_client* c) {
pa_headerlist_puts(headers, "RTP-Info", "seq=0;rtptime=0"); pa_headerlist_puts(headers, "RTP-Info", "seq=0;rtptime=0");
c->state = STATE_RECORD; c->state = STATE_RECORD;
rv = pa_rtsp_exec(c, "RECORD", NULL, NULL, 1, headers); rv = rtsp_exec(c, "RECORD", NULL, NULL, 1, headers);
pa_headerlist_free(headers); pa_headerlist_free(headers);
return rv; return rv;
} }
@ -487,7 +484,7 @@ int pa_rtsp_teardown(pa_rtsp_client *c) {
pa_assert(c); pa_assert(c);
c->state = STATE_TEARDOWN; c->state = STATE_TEARDOWN;
return pa_rtsp_exec(c, "TEARDOWN", NULL, NULL, 0, NULL); return rtsp_exec(c, "TEARDOWN", NULL, NULL, 0, NULL);
} }
@ -497,7 +494,7 @@ int pa_rtsp_setparameter(pa_rtsp_client *c, const char* param) {
return -1; return -1;
c->state = STATE_SET_PARAMETER; c->state = STATE_SET_PARAMETER;
return pa_rtsp_exec(c, "SET_PARAMETER", "text/parameters", param, 1, NULL); return rtsp_exec(c, "SET_PARAMETER", "text/parameters", param, 1, NULL);
} }
@ -511,7 +508,7 @@ int pa_rtsp_flush(pa_rtsp_client *c) {
pa_headerlist_puts(headers, "RTP-Info", "seq=0;rtptime=0"); pa_headerlist_puts(headers, "RTP-Info", "seq=0;rtptime=0");
c->state = STATE_FLUSH; c->state = STATE_FLUSH;
rv = pa_rtsp_exec(c, "FLUSH", NULL, NULL, 1, headers); rv = rtsp_exec(c, "FLUSH", NULL, NULL, 1, headers);
pa_headerlist_free(headers); pa_headerlist_free(headers);
return rv; return rv;
} }