summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIru Dog <mytbk920423@gmail.com>2014-11-02 20:07:22 +0800
committerIru Dog <mytbk920423@gmail.com>2014-11-02 20:07:22 +0800
commit6f0369acf0695b6f3a0e223e87af7e81d0db8b5f (patch)
treee5c9918752fb80a946ff0186c020fcbc66fae3e1
parent68d84181d53cc1b3cfab0b9a1505a1599744991d (diff)
downloadfqterm-6f0369acf0695b6f3a0e223e87af7e81d0db8b5f.tar.xz
test local socket
-rw-r--r--src/protocol/fqterm_local_socket.cpp3
-rw-r--r--src/terminal/internal/fqterm_telnet.cpp2
-rw-r--r--src/ui/quickdialog.cpp2
-rw-r--r--src/ui/quickdialog.h2
-rw-r--r--src/ui/quickdialog.ui10
5 files changed, 15 insertions, 4 deletions
diff --git a/src/protocol/fqterm_local_socket.cpp b/src/protocol/fqterm_local_socket.cpp
index e15f8d9..c062449 100644
--- a/src/protocol/fqterm_local_socket.cpp
+++ b/src/protocol/fqterm_local_socket.cpp
@@ -24,7 +24,8 @@ FQTermLocalSocket::~FQTermLocalSocket()
void FQTermLocalSocket::connectToHost( const QString &host, quint16 port )
{
- shell_process_->start("", QIODevice::ReadWrite | QIODevice::Unbuffered);
+ shell_process_->start("/bin/bash",
+ QIODevice::ReadWrite | QIODevice::Unbuffered);
}
void FQTermLocalSocket::close()
diff --git a/src/terminal/internal/fqterm_telnet.cpp b/src/terminal/internal/fqterm_telnet.cpp
index c87865a..758415c 100644
--- a/src/terminal/internal/fqterm_telnet.cpp
+++ b/src/terminal/internal/fqterm_telnet.cpp
@@ -218,7 +218,7 @@ FQTermTelnet::FQTermTelnet(const QString &strTermType, int rows, int columns,
FQ_VERIFY(connect(socket, SIGNAL(sshAuthOK()),
this, SIGNAL(onSSHAuthOK())));
} else if (protocolType == 3) {
- socket = new FQTermLocalSocket("");
+ socket = new FQTermLocalSocket("/bin/bash");
} else {
socket = new FQTermTelnetSocket();
}
diff --git a/src/ui/quickdialog.cpp b/src/ui/quickdialog.cpp
index e54c840..ff14973 100644
--- a/src/ui/quickdialog.cpp
+++ b/src/ui/quickdialog.cpp
@@ -41,7 +41,7 @@ namespace FQTerm {
extern void saveAddress(FQTermConfig *, int, const FQTermParam &);
-const int quickDialog::ports[3] = {23, 22, 22};
+ const int quickDialog::ports[] = {23, 22, 22, 22};
quickDialog::quickDialog(FQTermConfig * config, QWidget *parent, Qt::WFlags fl)
: QDialog(parent, fl),
diff --git a/src/ui/quickdialog.h b/src/ui/quickdialog.h
index 35a0e73..27a843e 100644
--- a/src/ui/quickdialog.h
+++ b/src/ui/quickdialog.h
@@ -41,7 +41,7 @@ class quickDialog: public QDialog {
FQTermParam param_;
- static const int ports[3];
+ static const int ports[];
protected slots:
void listChanged(int); //
diff --git a/src/ui/quickdialog.ui b/src/ui/quickdialog.ui
index 03fa6fc..a830652 100644
--- a/src/ui/quickdialog.ui
+++ b/src/ui/quickdialog.ui
@@ -147,6 +147,16 @@
<string>SSH</string>
</property>
</item>
+ <item>
+ <property name="text">
+ <string>SSH</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Local</string>
+ </property>
+ </item>
</widget>
</item>
<item>