enderice2/rpc-bridge
enderice2/rpc-bridge
1
0
Fork 0
mirror of https://github.com/EnderIce2/rpc-bridge.git synced 2025-05-28 15:34:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use mmap() once

Browse Source
This commit is contained in:
EnderIce2 2024-05-13 06:25:37 +03:00
parent ac590912bc
commit 8cd44da368
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bridge.c
View File

@ -162,6 +162,7 @@ static inline int sys_connect(int s, caddr_t name, socklen_t namelen)
return darwin_syscall(__darwin_connect, s, name, namelen, 0, 0, 0); return darwin_syscall(__darwin_connect, s, name, namelen, 0, 0, 0);
} }
void *environStr = NULL;
char *native_getenv(const char *name) char *native_getenv(const char *name)
{ {
static char lpBuffer[512]; static char lpBuffer[512];
@ -188,24 +189,23 @@ char *native_getenv(const char *name)
return value; return value;
} }
/* I hope the 0x10000 is okay */ /* I hope the 0x20000 is okay */
void *environStr = sys_mmap(0x10000, 4096, PROT_READ | PROT_WRITE, if (environStr == NULL)
MAP_PRIVATE | MAP_ANON | MAP_FIXED, -1, 0);
if (environStr == MAP_FAILED)
{ {
print("Failed to allocate environ string: %d\n", (intptr_t)environStr); environStr = sys_mmap(0x20000, 4096, PROT_READ | PROT_WRITE,
return NULL; MAP_PRIVATE | MAP_ANON | MAP_FIXED, -1, 0);
print("Allocated 4096 bytes at %#lx\n", environStr);
} }
if ((uintptr_t)environStr > 0x7effffff) if ((uintptr_t)environStr > 0x7effffff)
print("Warning: environStr %p is above 2GB\n", environStr); print("Warning: environStr %#lx is above 2GB\n", environStr);
const char *linux_environ = "/proc/self/environ"; const char *linux_environ = "/proc/self/environ";
memcpy(environStr, linux_environ, strlen(linux_environ) + 1); memcpy(environStr, linux_environ, strlen(linux_environ) + 1);
int fd = sys_open(environStr, O_RDONLY, 0); int fd = sys_open(environStr, O_RDONLY, 0);
sys_munmap(environStr, 4096); // sys_munmap(environStr, 4096);
if (fd < 0) if (fd < 0)
{ {
print("Failed to open /proc/self/environ: %d\n", fd); print("Failed to open /proc/self/environ: %d\n", fd);
@ -547,11 +547,13 @@ NewConnection:
(LPTHREAD_START_ROUTINE)PipeBufferInThread, (LPTHREAD_START_ROUTINE)PipeBufferInThread,
(LPVOID)&bt, (LPVOID)&bt,
0, NULL); 0, NULL);
print("Created in thread %#lx\n", hIn);
hOut = CreateThread(NULL, 0, hOut = CreateThread(NULL, 0,
(LPTHREAD_START_ROUTINE)PipeBufferOutThread, (LPTHREAD_START_ROUTINE)PipeBufferOutThread,
(LPVOID)&bt, (LPVOID)&bt,
0, NULL); 0, NULL);
print("Created out thread %#lx\n", hOut);
if (hIn == NULL || hOut == NULL) if (hIn == NULL || hOut == NULL)
{ {