Raw protocol adds four modes TCP Client, TCP Server, UDP Send, UDP Re…

…ceive Signed-off-by: xiaoming <2014500726@smail.xtu.edu.cn>
QQxiaoming · Jan 16, 2025 · 73891b3 · 73891b3
1 parent 0452c61
commit 73891b3
Show file tree

Hide file tree

Showing 14 changed files with 434 additions and 102 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ en-US:
 - Improve the log file path setting option
 - Add TFTP server configuration to settings
 - Add terminal recording video feature
+- Raw protocol adds four modes TCP Client, TCP Server, UDP Send, UDP Receive
 - Add view own log window for quardCRT self debug
 
 zh-CN:
@@ -18,6 +19,7 @@ zh-CN:
 - 改进记录日志文件路径设置选项
 - 增加TFTP服务器配置到设置中
 - 增加终端录制视频功能
+- Raw协议增加四种模式TCP Client、TCP Server、UDP Send、UDP Receive
 - 增加查看自身log窗口，用于quardCRT自身debug
 
 ## [[V0.5.1](https://github.com/QQxiaoming/quardCRT/releases/tag/V0.5.1)] - 2024-09-26

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -9,6 +9,7 @@
 - Improve the log file path setting option
 - Add TFTP server configuration to settings
 - Add terminal recording video feature
+- Raw protocol adds four modes TCP Client, TCP Server, UDP Send, UDP Receive
 - Add view own log window for quardCRT self debug
 
 ## [[V0.5.1](https://github.com/QQxiaoming/quardCRT/releases/tag/V0.5.1)] - 2024-09-26

