1 files changed, 29 insertions, 25 deletions

diff --git a/examples/network/multicastsender/sender.cpp b/examples/network/multicastsender/sender.cpp
index 4aa65fee27..a542a2528f 100644
--- a/examples/network/multicastsender/sender.cpp
+++ b/examples/network/multicastsender/sender.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -48,43 +48,45 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-#include <QtNetwork>
-
 #include "sender.h"
 
 Sender::Sender(QWidget *parent)
-    : QDialog(parent)
+    : QDialog(parent),
+      groupAddress4(QStringLiteral("239.255.43.21")),
+      groupAddress6(QStringLiteral("ff12::2115"))
 {
-    groupAddress = QHostAddress("239.255.43.21");
+    // force binding to their respective families
+    udpSocket4.bind(QHostAddress(QHostAddress::AnyIPv4), 0);
+    udpSocket6.bind(QHostAddress(QHostAddress::AnyIPv6), udpSocket4.localPort());
 
-    statusLabel = new QLabel(tr("Ready to multicast datagrams to group %1 on port 45454").arg(groupAddress.toString()));
+    QString msg = tr("Ready to multicast datagrams to groups %1 and [%2] on port 45454").arg(groupAddress4.toString());
+    if (udpSocket6.state() != QAbstractSocket::BoundState)
+        msg = tr("IPv6 failed. Ready to multicast datagrams to group %1 on port 45454").arg(groupAddress4.toString());
+    else
+        msg = msg.arg(groupAddress6.toString());
+    statusLabel = new QLabel(msg);
 
-    ttlLabel = new QLabel(tr("TTL for multicast datagrams:"));
-    ttlSpinBox = new QSpinBox;
+    auto ttlLabel = new QLabel(tr("TTL for IPv4 multicast datagrams:"));
+    auto ttlSpinBox = new QSpinBox;
     ttlSpinBox->setRange(0, 255);
 
-    QHBoxLayout *ttlLayout = new QHBoxLayout;
+    auto ttlLayout = new QHBoxLayout;
     ttlLayout->addWidget(ttlLabel);
     ttlLayout->addWidget(ttlSpinBox);
 
     startButton = new QPushButton(tr("&Start"));
-    quitButton = new QPushButton(tr("&Quit"));
+    auto quitButton = new QPushButton(tr("&Quit"));
 
-    buttonBox = new QDialogButtonBox;
+    auto buttonBox = new QDialogButtonBox;
     buttonBox->addButton(startButton, QDialogButtonBox::ActionRole);
     buttonBox->addButton(quitButton, QDialogButtonBox::RejectRole);
 
-    timer = new QTimer(this);
-    udpSocket = new QUdpSocket(this);
-    messageNo = 1;
-
-    connect(ttlSpinBox, SIGNAL(valueChanged(int)), this, SLOT(ttlChanged(int)));
-    connect(startButton, SIGNAL(clicked()), this, SLOT(startSending()));
-    connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
-    connect(timer, SIGNAL(timeout()), this, SLOT(sendDatagram()));
+    connect(ttlSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), this, &Sender::ttlChanged);
+    connect(startButton, &QPushButton::clicked, this, &Sender::startSending);
+    connect(quitButton, &QPushButton::clicked, this, &Sender::close);
+    connect(&timer, &QTimer::timeout, this, &Sender::sendDatagram);
 
-    QVBoxLayout *mainLayout = new QVBoxLayout;
+    auto mainLayout = new QVBoxLayout;
     mainLayout->addWidget(statusLabel);
     mainLayout->addLayout(ttlLayout);
     mainLayout->addWidget(buttonBox);
@@ -96,20 +98,22 @@ Sender::Sender(QWidget *parent)
 
 void Sender::ttlChanged(int newTtl)
 {
-    udpSocket->setSocketOption(QAbstractSocket::MulticastTtlOption, newTtl);
+    // we only set the TTL on the IPv4 socket, as that changes the multicast scope
+    udpSocket4.setSocketOption(QAbstractSocket::MulticastTtlOption, newTtl);
 }
 
 void Sender::startSending()
 {
     startButton->setEnabled(false);
-    timer->start(1000);
+    timer.start(1000);
 }
 
 void Sender::sendDatagram()
 {
     statusLabel->setText(tr("Now sending datagram %1").arg(messageNo));
     QByteArray datagram = "Multicast message " + QByteArray::number(messageNo);
-    udpSocket->writeDatagram(datagram.data(), datagram.size(),
-                             groupAddress, 45454);
+    udpSocket4.writeDatagram(datagram, groupAddress4, 45454);
+    if (udpSocket6.state() == QAbstractSocket::BoundState)
+        udpSocket6.writeDatagram(datagram, groupAddress6, 45454);
     ++messageNo;
 }