tesses50/tesses-framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix win32 somewhat?

Browse Source
This commit is contained in:
Mike Nolan
2025-04-16 07:28:11 -05:00
parent 0e1f35c1a0
commit fefec83b7e
10 changed files with 73 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Http/HttpServer.cpp
View File

@ -107,7 +107,11 @@ namespace Tesses::Framework::Http
uint8_t finField = fin ? 0b10000000 : 0;
uint8_t opcode2 = i == 0 ? opcode : 0;
uint8_t firstByte = finField | (opcode2 & 0xF);
#if defined(_WIN32)
size_t len = min((size_t)4096,msg->data.size() - offset);
#else
size_t len = std::min((size_t)4096,msg->data.size()- offset);
#endif
strm->WriteByte(firstByte);
write_len_bytes((uint64_t)len);
strm->WriteBlock(msg->data.data() + offset,len);
@ -368,7 +372,11 @@ namespace Tesses::Framework::Http
static bool parseUntillBoundaryEnd(Tesses::Framework::Streams::Stream* src, Tesses::Framework::Streams::Stream* dest, std::string boundary)
{
bool hasMore=true;
#if defined(_WIN32)
uint8_t* checkBuffer = new uint8_t[boundary.size()];
#else
uint8_t checkBuffer[boundary.size()];
#endif
int b;
size_t i = 0;
size_t i2 = 0;
@ -432,6 +440,9 @@ namespace Tesses::Framework::Http
{
dest->Write(buffer,offsetInMem);
}
#if defined(_WIN32)
delete checkBuffer;
#endif
return hasMore;
}
@ -567,16 +578,16 @@ namespace Tesses::Framework::Http
});
TF_LOG("Before printing interfaces");
std::cout << "\e[34mInterfaces:\n";
std::cout << "\x1B[34mInterfaces:\n";
for(auto _ip : NetworkStream::GetIPs())
{
std::cout << "\e[32m";
std::cout << "\x1B[32m";
std::cout << _ip.first << ": ";
std::cout << "\e[35mhttp://";
std::cout << "\x1B[35mhttp://";
std::cout << _ip.second << ":" << std::to_string(this->port) << "/\n";
}
if(!svr->IsValid()) std::cout << "\e[31mError, we failed to bind or something\e[39m\n" << std::endl;
std::cout << "\e[31mAlmost Ready to Listen\e[39m\n";
if(!svr->IsValid()) std::cout << "\x1B[31mError, we failed to bind or something\x1B[39m\n" << std::endl;
std::cout << "\x1B[31mAlmost Ready to Listen\x1B[39m\n";
TF_LOG("After printing interfaces");
}
HttpServer::~HttpServer()

16
src/Http/HttpStream.cpp
View File

@ -57,7 +57,11 @@ namespace Tesses::Framework::Http
if(this->length == 0) return 0;
if(this->length > 0)
{
#if defined(_WIN32)
len = min((size_t)(this->length - this->position), len);
#else
len = std::min((size_t)(this->length - this->position), len);
#endif
if(len > 0)
len = this->strm->Read(buff,len);
this->position += len;
@ -69,7 +73,11 @@ namespace Tesses::Framework::Http
{
if(this->offset < this->read)
{
#if defined(_WIN32)
len = min((size_t)(this->read - this->offset), len);
#else
len = std::min((size_t)(this->read - this->offset), len);
#endif
if(len > 0)
len = this->strm->Read(buff,len);
this->offset += len;
@ -99,8 +107,12 @@ namespace Tesses::Framework::Http
else
{
this->offset=0;
#if defined(_WIN32)
len = min((size_t)(this->read - this->offset), len);
#else
len = std::min((size_t)(this->read - this->offset), len);
#endif
if(len > 0)
len = this->strm->Read(buff,len);
this->offset += len;
@ -124,7 +136,11 @@ namespace Tesses::Framework::Http
if(this->length == 0) return 0;
if(this->length > 0)
{
#if defined(_WIN32)
len = min((size_t)(this->length - this->position), len);
#else
len = std::min((size_t)(this->length - this->position), len);
#endif
if(len > 0)
len = this->strm->Write(buff,len);
this->position += len;