diff --git a/lang/quardCRT_zh_CN.ts b/lang/quardCRT_zh_CN.ts
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -927,7 +927,7 @@ CentralWidget::CentralWidget(QString dir, StartupUIMode mode, QLocale lang, bool
                 } else if(type == "localshell") {
                     startLocalShellSession(findCurrentFocusGroup(),-1);
                 } else if(type == "raw") {
-                    startRawSocketSession(findCurrentFocusGroup(),-1,hostname,port.toInt());
+                    startRawSocketSession(findCurrentFocusGroup(),-1,hostname,port.toInt(),0);
                 } else if(type == "namepipe") {
                     startNamePipeSession(findCurrentFocusGroup(),-1,hostname);
                 } else if(type == "ssh") {
@@ -2571,7 +2571,7 @@ void CentralWidget::onPluginRequestLocalShellConnect(QString command, QString wo
 }
 
 void CentralWidget::onPluginRequestRawSocketConnect(QString host, int port) {
-    startRawSocketSession(findCurrentFocusGroup(),-1,host,port);
+    startRawSocketSession(findCurrentFocusGroup(),-1,host,port,0);
 }
 
 void CentralWidget::onPluginRequestNamePipeConnect(QString namePipe) {
@@ -4120,7 +4120,7 @@ void CentralWidget::connectSessionFromSessionManager(QString name)
                 startLocalShellSession(findCurrentFocusGroup(),-1,data.LocalShellData.command,globalOptionsWindow->getNewTabWorkPath(),current_name);
                 break;
             case QuickConnectWindow::Raw:
-                startRawSocketSession(findCurrentFocusGroup(),-1,data.RawData.hostname,data.RawData.port, current_name);
+                startRawSocketSession(findCurrentFocusGroup(),-1,data.RawData.hostname,data.RawData.port,data.RawData.mode,current_name);
                 break;
             case QuickConnectWindow::NamePipe:
                 startNamePipeSession(findCurrentFocusGroup(),-1,data.NamePipeData.pipeName, current_name);
@@ -4247,7 +4247,7 @@ QString CentralWidget::startSerialSession(MainWidgetGroup *group, int groupIndex
     return name;
 }
 
-QString CentralWidget::startRawSocketSession(MainWidgetGroup *group, int groupIndex, QString hostname, quint16 port, QString name)
+QString CentralWidget::startRawSocketSession(MainWidgetGroup *group, int groupIndex, QString hostname, quint16 port, int mode, QString name)
 {
     SessionsWindow *sessionsWindow = new SessionsWindow(SessionsWindow::RawSocket,this);
     setGlobalOptions(sessionsWindow);
@@ -4260,7 +4260,7 @@ QString CentralWidget::startRawSocketSession(MainWidgetGroup *group, int groupIn
         checkSessionName(name);
     }
     sessionsWindow->setName(name);
-    sessionsWindow->startRawSocketSession(hostname,port);
+    sessionsWindow->startRawSocketSession(hostname,port,mode);
     sessionList.push_back(sessionsWindow);
     connect(sessionsWindow, &SessionsWindow::titleChanged, this, [=](int title,const QString& newTitle){
         if(title == 0 || title == 2) {
@@ -4586,7 +4586,7 @@ void CentralWidget::startSession(MainWidgetGroup *group, int groupIndex, QuickCo
     } else if(data.type == QuickConnectWindow::Raw) {
         QString name = data.RawData.hostname;
         if(data.openInTab) {
-            name = startRawSocketSession(group,groupIndex,name,data.RawData.port);
+            name = startRawSocketSession(group,groupIndex,name,data.RawData.port,data.RawData.mode);
         } else {
             checkSessionName(name);
         }
@@ -4837,6 +4837,7 @@ void CentralWidget::sessionWindow2InfoData(SessionsWindow *sessionsWindow, Quick
         case QuickConnectWindow::Raw:
             data.RawData.hostname = sessionsWindow->getHostname();
             data.RawData.port = sessionsWindow->getPort();
+            data.RawData.mode = sessionsWindow->getRawMode();
             break;
         case QuickConnectWindow::NamePipe:
             data.NamePipeData.pipeName = sessionsWindow->getPipeName();
@@ -4883,6 +4884,7 @@ int CentralWidget::setting2InfoData(GlobalSetting *settings, QuickConnectWindow:
     case QuickConnectWindow::Raw:
         data.RawData.hostname = settings->value("hostname").toString();
         data.RawData.port = settings->value("port").toInt();
+        data.RawData.mode = settings->value("mode").toInt();
         break;
     case QuickConnectWindow::NamePipe:
         data.NamePipeData.pipeName = settings->value("pipeName").toString();
@@ -4941,6 +4943,7 @@ void CentralWidget::infoData2Setting(GlobalSetting *settings,const QuickConnectW
     case QuickConnectWindow::Raw:
         settings->setValue("hostname",data.RawData.hostname);
         settings->setValue("port",data.RawData.port);
+        settings->setValue("mode",data.RawData.mode);
         break;
     case QuickConnectWindow::NamePipe:
         settings->setValue("pipeName",data.NamePipeData.pipeName);
@@ -5380,10 +5383,11 @@ int CentralWidget::se_sessionConnect(const QString &cmd,int id) {
                 return 0;
             } 
         } else if(args[i] == "-raw") {
-            if(i+2 < args.size()) {
+            if(i+3 < args.size()) {
                 QString hostname = args[i+1];
                 quint16 port = args[i+2].toUShort();
-                startRawSocketSession(findCurrentFocusGroup(),-1,hostname,port);
+                int mode = args[i+3].toInt();
+                startRawSocketSession(findCurrentFocusGroup(),-1,hostname,port,mode);
                 return 0;
             } 
         } else if(args[i] == "-namepipe") {

diff --git a/src/mainwindow.h b/src/mainwindow.h
@@ -211,7 +211,7 @@ class CentralWidget : public QMainWindow
 #if defined(Q_OS_WIN)
     QString startWslSession(MainWidgetGroup *group, int groupIndex,  const QString &command = QString(), const QString &workingDirectory = QDir::homePath(), QString name = QString());
 #endif
-    QString startRawSocketSession(MainWidgetGroup *group, int groupIndex,  QString hostname, quint16 port, QString name = QString());
+    QString startRawSocketSession(MainWidgetGroup *group, int groupIndex,  QString hostname, quint16 port, int mode, QString name = QString());
     QString startNamePipeSession(MainWidgetGroup *group, int groupIndex,  QString namePipe, QString name = QString());
     QString startSSH2Session(MainWidgetGroup *group, int groupIndex, 
         QString hostname, quint16 port, QString username, QString password, QString name = QString());

diff --git a/src/quickconnectwindow/quickconnectwindow.cpp b/src/quickconnectwindow/quickconnectwindow.cpp
@@ -80,6 +80,7 @@ void QuickConnectWindow::comboBoxProtocolChanged(int index)
         case Telnet: {
             ui->labelHostname->setText(tr("Hostname"));
             ui->labelPort->setText(tr("Port"));
+            ui->labelWebSocket->setText(tr("WebSocket"));
             ui->comboBoxHostname->setVisible(false);
             ui->pushButtonRefresh->setVisible(false);
             ui->lineEditHostname->setVisible(true);
@@ -88,6 +89,7 @@ void QuickConnectWindow::comboBoxProtocolChanged(int index)
             ui->spinBoxPort->setToolTip("");
             ui->labelWebSocket->setVisible(true);
             ui->comboBoxWebSocket->setVisible(true);
+            ui->comboBoxRawMode->setVisible(false);
             ui->labelDataBits->setVisible(false);
             ui->comboBoxDataBits->setVisible(false);
             ui->labelParity->setVisible(false);
@@ -121,6 +123,7 @@ void QuickConnectWindow::comboBoxProtocolChanged(int index)
             ui->labelPort->setVisible(true);
             ui->spinBoxPort->setVisible(true);
             ui->spinBoxPort->setToolTip(tr("e.g. 110, 300, 600, 1200, 2400, \n4800, 9600, 14400, 19200, 38400, \n56000, 57600, 115200, 128000, 256000, \n460800, 921600"));
+            ui->comboBoxRawMode->setVisible(false);
             ui->labelWebSocket->setVisible(false);
             ui->comboBoxWebSocket->setVisible(false);
             ui->labelDataBits->setVisible(true);
@@ -164,6 +167,7 @@ void QuickConnectWindow::comboBoxProtocolChanged(int index)
             ui->spinBoxPort->setVisible(false);
             ui->spinBoxPort->setToolTip("");
             ui->labelWebSocket->setVisible(false);
+            ui->comboBoxRawMode->setVisible(false);
             ui->comboBoxWebSocket->setVisible(false);
             ui->labelDataBits->setVisible(false);
             ui->comboBoxDataBits->setVisible(false);
@@ -180,6 +184,7 @@ void QuickConnectWindow::comboBoxProtocolChanged(int index)
         case Raw: {
             ui->labelHostname->setText(tr("Hostname"));
             ui->labelPort->setText(tr("Port"));
+            ui->labelWebSocket->setText(tr("Mode"));
             ui->comboBoxHostname->setVisible(false);
             ui->pushButtonRefresh->setVisible(false);
             ui->lineEditHostname->setVisible(true);
@@ -190,7 +195,8 @@ void QuickConnectWindow::comboBoxProtocolChanged(int index)
             ui->labelPort->setVisible(true);
             ui->spinBoxPort->setVisible(true);
             ui->spinBoxPort->setToolTip("");
-            ui->labelWebSocket->setVisible(false);
+            ui->labelWebSocket->setVisible(true);
+            ui->comboBoxRawMode->setVisible(true);
             ui->comboBoxWebSocket->setVisible(false);
             ui->labelDataBits->setVisible(false);
             ui->comboBoxDataBits->setVisible(false);
@@ -205,6 +211,7 @@ void QuickConnectWindow::comboBoxProtocolChanged(int index)
             ui->spinBoxPort->setMinimum(0);
             ui->spinBoxPort->setMaximum(65535);
             ui->spinBoxPort->setValue(8080);
+            ui->comboBoxRawMode->setCurrentIndex(0);
             break;
         }
         case NamePipe:{
@@ -219,6 +226,7 @@ void QuickConnectWindow::comboBoxProtocolChanged(int index)
             ui->labelPort->setVisible(false);
             ui->spinBoxPort->setVisible(false);
             ui->spinBoxPort->setToolTip("");
+            ui->comboBoxRawMode->setVisible(false);
             ui->labelWebSocket->setVisible(false);
             ui->comboBoxWebSocket->setVisible(false);
             ui->labelDataBits->setVisible(false);
@@ -251,6 +259,7 @@ void QuickConnectWindow::comboBoxProtocolChanged(int index)
             ui->spinBoxPort->setVisible(true);
             ui->spinBoxPort->setToolTip("");
             ui->labelWebSocket->setVisible(false);
+            ui->comboBoxRawMode->setVisible(false);
             ui->comboBoxWebSocket->setVisible(false);
             ui->labelDataBits->setVisible(false);
             ui->comboBoxDataBits->setVisible(false);
@@ -281,6 +290,7 @@ void QuickConnectWindow::comboBoxProtocolChanged(int index)
             ui->labelWebSocket->setVisible(false);
             ui->labelUsername->setVisible(false);
             ui->lineEditUsername->setVisible(false);
+            ui->comboBoxRawMode->setVisible(false);
             ui->comboBoxWebSocket->setVisible(false);
             ui->labelDataBits->setVisible(false);
             ui->comboBoxDataBits->setVisible(false);
@@ -332,6 +342,7 @@ void QuickConnectWindow::buttonBoxAccepted(void)
         case Raw:
             data.RawData.hostname = ui->lineEditHostname->text();
             data.RawData.port = ui->spinBoxPort->value();
+            data.RawData.mode = ui->comboBoxRawMode->currentIndex();
             emit this->sendQuickConnectData(data);
             break;
         case NamePipe:
@@ -399,6 +410,7 @@ void QuickConnectWindow::setQuickConnectData(QuickConnectData data)
         case Raw:
             ui->lineEditHostname->setText(data.RawData.hostname);
             ui->spinBoxPort->setValue(data.RawData.port);
+            ui->comboBoxRawMode->setCurrentIndex(data.RawData.mode);
             break;
         case NamePipe:
             ui->lineEditHostname->setText(data.NamePipeData.pipeName);

diff --git a/src/quickconnectwindow/quickconnectwindow.h b/src/quickconnectwindow/quickconnectwindow.h
@@ -67,6 +67,7 @@ class QuickConnectWindow : public QDialog
         struct {
             QString hostname;
             int port;
+            int mode;
         }RawData;
         struct {
             QString pipeName;

diff --git a/src/quickconnectwindow/quickconnectwindow.ui b/src/quickconnectwindow/quickconnectwindow.ui
@@ -173,6 +173,30 @@
          </item>
         </widget>
        </item>
+       <item>
+        <widget class="QComboBox" name="comboBoxRawMode">
+         <item>
+          <property name="text">
+           <string>TCP Client</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>TCP Server</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>UDP Send</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>UDP Recv</string>
+          </property>
+         </item>
+        </widget>
+       </item>
       </layout>
      </item>
      <item>
@@ -332,7 +356,7 @@
      <item>
       <spacer name="verticalSpacer">
        <property name="orientation">
-        <enum>Qt::Vertical</enum>
+        <enum>Qt::Orientation::Vertical</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -372,10 +396,10 @@
      <item>
       <widget class="QDialogButtonBox" name="buttonBox">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
        <property name="standardButtons">
-        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+        <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
        </property>
       </widget>
      </item>

diff --git a/src/scriptengine/pyrun.cpp b/src/scriptengine/pyrun.cpp
@@ -256,8 +256,8 @@ PyRun::PyRun(QObject *parent)
                 resultList->append(QString::number(centralWidget->se_sessionGetLogging(id)));
         } else if (cmd == "sessionConnect") {
             int id = cmdList.at(1).toInt();
-            QString cmd = cmdList.at(2);
-            centralWidget->se_sessionConnect(cmd,id);
+            QString ccmd = cmdList.at(2);
+            centralWidget->se_sessionConnect(ccmd,id);
         } else if (cmd == "sessionDisconnect") {
             int id = cmdList.at(1).toInt();
             centralWidget->se_sessionDisconnect(id);

diff --git a/src/sessionoptions/sessionoptionsrawproperties.cpp b/src/sessionoptions/sessionoptionsrawproperties.cpp
@@ -25,6 +25,7 @@ SessionOptionsRawProperties::SessionOptionsRawProperties(QWidget *parent) :
     ui(new Ui::SessionOptionsRawProperties)
 {
     ui->setupUi(this);
+    ui->lineEditReadOnlyRawMode->setVisible(true);
 }
 
 SessionOptionsRawProperties::~SessionOptionsRawProperties()

diff --git a/src/sessionoptions/sessionoptionsrawproperties.ui b/src/sessionoptions/sessionoptionsrawproperties.ui
@@ -68,15 +68,55 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QLabel" name="label_3">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Mode</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="comboBoxRawMode">
+       <item>
+        <property name="text">
+         <string>TCP Client</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>TCP Server</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>UDP Send</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>UDP Recv</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="lineEditReadOnlyRawMode"/>
+     </item>
     </layout>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
-      <enum>Qt::Vertical</enum>
+      <enum>Qt::Orientation::Vertical</enum>
      </property>
      <property name="sizeType">
-      <enum>QSizePolicy::MinimumExpanding</enum>
+      <enum>QSizePolicy::Policy::MinimumExpanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>

diff --git a/src/sessionoptions/sessionoptionswindow.cpp b/src/sessionoptions/sessionoptionswindow.cpp
@@ -234,6 +234,7 @@ void SessionOptionsWindow::setSessionProperties(QString name, QuickConnectWindow
     case QuickConnectWindow::Raw:
         sessionOptionsRawProperties->ui->lineEditHostname->setText(data.RawData.hostname);
         sessionOptionsRawProperties->ui->spinBoxPort->setValue(data.RawData.port);
+        sessionOptionsRawProperties->ui->comboBoxRawMode->setCurrentIndex(data.RawData.mode);
         break;
     case QuickConnectWindow::NamePipe:
         sessionOptionsNamePipeProperties->ui->lineEditPipeName->setText(data.NamePipeData.pipeName);
@@ -357,6 +358,7 @@ void SessionOptionsWindow::setReadOnly(bool enable) {
 
     sessionOptionsRawProperties->ui->lineEditHostname->setReadOnly(enable);
     sessionOptionsRawProperties->ui->spinBoxPort->setReadOnly(enable);
+    comboxSetReadOnly(sessionOptionsRawProperties->ui->comboBoxRawMode, sessionOptionsRawProperties->ui->lineEditReadOnlyRawMode);
 
     sessionOptionsNamePipeProperties->ui->lineEditPipeName->setReadOnly(enable);
 
@@ -398,6 +400,7 @@ void SessionOptionsWindow::buttonBoxAccepted(void)
     case QuickConnectWindow::Raw:
         data.RawData.hostname = sessionOptionsRawProperties->ui->lineEditHostname->text();
         data.RawData.port = sessionOptionsRawProperties->ui->spinBoxPort->value();
+        data.RawData.mode = sessionOptionsRawProperties->ui->comboBoxRawMode->currentIndex();
         break;
     case QuickConnectWindow::NamePipe:
         data.NamePipeData.pipeName = sessionOptionsNamePipeProperties->ui->lineEditPipeName->text();