Skip to content

V
vlc-2-2
Commit 649ddb6f authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Centralize HTTP/RTSP error text

parent e83c981e
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 79 deletions
include/vlc_httpd.h
View file @ 649ddb6f
......@@ -73,7 +73,6 @@ struct httpd_message_t
/* for an answer */
int i_status;
char *psz_status;
/* for a query */
char *psz_url;
......
modules/misc/rtsp.c
View file @ 649ddb6f
......@@ -946,7 +946,6 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
if( httpd_ClientIP( cl, ip ) == NULL )
{
answer->i_status = 500;
answer->psz_status = strdup( "Internal server error" );
answer->i_body = 0;
answer->p_body = NULL;
break;
......@@ -963,7 +962,6 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
( p_vod->p_sys->i_connections >= p_vod->p_sys->i_throttle_users ) )
{
answer->i_status = 503;
answer->psz_status = strdup( "Too many connections" );
answer->i_body = 0;
answer->p_body = NULL;
break;
......@@ -975,7 +973,6 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
if( !p_rtsp )
{
answer->i_status = 454;
answer->psz_status = strdup( "Unknown session id" );
answer->i_body = 0;
answer->p_body = NULL;
break;
......@@ -987,7 +984,6 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
if( !p_rtsp )
{
answer->i_status = 454;
answer->psz_status = strdup( "Unknown session id" );
answer->i_body = 0;
answer->p_body = NULL;
break;
......@@ -995,7 +991,6 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
}
answer->i_status = 200;
answer->psz_status = strdup( "OK" );
answer->i_body = 0;
answer->p_body = NULL;
......@@ -1019,7 +1014,6 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
else /* TODO strstr( psz_transport, "interleaved" ) ) */
{
answer->i_status = 461;
answer->psz_status = strdup( "Unsupported Transport" );
answer->i_body = 0;
answer->p_body = NULL;
}
......@@ -1038,7 +1032,6 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
if( !psz_playnow )
{
answer->i_status = 200;
answer->psz_status = strdup( "OK" );
answer->i_body = 0;
answer->p_body = NULL;
}
......@@ -1051,7 +1044,6 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
if( !p_rtsp )
{
answer->i_status = 500;
answer->psz_status = strdup( "Internal server error" );
answer->i_body = 0;
answer->p_body = NULL;
break;
......@@ -1161,7 +1153,6 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
if( psz_sdp != NULL )
{
answer->i_status = 200;
answer->psz_status = strdup( "OK" );
httpd_MsgAdd( answer, "Content-type", "%s", "application/sdp" );
answer->p_body = (uint8_t *)psz_sdp;
......@@ -1170,7 +1161,6 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
else
{
answer->i_status = 500;
answer->psz_status = strdup( "Internal server error" );
answer->p_body = NULL;
answer->i_body = 0;
}
......@@ -1188,7 +1178,6 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
p_rtsp->b_paused = VLC_TRUE;
answer->i_status = 200;
answer->psz_status = strdup( "OK" );
answer->i_body = 0;
answer->p_body = NULL;
break;
......@@ -1196,7 +1185,6 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
case HTTPD_MSG_TEARDOWN:
/* for now only multicast so easy again */
answer->i_status = 200;
answer->psz_status = strdup( "OK" );
answer->i_body = 0;
answer->p_body = NULL;
......@@ -1212,7 +1200,6 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
case HTTPD_MSG_GETPARAMETER:
answer->i_status = 200;
answer->psz_status = strdup( "OK" );
answer->i_body = 0;
answer->p_body = NULL;
break;
......@@ -1285,7 +1272,6 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
if( httpd_ClientIP( cl, ip ) == NULL )
{
answer->i_status = 500;
answer->psz_status = strdup( "Internal server error" );
answer->i_body = 0;
answer->p_body = NULL;
break;
......@@ -1302,7 +1288,6 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
( p_vod->p_sys->i_connections >= p_vod->p_sys->i_throttle_users ) )
{
answer->i_status = 503;
answer->psz_status = strdup( "Too many connections" );
answer->i_body = 0;
answer->p_body = NULL;
break;
......@@ -1318,7 +1303,6 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
if( !p_rtsp )
{
answer->i_status = 454;
answer->psz_status = strdup( "Unknown session id" );
answer->i_body = 0;
answer->p_body = NULL;
break;
......@@ -1329,7 +1313,6 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
if( !p_rtsp_es )
{
answer->i_status = 500;
answer->psz_status = strdup( "Internal server error" );
answer->i_body = 0;
answer->p_body = NULL;
break;
......@@ -1340,7 +1323,6 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
TAB_APPEND( p_rtsp->i_es, p_rtsp->es, p_rtsp_es );
answer->i_status = 200;
answer->psz_status = strdup( "OK" );
answer->i_body = 0;
answer->p_body = NULL;
......@@ -1366,7 +1348,6 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
else /* TODO strstr( psz_transport, "interleaved" ) ) */
{
answer->i_status = 461;
answer->psz_status = strdup( "Unsupported Transport" );
answer->i_body = 0;
answer->p_body = NULL;
}
......@@ -1405,7 +1386,6 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
if( !psz_playnow )
{
answer->i_status = 200;
answer->psz_status = strdup( "OK" );
answer->i_body = 0;
answer->p_body = NULL;
}
......@@ -1413,7 +1393,6 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
case HTTPD_MSG_TEARDOWN:
answer->i_status = 200;
answer->psz_status = strdup( "OK" );
answer->i_body = 0;
answer->p_body = NULL;
......@@ -1453,7 +1432,6 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
p_rtsp->b_paused = VLC_TRUE;
answer->i_status = 200;
answer->psz_status = strdup( "OK" );
answer->i_body = 0;
answer->p_body = NULL;
break;
......
modules/stream_out/rtp.c
View file @ 649ddb6f
......@@ -1645,7 +1645,6 @@ static int RtspCallback( httpd_callback_sys_t *p_args,
char *psz_sdp = SDPGenerate( p_stream, psz_destination ? psz_destination : "0.0.0.0", VLC_TRUE );
answer->i_status = 200;
answer->psz_status = strdup( "OK" );
httpd_MsgAdd( answer, "Content-type", "%s", "application/sdp" );
httpd_MsgAdd( answer, "Content-Base", "%s", p_sys->psz_rtsp_control );
answer->p_body = (uint8_t *)psz_sdp;
......@@ -1658,7 +1657,6 @@ static int RtspCallback( httpd_callback_sys_t *p_args,
rtsp_client_t *rtsp;
/* for now only multicast so easy */
answer->i_status = 200;
answer->psz_status = strdup( "OK" );
answer->i_body = 0;
answer->p_body = NULL;
......@@ -1700,7 +1698,6 @@ static int RtspCallback( httpd_callback_sys_t *p_args,
/* for now only multicast so easy again */
answer->i_status = 200;
answer->psz_status = strdup( "OK" );
answer->i_body = 0;
answer->p_body = NULL;
......@@ -1785,7 +1782,6 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args,
if( psz_transport == NULL )
{
answer->i_status = 461;
answer->psz_status = strdup( "Unsupported Transport" );
answer->i_body = 0;
answer->p_body = NULL;
break;
......@@ -1797,7 +1793,6 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args,
{
//fprintf( stderr, "HTTPD_MSG_SETUP: multicast\n" );
answer->i_status = 200;
answer->psz_status = strdup( "OK" );
answer->i_body = 0;
answer->p_body = NULL;
......@@ -1822,7 +1817,6 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args,
if( httpd_ClientIP( cl, ip ) == NULL )
{
answer->i_status = 500;
answer->psz_status = strdup( "Internal server error" );
answer->i_body = 0;
answer->p_body = NULL;
break;
......@@ -1842,7 +1836,6 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args,
if( rtsp == NULL )
{
answer->i_status = 454;
answer->psz_status = strdup( "Unknown session id" );
answer->i_body = 0;
answer->p_body = NULL;
break;
......@@ -1865,7 +1858,6 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args,
msg_Err( p_stream, "cannot create the access out for %s://%s",
psz_access, psz_url );
answer->i_status = 500;
answer->psz_status = strdup( "Internal server error" );
answer->i_body = 0;
answer->p_body = NULL;
break;
......@@ -1875,7 +1867,6 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args,
TAB_APPEND( rtsp->i_access, rtsp->access, p_access );
answer->i_status = 200;
answer->psz_status = strdup( "OK" );
answer->i_body = 0;
answer->p_body = NULL;
......@@ -1885,7 +1876,6 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args,
else /* TODO strstr( psz_transport, "interleaved" ) ) */
{
answer->i_status = 461;
answer->psz_status = strdup( "Unsupported Transport" );
answer->i_body = 0;
answer->p_body = NULL;
}
......
src/network/httpd.c
View file @ 649ddb6f
......@@ -274,7 +274,7 @@ static const http_status_info http_reason[] =
{ 206, "Partial Content" },
{ 250, "Low on Storage Space" },
{ 300, "Multiple Choices" }*/,
{ 301, "Moved Permanently" }/*,
{ 301, "Moved permanently" }/*,
{ 302, "Moved Temporarily" }, - aka "Found"
{ 303, "See Other" },
{ 304, "Not Modified" },
......@@ -284,7 +284,7 @@ static const http_status_info http_reason[] =
{ 401, "Unauthorized" }/*,
{ 402, "Payment Required" }*/,
{ 403, "Forbidden" },
{ 404, "Not Found" }/*,
{ 404, "Not found" }/*,
{ 405, "Method Not Allowed" },
{ 406, "Not Acceptable" },
{ 407, "Proxy Authentication Required" },
......@@ -301,7 +301,7 @@ static const http_status_info http_reason[] =
{ 451, "Parameter Not Understood" },
{ 452, "Conference Not Found" },
{ 453, "Not Enough Bandwidth" }*/,
{ 454, "Session Not Found" }/*,
{ 454, "Session not found" }/*,
{ 455, "Method Not Valid in This State" },
{ 456, "Header Field Not Valid for Resource" },
{ 457, "Invalid Range" },
......@@ -310,11 +310,11 @@ static const http_status_info http_reason[] =
{ 460, "Only aggregate operation allowed" }*/,
{ 461, "Unsupported transport" }/*,
{ 462, "Destination unreachable" }*/,
{ 500, "Internal Server Error" },
{ 501, "Not Implemented" }/*,
{ 502, "Bad Gateway" }*/,
{ 503, "Service Unavailable" }/*,
{ 504, "Gateway Time-out" },
{ 500, "Internal server error" },
{ 501, "Not implemented" }/*,
{ 502, "Bad gateway" }*/,
{ 503, "Service unavailable" }/*,
{ 504, "Gateway time-out" },
{ 505, "Protocol version not supported" }*/,
{ 0, NULL }
};
......@@ -399,7 +399,6 @@ static int httpd_FileCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl,
answer->i_type = HTTPD_MSG_ANSWER;
answer->i_status = 200;
answer->psz_status = strdup( "OK" );
httpd_MsgAdd( answer, "Content-type", "%s", file->psz_mime );
httpd_MsgAdd( answer, "Cache-Control", "%s", "no-cache" );
......@@ -518,7 +517,6 @@ static int httpd_HandlerCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *c
/* We do it ourselves, thanks */
answer->i_status = 0;
answer->psz_status = NULL;
if( httpd_ClientIP( cl, psz_remote_addr ) == NULL )
*psz_remote_addr = '\0';
......@@ -567,20 +565,8 @@ static int httpd_HandlerCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *c
psz_headers = (char *)answer->p_body;
i_headers = answer->i_body;
}
switch( i_status )
{
case 200:
psz_status = "OK";
break;
case 401:
psz_status = "Unauthorized";
break;
default:
if( (i_status < 0) || (i_status > 999) )
i_status = 500;
psz_status = "Undefined";
break;
}
psz_status = httpd_ReasonFromCode( i_status );
answer->i_body = sizeof("HTTP/1.0 xxx \r\n")
+ strlen(psz_status) + i_headers - 1;
psz_new = (char *)malloc( answer->i_body + 1);
......@@ -654,7 +640,6 @@ static int httpd_RedirectCallBack( httpd_callback_sys_t *p_sys,
answer->i_version= query->i_version;
answer->i_type = HTTPD_MSG_ANSWER;
answer->i_status = 301;
answer->psz_status = strdup( "Moved Permanently" );
answer->i_body = httpd_HtmlError (&p_body, 301, rdir->psz_dst);
answer->p_body = (unsigned char *)p_body;
......@@ -790,7 +775,6 @@ static int httpd_StreamCallBack( httpd_callback_sys_t *p_sys,
answer->i_type = HTTPD_MSG_ANSWER;
answer->i_status = 200;
answer->psz_status = strdup( "OK" );
if( query->i_type != HTTPD_MSG_HEAD )
{
......@@ -1299,7 +1283,6 @@ void httpd_MsgInit( httpd_message_t *msg )
msg->i_version = -1;
msg->i_status = 0;
msg->psz_status = NULL;
msg->psz_url = NULL;
msg->psz_args = NULL;
......@@ -1320,10 +1303,6 @@ void httpd_MsgClean( httpd_message_t *msg )
{
int i;
if( msg->psz_status )
{
free( msg->psz_status );
}
if( msg->psz_url )
{
free( msg->psz_url );
......@@ -1584,16 +1563,13 @@ static void httpd_ClientRecv( httpd_client_t *cl )
strtol( (char *)&cl->p_buffer[8],
&p, 0 );
while( *p == ' ' )
{
p++;
}
cl->query.psz_status = strdup( p );
}
else
{
static const struct
{
const char *name;
const char name[16];
int i_type;
int i_proto;
}
......@@ -1611,16 +1587,16 @@ static void httpd_ClientRecv( httpd_client_t *cl )
{ "HEAD", HTTPD_MSG_HEAD, HTTPD_PROTO_HTTP },
{ "POST", HTTPD_MSG_POST, HTTPD_PROTO_HTTP },
{ NULL, HTTPD_MSG_NONE, HTTPD_PROTO_NONE }
{ "", HTTPD_MSG_NONE, HTTPD_PROTO_NONE }
};
int i;
unsigned i;
p = NULL;
cl->query.i_type = HTTPD_MSG_NONE;
/*fprintf( stderr, "received new request=%s\n", cl->p_buffer);*/
for( i = 0; msg_type[i].name != NULL; i++ )
for( i = 0; msg_type[i].name[0]; i++ )
{
if( !strncmp( (char *)cl->p_buffer, msg_type[i].name,
strlen( msg_type[i].name ) ) )
......@@ -1826,9 +1802,9 @@ static void httpd_ClientSend( httpd_client_t *cl )
/* We need to create the header */
int i_size = 0;
char *p;
const char *psz_status = httpd_ReasonFromCode( cl->answer.i_status );
i_size = strlen( "HTTP/1.") + 10 + 10 +
strlen( cl->answer.psz_status ? cl->answer.psz_status : "" ) + 5;
i_size = strlen( "HTTP/1.") + 10 + 10 + strlen( psz_status ) + 5;
for( i = 0; i < cl->answer.i_name; i++ )
{
i_size += strlen( cl->answer.name[i] ) + 2 +
......@@ -1846,7 +1822,7 @@ static void httpd_ClientSend( httpd_client_t *cl )
p += sprintf( p, "%s/1.%d %d %s\r\n",
cl->answer.i_proto == HTTPD_PROTO_HTTP ? "HTTP" : "RTSP",
cl->answer.i_version,
cl->answer.i_status, cl->answer.psz_status );
cl->answer.i_status, psz_status );
for( i = 0; i < cl->answer.i_name; i++ )
{
p += sprintf( p, "%s: %s\r\n", cl->answer.name[i],
......@@ -2066,7 +2042,6 @@ static void httpd_HostThread( httpd_host_t *host )
answer->i_type = HTTPD_MSG_ANSWER;
answer->i_version= 0;
answer->i_status = 200;
answer->psz_status = strdup( "Ok" );
answer->i_body = 0;
answer->p_body = NULL;
......@@ -2103,7 +2078,6 @@ static void httpd_HostThread( httpd_host_t *host )
answer->i_type = HTTPD_MSG_ANSWER;
answer->i_version= 0;
answer->i_status = 501;
answer->psz_status = strdup( "Unimplemented" );
answer->i_body = httpd_HtmlError (&p, 501, NULL);
answer->p_body = (uint8_t *)p;
......@@ -2210,18 +2184,15 @@ static void httpd_HostThread( httpd_host_t *host )
if( b_hosts_failed )
{
answer->i_status = 403;
answer->psz_status = strdup( "Forbidden" );
}
else if( b_auth_failed )
{
answer->i_status = 401;
answer->psz_status = strdup( "Authorization Required" );
}
else
{
/* no url registered */
answer->i_status = 404;
answer->psz_status = strdup( "Not found" );
}
answer->i_body = httpd_HtmlError (&p,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment