zii/MRCI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some minor bug fixes

Browse Source 
Fixed the shebang for the python build/install scripts to properly
point to the correct python executable in linux.

Fixed a bug that caused the host session to return false "command
not found errors" after running any command shortly after
successfully connecting.
This commit is contained in:
Maurice ONeal 2020-04-27 13:08:56 -04:00
parent 48b4c5b537
commit 5ea1e45eb2
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.py
View File

@ -1,4 +1,4 @@
#!/bin/python3 #!/usr/bin/python3
import os import os
import re import re

2
install.py
View File

@ -1,4 +1,4 @@
#!/bin/python3 #!/usr/bin/python3
import os import os
import subprocess import subprocess

2
src/db.h
View File

@ -37,7 +37,7 @@
#include "shell.h" #include "shell.h"
#define APP_NAME "MRCI" #define APP_NAME "MRCI"
#define APP_VER "3.3.1.0" #define APP_VER "3.4.1.0"
#define APP_TARGET "mrci" #define APP_TARGET "mrci"
#ifdef Q_OS_WIN #ifdef Q_OS_WIN

12
src/session.cpp
View File

@ -334,9 +334,17 @@ void Session::dataFromClient()
{ {
if (tcpSocket->bytesAvailable() >= CLIENT_HEADER_LEN) if (tcpSocket->bytesAvailable() >= CLIENT_HEADER_LEN)
{ {
if (tcpSocket->read(4) == QByteArray(SERVER_HEADER_TAG)) auto clientHeader = tcpSocket->read(CLIENT_HEADER_LEN);
// client header format: [4bytes(tag)][134bytes(appName)][272bytes(padding)]
// tag = 0x4D, 0x52, 0x43, 0x49 (MRCI)
// appName = UTF16LE string (padded with 0x00)
// padding = just a string of 0x00 (reserved for future expansion)
if (clientHeader.startsWith(SERVER_HEADER_TAG))
{ {
wrStringToBlock(fromTEXT(tcpSocket->read(BLKSIZE_APP_NAME)).trimmed(), appName, BLKSIZE_APP_NAME); wrToBlock(clientHeader.mid(4, BLKSIZE_APP_NAME), appName, BLKSIZE_APP_NAME);
auto ver = QCoreApplication::applicationVersion().split('.'); auto ver = QCoreApplication::applicationVersion().split('.');