Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0429aa93 authored by Geremy Condra's avatar Geremy Condra Committed by Android (Google) Code Review
Browse files

Merge "Add routing sockets for the requesting user"

parents 47110057 5908f88a

media/libstagefright/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ LOCAL_C_INCLUDES:= \ 
        $(TOP)/frameworks/av/include/media/stagefright/timedtext \

        $(TOP)/frameworks/native/include/media/hardware \

        $(TOP)/frameworks/native/include/media/openmax \

        $(TOP)/frameworks/native/services/connectivitymanager \

        $(TOP)/external/flac/include \

        $(TOP)/external/tremolo \

        $(TOP)/external/openssl/include \
@@ -69,6 +70,7 @@ LOCAL_C_INCLUDES:= \ 
LOCAL_SHARED_LIBRARIES := \

        libbinder \

        libcamera_client \

        libconnectivitymanager \

        libcutils \

        libdl \

        libdrmframework \

media/libstagefright/HTTPBase.cpp

+12 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
#include <cutils/properties.h>

#include <cutils/qtaguid.h>



#include <ConnectivityManager.h>



namespace android {



HTTPBase::HTTPBase()
@@ -164,4 +166,14 @@ void HTTPBase::UnRegisterSocketUserTag(int sockfd) { 
    }

}



// static

void HTTPBase::RegisterSocketUserMark(int sockfd, uid_t uid) {

    ConnectivityManager::markSocketAsUser(sockfd, uid);

}



// static

void HTTPBase::UnRegisterSocketUserMark(int sockfd) {

    RegisterSocketUserMark(sockfd, geteuid());

}



}  // namespace android

media/libstagefright/include/HTTPBase.h

+3 −0
Original line number Diff line number Diff line
@@ -59,6 +59,9 @@ struct HTTPBase : public DataSource { 
    static void RegisterSocketUserTag(int sockfd, uid_t uid, uint32_t kTag);

    static void UnRegisterSocketUserTag(int sockfd);



    static void RegisterSocketUserMark(int sockfd, uid_t uid);

    static void UnRegisterSocketUserMark(int sockfd);



protected:

    void addBandwidthMeasurement(size_t numBytes, int64_t delayUs);

media/libstagefright/rtsp/ARTSPConnection.cpp

+6 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ ARTSPConnection::~ARTSPConnection() { 
        ALOGE("Connection is still open, closing the socket.");

        if (mUIDValid) {

            HTTPBase::UnRegisterSocketUserTag(mSocket);

            HTTPBase::UnRegisterSocketUserMark(mSocket);

        }

        close(mSocket);

        mSocket = -1;
@@ -214,6 +215,7 @@ void ARTSPConnection::onConnect(const sp<AMessage> &msg) { 
    if (mState != DISCONNECTED) {

        if (mUIDValid) {

            HTTPBase::UnRegisterSocketUserTag(mSocket);

            HTTPBase::UnRegisterSocketUserMark(mSocket);

        }

        close(mSocket);

        mSocket = -1;
@@ -266,6 +268,7 @@ void ARTSPConnection::onConnect(const sp<AMessage> &msg) { 
    if (mUIDValid) {

        HTTPBase::RegisterSocketUserTag(mSocket, mUID,

                                        (uint32_t)*(uint32_t*) "RTSP");

        HTTPBase::RegisterSocketUserMark(mSocket, mUID);

    }



    MakeSocketBlocking(mSocket, false);
@@ -295,6 +298,7 @@ void ARTSPConnection::onConnect(const sp<AMessage> &msg) { 


        if (mUIDValid) {

            HTTPBase::UnRegisterSocketUserTag(mSocket);

            HTTPBase::UnRegisterSocketUserMark(mSocket);

        }

        close(mSocket);

        mSocket = -1;
@@ -312,6 +316,7 @@ void ARTSPConnection::onConnect(const sp<AMessage> &msg) { 
void ARTSPConnection::performDisconnect() {

    if (mUIDValid) {

        HTTPBase::UnRegisterSocketUserTag(mSocket);

        HTTPBase::UnRegisterSocketUserMark(mSocket);

    }

    close(mSocket);

    mSocket = -1;
@@ -385,6 +390,7 @@ void ARTSPConnection::onCompleteConnection(const sp<AMessage> &msg) { 
        mState = DISCONNECTED;

        if (mUIDValid) {

            HTTPBase::UnRegisterSocketUserTag(mSocket);

            HTTPBase::UnRegisterSocketUserMark(mSocket);

        }

        close(mSocket);

        mSocket = -1;

media/libstagefright/rtsp/MyHandler.h

+6 −0
Original line number Diff line number Diff line
@@ -712,7 +712,9 @@ struct MyHandler : public AHandler { 
                            // Clear the tag

                            if (mUIDValid) {

                                HTTPBase::UnRegisterSocketUserTag(track->mRTPSocket);

                                HTTPBase::UnRegisterSocketUserMark(track->mRTPSocket);

                                HTTPBase::UnRegisterSocketUserTag(track->mRTCPSocket);

                                HTTPBase::UnRegisterSocketUserMark(track->mRTCPSocket);

                            }



                            close(track->mRTPSocket);
@@ -843,7 +845,9 @@ struct MyHandler : public AHandler { 
                        // Clear the tag

                        if (mUIDValid) {

                            HTTPBase::UnRegisterSocketUserTag(info->mRTPSocket);

                            HTTPBase::UnRegisterSocketUserMark(info->mRTPSocket);

                            HTTPBase::UnRegisterSocketUserTag(info->mRTCPSocket);

                            HTTPBase::UnRegisterSocketUserMark(info->mRTPCSocket);

                        }



                        close(info->mRTPSocket);
@@ -1599,6 +1603,8 @@ private: 
                                                (uint32_t)*(uint32_t*) "RTP_");

                HTTPBase::RegisterSocketUserTag(info->mRTCPSocket, mUID,

                                                (uint32_t)*(uint32_t*) "RTP_");

                HTTPBase::RegisterSocketUserMark(info->mRTPSocket, mUID);

                HTTPBase::RegisterSocketUserMark(info->mRTCPSocket, mUID);

            }



            request.append("Transport: RTP/AVP/UDP;unicast;client_port=");