mirror of
https://github.com/Zeal-Operating-System/ZealOS.git
synced 2024-12-27 07:46:33 +00:00
Fix TCP RST ACK loop bug.
Fix Gopher client filename bug using filename character validation. Increase TCP timeout in TCPConnectionCreate. Move default AutoComplete position left a bit, just enough so that new windows' [X] button is visible.
This commit is contained in:
TomAwezome
parent
5a4bccc5b9
commit
68775b3b44
4 changed files with 74 additions and 42 deletions
|
|
@ -1,6 +1,6 @@
|
|||
/* Gopher client for TempleOS/Sockets
|
||||
by Declan Hoare 2020
|
||||
ported to ZealOS by TomAwezome in 2021
|
||||
ported to ZealOS and modified by TomAwezome in 2021
|
||||
Public Domain - No Warranty */
|
||||
|
||||
#define GOPHER_CLIENT_LOADED
|
||||
|
|
@ -39,7 +39,6 @@ I64 GopherOpen(U8* host, U16 port, U8* selector, U8* query)
|
|||
|
||||
sock(CTCPSocket *)->timeout = TCP_TIMEOUT * 5;
|
||||
|
||||
|
||||
// sendString(sock, line, 0);
|
||||
TCPSocketSendString(sock, line);
|
||||
Free(line);
|
||||
|
|
@ -47,11 +46,13 @@ I64 GopherOpen(U8* host, U16 port, U8* selector, U8* query)
|
|||
return sock;
|
||||
}
|
||||
|
||||
public I64 GopherDl
|
||||
(U8* host, U16 port = 70, U8* selector, U8* query = NULL, U8* dest)
|
||||
#define GOPHER_BUFF_SIZE BLK_SIZE * 64
|
||||
|
||||
public I64 GopherDl(U8 *host, U16 port = 70, U8 *selector, U8 *query = NULL, U8 *dest)
|
||||
{
|
||||
CFile *f;
|
||||
U8 buf[BLK_SIZE];
|
||||
// U8 buf[GOPHER_BUFF_SIZE];
|
||||
I64 data_len = 0, total_len = 0, got, sock;
|
||||
|
||||
f = FOpen(dest, "w");
|
||||
|
|
@ -62,7 +63,7 @@ public I64 GopherDl
|
|||
}
|
||||
|
||||
sock = GopherOpen(host, port, selector, query);
|
||||
if (sock < 0)
|
||||
if (sock <= 0)
|
||||
{
|
||||
return sock;
|
||||
}
|
||||
|
|
@ -74,6 +75,7 @@ public I64 GopherDl
|
|||
if (got <= 0)
|
||||
{
|
||||
if (data_len != 0 && !FBlkWrite(f, buf))
|
||||
// if (data_len != 0 && !FBlkWrite(f, buf,, GOPHER_BUFF_SIZE))
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
|
@ -84,23 +86,27 @@ public I64 GopherDl
|
|||
data_len += got;
|
||||
total_len += got;
|
||||
if (data_len == BLK_SIZE)
|
||||
// if (data_len == GOPHER_BUFF_SIZE)
|
||||
{
|
||||
if (!FBlkWrite(f, buf))
|
||||
// if (!FBlkWrite(f, buf,, GOPHER_BUFF_SIZE))
|
||||
{
|
||||
break;
|
||||
}
|
||||
data_len = 0;
|
||||
}
|
||||
}
|
||||
|
||||
PrintErr("Write failed, %s may be corrupted\n", dest);
|
||||
FClose(f);
|
||||
return -1;
|
||||
|
||||
}
|
||||
|
||||
U0 PrintEscaped(U8 *txt, U8 *backslashes = "")
|
||||
{
|
||||
U8 *cur;
|
||||
U8 offending;
|
||||
U64 offending;
|
||||
|
||||
while (cur = StrFirstOcc(txt, "$$\\\""))
|
||||
{
|
||||
|
|
@ -116,20 +122,33 @@ U0 PrintEscaped(U8* txt, U8* backslashes = "")
|
|||
}
|
||||
txt = cur + 1;
|
||||
}
|
||||
|
||||
"%s", txt;
|
||||
}
|
||||
|
||||
U8 *GopherBasename(U8 *selector)
|
||||
{
|
||||
U8* lastslash = StrLastOcc(selector, "/");
|
||||
U8 *lastslash = StrLastOcc(selector, "/"), *result;
|
||||
|
||||
if (lastslash == NULL)
|
||||
{
|
||||
return selector;
|
||||
result = selector;
|
||||
}
|
||||
else
|
||||
{
|
||||
return lastslash + 1;
|
||||
result = lastslash + 1;
|
||||
}
|
||||
|
||||
//BAD FOR FILENAMES: ? / | = %
|
||||
result = StrReplace(result, "?", "");
|
||||
result = StrReplace(result, "/", "",, TRUE);
|
||||
result = StrReplace(result, "|", "",, TRUE);
|
||||
result = StrReplace(result, "=", "",, TRUE);
|
||||
result = StrReplace(result, "%", "",, TRUE);
|
||||
// result = StrNew("TEST.TXT");
|
||||
SysLog("%s\n", result);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
U0 GopherTextView(U8 *host, U16 port, U8 *selector)
|
||||
|
|
@ -157,7 +176,7 @@ U0 GopherTextView(U8* host, U16 port, U8* selector)
|
|||
|
||||
U0 GopherLine(U8 *line)
|
||||
{
|
||||
U8 type;
|
||||
U64 type;
|
||||
U8 *display;
|
||||
U8 *selector;
|
||||
U8 *host = NULL;
|
||||
|
|
@ -202,7 +221,7 @@ U0 GopherLine(U8* line)
|
|||
}
|
||||
|
||||
if (!*host)
|
||||
return;
|
||||
return;
|
||||
|
||||
switch (type)
|
||||
{
|
||||
|
|
@ -223,8 +242,7 @@ U0 GopherLine(U8* line)
|
|||
"\n";
|
||||
}
|
||||
|
||||
public I64 GopherMenu
|
||||
(U8* host, U16 port = 70, U8* selector = "/", U8* query = NULL)
|
||||
public I64 GopherMenu(U8 *host, U16 port = 70, U8 *selector = "/", U8 *query = NULL)
|
||||
{
|
||||
I64 sock, n;
|
||||
U8 buf[256];
|
||||
|
|
@ -277,6 +295,7 @@ U0 GopherDlPrompt(U8* host, U16 port, U8* selector)
|
|||
U8 *basename;
|
||||
|
||||
basename = GopherBasename(selector);
|
||||
MemSet(form.name, 0, 256);
|
||||
MemCopy(form.name, basename,
|
||||
MinI64(StrLen(basename), sizeof(form.name) - 1));
|
||||
form.name[255] = 0;
|
||||
|
|
@ -286,11 +305,21 @@ U0 GopherDlPrompt(U8* host, U16 port, U8* selector)
|
|||
}
|
||||
}
|
||||
|
||||
public I64 Gopher(U8 *hostname)
|
||||
{
|
||||
return GopherMenu(hostname);
|
||||
}
|
||||
|
||||
MemSetI64(gopher_associations, "GopherDlPrompt", 256);
|
||||
gopher_associations['0'] = "GopherTextView";
|
||||
gopher_associations['1'] = "GopherMenu";
|
||||
gopher_associations['7'] = "GopherQueryPrompt";
|
||||
/* Include this file from your HomeSys, then add more associations */
|
||||
/* Include this file from your Net/Load.CC, then add more associations */
|
||||
|
||||
"\n\nTry using GopherMenu to connect to a gopher server, for example:\n\n"
|
||||
" $FG,2$GopherMenu(\"gopher.floodgap.com\");$FG$\n\n";
|
||||
|
||||
DocMax;
|
||||
"\n\nTry using Gopher to connect to a gopher server, for example:"
|
||||
"\n\n$FG,2$ Gopher(\"gopher.floodgap.com\");$FG$"
|
||||
"\n\n$FG,2$ GopherMenu(\"eyeblea.ch\",70,\"/~zealos\");$FG$"
|
||||
"\n\n$FG,2$ Gopher(\"codevoid.de\");$FG$"
|
||||
"\n\n";
|
||||
|
|
@ -1449,7 +1449,7 @@ CTCPSocket *TCPConnectionCreate(U8 *hostname, U16 port)
|
|||
|
||||
if (current->family == AF_INET && (current->socket_type == 0 || current->socket_type == SOCKET_STREAM))
|
||||
{ // TODO: IPV6 support !
|
||||
socket_addr.address.address = EndianU32(current->address(CSocketAddressIPV4 *)->address.address); // ?? why are bits flipped here
|
||||
socket_addr.address.address = EndianU32(current->address(CSocketAddressIPV4 *)->address.address); // ?? why are bits flipped here
|
||||
AddressInfoFree(info);
|
||||
|
||||
result = TCPSocket(AF_INET);
|
||||
|
|
@ -1458,7 +1458,7 @@ CTCPSocket *TCPConnectionCreate(U8 *hostname, U16 port)
|
|||
NetErr("TCP CONNECTION CREATE: Failed to create new TCP Socket.");
|
||||
return NULL;
|
||||
}
|
||||
result->timeout = TCP_TIMEOUT;
|
||||
result->timeout = TCP_TIMEOUT * 3; // generous
|
||||
error = TCPSocketConnect(result, &socket_addr);
|
||||
if (error < 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -276,6 +276,9 @@ I64 TCPHandleRefuse(CIPV4Packet *packet, CTCPHeader *header, I64 length)
|
|||
|
||||
// review RFC Reset-Generation ...
|
||||
|
||||
if (Bt(&header->flags, TCPf_RST) && Bt(&header->flags, TCPf_ACK))
|
||||
return 0; // bail: we probably sent an RST earlier, and this is the acknowledgement
|
||||
|
||||
de_index = TCPSend(packet->destination_ip_address,
|
||||
EndianU16(header->destination_port),
|
||||
packet->source_ip_address,
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@ public U0 ACInit(U8 *mask=NULL)
|
|||
ACMainFileListTraverse(mask);
|
||||
|
||||
ACDWordsLoad;
|
||||
RegDefault("AutoComplete", "ac.col = TEXT_COLS-31;ac.row = 10;");
|
||||
RegDefault("AutoComplete", "ac.col = TEXT_COLS-34;ac.row = 10;");
|
||||
RegExe("AutoComplete");
|
||||
LBtr(&ac.flags, ACf_INIT_IN_PROGRESS);
|
||||
LBts(&sys_run_level, RLf_AUTOCOMPLETE);
|
||||
|
|
|
|||
Loading…
Reference in a new issue