CrunkLord420/Shrine
1
0
Fork 0
mirror of https://github.com/minexew/Shrine.git synced 2026-05-26 05:48:36 +00:00
Code Issues Projects Releases Wiki Activity

Replace inet_ntoa with inet_ntop

Browse Source
This commit is contained in:
minexew
2020-11-13 10:12:30 +01:00
parent a5c21206f2
commit de5f39acda
5 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Adam/Net/Dns.HC
+2 -1
View File
@@ -516,9 +516,10 @@ public U0 Host(U8* hostname) {
else {
addrinfo* curr = res;
while (curr) {
U8 buffer[INET_ADDRSTRLEN];
"flags %04Xh, family %d, socktype %d, proto %d, addrlen %d, addr %s\n",
curr->ai_flags, curr->ai_family, curr->ai_socktype, curr->ai_protocol, curr->ai_addrlen,
inet_ntoa((curr->ai_addr(sockaddr_in*))->sin_addr);
inet_ntop(AF_INET, &(curr->ai_addr(sockaddr_in*))->sin_addr, buffer, sizeof(buffer));
curr = curr->ai_next;
}
}
Adam/Net/IPv4.HC
+2 -1
View File
@@ -132,7 +132,8 @@ static I64 GetEthernetAddressForIP(U32 ip, U8** mac_out) {
in_addr in;
in.s_addr = htonl(ip);
"$FG,6$IPv4: Failed to resolve address %s\n$FG$", inet_ntoa(in);
U8 buffer[INET_ADDRSTRLEN];
"$FG,6$IPv4: Failed to resolve address %s\n$FG$", inet_ntop(AF_INET, &in.s_addr, buffer, sizeof(buffer));
return IPV4_EHOST_UNREACHABLE;
}
}
Adam/Net/NativeSocket.HC
+10 -5
View File
@@ -8,6 +8,8 @@
#define INADDR_ANY 0
#define INET_ADDRSTRLEN 16
#define NS_INADDRSZ 4
#define SOL_SOCKET 1
@@ -89,11 +91,14 @@ I64 inet_pton(I64 af, U8 *src, U8 *dst) {
return 1;
}
U8* inet_ntoa(in_addr in) {
static U8 buffer[16];
StrPrint(buffer, "%d.%d.%d.%d", in.s_addr & 0xff, (in.s_addr >> 8) & 0xff,
(in.s_addr >> 16) & 0xff, (in.s_addr >> 24) & 0xff);
return buffer;
U8* inet_ntop(I64 af, U8* src, U8* dst, I64 size) {
if (af == AF_INET && size >= INET_ADDRSTRLEN) {
StrPrint(dst, "%d.%d.%d.%d", src[0], src[1], src[2], src[3]);
return dst;
}
else {
return 0;
}
}
class CSocket {
Adam/Net/Netcfg.HC
+2 -1
View File
@@ -116,7 +116,8 @@ I64 DhcpConfigure() {
if (state == CLIENT_REQUEST_ACCEPTED) {
in_addr in;
in.s_addr = htonl(yiaddr);
"$FG,2$Obtained IP address %s\n$FG$", inet_ntoa(in);
U8 buffer[INET_ADDRSTRLEN];
"$FG,2$Obtained IP address %s\n$FG$", inet_ntop(AF_INET, &in.s_addr, buffer, sizeof(buffer));
IPv4SetAddress(yiaddr);
IPv4SetSubnet(router_ip, subnet_mask);
DnsSetResolverIPv4(dns_ip);
Demo/Network/UdpListen.HC
+4 -1
View File
@@ -29,6 +29,7 @@ I64 UdpListen() {
while (1) {
U8 buffer[2048 + 1];
U8 addr_buffer[INET_ADDRSTRLEN];
I64 count = recvfrom(sock, buffer, sizeof(buffer) - 1, 0, &addr, sizeof(addr));
if (count == 0)
@@ -40,8 +41,10 @@ I64 UdpListen() {
else {
buffer[count] = 0;
inet_ntop(addr.sin_family, &addr.sin_addr, addr_buffer, sizeof(addr_buffer));
"$FG,8$Received %d bytes from %s:%d:\n$FG$%s\n", count,
inet_ntoa(addr.sin_addr), ntohs(addr.sin_port), buffer;
addr_buffer, ntohs(addr.sin_port), buffer;
}
}