Browse Source

ffserver: move close_connection() call to avoid a temporary string and copy.

Signed-off-by: Mike Williams <mike@mikebwilliams.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
tags/n0.8
Mike Williams Anton Khirnov 14 years ago
parent
commit
e2d7dc87df
1 changed files with 4 additions and 7 deletions
  1. +4
    -7
      ffserver.c

+ 4
- 7
ffserver.c View File

@@ -3274,7 +3274,6 @@ static void rtsp_cmd_pause(HTTPContext *c, const char *url, RTSPMessageHeader *h
static void rtsp_cmd_teardown(HTTPContext *c, const char *url, RTSPMessageHeader *h)
{
HTTPContext *rtp_c;
char session_id[32];

rtp_c = find_rtp_session_with_url(url, h->session_id);
if (!rtp_c) {
@@ -3282,16 +3281,14 @@ static void rtsp_cmd_teardown(HTTPContext *c, const char *url, RTSPMessageHeader
return;
}

av_strlcpy(session_id, rtp_c->session_id, sizeof(session_id));

/* abort the session */
close_connection(rtp_c);

/* now everything is OK, so we can send the connection parameters */
rtsp_reply_header(c, RTSP_STATUS_OK);
/* session ID */
avio_printf(c->pb, "Session: %s\r\n", session_id);
avio_printf(c->pb, "Session: %s\r\n", rtp_c->session_id);
avio_printf(c->pb, "\r\n");

/* abort the session */
close_connection(rtp_c);
}




Loading…
Cancel
Save