Ticket #10259: fix-ipv6.diff

File fix-ipv6.diff, 1.7 KB (added by beirdo, 9 years ago)
  • mythtv/libs/libmythbase/msocketdevice.cpp

    diff --git a/mythtv/libs/libmythbase/msocketdevice.cpp b/mythtv/libs/libmythbase/msocketdevice.cpp
    index aaa30ca..ed2a188 100644
    a b MSocketDevice::MSocketDevice(int socket, Type type) 
    182182MSocketDevice::MSocketDevice(Type type)
    183183        : fd(-1), t(type), p(0), pp(0), e(NoError),
    184184        d(new MSocketDevicePrivate(Unknown))
    185 
    186         //  d(new MSocketDevicePrivate(IPv4))
    187185{
    188186#if defined(MSOCKETDEVICE_DEBUG)
    189187    qDebug("MSocketDevice: Created MSocketDevice object %p, type %d",
  • mythtv/libs/libmythbase/msocketdevice_unix.cpp

    diff --git a/mythtv/libs/libmythbase/msocketdevice_unix.cpp b/mythtv/libs/libmythbase/msocketdevice_unix.cpp
    index b03f9c6..ea74123 100644
    a b void MSocketDevice::setOption(Option opt, int v) 
    501501*/
    502502bool MSocketDevice::connect(const QHostAddress &addr, quint16 port)
    503503{
     504    if (isValid() && addr.protocol() != pa.protocol())
     505    {
     506        close();
     507        fd = -1;
     508    }
     509
    504510    if (!isValid())
    505511    {
    506512#if !defined(QT_NO_IPV6)
  • mythtv/libs/libmythbase/msocketdevice_win.cpp

    diff --git a/mythtv/libs/libmythbase/msocketdevice_win.cpp b/mythtv/libs/libmythbase/msocketdevice_win.cpp
    index f253456..44872eb 100644
    a b void MSocketDevice::setOption(Option opt, int v) 
    530530
    531531bool MSocketDevice::connect(const QHostAddress &addr, quint16 port)
    532532{
     533    if (isValid() && addr.protocol() != pa.protocol())
     534    {
     535        close();
     536        fd = -1;
     537    }
     538
    533539    if (!isValid())
    534540    {
    535541#if !defined(QT_NO_IPV6)