From a1705e7619204e0815d980994b1d8d3689e40e85 Mon Sep 17 00:00:00 2001 From: Srivats P Date: Sun, 25 Apr 2021 10:52:42 +0530 Subject: [PATCH 1/3] Try to reconnect with drone after disconnect This used to work earlier, but got broken when the incompatibility check was added as we didn't want reconnect to be initiated if versions were incompatible. This fix will always try to reconnect, except for following cases - * Compatibility check is false * Bad data received from drone * User triggered disconnect Fixes #333 --- client/portgroup.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/client/portgroup.cpp b/client/portgroup.cpp index 7b259ac..e2a0328 100644 --- a/client/portgroup.cpp +++ b/client/portgroup.cpp @@ -206,6 +206,7 @@ void PortGroup::processVersionCompatibility(PbRpcController *controller) logError(id(), QString("checkVersion failed: %1") .arg(QString::fromStdString(verCompat->notes()))); compat = kIncompatible; + reconnect = false; emit portGroupDataChanged(mPortGroupId); QMessageBox msgBox; @@ -289,8 +290,6 @@ void PortGroup::on_rpcChannel_error(QAbstractSocket::SocketError socketError) " - is it drone or some other process?") .arg(rpcChannel->serverName()) .arg(rpcChannel->serverPort())); - // fall-through - case QAbstractSocket::RemoteHostClosedError: reconnect = false; break; default: From 1216cfbce652ebef7ee00f9f4e4690d66e4c0c84 Mon Sep 17 00:00:00 2001 From: Srivats P Date: Sat, 14 Aug 2021 11:31:38 +0530 Subject: [PATCH 2/3] Include QRegExpValidator in MacEdit to fix build break This build break is seen only on some platform/compiler combos --- common/macedit.h | 1 + 1 file changed, 1 insertion(+) diff --git a/common/macedit.h b/common/macedit.h index 60c4d32..6c005be 100644 --- a/common/macedit.h +++ b/common/macedit.h @@ -21,6 +21,7 @@ along with this program. If not, see #define _MAC_EDIT_H #include +#include class MacEdit: public QLineEdit { From 34d8ac25840f03b6ebd525925f3d994e1682f913 Mon Sep 17 00:00:00 2001 From: Srivats P Date: Sat, 14 Aug 2021 11:35:49 +0530 Subject: [PATCH 3/3] Migrate from travis-ci.org to travis-ci.com --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6ca1064..768c5ad 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Ostinato -[![Build Status](https://travis-ci.org/pstavirs/ostinato.svg?branch=master)](https://travis-ci.org/pstavirs/ostinato) +[![Build Status](https://travis-ci.com/pstavirs/ostinato.svg?branch=master)](https://travis-ci.com/pstavirs/ostinato) This is the code repository for the Ostinato network packet crafter and traffic generator