From 5b44be841c960a756a4530f5b120b7d33c8d3b50 Mon Sep 17 00:00:00 2001 From: Iru Cai Date: Fri, 4 Nov 2016 16:27:30 +0800 Subject: fqterm_ssh_socket.cpp: test SSH2 first, fix typo TODO: make version 1.99 use SSH2 --- src/protocol/fqterm_ssh_socket.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/protocol/fqterm_ssh_socket.cpp b/src/protocol/fqterm_ssh_socket.cpp index 71031f6..588d65c 100644 --- a/src/protocol/fqterm_ssh_socket.cpp +++ b/src/protocol/fqterm_ssh_socket.cpp @@ -236,22 +236,21 @@ void FQTermSSHSocket::parsePacket() { QByteArray data; size = private_socket_->bytesAvailable(); data = private_socket_->readBlock(size); - + socket_buffer_->putRawData(data.data(), size); packet_receiver_->parseData(socket_buffer_); } int FQTermSSHSocket::chooseVersion(const QString &ver) { - QString verion = ver.mid(ver.indexOf("-") + 1); - verion = verion.left(verion.indexOf("-")); + QString version = ver.mid(ver.indexOf("-") + 1); + version = version.left(version.indexOf("-")); - if (verion == "1.99" || verion == "1.3" || verion == "1.5") { - return 1; - } else if (verion == "2.0") { + if (version == "2.0") return 2; - } else { - return - 1; - } + else if (version == "1.99" || version == "1.3" || version == "1.5") + return 1; + else + return -1; } void FQTermSSHSocket::connectToHost(const QString &host_name, quint16 port) { -- cgit v1.2.3