Revision 33f5e2ec ffserver.c

View differences:

ffserver.c
232 232
struct sockaddr_in my_http_addr;
233 233
struct sockaddr_in my_rtsp_addr;
234 234

  
235
char logfilename[1024];
236
HTTPContext *first_http_ctx;
237
FFStream *first_feed;   /* contains only feeds */
238
FFStream *first_stream; /* contains all streams, including feeds */
235
static char logfilename[1024];
236
static HTTPContext *first_http_ctx;
237
static FFStream *first_feed;   /* contains only feeds */
238
static FFStream *first_stream; /* contains all streams, including feeds */
239 239

  
240 240
static void new_connection(int server_fd, int is_rtsp);
241 241
static void close_connection(HTTPContext *c);
......
278 278
static int no_launch;
279 279
static int need_to_start_children;
280 280

  
281
int nb_max_connections;
282
int nb_connections;
281
static int nb_max_connections;
282
static int nb_connections;
283 283

  
284
int max_bandwidth;
285
int current_bandwidth;
284
static int max_bandwidth;
285
static int current_bandwidth;
286 286

  
287 287
static long cur_time;           // Making this global saves on passing it around everywhere
288 288

  
......
1298 1298
        q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "Content-type: text/html\r\n");
1299 1299
        q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\r\n");
1300 1300
        q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "<html><head><title>Too busy</title></head><body>\r\n");
1301
        q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "The server is too busy to serve your request at this time.<p>\r\n");
1302
        q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "The bandwidth being served (including your stream) is %dkbit/sec, and this exceeds the limit of %dkbit/sec\r\n",
1301
        q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "<p>The server is too busy to serve your request at this time.</p>\r\n");
1302
        q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "<p>The bandwidth being served (including your stream) is %dkbit/sec, and this exceeds the limit of %dkbit/sec.</p>\r\n",
1303 1303
            current_bandwidth, max_bandwidth);
1304 1304
        q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "</body></html>\r\n");
1305 1305

  

Also available in: Unified diff