From 2e14cc5f2d09b6e0f435a7c63447e7d09996c561 Mon Sep 17 00:00:00 2001 From: Iru Cai Date: Mon, 21 May 2018 19:43:47 +0800 Subject: add warnInsecure signals and slots --- src/fqterm/fqterm_window.cpp | 2 ++ src/fqterm/fqterm_window.h | 1 + src/protocol/fqterm_socket.h | 1 + src/terminal/fqterm_session.cpp | 2 ++ src/terminal/fqterm_session.h | 2 +- src/terminal/internal/fqterm_telnet.cpp | 2 ++ src/terminal/internal/fqterm_telnet.h | 1 + 7 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/fqterm/fqterm_window.cpp b/src/fqterm/fqterm_window.cpp index 8604c9e..c59fcd3 100644 --- a/src/fqterm/fqterm_window.cpp +++ b/src/fqterm/fqterm_window.cpp @@ -179,6 +179,8 @@ FQTermWindow::FQTermWindow(FQTermConfig *config, FQTermFrame *frame, FQTermParam this, SLOT(articleCopied(int, const QString)))); FQ_VERIFY(connect(session_, SIGNAL(requestUserPwd(QString*, QString*, bool*)), this, SLOT(requestUserPwd(QString *, QString *, bool *)))); + FQ_VERIFY(connect(session_, SIGNAL(warnInsecure(const QString &, bool*)), + this, SLOT(warnInsecure(const QString &, bool *)))); //connect telnet signal to slots // QVERIFY(connect(session_->telnet_, SIGNAL(readyRead(int)), // this, SLOT(readReady(int)))); diff --git a/src/fqterm/fqterm_window.h b/src/fqterm/fqterm_window.h index 7a736b3..984d476 100644 --- a/src/fqterm/fqterm_window.h +++ b/src/fqterm/fqterm_window.h @@ -182,6 +182,7 @@ signals: void sessionUpdated(); void requestUserPwd(QString *userName, QString *password, bool *isOK); + void warnInsecure(const QString &msg, bool *isOK) {} void TelnetState(int); void ZmodemState(int, int, const char *); diff --git a/src/protocol/fqterm_socket.h b/src/protocol/fqterm_socket.h index 67a0648..1759073 100644 --- a/src/protocol/fqterm_socket.h +++ b/src/protocol/fqterm_socket.h @@ -150,6 +150,7 @@ protected: void errorMessage(QString); void socketState(int); void requestUserPwd(QString *user, QString *pwd, bool *isOK); + void warnInsecure(const QString&, bool *isOK); }; diff --git a/src/terminal/fqterm_session.cpp b/src/terminal/fqterm_session.cpp index ff1bd26..bf39a7a 100644 --- a/src/terminal/fqterm_session.cpp +++ b/src/terminal/fqterm_session.cpp @@ -143,6 +143,8 @@ FQTermSession::FQTermSession(FQTermConfig *config, FQTermParam param) { this, SIGNAL(errorMessage(QString)))); FQ_VERIFY(connect(telnet_, SIGNAL(requestUserPwd(QString*, QString*, bool*)), this, SIGNAL(requestUserPwd(QString*, QString*, bool*)))); + FQ_VERIFY(connect(telnet_, SIGNAL(warnInsecure(const QString &, bool*)), + this, SIGNAL(warnInsecure(const QString &, bool*)))); FQ_VERIFY(connect(telnet_, SIGNAL(onSSHAuthOK()), this, SLOT(onSSHAuthOK()))); diff --git a/src/terminal/fqterm_session.h b/src/terminal/fqterm_session.h index 17e35d0..03e1b22 100644 --- a/src/terminal/fqterm_session.h +++ b/src/terminal/fqterm_session.h @@ -249,7 +249,7 @@ class FQTermSession: public QObject { void stopAlert(); void requestUserPwd(QString *user, QString *pwd, bool *isOK); - + void warnInsecure(const QString&, bool *isOK); void telnetStateChanged(int state); void zmodemStateChanged(int type, int value, const char *status); diff --git a/src/terminal/internal/fqterm_telnet.cpp b/src/terminal/internal/fqterm_telnet.cpp index ea2740b..7d710a9 100644 --- a/src/terminal/internal/fqterm_telnet.cpp +++ b/src/terminal/internal/fqterm_telnet.cpp @@ -238,6 +238,8 @@ FQTermTelnet::FQTermTelnet(const QString &strTermType, int rows, int columns, FQ_VERIFY(connect(socket, SIGNAL(requestUserPwd(QString *, QString *, bool *)), this, SIGNAL(requestUserPwd(QString *, QString *, bool *)))); + FQ_VERIFY(connect(socket, SIGNAL(warnInsecure(const QString &, bool *)), + this, SIGNAL(warnInsecure(const QString &, bool *)))); FQ_VERIFY(connect(socket, SIGNAL(errorMessage(QString)), this, SIGNAL(errorMessage(QString)))); diff --git a/src/terminal/internal/fqterm_telnet.h b/src/terminal/internal/fqterm_telnet.h index 90595cc..0a0ba01 100644 --- a/src/terminal/internal/fqterm_telnet.h +++ b/src/terminal/internal/fqterm_telnet.h @@ -91,6 +91,7 @@ class FQTermTelnet: public QObject { void readyRead(int, int); // There are datas to be read out void TelnetState(int); // The state telnet, defined as TSXXXX in fqterm.h void requestUserPwd(QString *user, QString *pwd, bool *isOK); + void warnInsecure(const QString&, bool *isOK); void errorMessage(QString); public slots: -- cgit v1.2.3