mirror of
https://github.com/moparisthebest/curl
synced 2024-11-15 22:15:13 -05:00
d7934b8bd4
After a PORT has been issued, and the multi handle would switch to the CURLM_STATE_DO_MORE state (which is unique for FTP), libcurl would return the wrong fdset to wait for when curl_multi_fdset() is called. The code would blindly assume that it was waiting for a connect of the second connection, while that isn't true immediately after the PORT command. Also, the function multi.c:domore_getsock() was highly FTP-centric and therefore ugly to keep in protocol-agnostic code. I solved this problem by introducing a new function pointer in the Curl_handler struct called domore_getsock() which is only called during the DOMORE state for protocols that set that pointer. The new ftp.c:ftp_domore_getsock() function now returns fdset info about the control connection's command/response handling while such a state is in use, and goes over to waiting for a writable second connection first once the commands are done. The original problem could be seen by running test 525 and checking the time stamps in the FTP server log. I can verify that this fix at least fixes this problem. Bug: http://curl.haxx.se/mail/lib-2011-10/0250.html Reported by: Gokhan Sengun
310 lines
11 KiB
C
310 lines
11 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 2010, Howard Chu, <hyc@highlandsun.com>
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at http://curl.haxx.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "setup.h"
|
|
|
|
#ifdef USE_LIBRTMP
|
|
|
|
#include "urldata.h"
|
|
#include "nonblock.h" /* for curlx_nonblock */
|
|
#include "progress.h" /* for Curl_pgrsSetUploadSize */
|
|
#include "transfer.h"
|
|
#include <curl/curl.h>
|
|
#include <librtmp/rtmp.h>
|
|
|
|
#define _MPRINTF_REPLACE /* use our functions only */
|
|
#include <curl/mprintf.h>
|
|
|
|
#include "curl_memory.h"
|
|
/* The last #include file should be: */
|
|
#include "memdebug.h"
|
|
|
|
#ifdef _WIN32
|
|
#define setsockopt(a,b,c,d,e) (setsockopt)(a,b,c,(const char *)d,(int)e)
|
|
#define SET_RCVTIMEO(tv,s) int tv = s*1000
|
|
#else
|
|
#define SET_RCVTIMEO(tv,s) struct timeval tv = {s,0}
|
|
#endif
|
|
|
|
#define DEF_BUFTIME (2*60*60*1000) /* 2 hours */
|
|
|
|
static CURLcode rtmp_setup(struct connectdata *conn);
|
|
static CURLcode rtmp_do(struct connectdata *conn, bool *done);
|
|
static CURLcode rtmp_done(struct connectdata *conn, CURLcode, bool premature);
|
|
static CURLcode rtmp_connect(struct connectdata *conn, bool *done);
|
|
static CURLcode rtmp_disconnect(struct connectdata *conn, bool dead);
|
|
|
|
static Curl_recv rtmp_recv;
|
|
static Curl_send rtmp_send;
|
|
|
|
/*
|
|
* RTMP protocol handler.h, based on http://rtmpdump.mplayerhq.hu
|
|
*/
|
|
|
|
const struct Curl_handler Curl_handler_rtmp = {
|
|
"RTMP", /* scheme */
|
|
rtmp_setup, /* setup_connection */
|
|
rtmp_do, /* do_it */
|
|
rtmp_done, /* done */
|
|
ZERO_NULL, /* do_more */
|
|
rtmp_connect, /* connect_it */
|
|
ZERO_NULL, /* connecting */
|
|
ZERO_NULL, /* doing */
|
|
ZERO_NULL, /* proto_getsock */
|
|
ZERO_NULL, /* doing_getsock */
|
|
ZERO_NULL, /* domore_getsock */
|
|
ZERO_NULL, /* perform_getsock */
|
|
rtmp_disconnect, /* disconnect */
|
|
ZERO_NULL, /* readwrite */
|
|
PORT_RTMP, /* defport */
|
|
CURLPROTO_RTMP, /* protocol */
|
|
PROTOPT_NONE /* flags*/
|
|
};
|
|
|
|
const struct Curl_handler Curl_handler_rtmpt = {
|
|
"RTMPT", /* scheme */
|
|
rtmp_setup, /* setup_connection */
|
|
rtmp_do, /* do_it */
|
|
rtmp_done, /* done */
|
|
ZERO_NULL, /* do_more */
|
|
rtmp_connect, /* connect_it */
|
|
ZERO_NULL, /* connecting */
|
|
ZERO_NULL, /* doing */
|
|
ZERO_NULL, /* proto_getsock */
|
|
ZERO_NULL, /* doing_getsock */
|
|
ZERO_NULL, /* domore_getsock */
|
|
ZERO_NULL, /* perform_getsock */
|
|
rtmp_disconnect, /* disconnect */
|
|
ZERO_NULL, /* readwrite */
|
|
PORT_RTMPT, /* defport */
|
|
CURLPROTO_RTMPT, /* protocol */
|
|
PROTOPT_NONE /* flags*/
|
|
};
|
|
|
|
const struct Curl_handler Curl_handler_rtmpe = {
|
|
"RTMPE", /* scheme */
|
|
rtmp_setup, /* setup_connection */
|
|
rtmp_do, /* do_it */
|
|
rtmp_done, /* done */
|
|
ZERO_NULL, /* do_more */
|
|
rtmp_connect, /* connect_it */
|
|
ZERO_NULL, /* connecting */
|
|
ZERO_NULL, /* doing */
|
|
ZERO_NULL, /* proto_getsock */
|
|
ZERO_NULL, /* doing_getsock */
|
|
ZERO_NULL, /* domore_getsock */
|
|
ZERO_NULL, /* perform_getsock */
|
|
rtmp_disconnect, /* disconnect */
|
|
ZERO_NULL, /* readwrite */
|
|
PORT_RTMP, /* defport */
|
|
CURLPROTO_RTMPE, /* protocol */
|
|
PROTOPT_NONE /* flags*/
|
|
};
|
|
|
|
const struct Curl_handler Curl_handler_rtmpte = {
|
|
"RTMPTE", /* scheme */
|
|
rtmp_setup, /* setup_connection */
|
|
rtmp_do, /* do_it */
|
|
rtmp_done, /* done */
|
|
ZERO_NULL, /* do_more */
|
|
rtmp_connect, /* connect_it */
|
|
ZERO_NULL, /* connecting */
|
|
ZERO_NULL, /* doing */
|
|
ZERO_NULL, /* proto_getsock */
|
|
ZERO_NULL, /* doing_getsock */
|
|
ZERO_NULL, /* domore_getsock */
|
|
ZERO_NULL, /* perform_getsock */
|
|
rtmp_disconnect, /* disconnect */
|
|
ZERO_NULL, /* readwrite */
|
|
PORT_RTMPT, /* defport */
|
|
CURLPROTO_RTMPTE, /* protocol */
|
|
PROTOPT_NONE /* flags*/
|
|
};
|
|
|
|
const struct Curl_handler Curl_handler_rtmps = {
|
|
"RTMPS", /* scheme */
|
|
rtmp_setup, /* setup_connection */
|
|
rtmp_do, /* do_it */
|
|
rtmp_done, /* done */
|
|
ZERO_NULL, /* do_more */
|
|
rtmp_connect, /* connect_it */
|
|
ZERO_NULL, /* connecting */
|
|
ZERO_NULL, /* doing */
|
|
ZERO_NULL, /* proto_getsock */
|
|
ZERO_NULL, /* doing_getsock */
|
|
ZERO_NULL, /* domore_getsock */
|
|
ZERO_NULL, /* perform_getsock */
|
|
rtmp_disconnect, /* disconnect */
|
|
ZERO_NULL, /* readwrite */
|
|
PORT_RTMPS, /* defport */
|
|
CURLPROTO_RTMPS, /* protocol */
|
|
PROTOPT_NONE /* flags*/
|
|
};
|
|
|
|
const struct Curl_handler Curl_handler_rtmpts = {
|
|
"RTMPTS", /* scheme */
|
|
rtmp_setup, /* setup_connection */
|
|
rtmp_do, /* do_it */
|
|
rtmp_done, /* done */
|
|
ZERO_NULL, /* do_more */
|
|
rtmp_connect, /* connect_it */
|
|
ZERO_NULL, /* connecting */
|
|
ZERO_NULL, /* doing */
|
|
ZERO_NULL, /* proto_getsock */
|
|
ZERO_NULL, /* doing_getsock */
|
|
ZERO_NULL, /* domore_getsock */
|
|
ZERO_NULL, /* perform_getsock */
|
|
rtmp_disconnect, /* disconnect */
|
|
ZERO_NULL, /* readwrite */
|
|
PORT_RTMPS, /* defport */
|
|
CURLPROTO_RTMPTS, /* protocol */
|
|
PROTOPT_NONE /* flags*/
|
|
};
|
|
|
|
static CURLcode rtmp_setup(struct connectdata *conn)
|
|
{
|
|
RTMP *r = RTMP_Alloc();
|
|
|
|
if(!r)
|
|
return CURLE_OUT_OF_MEMORY;
|
|
|
|
RTMP_Init(r);
|
|
RTMP_SetBufferMS(r, DEF_BUFTIME);
|
|
if(!RTMP_SetupURL(r, conn->data->change.url)) {
|
|
RTMP_Free(r);
|
|
return CURLE_URL_MALFORMAT;
|
|
}
|
|
conn->proto.generic = r;
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static CURLcode rtmp_connect(struct connectdata *conn, bool *done)
|
|
{
|
|
RTMP *r = conn->proto.generic;
|
|
SET_RCVTIMEO(tv,10);
|
|
|
|
r->m_sb.sb_socket = conn->sock[FIRSTSOCKET];
|
|
|
|
/* We have to know if it's a write before we send the
|
|
* connect request packet
|
|
*/
|
|
if(conn->data->set.upload)
|
|
r->Link.protocol |= RTMP_FEATURE_WRITE;
|
|
|
|
/* For plain streams, use the buffer toggle trick to keep data flowing */
|
|
if(!(r->Link.lFlags & RTMP_LF_LIVE) &&
|
|
!(r->Link.protocol & RTMP_FEATURE_HTTP))
|
|
r->Link.lFlags |= RTMP_LF_BUFX;
|
|
|
|
curlx_nonblock(r->m_sb.sb_socket, FALSE);
|
|
setsockopt(r->m_sb.sb_socket, SOL_SOCKET, SO_RCVTIMEO,
|
|
(char *)&tv, sizeof(tv));
|
|
|
|
if(!RTMP_Connect1(r, NULL))
|
|
return CURLE_FAILED_INIT;
|
|
|
|
/* Clients must send a periodic BytesReceived report to the server */
|
|
r->m_bSendCounter = true;
|
|
|
|
*done = TRUE;
|
|
conn->recv[FIRSTSOCKET] = rtmp_recv;
|
|
conn->send[FIRSTSOCKET] = rtmp_send;
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static CURLcode rtmp_do(struct connectdata *conn, bool *done)
|
|
{
|
|
RTMP *r = conn->proto.generic;
|
|
|
|
if(!RTMP_ConnectStream(r, 0))
|
|
return CURLE_FAILED_INIT;
|
|
|
|
if(conn->data->set.upload) {
|
|
Curl_pgrsSetUploadSize(conn->data, conn->data->set.infilesize);
|
|
Curl_setup_transfer(conn, -1, -1, FALSE, NULL, FIRSTSOCKET, NULL);
|
|
}
|
|
else
|
|
Curl_setup_transfer(conn, FIRSTSOCKET, -1, FALSE, NULL, -1, NULL);
|
|
*done = TRUE;
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static CURLcode rtmp_done(struct connectdata *conn, CURLcode status,
|
|
bool premature)
|
|
{
|
|
(void)conn; /* unused */
|
|
(void)status; /* unused */
|
|
(void)premature; /* unused */
|
|
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static CURLcode rtmp_disconnect(struct connectdata *conn,
|
|
bool dead_connection)
|
|
{
|
|
RTMP *r = conn->proto.generic;
|
|
(void)dead_connection;
|
|
if(r) {
|
|
conn->proto.generic = NULL;
|
|
RTMP_Close(r);
|
|
RTMP_Free(r);
|
|
}
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static ssize_t rtmp_recv(struct connectdata *conn, int sockindex, char *buf,
|
|
size_t len, CURLcode *err)
|
|
{
|
|
RTMP *r = conn->proto.generic;
|
|
ssize_t nread;
|
|
|
|
(void)sockindex; /* unused */
|
|
|
|
nread = RTMP_Read(r, buf, len);
|
|
if(nread < 0) {
|
|
if(r->m_read.status == RTMP_READ_COMPLETE ||
|
|
r->m_read.status == RTMP_READ_EOF) {
|
|
conn->data->req.size = conn->data->req.bytecount;
|
|
nread = 0;
|
|
}
|
|
else
|
|
*err = CURLE_RECV_ERROR;
|
|
}
|
|
return nread;
|
|
}
|
|
|
|
static ssize_t rtmp_send(struct connectdata *conn, int sockindex,
|
|
const void *buf, size_t len, CURLcode *err)
|
|
{
|
|
RTMP *r = conn->proto.generic;
|
|
ssize_t num;
|
|
|
|
(void)sockindex; /* unused */
|
|
|
|
num = RTMP_Write(r, (char *)buf, len);
|
|
if(num < 0)
|
|
*err = CURLE_SEND_ERROR;
|
|
|
|
return num;
|
|
}
|
|
#endif /* USE_LIBRTMP */
|