Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
256a65be
Commit
256a65be
authored
Aug 31, 2007
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement dummy RTSP GET_PARAMETER so that clients can "ping"
parent
9160f1e0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
3 deletions
+28
-3
modules/stream_out/rtsp.c
modules/stream_out/rtsp.c
+27
-2
src/network/httpd.c
src/network/httpd.c
+1
-1
No files found.
modules/stream_out/rtsp.c
View file @
256a65be
...
@@ -108,6 +108,8 @@ rtsp_stream_t *RtspSetup( sout_stream_t *p_stream, const vlc_url_t *url )
...
@@ -108,6 +108,8 @@ rtsp_stream_t *RtspSetup( sout_stream_t *p_stream, const vlc_url_t *url )
httpd_UrlCatch
(
rtsp
->
url
,
HTTPD_MSG_SETUP
,
RtspCallback
,
(
void
*
)
rtsp
);
httpd_UrlCatch
(
rtsp
->
url
,
HTTPD_MSG_SETUP
,
RtspCallback
,
(
void
*
)
rtsp
);
httpd_UrlCatch
(
rtsp
->
url
,
HTTPD_MSG_PLAY
,
RtspCallback
,
(
void
*
)
rtsp
);
httpd_UrlCatch
(
rtsp
->
url
,
HTTPD_MSG_PLAY
,
RtspCallback
,
(
void
*
)
rtsp
);
httpd_UrlCatch
(
rtsp
->
url
,
HTTPD_MSG_PAUSE
,
RtspCallback
,
(
void
*
)
rtsp
);
httpd_UrlCatch
(
rtsp
->
url
,
HTTPD_MSG_PAUSE
,
RtspCallback
,
(
void
*
)
rtsp
);
httpd_UrlCatch
(
rtsp
->
url
,
HTTPD_MSG_GETPARAMETER
,
RtspCallback
,
(
void
*
)
rtsp
);
httpd_UrlCatch
(
rtsp
->
url
,
HTTPD_MSG_TEARDOWN
,
RtspCallback
,
(
void
*
)
rtsp
);
httpd_UrlCatch
(
rtsp
->
url
,
HTTPD_MSG_TEARDOWN
,
RtspCallback
,
(
void
*
)
rtsp
);
return
rtsp
;
return
rtsp
;
...
@@ -205,6 +207,7 @@ rtsp_stream_id_t *RtspAddId( rtsp_stream_t *rtsp, sout_stream_id_t *sid,
...
@@ -205,6 +207,7 @@ rtsp_stream_id_t *RtspAddId( rtsp_stream_t *rtsp, sout_stream_id_t *sid,
httpd_UrlCatch
(
url
,
HTTPD_MSG_SETUP
,
RtspCallbackId
,
(
void
*
)
id
);
httpd_UrlCatch
(
url
,
HTTPD_MSG_SETUP
,
RtspCallbackId
,
(
void
*
)
id
);
httpd_UrlCatch
(
url
,
HTTPD_MSG_PLAY
,
RtspCallbackId
,
(
void
*
)
id
);
httpd_UrlCatch
(
url
,
HTTPD_MSG_PLAY
,
RtspCallbackId
,
(
void
*
)
id
);
httpd_UrlCatch
(
url
,
HTTPD_MSG_PAUSE
,
RtspCallbackId
,
(
void
*
)
id
);
httpd_UrlCatch
(
url
,
HTTPD_MSG_PAUSE
,
RtspCallbackId
,
(
void
*
)
id
);
httpd_UrlCatch
(
url
,
HTTPD_MSG_GETPARAMETER
,
RtspCallbackId
,
(
void
*
)
id
);
httpd_UrlCatch
(
url
,
HTTPD_MSG_TEARDOWN
,
RtspCallbackId
,
(
void
*
)
id
);
httpd_UrlCatch
(
url
,
HTTPD_MSG_TEARDOWN
,
RtspCallbackId
,
(
void
*
)
id
);
return
id
;
return
id
;
...
@@ -396,7 +399,18 @@ static int RtspCallback( httpd_callback_sys_t *p_args,
...
@@ -396,7 +399,18 @@ static int RtspCallback( httpd_callback_sys_t *p_args,
case
HTTPD_MSG_PAUSE
:
case
HTTPD_MSG_PAUSE
:
answer
->
i_status
=
405
;
answer
->
i_status
=
405
;
httpd_MsgAdd
(
answer
,
"Allow"
,
"DESCRIBE, PLAY, TEARDOWN"
);
httpd_MsgAdd
(
answer
,
"Allow"
,
"DESCRIBE, TEARDOWN, PLAY, GET_PARAMETER"
);
break
;
case
HTTPD_MSG_GETPARAMETER
:
if
(
query
->
i_body
>
0
)
{
answer
->
i_status
=
451
;
break
;
}
answer
->
i_status
=
200
;
break
;
break
;
case
HTTPD_MSG_TEARDOWN
:
case
HTTPD_MSG_TEARDOWN
:
...
@@ -707,7 +721,18 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args,
...
@@ -707,7 +721,18 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args,
case
HTTPD_MSG_PAUSE
:
case
HTTPD_MSG_PAUSE
:
answer
->
i_status
=
405
;
answer
->
i_status
=
405
;
httpd_MsgAdd
(
answer
,
"Allow"
,
"SETUP, PLAY, TEARDOWN"
);
httpd_MsgAdd
(
answer
,
"Allow"
,
"SETUP, TEARDOWN, PLAY, GET_PARAMETER"
);
break
;
case
HTTPD_MSG_GETPARAMETER
:
if
(
query
->
i_body
>
0
)
{
answer
->
i_status
=
451
;
break
;
}
answer
->
i_status
=
200
;
break
;
break
;
case
HTTPD_MSG_TEARDOWN
:
case
HTTPD_MSG_TEARDOWN
:
...
...
src/network/httpd.c
View file @
256a65be
...
@@ -2068,7 +2068,7 @@ static void httpd_HostThread( httpd_host_t *host )
...
@@ -2068,7 +2068,7 @@ static void httpd_HostThread( httpd_host_t *host )
httpd_MsgAdd
(
answer
,
"Server"
,
"%s"
,
PACKAGE_STRING
);
httpd_MsgAdd
(
answer
,
"Server"
,
"%s"
,
PACKAGE_STRING
);
httpd_MsgAdd
(
answer
,
"Public"
,
"DESCRIBE, SETUP, "
httpd_MsgAdd
(
answer
,
"Public"
,
"DESCRIBE, SETUP, "
"TEARDOWN, PLAY, PAUSE"
);
"TEARDOWN, PLAY, PAUSE
, GET_PARAMETER
"
);
httpd_MsgAdd
(
answer
,
"Content-Length"
,
"0"
);
httpd_MsgAdd
(
answer
,
"Content-Length"
,
"0"
);
cl
->
i_buffer
=
-
1
;
/* Force the creation of the answer in
cl
->
i_buffer
=
-
1
;
/* Force the creation of the answer in
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment