mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2024-11-20 07:34:49 +00:00
Code Issues 1 Releases Wiki Activity

Fix network byte order port.

Browse Source
This commit is contained in:
Calvin Rose 2021-09-25 14:31:19 -05:00
parent 64e29c6fce
commit 7748ccdb8e
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/net.c
View File

@ -323,12 +323,13 @@ static struct addrinfo *janet_get_addrinfo(Janet *argv, int32_t offset, int sock
*/ */
JANET_CORE_FN(cfun_net_sockaddr, JANET_CORE_FN(cfun_net_sockaddr,
"(net/address host port &opt type)", "(net/address host &opt port type multi)",
"Look up the connection information for a given hostname, port, and connection type. Returns " "Look up the connection information for a given hostname, port, and connection type. Returns "
"a handle that can be used to send datagrams over network without establishing a connection. " "a handle that can be used to send datagrams over network without establishing a connection. "
"On Posix platforms, you can use :unix for host to connect to a unix domain socket, where the name is " "On Posix platforms, you can use :unix for host to connect to a unix domain socket, where the name is "
"given in the port argument. On Linux, abstract " "given in the port argument. On Linux, abstract "
"unix domain sockets are specified with a leading '@' character in port.") { "unix domain sockets are specified with a leading '@' character in port. If `multi` is truthy, will "
"return all address that match in an array instead of just the first.") {
janet_arity(argc, 2, 4); janet_arity(argc, 2, 4);
int socktype = janet_get_sockettype(argv, argc, 2); int socktype = janet_get_sockettype(argv, argc, 2);
int is_unix = 0; int is_unix = 0;
@ -648,7 +649,7 @@ struct sockaddr_in6 *sin6; // IPv6 address + port
struct sockaddr_un *sun; // Unix Domain Socket Address struct sockaddr_un *sun; // Unix Domain Socket Address
*/ */
/* Turn a socket address into a host, port pair (port is optional). /* Turn a socket address into a host, port pair (port is optional).
* For unix domain sockets, returned tuple will have only a single element, the path string. */ * For unix domain sockets, returned tuple will have only a single element, the path string. */
static Janet janet_so_getname(const void *sa_any) { static Janet janet_so_getname(const void *sa_any) {
const struct sockaddr *sa = sa_any; const struct sockaddr *sa = sa_any;
@ -661,7 +662,7 @@ static Janet janet_so_getname(const void *sa_any) {
if (!inet_ntop(AF_INET, &(sai->sin_addr), buffer, sizeof(buffer))) { if (!inet_ntop(AF_INET, &(sai->sin_addr), buffer, sizeof(buffer))) {
janet_panic("unable to decode ipv4 host address"); janet_panic("unable to decode ipv4 host address");
} }
Janet pair[2] = {janet_cstringv(buffer), janet_wrap_integer(sai->sin_port)}; Janet pair[2] = {janet_cstringv(buffer), janet_wrap_integer(ntohs(sai->sin_port))};
return janet_wrap_tuple(janet_tuple_n(pair, sai->sin_port ? 2 : 1)); return janet_wrap_tuple(janet_tuple_n(pair, sai->sin_port ? 2 : 1));
} }
case AF_INET6: { case AF_INET6: {
@ -669,7 +670,7 @@ static Janet janet_so_getname(const void *sa_any) {
if (!inet_ntop(AF_INET6, &(sai6->sin6_addr), buffer, sizeof(buffer))) { if (!inet_ntop(AF_INET6, &(sai6->sin6_addr), buffer, sizeof(buffer))) {
janet_panic("unable to decode ipv4 host address"); janet_panic("unable to decode ipv4 host address");
} }
Janet pair[2] = {janet_cstringv(buffer), janet_wrap_integer(sai6->sin6_port)}; Janet pair[2] = {janet_cstringv(buffer), janet_wrap_integer(ntohs(sai6->sin6_port))};
return janet_wrap_tuple(janet_tuple_n(pair, sai6->sin6_port ? 2 : 1)); return janet_wrap_tuple(janet_tuple_n(pair, sai6->sin6_port ? 2 : 1));
} }
#ifndef JANET_WINDOWS #ifndef JANET_WINDOWS
@ -719,6 +720,15 @@ JANET_CORE_FN(cfun_net_getpeername,
return janet_so_getname(&ss); return janet_so_getname(&ss);
} }
JANET_CORE_FN(cfun_net_address_unpack,
"(net/address-unpack address)",
"Given an address returned by net/adress, return a host, port pair. Unix domain sockets "
"will have only the path in the returned tuple.") {
janet_fixarity(argc, 1);
struct sockaddr *sa = janet_getabstract(argv, 0, &janet_address_type);
return janet_so_getname(sa);
}
JANET_CORE_FN(cfun_stream_accept_loop, JANET_CORE_FN(cfun_stream_accept_loop,
"(net/accept-loop stream handler)", "(net/accept-loop stream handler)",
"Shorthand for running a server stream that will continuously accept new connections. " "Shorthand for running a server stream that will continuously accept new connections. "
@ -890,6 +900,7 @@ void janet_lib_net(JanetTable *env) {
JANET_CORE_REG("net/shutdown", cfun_net_shutdown), JANET_CORE_REG("net/shutdown", cfun_net_shutdown),
JANET_CORE_REG("net/peername", cfun_net_getpeername), JANET_CORE_REG("net/peername", cfun_net_getpeername),
JANET_CORE_REG("net/localname", cfun_net_getsockname), JANET_CORE_REG("net/localname", cfun_net_getsockname),
JANET_CORE_REG("net/address-unpack", cfun_net_address_unpack),
JANET_REG_END JANET_REG_END
}; };
janet_core_cfuns_ext(env, NULL, net_cfuns); janet_core_cfuns_ext(env, NULL, net_cfuns);