Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1 (4c5f7e33) · Commits · e / os / android_frameworks_av

media/libstagefright/rtsp/ARTSPConnection.cpp

+70 −64

Original line number	Diff line number	Diff line
		@@ -187,10 +187,13 @@ bool ARTSPConnection::ParseURL(
		return true;
		}

		static void MakeSocketBlocking(int s, bool blocking) {
		static status_t MakeSocketBlocking(int s, bool blocking) {
		// Make socket non-blocking.
		int flags = fcntl(s, F_GETFL, 0);
		CHECK_NE(flags, -1);

		if (flags == -1) {
		return UNKNOWN_ERROR;
		}

		if (blocking) {
		flags &= ~O_NONBLOCK;
		@@ -198,7 +201,9 @@ static void MakeSocketBlocking(int s, bool blocking) {
		flags \|= O_NONBLOCK;
		}

		CHECK_NE(fcntl(s, F_SETFL, flags), -1);
		flags = fcntl(s, F_SETFL, flags);

		return flags == -1 ? UNKNOWN_ERROR : OK;
		}

		void ARTSPConnection::onConnect(const sp<AMessage> &msg) {
		@@ -302,8 +307,7 @@ void ARTSPConnection::onConnect(const sp<AMessage> &msg) {
		reply->post();
		}

		void ARTSPConnection::onDisconnect(const sp<AMessage> &msg) {
		if (mState == CONNECTED \|\| mState == CONNECTING) {
		void ARTSPConnection::performDisconnect() {
		if (mUIDValid) {
		HTTPBase::UnRegisterSocketUserTag(mSocket);
		}
		@@ -311,18 +315,24 @@ void ARTSPConnection::onDisconnect(const sp<AMessage> &msg) {
		mSocket = -1;

		flushPendingRequests();

		mUser.clear();
		mPass.clear();
		mAuthType = NONE;
		mNonce.clear();

		mState = DISCONNECTED;
		}

		void ARTSPConnection::onDisconnect(const sp<AMessage> &msg) {
		if (mState == CONNECTED \|\| mState == CONNECTING) {
		performDisconnect();
		}

		sp<AMessage> reply;
		CHECK(msg->findMessage("reply", &reply));

		reply->setInt32("result", OK);
		mState = DISCONNECTED;

		mUser.clear();
		mPass.clear();
		mAuthType = NONE;
		mNonce.clear();

		reply->post();
		}
		@@ -427,21 +437,25 @@ void ARTSPConnection::onSendRequest(const sp<AMessage> &msg) {
		send(mSocket, request.c_str() + numBytesSent,
		request.size() - numBytesSent, 0);

		if (n < 0 && errno == EINTR) {
		continue;
		}

		if (n <= 0) {
		performDisconnect();

		if (n == 0) {
		// Server closed the connection.
		LOGE("Server unexpectedly closed the connection.");

		reply->setInt32("result", ERROR_IO);
		reply->post();
		return;
		} else if (n < 0) {
		if (errno == EINTR) {
		continue;
		}

		LOGE("Error sending rtsp request.");
		} else {
		LOGE("Error sending rtsp request. (%s)", strerror(errno));
		reply->setInt32("result", -errno);
		reply->post();
		}

		return;
		}

		@@ -512,18 +526,23 @@ status_t ARTSPConnection::receive(void *data, size_t size) {
		size_t offset = 0;
		while (offset < size) {
		ssize_t n = recv(mSocket, (uint8_t *)data + offset, size - offset, 0);

		if (n < 0 && errno == EINTR) {
		continue;
		}

		if (n <= 0) {
		performDisconnect();

		if (n == 0) {
		// Server closed the connection.
		LOGE("Server unexpectedly closed the connection.");
		return ERROR_IO;
		} else if (n < 0) {
		if (errno == EINTR) {
		continue;
		}

		LOGE("Error reading rtsp response.");
		} else {
		LOGE("Error reading rtsp response. (%s)", strerror(errno));
		return -errno;
		}
		}

		offset += (size_t)n;
		}
		@@ -681,24 +700,8 @@ bool ARTSPConnection::receiveRTSPReponse() {
		if (contentLength > 0) {
		response->mContent = new ABuffer(contentLength);

		size_t numBytesRead = 0;
		while (numBytesRead < contentLength) {
		ssize_t n = recv(
		mSocket, response->mContent->data() + numBytesRead,
		contentLength - numBytesRead, 0);

		if (n == 0) {
		// Server closed the connection.
		TRESPASS();
		} else if (n < 0) {
		if (errno == EINTR) {
		continue;
		}

		TRESPASS();
		}

		numBytesRead += (size_t)n;
		if (receive(response->mContent->data(), contentLength) != OK) {
		return false;
		}
		}

		@@ -765,17 +768,20 @@ bool ARTSPConnection::handleServerRequest(const sp<ARTSPResponse> &request) {
		send(mSocket, response.c_str() + numBytesSent,
		response.size() - numBytesSent, 0);

		if (n < 0 && errno == EINTR) {
		continue;
		}

		if (n <= 0) {
		if (n == 0) {
		// Server closed the connection.
		LOGE("Server unexpectedly closed the connection.");

		return false;
		} else if (n < 0) {
		if (errno == EINTR) {
		continue;
		} else {
		LOGE("Error sending rtsp response (%s).", strerror(errno));
		}

		LOGE("Error sending rtsp response.");
		performDisconnect();

		return false;
		}

media/libstagefright/rtsp/ARTSPConnection.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,8 @@ private:

		AString mUserAgent;

		void performDisconnect();

		void onConnect(const sp<AMessage> &msg);
		void onDisconnect(const sp<AMessage> &msg);
		void onCompleteConnection(const sp<AMessage> &msg);