From 61109437da7a73e8cf559a29450b87bff4cb1043 Mon Sep 17 00:00:00 2001
From: Iru Cai <mytbk920423@gmail.com>
Date: Mon, 21 May 2018 13:01:24 +0800
Subject: remove is_compressed

---
 src/protocol/internal/fqterm_ssh2_packet.cpp |  8 --------
 src/protocol/internal/fqterm_ssh_packet.cpp  |  4 ----
 src/protocol/internal/fqterm_ssh_packet.h    | 16 ++++------------
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/src/protocol/internal/fqterm_ssh2_packet.cpp b/src/protocol/internal/fqterm_ssh2_packet.cpp
index 5493623..4a5cde4 100644
--- a/src/protocol/internal/fqterm_ssh2_packet.cpp
+++ b/src/protocol/internal/fqterm_ssh2_packet.cpp
@@ -31,14 +31,6 @@ namespace FQTerm {
 //==============================================================================
 void FQTermSSH2PacketSender::makePacket()
 {
-	FQ_TRACE("ssh2packet", 9) << "----------------------------Send "
-		<< (cipher->started ? "Encrypted": "plain")
-		<< " Packet---->>>>>>>";
-
-	// 0. compress
-	if (is_compressed_)
-		FQ_VERIFY(false);
-
 	make_ssh2_packet(&orig_data, &data_to_send, cipher,
 			mac, is_mac_, &sequence_no_);
 }
diff --git a/src/protocol/internal/fqterm_ssh_packet.cpp b/src/protocol/internal/fqterm_ssh_packet.cpp
index cc258b2..1e53250 100644
--- a/src/protocol/internal/fqterm_ssh_packet.cpp
+++ b/src/protocol/internal/fqterm_ssh_packet.cpp
@@ -41,8 +41,6 @@ FQTermSSHPacketSender::FQTermSSHPacketSender()
   is_mac_ = false;
   mac = NULL;
 
-  is_compressed_ = false;
-
   sequence_no_ = 0;
 }
 
@@ -129,8 +127,6 @@ FQTermSSHPacketReceiver::FQTermSSHPacketReceiver()
   is_mac_ = false;
   mac = NULL;
 
-  is_compressed_ = false;
-
   sequence_no_ = 0;
 }
 
diff --git a/src/protocol/internal/fqterm_ssh_packet.h b/src/protocol/internal/fqterm_ssh_packet.h
index 5b51fbb..071c8e0 100644
--- a/src/protocol/internal/fqterm_ssh_packet.h
+++ b/src/protocol/internal/fqterm_ssh_packet.h
@@ -39,6 +39,8 @@ class FQTermSSHPacketSender: public QObject {
   buffer data_to_send;
   ssh_cipher_t *cipher;
   ssh_mac_t *mac;
+  bool is_mac_;
+  uint32_t sequence_no_;
 
   FQTermSSHPacketSender();
   virtual ~FQTermSSHPacketSender();
@@ -66,12 +68,6 @@ class FQTermSSHPacketSender: public QObject {
   void dataToWrite();
 
  protected:
-  bool is_mac_;
-
-  bool is_compressed_;
-
-  u_int32_t sequence_no_;
-
   virtual void makePacket() = 0;
 };
 
@@ -81,6 +77,8 @@ class FQTermSSHPacketReceiver: public QObject {
   buffer recvbuf;
   ssh_cipher_t *cipher;
   ssh_mac_t *mac;
+  bool is_mac_;
+  uint32_t sequence_no_;
 
   FQTermSSHPacketReceiver();
   virtual ~FQTermSSHPacketReceiver();
@@ -113,14 +111,8 @@ class FQTermSSHPacketReceiver: public QObject {
   void packetError(QString);
 
  protected:
-  bool is_mac_;
-
-  bool is_compressed_;
-
   int packet_type_;
   int real_data_len_;
-
-  u_int32_t sequence_no_;
 };
 
 }  // namespace FQTerm
-- 
cgit v1.2.3