mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2024-11-29 03:19:54 +00:00
Code Issues 1 Releases Wiki Activity

Make net/connect special

Browse Source 
Keeps net/listen from being affected by changes necessary to make bind
on connect work (while keeping from breaking the API).
This commit is contained in:
llmII 2021-09-07 05:40:48 -05:00
parent 4370cb77e7
commit c9bef39f96
No known key found for this signature in database
GPG Key ID: E3AD2E259F58A9A0
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/core/net.c
View File

@ -248,9 +248,7 @@ JANET_NO_RETURN static void janet_sched_accept(JanetStream *stream, JanetFunctio
/* Adress info */ /* Adress info */
static int janet_get_sockettype(Janet *argv, int32_t argc, int32_t n) { static int janet_get_sockettype(Janet *argv, int32_t argc, int32_t n) {
JanetKeyword stype = NULL; JanetKeyword stype = janet_optkeyword(argv, argc, n, NULL);
if(janet_checktype(argv[n], JANET_KEYWORD))
stype = janet_optkeyword(argv, argc, n, NULL);
int socktype = SOCK_DGRAM; int socktype = SOCK_DGRAM;
if ((NULL == stype) || !janet_cstrcmp(stype, "stream")) { if ((NULL == stype) || !janet_cstrcmp(stype, "stream")) {
socktype = SOCK_STREAM; socktype = SOCK_STREAM;
@ -384,10 +382,31 @@ JANET_CORE_FN(cfun_net_connect,
"connection, with the default being the same as using the OS's preferred address. ") { "connection, with the default being the same as using the OS's preferred address. ") {
janet_arity(argc, 2, 4); janet_arity(argc, 2, 4);
int socktype = janet_get_sockettype(argv, argc, 2); int socktype = SOCK_STREAM;
int strict = 0;
int is_unix = 0; int is_unix = 0;
struct addrinfo *ai = janet_get_addrinfo(argv, 0, socktype, 0, &is_unix, 0); struct addrinfo *ai = janet_get_addrinfo(argv, 0, socktype, 0, &is_unix, 0);
/* figure out socket type */
switch (argc) {
case 4:
strict = 1;
case 3:
if(janet_checktype(argv[2], JANET_KEYWORD) || strict)
socktype = janet_get_sockettype(argv, argc, 2);
break;
default:
socktype = SOCK_STREAM;
}
/* Check if we're binding address */
struct addrinfo *binding = NULL;
if (argc >= 3 && is_unix == 0) {
if (argc == 4 || !janet_checktype(argv[2], JANET_KEYWORD)) {
binding = janet_get_addrinfo(argv, 0, socktype, 0, &is_unix, 1);
}
}
/* Create socket */ /* Create socket */
JSock sock = JSOCKDEFAULT; JSock sock = JSOCKDEFAULT;
void *addr = NULL; void *addr = NULL;
@ -422,14 +441,7 @@ JANET_CORE_FN(cfun_net_connect,
} }
} }
/* Check if we're binding address */ /* Perform bind if binding */
struct addrinfo *binding = NULL;
if (argc >= 3 && is_unix == 0) {
if (argc == 4 || !janet_checktype(argv[2], JANET_KEYWORD)) {
binding = janet_get_addrinfo(argv, 0, socktype, 0, &is_unix, 1);
}
}
if (binding != NULL) { if (binding != NULL) {
/* Check all addrinfos in a loop for the first that we can bind to. */ /* Check all addrinfos in a loop for the first that we can bind to. */
struct addrinfo *rp = NULL; struct addrinfo *rp = NULL;