add ntfs.sys standalone driver target, change default usb vhd layout formatting to ntfs, implement Fat32CreateDir for directory creation support in the fat32 file system driver, add a dedicated HAL serial output endpoint for COM1 writes in hal_serial.c and subscribe serial to HAL text streams, introduce waitable kernel timers with KeTimerCreate, KeTimerSet, and KeTimerCancel alongside spinlock-protected global timer list initialization and scheduler tick tracking, implement SyscallWriteFileAsync system call for asynchronous non-blocking file writes, refactor NetSocketConnect and NetSocketSendTo to use generic SYS_SOCKET_ADDRESS_K structures instead of being hardcoded to IPv4, update gethostbyname and DNS name resolution to support IPv6 parsing via ResolveNameFamily, update tcpserve.exe with -4 and -6 command-line flags to accept and display IPv6 addresses, append size and version headers to all kernel telemetry and statistics structures including SYS_PMM_STATS, SYS_CPU_STATS, and SYS_SCHEDULER_STATS, update winmm timeGetTime to look up high-resolution hardware frequencies via SysGetTickFrequency, integrate 14 native smoke test applications.
This commit is contained in:
1 parent
2c4a68a75f
commit
ed3d065abd
156 files changed
+10509
-2643
No files matched your search
@@ -58,6 +58,95 @@ static int ParseIpv4Bytes(const char* text, uint8_t out[4]) {
|
||||
return *p == '\0';
|
||||
}
|
||||
|
||||
static int ParseHex(char c) {
|
||||
if (c >= '0' && c <= '9') return c - '0';
|
||||
if (c >= 'a' && c <= 'f') return c - 'a' + 10;
|
||||
if (c >= 'A' && c <= 'F') return c - 'A' + 10;
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int ParseIpv6Bytes(const char* text, uint8_t out[16]) {
|
||||
uint16_t words[8];
|
||||
int count = 0;
|
||||
int compress = -1;
|
||||
const char* p = text;
|
||||
|
||||
if (!text || !*text || !out)
|
||||
return 0;
|
||||
memset(words, 0, sizeof(words));
|
||||
|
||||
if (p[0] == ':' && p[1] == ':') {
|
||||
compress = 0;
|
||||
p += 2;
|
||||
if (*p == '\0')
|
||||
count = 0;
|
||||
}
|
||||
|
||||
while (*p) {
|
||||
if (count >= 8)
|
||||
return 0;
|
||||
|
||||
unsigned value = 0;
|
||||
int digits = 0;
|
||||
while (digits < 4) {
|
||||
int h = ParseHex(*p);
|
||||
if (h < 0)
|
||||
break;
|
||||
value = (value << 4) | (unsigned)h;
|
||||
p++;
|
||||
digits++;
|
||||
}
|
||||
if (digits == 0)
|
||||
return 0;
|
||||
words[count++] = (uint16_t)value;
|
||||
|
||||
if (*p == '\0')
|
||||
break;
|
||||
if (*p != ':')
|
||||
return 0;
|
||||
p++;
|
||||
if (*p == ':') {
|
||||
if (compress >= 0)
|
||||
return 0;
|
||||
compress = count;
|
||||
p++;
|
||||
if (*p == '\0')
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (compress >= 0) {
|
||||
int zeros = 8 - count;
|
||||
if (zeros <= 0)
|
||||
return 0;
|
||||
for (int i = count - 1; i >= compress; --i)
|
||||
words[i + zeros] = words[i];
|
||||
for (int i = 0; i < zeros; ++i)
|
||||
words[compress + i] = 0;
|
||||
} else if (count != 8) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
for (int i = 0; i < 8; ++i) {
|
||||
out[i * 2 + 0] = (uint8_t)(words[i] >> 8);
|
||||
out[i * 2 + 1] = (uint8_t)words[i];
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
static char* AppendHex16(char* out, uint16_t value) {
|
||||
static const char hex[] = "0123456789abcdef";
|
||||
int started = 0;
|
||||
for (int shift = 12; shift >= 0; shift -= 4) {
|
||||
unsigned nibble = (value >> shift) & 0xfu;
|
||||
if (nibble || started || shift == 0) {
|
||||
*out++ = hex[nibble];
|
||||
started = 1;
|
||||
}
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
// Implements the inet addr operation.
|
||||
__declspec(dllexport) in_addr_t inet_addr(const char* text) {
|
||||
uint8_t b[4];
|
||||
@@ -85,41 +174,114 @@ __declspec(dllexport) char* inet_ntoa(struct in_addr in) {
|
||||
return buf;
|
||||
}
|
||||
|
||||
// Implements the sock Addr To Sys operation.
|
||||
static int SockAddrToSys(const struct sockaddr* addr, socklen_t addrlen, SYS_SOCKET_ADDRESS_IPV4* out) {
|
||||
if (!addr || !out || addrlen < sizeof(struct sockaddr_in)) { errno = EINVAL; return -1; }
|
||||
const struct sockaddr_in* in = (const struct sockaddr_in*)addr;
|
||||
if (in->sin_family != AF_INET) { errno = EINVAL; return -1; }
|
||||
// Implements the inet pton operation.
|
||||
__declspec(dllexport) int inet_pton(int af, const char* src, void* dst) {
|
||||
if (!src || !dst) { errno = EINVAL; return -1; }
|
||||
if (af == AF_INET) {
|
||||
uint8_t b[4];
|
||||
if (!ParseIpv4Bytes(src, b))
|
||||
return 0;
|
||||
memcpy(dst, b, 4);
|
||||
return 1;
|
||||
}
|
||||
if (af == AF_INET6) {
|
||||
uint8_t b[16];
|
||||
if (!ParseIpv6Bytes(src, b))
|
||||
return 0;
|
||||
memcpy(dst, b, 16);
|
||||
return 1;
|
||||
}
|
||||
errno = EAFNOSUPPORT;
|
||||
return -1;
|
||||
}
|
||||
|
||||
// Implements the inet ntop operation.
|
||||
__declspec(dllexport) const char* inet_ntop(int af, const void* src, char* dst, socklen_t size) {
|
||||
if (!src || !dst) { errno = EINVAL; return (const char*)0; }
|
||||
if (af == AF_INET) {
|
||||
if (size < 16) { errno = ERANGE; return (const char*)0; }
|
||||
struct in_addr in;
|
||||
memcpy(&in, src, sizeof(in));
|
||||
strcpy(dst, inet_ntoa(in));
|
||||
return dst;
|
||||
}
|
||||
if (af == AF_INET6) {
|
||||
if (size < 40) { errno = ERANGE; return (const char*)0; }
|
||||
const uint8_t* b = (const uint8_t*)src;
|
||||
char* w = dst;
|
||||
for (int i = 0; i < 8; ++i) {
|
||||
uint16_t value = ((uint16_t)b[i * 2] << 8) | b[i * 2 + 1];
|
||||
w = AppendHex16(w, value);
|
||||
if (i != 7)
|
||||
*w++ = ':';
|
||||
}
|
||||
*w = '\0';
|
||||
return dst;
|
||||
}
|
||||
errno = EAFNOSUPPORT;
|
||||
return (const char*)0;
|
||||
}
|
||||
|
||||
// Implements the sock Addr To Sys operation.
|
||||
static int SockAddrToSys(const struct sockaddr* addr, socklen_t addrlen, SYS_SOCKET_ADDRESS* out) {
|
||||
if (!addr || !out) { errno = EINVAL; return -1; }
|
||||
memset(out, 0, sizeof(*out));
|
||||
out->Family = SYS_AF_INET;
|
||||
out->Port = ntohs(in->sin_port);
|
||||
const uint8_t* p = (const uint8_t*)&in->sin_addr.s_addr;
|
||||
out->Address[0] = p[0];
|
||||
out->Address[1] = p[1];
|
||||
out->Address[2] = p[2];
|
||||
out->Address[3] = p[3];
|
||||
return 0;
|
||||
out->Size = sizeof(*out);
|
||||
|
||||
if (addr->sa_family == AF_INET) {
|
||||
if (addrlen < sizeof(struct sockaddr_in)) { errno = EINVAL; return -1; }
|
||||
const struct sockaddr_in* in = (const struct sockaddr_in*)addr;
|
||||
out->Family = SYS_AF_INET;
|
||||
out->Port = ntohs(in->sin_port);
|
||||
memcpy(out->Address, &in->sin_addr.s_addr, 4);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (addr->sa_family == AF_INET6) {
|
||||
if (addrlen < sizeof(struct sockaddr_in6)) { errno = EINVAL; return -1; }
|
||||
const struct sockaddr_in6* in6 = (const struct sockaddr_in6*)addr;
|
||||
out->Family = SYS_AF_INET6;
|
||||
out->Port = ntohs(in6->sin6_port);
|
||||
memcpy(out->Address, in6->sin6_addr.s6_addr, 16);
|
||||
out->ScopeId = in6->sin6_scope_id;
|
||||
return 0;
|
||||
}
|
||||
|
||||
errno = EAFNOSUPPORT;
|
||||
return -1;
|
||||
}
|
||||
|
||||
// Implements the to Sock Addr operation.
|
||||
static void SysToSockAddr(const SYS_SOCKET_ADDRESS_IPV4* in, struct sockaddr* addr, socklen_t* addrlen) {
|
||||
if (!addr || !addrlen) return;
|
||||
if (*addrlen < sizeof(struct sockaddr_in)) {
|
||||
static void SysToSockAddr(const SYS_SOCKET_ADDRESS* in, struct sockaddr* addr, socklen_t* addrlen) {
|
||||
if (!in || !addr || !addrlen) return;
|
||||
|
||||
if (in->Family == SYS_AF_INET) {
|
||||
if (*addrlen < sizeof(struct sockaddr_in)) {
|
||||
*addrlen = sizeof(struct sockaddr_in);
|
||||
return;
|
||||
}
|
||||
struct sockaddr_in* out = (struct sockaddr_in*)addr;
|
||||
memset(out, 0, sizeof(*out));
|
||||
out->sin_family = AF_INET;
|
||||
out->sin_port = htons(in->Port);
|
||||
memcpy(&out->sin_addr.s_addr, in->Address, 4);
|
||||
*addrlen = sizeof(struct sockaddr_in);
|
||||
return;
|
||||
}
|
||||
|
||||
struct sockaddr_in* out = (struct sockaddr_in*)addr;
|
||||
memset(out, 0, sizeof(*out));
|
||||
out->sin_family = AF_INET;
|
||||
out->sin_port = htons(in->Port);
|
||||
uint8_t* p = (uint8_t*)&out->sin_addr.s_addr;
|
||||
p[0] = in->Address[0];
|
||||
p[1] = in->Address[1];
|
||||
p[2] = in->Address[2];
|
||||
p[3] = in->Address[3];
|
||||
*addrlen = sizeof(struct sockaddr_in);
|
||||
if (in->Family == SYS_AF_INET6) {
|
||||
if (*addrlen < sizeof(struct sockaddr_in6)) {
|
||||
*addrlen = sizeof(struct sockaddr_in6);
|
||||
return;
|
||||
}
|
||||
struct sockaddr_in6* out = (struct sockaddr_in6*)addr;
|
||||
memset(out, 0, sizeof(*out));
|
||||
out->sin6_family = AF_INET6;
|
||||
out->sin6_port = htons(in->Port);
|
||||
memcpy(out->sin6_addr.s6_addr, in->Address, 16);
|
||||
out->sin6_scope_id = in->ScopeId;
|
||||
*addrlen = sizeof(struct sockaddr_in6);
|
||||
}
|
||||
}
|
||||
|
||||
// Implements the socket Fd Get operation.
|
||||
@@ -148,7 +310,7 @@ __declspec(dllexport) int socket(int domain, int type, int protocol) {
|
||||
__declspec(dllexport) int bind(int fd, const struct sockaddr* addr, socklen_t addrlen) {
|
||||
FD_ENTRY* e = SocketFdGet(fd);
|
||||
if (!e) return -1;
|
||||
SYS_SOCKET_ADDRESS_IPV4 a;
|
||||
SYS_SOCKET_ADDRESS a;
|
||||
if (SockAddrToSys(addr, addrlen, &a) != 0) return -1;
|
||||
uint32_t s = SysBindSocket(e->KHandle, &a, sizeof(a));
|
||||
if (s != 0) { errno = PosixStatusToErrno(s); return -1; }
|
||||
@@ -169,10 +331,10 @@ __declspec(dllexport) int accept(int fd, struct sockaddr* addr, socklen_t* addrl
|
||||
FD_ENTRY* e = SocketFdGet(fd);
|
||||
if (!e) return -1;
|
||||
|
||||
SYS_SOCKET_ADDRESS_IPV4 remote;
|
||||
SYS_SOCKET_ADDRESS remote;
|
||||
size_t remoteSize = sizeof(remote);
|
||||
uint32_t kh = 0;
|
||||
uint32_t s = SysAcceptSocket(e->KHandle, addr ? &remote : (SYS_SOCKET_ADDRESS_IPV4*)0,
|
||||
uint32_t s = SysAcceptSocket(e->KHandle, addr ? &remote : (SYS_SOCKET_ADDRESS*)0,
|
||||
addr ? &remoteSize : (size_t*)0, &kh);
|
||||
if (s != 0) { errno = PosixStatusToErrno(s); return -1; }
|
||||
|
||||
@@ -189,7 +351,7 @@ __declspec(dllexport) int accept(int fd, struct sockaddr* addr, socklen_t* addrl
|
||||
__declspec(dllexport) int connect(int fd, const struct sockaddr* addr, socklen_t addrlen) {
|
||||
FD_ENTRY* e = SocketFdGet(fd);
|
||||
if (!e) return -1;
|
||||
SYS_SOCKET_ADDRESS_IPV4 a;
|
||||
SYS_SOCKET_ADDRESS a;
|
||||
if (SockAddrToSys(addr, addrlen, &a) != 0) return -1;
|
||||
uint32_t s = SysConnectSocket(e->KHandle, &a, sizeof(a));
|
||||
if (s != 0) { errno = PosixStatusToErrno(s); return -1; }
|
||||
@@ -220,7 +382,7 @@ __declspec(dllexport) ssize_t sendto(int fd, const void* buf, size_t len, int fl
|
||||
const struct sockaddr* dest, socklen_t destlen) {
|
||||
FD_ENTRY* e = SocketFdGet(fd);
|
||||
if (!e) return -1;
|
||||
SYS_SOCKET_ADDRESS_IPV4 remote;
|
||||
SYS_SOCKET_ADDRESS remote;
|
||||
if (SockAddrToSys(dest, destlen, &remote) != 0) return -1;
|
||||
|
||||
size_t sent = 0;
|
||||
@@ -243,7 +405,7 @@ __declspec(dllexport) ssize_t recvfrom(int fd, void* buf, size_t len, int flags,
|
||||
FD_ENTRY* e = SocketFdGet(fd);
|
||||
if (!e) return -1;
|
||||
|
||||
SYS_SOCKET_ADDRESS_IPV4 remote;
|
||||
SYS_SOCKET_ADDRESS remote;
|
||||
size_t remoteSize = sizeof(remote);
|
||||
size_t got = 0;
|
||||
SYS_SOCKET_RECV_FROM_REQUEST req;
|
||||
@@ -251,7 +413,7 @@ __declspec(dllexport) ssize_t recvfrom(int fd, void* buf, size_t len, int flags,
|
||||
req.Buffer = buf;
|
||||
req.Length = len;
|
||||
req.Flags = (uint32_t)flags;
|
||||
req.RemoteAddressOut = src ? &remote : (SYS_SOCKET_ADDRESS_IPV4*)0;
|
||||
req.RemoteAddressOut = src ? &remote : (SYS_SOCKET_ADDRESS*)0;
|
||||
req.RemoteAddressSizeInOut = src ? &remoteSize : (size_t*)0;
|
||||
req.ReceivedOut = &got;
|
||||
|
||||
@@ -408,21 +570,36 @@ static unsigned ParsePort(const char* s) {
|
||||
return *s == '\0' ? v : 0;
|
||||
}
|
||||
|
||||
// Implements the resolve Name Ipv4 operation.
|
||||
static int ResolveNameIpv4(const char* name, SYS_SOCKET_ADDRESS_IPV4* out) {
|
||||
uint8_t b[4];
|
||||
if (ParseIpv4Bytes(name, b)) {
|
||||
memset(out, 0, sizeof(*out));
|
||||
out->Family = SYS_AF_INET;
|
||||
out->Address[0] = b[0]; out->Address[1] = b[1]; out->Address[2] = b[2]; out->Address[3] = b[3];
|
||||
return 0;
|
||||
// Implements the resolve Name operation.
|
||||
static int ResolveNameFamily(const char* name, int family, SYS_SOCKET_ADDRESS* out) {
|
||||
if (!name || !out) { errno = EINVAL; return -1; }
|
||||
memset(out, 0, sizeof(*out));
|
||||
out->Size = sizeof(*out);
|
||||
|
||||
if (family == AF_INET) {
|
||||
uint8_t b[4];
|
||||
if (ParseIpv4Bytes(name, b)) {
|
||||
out->Family = SYS_AF_INET;
|
||||
memcpy(out->Address, b, 4);
|
||||
return 0;
|
||||
}
|
||||
} else if (family == AF_INET6) {
|
||||
uint8_t b[16];
|
||||
if (ParseIpv6Bytes(name, b)) {
|
||||
out->Family = SYS_AF_INET6;
|
||||
memcpy(out->Address, b, 16);
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
errno = EAFNOSUPPORT;
|
||||
return -1;
|
||||
}
|
||||
|
||||
size_t size = sizeof(*out);
|
||||
SYS_RESOLVE_HOST_REQUEST req;
|
||||
memset(&req, 0, sizeof(req));
|
||||
req.Name = SysSvFromCstr(name);
|
||||
req.Family = SYS_AF_INET;
|
||||
req.Family = family == AF_INET6 ? SYS_AF_INET6 : SYS_AF_INET;
|
||||
req.AddressOut = out;
|
||||
req.AddressSizeInOut = &size;
|
||||
uint32_t s = SysResolveHost(&req);
|
||||
@@ -430,6 +607,16 @@ static int ResolveNameIpv4(const char* name, SYS_SOCKET_ADDRESS_IPV4* out) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int ResolveNameAny(const char* name, int family, SYS_SOCKET_ADDRESS* out) {
|
||||
if (family == AF_INET || family == AF_INET6)
|
||||
return ResolveNameFamily(name, family, out);
|
||||
if (family != AF_UNSPEC) { errno = EAFNOSUPPORT; return -1; }
|
||||
|
||||
if (ResolveNameFamily(name, AF_INET6, out) == 0)
|
||||
return 0;
|
||||
return ResolveNameFamily(name, AF_INET, out);
|
||||
}
|
||||
|
||||
// Implements the gethostbyname operation.
|
||||
__declspec(dllexport) struct hostent* gethostbyname(const char* name) {
|
||||
static struct hostent h;
|
||||
@@ -440,8 +627,8 @@ __declspec(dllexport) struct hostent* gethostbyname(const char* name) {
|
||||
|
||||
if (!name || strlen(name) >= sizeof(hname)) { errno = EINVAL; return (struct hostent*)0; }
|
||||
|
||||
SYS_SOCKET_ADDRESS_IPV4 a;
|
||||
if (ResolveNameIpv4(name, &a) != 0) return (struct hostent*)0;
|
||||
SYS_SOCKET_ADDRESS a;
|
||||
if (ResolveNameFamily(name, AF_INET, &a) != 0) return (struct hostent*)0;
|
||||
|
||||
strcpy(hname, name);
|
||||
memcpy(addr, a.Address, 4);
|
||||
@@ -462,35 +649,34 @@ __declspec(dllexport) int getaddrinfo(const char* node, const char* service,
|
||||
if (!res) return EINVAL;
|
||||
*res = (struct addrinfo*)0;
|
||||
|
||||
int family = hints ? hints->ai_family : AF_INET;
|
||||
if (family != AF_INET && family != 0) return EINVAL;
|
||||
int family = hints ? hints->ai_family : AF_UNSPEC;
|
||||
if (family != AF_INET && family != AF_INET6 && family != AF_UNSPEC) return EAFNOSUPPORT;
|
||||
|
||||
SYS_SOCKET_ADDRESS_IPV4 a;
|
||||
SYS_SOCKET_ADDRESS a;
|
||||
memset(&a, 0, sizeof(a));
|
||||
a.Family = SYS_AF_INET;
|
||||
a.Size = sizeof(a);
|
||||
if (!node) {
|
||||
a.Address[0] = 0; a.Address[1] = 0; a.Address[2] = 0; a.Address[3] = 0;
|
||||
} else if (ResolveNameIpv4(node, &a) != 0) {
|
||||
a.Family = family == AF_INET6 ? SYS_AF_INET6 : SYS_AF_INET;
|
||||
} else if (ResolveNameAny(node, family, &a) != 0) {
|
||||
return errno;
|
||||
}
|
||||
a.Port = service ? ParsePort(service) : 0;
|
||||
|
||||
size_t total = sizeof(struct addrinfo) + sizeof(struct sockaddr_in);
|
||||
socklen_t addrLen = a.Family == SYS_AF_INET6 ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in);
|
||||
size_t total = sizeof(struct addrinfo) + addrLen;
|
||||
struct addrinfo* ai = (struct addrinfo*)malloc(total);
|
||||
if (!ai) return ENOMEM;
|
||||
memset(ai, 0, total);
|
||||
|
||||
struct sockaddr_in* sin = (struct sockaddr_in*)((uint8_t*)ai + sizeof(struct addrinfo));
|
||||
sin->sin_family = AF_INET;
|
||||
sin->sin_port = htons(a.Port);
|
||||
uint8_t* p = (uint8_t*)&sin->sin_addr.s_addr;
|
||||
p[0] = a.Address[0]; p[1] = a.Address[1]; p[2] = a.Address[2]; p[3] = a.Address[3];
|
||||
struct sockaddr* sa = (struct sockaddr*)((uint8_t*)ai + sizeof(struct addrinfo));
|
||||
socklen_t cap = addrLen;
|
||||
SysToSockAddr(&a, sa, &cap);
|
||||
|
||||
ai->ai_family = AF_INET;
|
||||
ai->ai_family = a.Family == SYS_AF_INET6 ? AF_INET6 : AF_INET;
|
||||
ai->ai_socktype = hints ? hints->ai_socktype : 0;
|
||||
ai->ai_protocol = hints ? hints->ai_protocol : 0;
|
||||
ai->ai_addrlen = sizeof(struct sockaddr_in);
|
||||
ai->ai_addr = (struct sockaddr*)sin;
|
||||
ai->ai_addrlen = cap;
|
||||
ai->ai_addr = sa;
|
||||
ai->ai_next = (struct addrinfo*)0;
|
||||
*res = ai;
|
||||
return 0;
|
||||
|
||||
Reference in new issue
Block a user