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

Commit 7304f906 authored by Kim Sungyeon's avatar Kim Sungyeon Committed by Automerger Merge Worker
Browse files

VT: Change socket option to REUSEADDR am: ebf1e771 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/952493

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6a62da934eea750dda57b5c5c76ad6c465652bde
parents 25b6a005 ebf1e771

media/libstagefright/rtsp/ARTPConnection.cpp

+2 −2
Original line number Diff line number Diff line
@@ -192,8 +192,8 @@ void ARTPConnection::MakeRTPSocketPair( 
    }



    int sockopt = 1;

    setsockopt(*rtpSocket, SOL_SOCKET, SO_REUSEPORT, (int *)&sockopt, sizeof(sockopt));

    setsockopt(*rtcpSocket, SOL_SOCKET, SO_REUSEPORT, (int *)&sockopt, sizeof(sockopt));

    setsockopt(*rtpSocket, SOL_SOCKET, SO_REUSEADDR, (int *)&sockopt, sizeof(sockopt));

    setsockopt(*rtcpSocket, SOL_SOCKET, SO_REUSEADDR, (int *)&sockopt, sizeof(sockopt));



    int sizeSockSt = isIPv6 ? sizeof(addr6) : sizeof(addr4);

media/libstagefright/rtsp/ARTPWriter.cpp

+4 −9
Original line number Diff line number Diff line
@@ -1164,8 +1164,8 @@ void ARTPWriter::makeSocketPairAndBind(String8& localIp, int localPort, 
    CHECK_GE(mRTCPSocket, 0);



    int sockopt = 1;

    setsockopt(mRTPSocket, SOL_SOCKET, SO_REUSEPORT, (int *)&sockopt, sizeof(sockopt));

    setsockopt(mRTCPSocket, SOL_SOCKET, SO_REUSEPORT, (int *)&sockopt, sizeof(sockopt));

    setsockopt(mRTPSocket, SOL_SOCKET, SO_REUSEADDR, (int *)&sockopt, sizeof(sockopt));

    setsockopt(mRTCPSocket, SOL_SOCKET, SO_REUSEADDR, (int *)&sockopt, sizeof(sockopt));



    if (mIsIPv6) {

        memset(&mLocalAddr6, 0, sizeof(mLocalAddr6));
@@ -1207,7 +1207,7 @@ void ARTPWriter::makeSocketPairAndBind(String8& localIp, int localPort, 
    if (bind(mRTPSocket, localAddr, sizeSockSt) == -1) {

        ALOGE("failed to bind rtp %s:%d err=%s", localIp.string(), localPort, strerror(errno));

    } else {

        ALOGI("succeed to bind rtp %s:%d", localIp.string(), localPort);

        ALOGD("succeed to bind rtp %s:%d", localIp.string(), localPort);

    }



    if (mIsIPv6)
@@ -1218,13 +1218,8 @@ void ARTPWriter::makeSocketPairAndBind(String8& localIp, int localPort, 
    if (bind(mRTCPSocket, localAddr, sizeSockSt) == -1) {

        ALOGE("failed to bind rtcp %s:%d err=%s", localIp.string(), localPort + 1, strerror(errno));

    } else {

        ALOGI("succeed to bind rtcp %s:%d", localIp.string(), localPort + 1);

        ALOGD("succeed to bind rtcp %s:%d", localIp.string(), localPort + 1);

    }



    if (mIsIPv6)

        mLocalAddr6.sin6_port = htons((uint16_t)localPort);

    else

        mLocalAddr.sin_port = htons((uint16_t)localPort);

}



}  // namespace android