tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2024-12-25 15:10:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

BBS doesnt crash anymore

Browse source
This commit is contained in:
y4my4my4m 2023-05-09 23:51:23 +09:00
parent 9665977f8b
commit 3f901db8b8
1 changed files with 30 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/Home/Telnet/Telnet.ZC
View file

@ -15,8 +15,9 @@
#define SUPPRESS_GO_AHEAD 0x03 #define SUPPRESS_GO_AHEAD 0x03
#define TERMINAL_TYPE 0x18 #define TERMINAL_TYPE 0x18
#define LINEMODE 0x22 #define LINEMODE 0x22
#define NAWS 0x1F #define NAWS 0x1F // NAWS (Negotiate About Window Size)
#define IS 0x00 #define IS 0x00
#define SB 0xFA
#define SE 0xF0 #define SE 0xF0
#define ANSI_ESC 0x1B #define ANSI_ESC 0x1B
@ -42,16 +43,17 @@ Bool CursorInWin(CTask *task, I64 x, I64 y)
U0 SendWindowSize(I64 sock, U16 rows, U16 cols) { U0 SendWindowSize(I64 sock, U16 rows, U16 cols) {
U8 buf[9]; U8 buf[9];
buf[0] = 0xFF; // IAC buf[0] = IAC;
buf[1] = 0xFA; // SB buf[1] = SB;
buf[2] = 0x1F; // NAWS (Negotiate About Window Size) buf[2] = NAWS;
buf[3] = cols >> 8; // High byte of columns buf[3] = cols >> 8; // High byte of columns
buf[4] = cols & 0xFF; // Low byte of columns buf[4] = cols & 0xFF; // Low byte of columns
buf[5] = rows >> 8; // High byte of rows buf[5] = rows >> 8; // High byte of rows
buf[6] = rows & 0xFF; // Low byte of rows buf[6] = rows & 0xFF; // Low byte of rows
buf[7] = 0xFF; // IAC buf[7] = IAC;
buf[8] = 0xF0; // SE buf[8] = SE;
SysLog("SendWindowSize: %d x %d\n", cols, rows);
TCPSocketSendString(sock, buf); TCPSocketSendString(sock, buf);
} }
@ -59,20 +61,22 @@ U0 SendTerminalType(I64 sock, U8 *terminal_type) {
U8 response[256]; U8 response[256];
I64 len = StrLen(terminal_type); I64 len = StrLen(terminal_type);
response[0] = 0xFF; // IAC response[0] = IAC;
response[1] = 0xFA; // SB response[1] = SB;
response[2] = 0x18; // TERMINAL TYPE response[2] = TERMINAL_TYPE;
response[3] = 0x00; // IS response[3] = IS;
MemCopy(response + 4, terminal_type, len); MemCopy(response + 4, terminal_type, len);
response[len + 4] = 0xFF; // IAC SysLog("SendTerminalType: %s\n", terminal_type);
response[len + 5] = 0xF0; // SE
response[len + 4] = IAC;
response[len + 5] = SE;
response[len + 6] = '\0'; response[len + 6] = '\0';
TCPSocketSendString(sock, response); TCPSocketSendString(sock, response);
} }
U0 HandleControlCodes(U8 ch) { U0 HandleControlCodes(U8 ch) {
if (ch < 32 && ch != 20) { // ASCII code below 32 (control character) if (ch < 32) { // ASCII code below 32 (control character)
switch (ch) { switch (ch) {
case 0: // NUL (Null) - Typically ignored case 0: // NUL (Null) - Typically ignored
break; break;
@ -103,6 +107,9 @@ U0 HandleControlCodes(U8 ch) {
} }
} }
else { else {
if (ch == 127) {
SysLog("case 127");
}
if (ch == 0x24) { if (ch == 0x24) {
// ch = "//$$$$"; // ch = "//$$$$";
} }
@ -268,18 +275,18 @@ U0 Telnet(U8 *host, U16 port=TELNET_PORT) {
} else if (option_code == TERMINAL_TYPE) { } else if (option_code == TERMINAL_TYPE) {
if (negotiation_code == DO) { if (negotiation_code == DO) {
response[1] = WILL; response[1] = WILL;
response[2] = option_code; } else {
response[3] = '\0'; response[1] = WONT;
TCPSocketSendString(sock, response); }
SendTerminalType(sock, "ANSI-BBS"); } else if (option_code == NAWS) {
SendWindowSize(sock, 25, 80); if (negotiation_code == DO) {
response[1] = WILL;
} else { } else {
response[1] = WONT; response[1] = WONT;
} }
} else if (option_code == LINEMODE) { } else if (option_code == LINEMODE) {
if (negotiation_code == DO) { if (negotiation_code == DO) {
response[1] = WILL; response[1] = WILL;
// Do we need LINEMODE?
} else { } else {
response[1] = WONT; response[1] = WONT;
} }
@ -293,6 +300,9 @@ U0 Telnet(U8 *host, U16 port=TELNET_PORT) {
response[2] = option_code; response[2] = option_code;
response[3] = '\0'; response[3] = '\0';
TCPSocketSendString(sock, response); TCPSocketSendString(sock, response);
// the bugged out SendTerminalType and SendWindowsSize was what crashed the BBS...
// if (option_code == TERMINAL_TYPE) SendTerminalType(sock, "ANSI-BBS");
// else if (option_code == NAWS) SendWindowSize(sock, 25, 80);
ptr += 3; ptr += 3;
} }
// check for pipecode here?? // check for pipecode here??
@ -399,7 +409,7 @@ U0 Telnet(U8 *host, U16 port=TELNET_PORT) {
ptr++; ptr++;
} else if (*ptr == 'H' || *ptr == 'f') { } else if (*ptr == 'H' || *ptr == 'f') {
// TODO: Cursor Position // TODO: Cursor Position
// CursorInWin(Fs, arg1, arg2); // CursorInWin(Fs, arg1, arg2);
ptr++; ptr++;
} else if (*ptr == 'J') { } else if (*ptr == 'J') {
// Erase in Display // Erase in Display