frsh: Export information about the last RTP contract and VRES

[frescor/ffmpeg.git] / ffserver.c
diff --git a/ffserver.c b/ffserver.c

index baefd7809614987bd6a2e8048a18153dd83653e6..61ecf206d4a842e48e1a41d566ad929c0f737501 100644 (file)
--- a/ffserver.c
+++ b/ffserver.c
@@ -237,6 +237,7 @@ typedef struct FFStream {
      int feed_opened;     /* true if someone is writing to the feed */
      int is_feed;         /* true if it is a feed */
      int readonly;        /* True if writing is prohibited to the file */
+    int truncate;        /* True if feeder connection truncate the feed file */
      int conns_served;
      int64_t bytes_served;
      int64_t feed_max_size;      /* maximum storage size, zero means unlimited */
@@ -700,6 +701,22 @@ static void start_wait_request(HTTPContext *c, int is_rtsp)
      }
  }
  
+static void http_send_too_busy_reply(int fd)
+{
+    char buffer[300];
+    int len = snprintf(buffer, sizeof(buffer),
+                       "HTTP/1.0 200 Server too busy\r\n"
+                       "Content-type: text/html\r\n"
+                       "\r\n"
+                       "<html><head><title>Too busy</title></head><body>\r\n"
+                       "<p>The server is too busy to serve your request at this time.</p>\r\n"
+                       "<p>The number of current connections is %d, and this exceeds the limit of %d.</p>\r\n"
+                       "</body></html>\r\n",
+                       nb_connections, nb_max_connections);
+    send(fd, buffer, len, 0);
+}
+
+
  static void new_connection(int server_fd, int is_rtsp)
  {
      struct sockaddr_in from_addr;
@@ -715,10 +732,10 @@ static void new_connection(int server_fd, int is_rtsp)
      }
      ff_socket_nonblock(fd, 1);
  
-    /* XXX: should output a warning page when coming
-       close to the connection limit */
-    if (nb_connections >= nb_max_connections)
+    if (nb_connections >= nb_max_connections) {
+        http_send_too_busy_reply(fd);
          goto fail;
+    }
  
      /* add a new connection */
      c = av_mallocz(sizeof(HTTPContext));
@@ -1986,7 +2003,7 @@ static int open_input_stream(HTTPContext *c, const char *info)
      }
      s->flags |= AVFMT_FLAG_GENPTS;
      c->fmt_in = s;
-    if (av_find_stream_info(c->fmt_in) < 0) {
+    if (strcmp(s->iformat->name, "ffm") && av_find_stream_info(c->fmt_in) < 0) {
          http_log("Could not find stream info '%s'\n", input_filename);
          av_close_input_file(s);
          return -1;
@@ -2415,12 +2432,19 @@ static int http_start_receive_data(HTTPContext *c)
      }
      c->feed_fd = fd;
  
-    if ((c->stream->feed_write_index = ffm_read_write_index(fd)) < 0) {
-        http_log("Error reading write index from feed file: %s\n", strerror(errno));
-        return -1;
+    if (c->stream->truncate) {
+        /* truncate feed file */
+        ffm_write_write_index(c->feed_fd, FFM_PACKET_SIZE);
+        ftruncate(c->feed_fd, FFM_PACKET_SIZE);
+        http_log("Truncating feed file '%s'\n", c->stream->feed_filename);
+    } else {
+        if ((c->stream->feed_write_index = ffm_read_write_index(fd)) < 0) {
+            http_log("Error reading write index from feed file: %s\n", strerror(errno));
+            return -1;
+        }
      }
-    c->stream->feed_write_index = FFMAX(ffm_read_write_index(fd), FFM_PACKET_SIZE);
  
+    c->stream->feed_write_index = FFMAX(ffm_read_write_index(fd), FFM_PACKET_SIZE);
      c->stream->feed_size = lseek(fd, 0, SEEK_END);
      lseek(fd, 0, SEEK_SET);
  
@@ -3938,6 +3962,11 @@ static int parse_ffconfig(const char *filename)
                  get_arg(feed->feed_filename, sizeof(feed->feed_filename), &p);
              } else if (stream)
                  get_arg(stream->feed_filename, sizeof(stream->feed_filename), &p);
+        } else if (!strcasecmp(cmd, "Truncate")) {
+            if (feed) {
+                get_arg(arg, sizeof(arg), &p);
+                feed->truncate = strtod(arg, NULL);
+            }
          } else if (!strcasecmp(cmd, "FileMaxSize")) {
              if (feed) {
                  char *p1;
@@ -3958,6 +3987,11 @@ static int parse_ffconfig(const char *filename)
                      break;
                  }
                  feed->feed_max_size = (int64_t)fsize;
+                if (feed->feed_max_size < FFM_PACKET_SIZE*4) {
+                    fprintf(stderr, "%s:%d: Feed max file size is too small, "
+                            "must be at least %d\n", filename, line_num, FFM_PACKET_SIZE*4);
+                    errors++;
+                }
              }
          } else if (!strcasecmp(cmd, "</Feed>")) {
              if (!feed) {