Move QIpPacketHeader to the header where QNetworkDatagramPrivate will be
Change-Id: I14839ba5678944c2864bffff1417a1d4b790f9c3 Reviewed-by: Richard J. Moore <rich@kde.org>
This commit is contained in:
parent
198768cbba
commit
26ece94a68
@ -11,11 +11,12 @@ HEADERS += kernel/qauthenticator.h \
|
|||||||
kernel/qhostaddress_p.h \
|
kernel/qhostaddress_p.h \
|
||||||
kernel/qhostinfo.h \
|
kernel/qhostinfo.h \
|
||||||
kernel/qhostinfo_p.h \
|
kernel/qhostinfo_p.h \
|
||||||
kernel/qurlinfo_p.h \
|
kernel/qnetworkdatagram_p.h \
|
||||||
|
kernel/qnetworkinterface.h \
|
||||||
|
kernel/qnetworkinterface_p.h \
|
||||||
kernel/qnetworkproxy.h \
|
kernel/qnetworkproxy.h \
|
||||||
kernel/qnetworkproxy_p.h \
|
kernel/qnetworkproxy_p.h \
|
||||||
kernel/qnetworkinterface.h \
|
kernel/qurlinfo_p.h
|
||||||
kernel/qnetworkinterface_p.h
|
|
||||||
|
|
||||||
SOURCES += kernel/qauthenticator.cpp \
|
SOURCES += kernel/qauthenticator.cpp \
|
||||||
kernel/qdnslookup.cpp \
|
kernel/qdnslookup.cpp \
|
||||||
|
67
src/network/kernel/qnetworkdatagram_p.h
Normal file
67
src/network/kernel/qnetworkdatagram_p.h
Normal file
@ -0,0 +1,67 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
**
|
||||||
|
** Copyright (C) 2015 Intel Corporation.
|
||||||
|
** Contact: http://www.qt.io/licensing/
|
||||||
|
**
|
||||||
|
** This file is part of the QtNetwork module of the Qt Toolkit.
|
||||||
|
**
|
||||||
|
** $QT_BEGIN_LICENSE:LGPL21$
|
||||||
|
** Commercial License Usage
|
||||||
|
** Licensees holding valid commercial Qt licenses may use this file in
|
||||||
|
** accordance with the commercial license agreement provided with the
|
||||||
|
** Software or, alternatively, in accordance with the terms contained in
|
||||||
|
** a written agreement between you and The Qt Company. For licensing terms
|
||||||
|
** and conditions see http://www.qt.io/terms-conditions. For further
|
||||||
|
** information use the contact form at http://www.qt.io/contact-us.
|
||||||
|
**
|
||||||
|
** GNU Lesser General Public License Usage
|
||||||
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||||
|
** General Public License version 2.1 or version 3 as published by the Free
|
||||||
|
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
||||||
|
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
||||||
|
** following information to ensure the GNU Lesser General Public License
|
||||||
|
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
||||||
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||||
|
**
|
||||||
|
** As a special exception, The Qt Company gives you certain additional
|
||||||
|
** rights. These rights are described in The Qt Company LGPL Exception
|
||||||
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||||
|
**
|
||||||
|
** $QT_END_LICENSE$
|
||||||
|
**
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#ifndef QNETWORKDATAGRAM_P_H
|
||||||
|
#define QNETWORKDATAGRAM_P_H
|
||||||
|
|
||||||
|
#include <QtNetwork/qhostaddress.h>
|
||||||
|
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
class QIpPacketHeader
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
QIpPacketHeader(const QHostAddress &dstAddr = QHostAddress(), quint16 port = 0)
|
||||||
|
: destinationAddress(dstAddr), ifindex(0), hopLimit(-1), destinationPort(port)
|
||||||
|
{}
|
||||||
|
|
||||||
|
void clear()
|
||||||
|
{
|
||||||
|
senderAddress.clear();
|
||||||
|
destinationAddress.clear();
|
||||||
|
ifindex = 0;
|
||||||
|
hopLimit = -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
QHostAddress senderAddress;
|
||||||
|
QHostAddress destinationAddress;
|
||||||
|
|
||||||
|
uint ifindex;
|
||||||
|
int hopLimit;
|
||||||
|
quint16 senderPort;
|
||||||
|
quint16 destinationPort;
|
||||||
|
};
|
||||||
|
|
||||||
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
#endif // QNETWORKDATAGRAM_P_H
|
@ -55,6 +55,7 @@
|
|||||||
#include "QtNetwork/qhostaddress.h"
|
#include "QtNetwork/qhostaddress.h"
|
||||||
#include "QtNetwork/qabstractsocket.h"
|
#include "QtNetwork/qabstractsocket.h"
|
||||||
#include "private/qobject_p.h"
|
#include "private/qobject_p.h"
|
||||||
|
#include "private/qnetworkdatagram_p.h"
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
@ -65,30 +66,6 @@ class QNetworkInterface;
|
|||||||
#endif
|
#endif
|
||||||
class QNetworkProxy;
|
class QNetworkProxy;
|
||||||
|
|
||||||
class QIpPacketHeader
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
QIpPacketHeader(const QHostAddress &dstAddr = QHostAddress(), quint16 port = 0)
|
|
||||||
: destinationAddress(dstAddr), ifindex(0), hopLimit(-1), destinationPort(port)
|
|
||||||
{}
|
|
||||||
|
|
||||||
void clear()
|
|
||||||
{
|
|
||||||
senderAddress.clear();
|
|
||||||
destinationAddress.clear();
|
|
||||||
ifindex = 0;
|
|
||||||
hopLimit = -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
QHostAddress senderAddress;
|
|
||||||
QHostAddress destinationAddress;
|
|
||||||
|
|
||||||
uint ifindex;
|
|
||||||
int hopLimit;
|
|
||||||
quint16 senderPort;
|
|
||||||
quint16 destinationPort;
|
|
||||||
};
|
|
||||||
|
|
||||||
class QAbstractSocketEngineReceiver {
|
class QAbstractSocketEngineReceiver {
|
||||||
public:
|
public:
|
||||||
virtual ~QAbstractSocketEngineReceiver(){}
|
virtual ~QAbstractSocketEngineReceiver(){}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user