X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=psi.d%2Fnetdb.psi;h=f37476d186275cf701243b34c6db58e287700871;hp=dd81ed882de993602f2e670fd1c91b4f75ca3272;hb=3b0b651ea1b555d8d023e45b43e5eb93b23d00a1;hpb=cfebc76ed7426836f21296cca9a14b422bfa04cf diff --git a/psi.d/netdb.psi b/psi.d/netdb.psi index dd81ed8..f37476d 100644 --- a/psi.d/netdb.psi +++ b/psi.d/netdb.psi @@ -29,7 +29,7 @@ function psi\setservent(bool $stayopen) : void { } function psi\gethostent() : array { - return to_array(gethostent, + return to_array(*gethostent, to_string(h_name), to_array(h_aliases, to_string(h_aliases)), to_int(h_addrtype), @@ -43,11 +43,16 @@ function psi\gai_strerror(int $errcode) : string { return to_string(gai_strerror); } -// extern int getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res); -function psi\getaddrinfo(string $node, string $service, array $hints, object &$res = NULL) : int { +// extern int getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res) +function psi\getaddrinfo(string $node, string $service, array $hints = NULL, object &$res = NULL) : int { let node = strval($node); let service = strval($service); - let hints = arrval($hints); + let hints = &arrval($hints, + intval($ai_flags), + intval($ai_family), + intval($ai_socktype), + intval($ai_protocol) + ); let res = &NULL; return to_int(getaddrinfo); set $res = to_array(**res, @@ -60,5 +65,19 @@ function psi\getaddrinfo(string $node, string $service, array $hints, object &$r to_string(ai_canonname), to_array(*ai_next, ...) ); - free freeaddrinfo(res); -} \ No newline at end of file + free freeaddrinfo(*res); +} + +// extern int getnameinfo(struct sockaddr *sa, socklen_t salen, char *host, socklen_t hostlen, char *serv, socklen_t servlen, int flags) +function psi\getnameinfo(string $addr, string &$host = NULL, string &$service = NULL, int $flags = 0) : int { + let sa = strval($addr); + let salen = strlen($addr); + let hostlen = psi\NI_MAXHOST; + let host = calloc(hostlen, psi\SIZEOF_CHAR); + let servlen = psi\NI_MAXSERV; + let serv = calloc(servlen, psi\SIZEOF_CHAR); + let flags = intval($flags); + return to_int(getnameinfo); + set $host = to_string(host); + set $service = to_string(serv); +}