diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2011-03-09 15:21:34 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-09 15:21:34 -0800 |
commit | 3b93951624b5490a2d40abc5385dc71b15526757 (patch) | |
tree | 87323789eb4da7e1914c739601cde3bc13f7538b | |
parent | e146aa536ae4c990e70dd03e85f5bac9fbe956a0 (diff) | |
parent | 4ec5179bf8cdebe37538fd22a690f20783a2b010 (diff) | |
download | frameworks_av-3b93951624b5490a2d40abc5385dc71b15526757.zip frameworks_av-3b93951624b5490a2d40abc5385dc71b15526757.tar.gz frameworks_av-3b93951624b5490a2d40abc5385dc71b15526757.tar.bz2 |
am d1e09e08: am 8df2477c: am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.
* commit 'd1e09e08210e755034bbdd07e1f48b35ec9a4752':
Support IPv6->IPv4 fallback in HTTP streaming.
-rw-r--r-- | media/libstagefright/HTTPStream.cpp | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/media/libstagefright/HTTPStream.cpp b/media/libstagefright/HTTPStream.cpp index d216ef2..2caf211 100644 --- a/media/libstagefright/HTTPStream.cpp +++ b/media/libstagefright/HTTPStream.cpp @@ -237,31 +237,41 @@ status_t HTTPStream::connect(const char *server, int port, bool https) { } CHECK_EQ(mSocket, -1); - mSocket = socket(ai[0].ai_family, ai[0].ai_socktype, ai[0].ai_protocol); - if (mSocket < 0) { - freeaddrinfo(ai); - return UNKNOWN_ERROR; - } + mState = CONNECTING; + status_t res = -1; + struct addrinfo *tmp; + for (tmp = ai; tmp; tmp = tmp->ai_next) { + mSocket = socket(tmp->ai_family, tmp->ai_socktype, tmp->ai_protocol); + if (mSocket < 0) { + continue; + } - setReceiveTimeout(30); // Time out reads after 30 secs by default + setReceiveTimeout(30); // Time out reads after 30 secs by default. - mState = CONNECTING; + int s = mSocket; - int s = mSocket; + mLock.unlock(); - mLock.unlock(); + res = MyConnect(s, tmp->ai_addr, tmp->ai_addrlen); - status_t res = MyConnect(s, ai[0].ai_addr, ai[0].ai_addrlen); + mLock.lock(); - freeaddrinfo(ai); + if (mState != CONNECTING) { + close(s); + freeaddrinfo(ai); + return UNKNOWN_ERROR; + } - mLock.lock(); + if (res == OK) { + break; + } - if (mState != CONNECTING) { - return UNKNOWN_ERROR; + close(s); } + freeaddrinfo(ai); + if (res != OK) { close(mSocket); mSocket = -1; |