diff options
| -rw-r--r-- | erts/emulator/Makefile.in | 28 | ||||
| -rw-r--r-- | erts/emulator/nifs/common/net_nif.c | 63 | ||||
| -rw-r--r-- | erts/emulator/nifs/common/socket_nif.c | 201 | ||||
| -rw-r--r-- | erts/emulator/test/socket_SUITE.erl | 9 |
4 files changed, 276 insertions, 25 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index 1964d27134..adb4867e62 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -833,6 +833,18 @@ EMU_OBJS = \ $(OBJDIR)/beam_catches.o $(OBJDIR)/code_ix.o \ $(OBJDIR)/beam_ranges.o +ifneq ($(TARGET), win32) +# These are *currently* only needed for non-win32, +# since the nif-functions for socket and net are basically +# stubbed with badarg in the win32 case. +ESOCK_RUN_OBJS = \ + $(OBJDIR)/socket_dbg.o \ + $(OBJDIR)/socket_tarray.o \ + $(OBJDIR)/socket_util.o +else +ESOCK_RUN_OBJS = +endif + RUN_OBJS += \ $(OBJDIR)/erl_alloc.o $(OBJDIR)/erl_mtrace.o \ $(OBJDIR)/erl_alloc_util.o $(OBJDIR)/erl_goodfit_alloc.o \ @@ -878,17 +890,17 @@ RUN_OBJS += \ $(OBJDIR)/erl_ptab.o $(OBJDIR)/erl_map.o \ $(OBJDIR)/erl_msacc.o $(OBJDIR)/erl_lock_flags.o \ $(OBJDIR)/erl_io_queue.o \ - $(OBJDIR)/socket_dbg.o $(OBJDIR)/socket_tarray.o \ - $(OBJDIR)/socket_util.o + $(ESOCK_RUN_OBJS) LTTNG_OBJS = $(OBJDIR)/erlang_lttng.o + NIF_OBJS = \ - $(OBJDIR)/erl_tracer_nif.o \ - $(OBJDIR)/prim_buffer_nif.o \ - $(OBJDIR)/prim_file_nif.o \ - $(OBJDIR)/socket_nif.o \ - $(OBJDIR)/net_nif.o \ - $(OBJDIR)/zlib_nif.o + $(OBJDIR)/erl_tracer_nif.o \ + $(OBJDIR)/prim_buffer_nif.o \ + $(OBJDIR)/prim_file_nif.o \ + $(OBJDIR)/zlib_nif.o \ + $(OBJDIR)/socket_nif.o \ + $(OBJDIR)/net_nif.o ifeq ($(TARGET),win32) DRV_OBJS = \ diff --git a/erts/emulator/nifs/common/net_nif.c b/erts/emulator/nifs/common/net_nif.c index f7eeee45ac..f51975b564 100644 --- a/erts/emulator/nifs/common/net_nif.c +++ b/erts/emulator/nifs/common/net_nif.c @@ -421,7 +421,6 @@ static ERL_NIF_TERM atom_esystem; /* *** net *** */ static ErlNifResourceType* net; -/* Maybe all of these whould be NULL? */ static ErlNifResourceTypeInit netInit = { NULL, // net_dtor, NULL, // net_stop, @@ -462,6 +461,9 @@ ERL_NIF_TERM nif_info(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else ERL_NIF_TERM info, tmp; NDBG( ("NET", "info -> entry\r\n") ); @@ -473,6 +475,7 @@ ERL_NIF_TERM nif_info(ErlNifEnv* env, NDBG( ("NET", "info -> done: %T\r\n", info) ); return info; +#endif } @@ -494,6 +497,9 @@ ERL_NIF_TERM nif_command(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else ERL_NIF_TERM ecmd, result; NDBG( ("NET", "command -> entry (%d)\r\n", argc) ); @@ -510,6 +516,7 @@ ERL_NIF_TERM nif_command(ErlNifEnv* env, NDBG( ("NET", "command -> result: %T\r\n", result) ); return result; +#endif } @@ -518,6 +525,7 @@ ERL_NIF_TERM nif_command(ErlNifEnv* env, * The command can, in principle, be anything, though currently we only * support a debug command. */ +#if !defined(__WIN32__) static ERL_NIF_TERM ncommand(ErlNifEnv* env, ERL_NIF_TERM cmd) @@ -544,6 +552,7 @@ ERL_NIF_TERM ncommand(ErlNifEnv* env, } } +#endif @@ -559,6 +568,9 @@ ERL_NIF_TERM nif_gethostname(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else ERL_NIF_TERM result; NDBG( ("NET", "nif_gethostname -> entry (%d)\r\n", argc) ); @@ -571,9 +583,11 @@ ERL_NIF_TERM nif_gethostname(ErlNifEnv* env, NDBG( ("NET", "nif_gethostname -> done when result: %T\r\n", result) ); return result; +#endif } +#if !defined(__WIN32__) static ERL_NIF_TERM ngethostname(ErlNifEnv* env) { @@ -609,6 +623,7 @@ ERL_NIF_TERM ngethostname(ErlNifEnv* env) return result; } +#endif @@ -629,6 +644,9 @@ ERL_NIF_TERM nif_getnameinfo(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else ERL_NIF_TERM result; ERL_NIF_TERM eSockAddr, eFlags; int flags = 0; // Just in case... @@ -661,6 +679,7 @@ ERL_NIF_TERM nif_getnameinfo(ErlNifEnv* env, "\r\n %T\r\n", result) ); return result; +#endif } @@ -668,6 +687,7 @@ ERL_NIF_TERM nif_getnameinfo(ErlNifEnv* env, /* Given the provided sock(et) address (and honts), retreive the host and * service info. */ +#if !defined(__WIN32__) static ERL_NIF_TERM ngetnameinfo(ErlNifEnv* env, const SocketAddress* saP, @@ -753,6 +773,7 @@ ERL_NIF_TERM ngetnameinfo(ErlNifEnv* env, return result; } +#endif @@ -773,6 +794,9 @@ ERL_NIF_TERM nif_getaddrinfo(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else ERL_NIF_TERM result, eHostName, eServName; //, eHints; char* hostName; char* servName; @@ -826,9 +850,11 @@ ERL_NIF_TERM nif_getaddrinfo(ErlNifEnv* env, "\r\n %T\r\n", result) ); return result; +#endif } +#if !defined(__WIN32__) static ERL_NIF_TERM ngetaddrinfo(ErlNifEnv* env, char* host, @@ -931,6 +957,8 @@ ERL_NIF_TERM ngetaddrinfo(ErlNifEnv* env, return result; } +#endif + /* ---------------------------------------------------------------------- @@ -948,6 +976,9 @@ ERL_NIF_TERM nif_if_name2index(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else ERL_NIF_TERM eifn, result; char ifn[IF_NAMESIZE+1]; @@ -971,10 +1002,12 @@ ERL_NIF_TERM nif_if_name2index(ErlNifEnv* env, NDBG( ("NET", "nif_if_name2index -> done when result: %T\r\n", result) ); return result; +#endif } +#if !defined(__WIN32__) static ERL_NIF_TERM nif_name2index(ErlNifEnv* env, char* ifn) @@ -987,12 +1020,16 @@ ERL_NIF_TERM nif_name2index(ErlNifEnv* env, NDBG( ("NET", "nif_name2index -> idx: %d\r\n", idx) ); - if (idx == 0) - return esock_make_error_errno(env, get_errno()); - else + if (idx == 0) { + int save_errno = get_errno(); + NDBG( ("NET", "nif_name2index -> failed: %d\r\n", save_errno) ); + return esock_make_error_errno(env, save_errno); + } else { return esock_make_ok2(env, MKI(env, idx)); + } } +#endif @@ -1011,6 +1048,9 @@ ERL_NIF_TERM nif_if_index2name(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else ERL_NIF_TERM result; unsigned int idx; @@ -1030,10 +1070,12 @@ ERL_NIF_TERM nif_if_index2name(ErlNifEnv* env, NDBG( ("NET", "nif_if_index2name -> done when result: %T\r\n", result) ); return result; +#endif } +#if !defined(__WIN32__) static ERL_NIF_TERM nif_index2name(ErlNifEnv* env, unsigned int idx) @@ -1054,6 +1096,7 @@ ERL_NIF_TERM nif_index2name(ErlNifEnv* env, return result; } +#endif @@ -1070,6 +1113,9 @@ ERL_NIF_TERM nif_if_names(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else ERL_NIF_TERM result; NDBG( ("NET", "nif_if_names -> entry (%d)\r\n", argc) ); @@ -1083,10 +1129,12 @@ ERL_NIF_TERM nif_if_names(ErlNifEnv* env, NDBG( ("NET", "nif_if_names -> done when result: %T\r\n", result) ); return result; +#endif } +#if !defined(__WIN32__) static ERL_NIF_TERM nif_names(ErlNifEnv* env) { @@ -1159,6 +1207,7 @@ unsigned int nif_names_length(struct if_nameindex* p) return len; } +#endif // if !defined(__WIN32__) @@ -1171,6 +1220,7 @@ unsigned int nif_names_length(struct if_nameindex* p) * A special case is when there is no flags, which is * represented by the atom undefined. */ +#if !defined(__WIN32__) static BOOLEAN_T decode_nameinfo_flags(ErlNifEnv* env, const ERL_NIF_TERM eflags, @@ -1477,6 +1527,7 @@ char* make_address_info(ErlNifEnv* env, return NULL; } } +#endif // if !defined(__WIN32__) @@ -1553,6 +1604,7 @@ ErlNifFunc net_funcs[] = }; +#if !defined(__WIN32__) static BOOLEAN_T extract_debug(ErlNifEnv* env, ERL_NIF_TERM map) @@ -1565,6 +1617,7 @@ BOOLEAN_T extract_debug(ErlNifEnv* env, return esock_extract_bool_from_map(env, map, debug, NET_NIF_DEBUG_DEFAULT); } +#endif /* ======================================================================= @@ -1574,10 +1627,12 @@ BOOLEAN_T extract_debug(ErlNifEnv* env, static int on_load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info) { +#if !defined(__WIN32__) // We should make it possible to use load_info to get default values data.debug = extract_debug(env, load_info); NDBG( ("NET", "on_load -> entry\r\n") ); +#endif /* +++ Misc atoms +++ */ atom_address_info = MKA(env, str_address_info); diff --git a/erts/emulator/nifs/common/socket_nif.c b/erts/emulator/nifs/common/socket_nif.c index fc218f5163..7ccc9cf349 100644 --- a/erts/emulator/nifs/common/socket_nif.c +++ b/erts/emulator/nifs/common/socket_nif.c @@ -2798,6 +2798,9 @@ ERL_NIF_TERM nif_info(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else if (argc != 0) { return enif_make_badarg(env); } else { @@ -2831,6 +2834,7 @@ ERL_NIF_TERM nif_info(ErlNifEnv* env, return info; } +#endif } @@ -2859,6 +2863,9 @@ ERL_NIF_TERM nif_supports(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else int key; SGDBG( ("SOCKET", "nif_supports -> entry with %d args\r\n", argc) ); @@ -2871,6 +2878,7 @@ ERL_NIF_TERM nif_supports(ErlNifEnv* env, } return nsupports(env, key); +#endif } @@ -2883,6 +2891,7 @@ ERL_NIF_TERM nif_supports(ErlNifEnv* env, * by the sockets own debug flag. But since we don't even have a socket * yet, we must use the global debug flag. */ +#if !defined(__WIN32__) static ERL_NIF_TERM nsupports(ErlNifEnv* env, int key) { @@ -2910,8 +2919,10 @@ ERL_NIF_TERM nsupports(ErlNifEnv* env, int key) return result; } +#endif +#if !defined(__WIN32__) static ERL_NIF_TERM nsupports_options(ErlNifEnv* env) { @@ -2935,9 +2946,11 @@ ERL_NIF_TERM nsupports_options(ErlNifEnv* env) return optsL; } +#endif +#if !defined(__WIN32__) static ERL_NIF_TERM nsupports_options_socket(ErlNifEnv* env) { @@ -3197,9 +3210,11 @@ ERL_NIF_TERM nsupports_options_socket(ErlNifEnv* env) return optsL; } +#endif +#if !defined(__WIN32__) static ERL_NIF_TERM nsupports_options_ip(ErlNifEnv* env) { @@ -3496,9 +3511,11 @@ ERL_NIF_TERM nsupports_options_ip(ErlNifEnv* env) return optsL; } +#endif +#if !defined(__WIN32__) static ERL_NIF_TERM nsupports_options_ipv6(ErlNifEnv* env) { @@ -3746,9 +3763,11 @@ ERL_NIF_TERM nsupports_options_ipv6(ErlNifEnv* env) return optsL; } +#endif +#if !defined(__WIN32__) static ERL_NIF_TERM nsupports_options_tcp(ErlNifEnv* env) { @@ -3841,9 +3860,11 @@ ERL_NIF_TERM nsupports_options_tcp(ErlNifEnv* env) return optsL; } +#endif +#if !defined(__WIN32__) static ERL_NIF_TERM nsupports_options_udp(ErlNifEnv* env) { @@ -3864,9 +3885,11 @@ ERL_NIF_TERM nsupports_options_udp(ErlNifEnv* env) return optsL; } +#endif +#if !defined(__WIN32__) static ERL_NIF_TERM nsupports_options_sctp(ErlNifEnv* env) { @@ -4070,9 +4093,11 @@ ERL_NIF_TERM nsupports_options_sctp(ErlNifEnv* env) return optsL; } +#endif +#if !defined(__WIN32__) static ERL_NIF_TERM nsupports_sctp(ErlNifEnv* env) { @@ -4086,9 +4111,11 @@ ERL_NIF_TERM nsupports_sctp(ErlNifEnv* env) return supports; } +#endif +#if !defined(__WIN32__) static ERL_NIF_TERM nsupports_ipv6(ErlNifEnv* env) { @@ -4103,6 +4130,7 @@ ERL_NIF_TERM nsupports_ipv6(ErlNifEnv* env) return supports; } +#endif @@ -4125,6 +4153,9 @@ ERL_NIF_TERM nif_open(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else int edomain, etype, eproto; int domain, type, proto; char* netns; @@ -4183,6 +4214,7 @@ ERL_NIF_TERM nif_open(ErlNifEnv* env, "\r\n", result) ); return result; +#endif } @@ -4194,6 +4226,7 @@ ERL_NIF_TERM nif_open(ErlNifEnv* env, * by the sockets own debug flag. But since we don't even have a socket * yet, we must use the global debug flag. */ +#if !defined(__WIN32__) static ERL_NIF_TERM nopen(ErlNifEnv* env, int domain, int type, int protocol, @@ -4310,6 +4343,7 @@ ERL_NIF_TERM nopen(ErlNifEnv* env, return esock_make_ok2(env, res); } +#endif @@ -4320,6 +4354,7 @@ ERL_NIF_TERM nopen(ErlNifEnv* env, * Retreive the current namespace and set the new. * Return result and previous namespace if successfull. */ +#if !defined(__WIN32__) static BOOLEAN_T change_network_namespace(char* netns, int* cns, int* err) { @@ -4368,11 +4403,13 @@ BOOLEAN_T change_network_namespace(char* netns, int* cns, int* err) return TRUE; } } +#endif /* *** restore network namespace *** * Restore the previous namespace (see above). */ +#if !defined(__WIN32__) static BOOLEAN_T restore_network_namespace(int ns, SOCKET sock, int* err) { @@ -4408,7 +4445,8 @@ BOOLEAN_T restore_network_namespace(int ns, SOCKET sock, int* err) *err = 0; return TRUE; } -#endif +#endif // if !defined(__WIN32__) +#endif // ifdef HAVE_SETNS @@ -4427,6 +4465,9 @@ ERL_NIF_TERM nif_bind(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else SocketDescriptor* descP; ERL_NIF_TERM eSockAddr; SocketAddress sockAddr; @@ -4462,9 +4503,11 @@ ERL_NIF_TERM nif_bind(ErlNifEnv* env, return esock_make_error_str(env, xres); return nbind(env, descP, &sockAddr, addrLen); +#endif } +#if !defined(__WIN32__) static ERL_NIF_TERM nbind(ErlNifEnv* env, SocketDescriptor* descP, @@ -4500,6 +4543,7 @@ ERL_NIF_TERM nbind(ErlNifEnv* env, return esock_make_ok2(env, MKI(env, ntohs_port)); } +#endif @@ -4521,6 +4565,9 @@ ERL_NIF_TERM nif_connect(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else SocketDescriptor* descP; ERL_NIF_TERM eSockAddr; char* xres; @@ -4550,9 +4597,11 @@ ERL_NIF_TERM nif_connect(ErlNifEnv* env, } return nconnect(env, descP); +#endif } +#if !defined(__WIN32__) static ERL_NIF_TERM nconnect(ErlNifEnv* env, SocketDescriptor* descP) @@ -4614,6 +4663,7 @@ ERL_NIF_TERM nconnect(ErlNifEnv* env, } } +#endif /* ---------------------------------------------------------------------- @@ -4630,6 +4680,9 @@ ERL_NIF_TERM nif_finalize_connection(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else SocketDescriptor* descP; /* Extract arguments and perform preliminary validation */ @@ -4641,12 +4694,14 @@ ERL_NIF_TERM nif_finalize_connection(ErlNifEnv* env, return nfinalize_connection(env, descP); +#endif } /* *** nfinalize_connection *** * Perform the final check to verify a connection. */ +#if !defined(__WIN32__) static ERL_NIF_TERM nfinalize_connection(ErlNifEnv* env, SocketDescriptor* descP) @@ -4667,11 +4722,13 @@ ERL_NIF_TERM nfinalize_connection(ErlNifEnv* env, return esock_atom_ok; } +#endif /* *** verify_is_connected *** * Check if a connection has been established. */ +#if !defined(__WIN32__) static BOOLEAN_T verify_is_connected(SocketDescriptor* descP, int* err) { @@ -4718,6 +4775,7 @@ BOOLEAN_T verify_is_connected(SocketDescriptor* descP, int* err) return TRUE; } +#endif @@ -4737,6 +4795,9 @@ ERL_NIF_TERM nif_listen(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else SocketDescriptor* descP; int backlog; @@ -4760,10 +4821,12 @@ ERL_NIF_TERM nif_listen(ErlNifEnv* env, "\r\n", descP->sock, argv[0], backlog) ); return nlisten(env, descP, backlog); +#endif } +#if !defined(__WIN32__) static ERL_NIF_TERM nlisten(ErlNifEnv* env, SocketDescriptor* descP, @@ -4782,6 +4845,7 @@ ERL_NIF_TERM nlisten(ErlNifEnv* env, return esock_atom_ok; } +#endif @@ -4801,6 +4865,9 @@ ERL_NIF_TERM nif_accept(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else SocketDescriptor* descP; ERL_NIF_TERM ref; @@ -4810,8 +4877,8 @@ ERL_NIF_TERM nif_accept(ErlNifEnv* env, if ((argc != 2) || !enif_get_resource(env, argv[0], sockets, (void**) &descP)) { - return enif_make_badarg(env); - } + return enif_make_badarg(env); + } ref = argv[1]; if (IS_CLOSED(descP) || IS_CLOSING(descP)) @@ -4824,9 +4891,11 @@ ERL_NIF_TERM nif_accept(ErlNifEnv* env, "\r\n", descP->sock, argv[0], ref) ); return naccept(env, descP, ref); +#endif } +#if !defined(__WIN32__) static ERL_NIF_TERM naccept(ErlNifEnv* env, SocketDescriptor* descP, @@ -4854,11 +4923,13 @@ ERL_NIF_TERM naccept(ErlNifEnv* env, return res; } +#endif /* *** naccept_listening *** * We have no active acceptor and no acceptors in queue. */ +#if !defined(__WIN32__) static ERL_NIF_TERM naccept_listening(ErlNifEnv* env, SocketDescriptor* descP, @@ -5003,6 +5074,7 @@ ERL_NIF_TERM naccept_listening(ErlNifEnv* env, return esock_make_ok2(env, accRef); } } +#endif /* *** naccept_accepting *** @@ -5010,6 +5082,7 @@ ERL_NIF_TERM naccept_listening(ErlNifEnv* env, * If the pid of the calling process is not the pid of the "current process", * push the requester onto the queue. */ +#if !defined(__WIN32__) static ERL_NIF_TERM naccept_accepting(ErlNifEnv* env, SocketDescriptor* descP, @@ -5170,6 +5243,7 @@ ERL_NIF_TERM naccept_accepting(ErlNifEnv* env, return esock_make_ok2(env, accRef); } } +#endif @@ -5191,6 +5265,9 @@ ERL_NIF_TERM nif_send(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else SocketDescriptor* descP; ERL_NIF_TERM sockRef, sendRef; ErlNifBinary sndData; @@ -5245,9 +5322,11 @@ ERL_NIF_TERM nif_send(ErlNifEnv* env, MUNLOCK(descP->writeMtx); return res; +#endif } + /* *** nsend *** * * Do the actual send. @@ -5255,6 +5334,7 @@ ERL_NIF_TERM nif_send(ErlNifEnv* env, * analyze the result. If we are done, another writer may be * scheduled (if there is one in the writer queue). */ +#if !defined(__WIN32__) static ERL_NIF_TERM nsend(ErlNifEnv* env, SocketDescriptor* descP, @@ -5290,6 +5370,7 @@ ERL_NIF_TERM nsend(ErlNifEnv* env, sockRef, sendRef); } +#endif @@ -5312,6 +5393,9 @@ ERL_NIF_TERM nif_sendto(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else SocketDescriptor* descP; ERL_NIF_TERM sockRef, sendRef; ErlNifBinary sndData; @@ -5375,9 +5459,11 @@ ERL_NIF_TERM nif_sendto(ErlNifEnv* env, "\r\n", res) ); return res; +#endif } +#if !defined(__WIN32__) static ERL_NIF_TERM nsendto(ErlNifEnv* env, SocketDescriptor* descP, @@ -5421,6 +5507,7 @@ ERL_NIF_TERM nsendto(ErlNifEnv* env, return send_check_result(env, descP, written, dataP->size, save_errno, sockRef, sendRef); } +#endif @@ -5442,6 +5529,9 @@ ERL_NIF_TERM nif_sendmsg(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else ERL_NIF_TERM res, sockRef, sendRef, eMsgHdr; SocketDescriptor* descP; unsigned int eflags; @@ -5487,9 +5577,11 @@ ERL_NIF_TERM nif_sendmsg(ErlNifEnv* env, "\r\n", res) ); return res; +#endif } +#if !defined(__WIN32__) static ERL_NIF_TERM nsendmsg(ErlNifEnv* env, SocketDescriptor* descP, @@ -5643,6 +5735,7 @@ ERL_NIF_TERM nsendmsg(ErlNifEnv* env, return res; } +#endif @@ -5736,6 +5829,9 @@ ERL_NIF_TERM nif_recv(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else SocketDescriptor* descP; ERL_NIF_TERM sockRef, recvRef; int len; @@ -5778,7 +5874,7 @@ ERL_NIF_TERM nif_recv(ErlNifEnv* env, MUNLOCK(descP->readMtx); return res; - +#endif } @@ -5787,6 +5883,7 @@ ERL_NIF_TERM nif_recv(ErlNifEnv* env, * allocating a binary (of the specified or default * size) and then throwing it away... */ +#if !defined(__WIN32__) static ERL_NIF_TERM nrecv(ErlNifEnv* env, SocketDescriptor* descP, @@ -5843,6 +5940,7 @@ ERL_NIF_TERM nrecv(ErlNifEnv* env, sockRef, recvRef); } +#endif @@ -5875,6 +5973,9 @@ ERL_NIF_TERM nif_recvfrom(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else SocketDescriptor* descP; ERL_NIF_TERM sockRef, recvRef; unsigned int bufSz; @@ -5936,7 +6037,7 @@ ERL_NIF_TERM nif_recvfrom(ErlNifEnv* env, MUNLOCK(descP->readMtx); return res; - +#endif } @@ -5945,6 +6046,7 @@ ERL_NIF_TERM nif_recvfrom(ErlNifEnv* env, * allocating a binary (of the specified or default * size) and then throwing it away... */ +#if !defined(__WIN32__) static ERL_NIF_TERM nrecvfrom(ErlNifEnv* env, SocketDescriptor* descP, @@ -6003,6 +6105,7 @@ ERL_NIF_TERM nrecvfrom(ErlNifEnv* env, sockRef, recvRef); } +#endif @@ -6039,6 +6142,9 @@ ERL_NIF_TERM nif_recvmsg(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else SocketDescriptor* descP; ERL_NIF_TERM sockRef, recvRef; unsigned int bufSz; @@ -6103,7 +6209,7 @@ ERL_NIF_TERM nif_recvmsg(ErlNifEnv* env, MUNLOCK(descP->readMtx); return res; - +#endif } @@ -6112,6 +6218,7 @@ ERL_NIF_TERM nif_recvmsg(ErlNifEnv* env, * allocating a binary (of the specified or default * size) and then throwing it away... */ +#if !defined(__WIN32__) static ERL_NIF_TERM nrecvmsg(ErlNifEnv* env, SocketDescriptor* descP, @@ -6199,6 +6306,7 @@ ERL_NIF_TERM nrecvmsg(ErlNifEnv* env, sockRef, recvRef); } +#endif @@ -6217,6 +6325,9 @@ ERL_NIF_TERM nif_close(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else SocketDescriptor* descP; if ((argc != 1) || @@ -6228,9 +6339,11 @@ ERL_NIF_TERM nif_close(ErlNifEnv* env, return esock_make_error(env, atom_closed); return nclose(env, descP); +#endif } +#if !defined(__WIN32__) static ERL_NIF_TERM nclose(ErlNifEnv* env, SocketDescriptor* descP) @@ -6350,6 +6463,7 @@ ERL_NIF_TERM nclose(ErlNifEnv* env, return reply; } +#endif @@ -6368,6 +6482,9 @@ ERL_NIF_TERM nif_finalize_close(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else SocketDescriptor* descP; /* Extract arguments and perform preliminary validation */ @@ -6378,13 +6495,14 @@ ERL_NIF_TERM nif_finalize_close(ErlNifEnv* env, } return nfinalize_close(env, descP); - +#endif } /* *** nfinalize_close *** * Perform the final step in the socket close. */ +#if !defined(__WIN32__) static ERL_NIF_TERM nfinalize_close(ErlNifEnv* env, SocketDescriptor* descP) @@ -6428,6 +6546,7 @@ ERL_NIF_TERM nfinalize_close(ErlNifEnv* env, return reply; } +#endif @@ -6447,6 +6566,9 @@ ERL_NIF_TERM nif_shutdown(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else SocketDescriptor* descP; unsigned int ehow; int how; @@ -6464,10 +6586,12 @@ ERL_NIF_TERM nif_shutdown(ErlNifEnv* env, return enif_make_badarg(env); return nshutdown(env, descP, how); +#endif } +#if !defined(__WIN32__) static ERL_NIF_TERM nshutdown(ErlNifEnv* env, SocketDescriptor* descP, @@ -6495,6 +6619,7 @@ ERL_NIF_TERM nshutdown(ErlNifEnv* env, return reply; } +#endif @@ -6522,6 +6647,9 @@ ERL_NIF_TERM nif_setopt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else SocketDescriptor* descP = NULL; int eLevel, level = -1; int eOpt; @@ -6578,9 +6706,11 @@ ERL_NIF_TERM nif_setopt(ErlNifEnv* env, "\r\n", result) ); return result; +#endif } +#if !defined(__WIN32__) static ERL_NIF_TERM nsetopt(ErlNifEnv* env, SocketDescriptor* descP, @@ -9926,6 +10056,7 @@ int socket_setopt(int sock, int level, int opt, return res; } +#endif // if !defined(__WIN32__) @@ -9951,6 +10082,9 @@ ERL_NIF_TERM nif_getopt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else SocketDescriptor* descP; int eLevel, level = -1; ERL_NIF_TERM eIsEncoded, eOpt; @@ -9984,10 +10118,12 @@ ERL_NIF_TERM nif_getopt(ErlNifEnv* env, return esock_make_error(env, esock_atom_einval); return ngetopt(env, descP, isEncoded, isOTP, level, eOpt); +#endif } +#if !defined(__WIN32__) static ERL_NIF_TERM ngetopt(ErlNifEnv* env, SocketDescriptor* descP, @@ -12646,6 +12782,7 @@ ERL_NIF_TERM ngetopt_str_opt(ErlNifEnv* env, return result; } +#endif // if !defined(__WIN32__) @@ -12664,6 +12801,9 @@ ERL_NIF_TERM nif_sockname(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else SocketDescriptor* descP; ERL_NIF_TERM res; @@ -12689,10 +12829,12 @@ ERL_NIF_TERM nif_sockname(ErlNifEnv* env, SSDBG( descP, ("SOCKET", "nif_sockname -> done with res = %T\r\n", res) ); return res; +#endif } +#if !defined(__WIN32__) static ERL_NIF_TERM nsockname(ErlNifEnv* env, SocketDescriptor* descP) @@ -12714,6 +12856,7 @@ ERL_NIF_TERM nsockname(ErlNifEnv* env, return esock_make_ok2(env, esa); } } +#endif @@ -12732,6 +12875,9 @@ ERL_NIF_TERM nif_peername(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else SocketDescriptor* descP; ERL_NIF_TERM res; @@ -12757,10 +12903,12 @@ ERL_NIF_TERM nif_peername(ErlNifEnv* env, SSDBG( descP, ("SOCKET", "nif_peername -> done with res = %T\r\n", res) ); return res; +#endif } +#if !defined(__WIN32__) static ERL_NIF_TERM npeername(ErlNifEnv* env, SocketDescriptor* descP) @@ -12782,6 +12930,7 @@ ERL_NIF_TERM npeername(ErlNifEnv* env, return esock_make_ok2(env, esa); } } +#endif @@ -12801,6 +12950,9 @@ ERL_NIF_TERM nif_cancel(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { +#if defined(__WIN32__) + return enif_make_badarg(env); +#else SocketDescriptor* descP; ERL_NIF_TERM op, opRef, result; @@ -12832,10 +12984,11 @@ ERL_NIF_TERM nif_cancel(ErlNifEnv* env, "\r\n", result) ); return result; - +#endif } +#if !defined(__WIN32__) static ERL_NIF_TERM ncancel(ErlNifEnv* env, SocketDescriptor* descP, @@ -13294,6 +13447,8 @@ ERL_NIF_TERM ncancel_mode_select(ErlNifEnv* env, } } +#endif // if !defined(__WIN32__) + @@ -13307,6 +13462,7 @@ ERL_NIF_TERM ncancel_mode_select(ErlNifEnv* env, * Checks if we have a current writer and if that is us. If not, then we must * be made to wait for our turn. This is done by pushing us unto the writer queue. */ +#if !defined(__WIN32__) static BOOLEAN_T send_check_writer(ErlNifEnv* env, SocketDescriptor* descP, @@ -16087,6 +16243,8 @@ int compare_pids(ErlNifEnv* env, return enif_is_identical(p1, p2); } +#endif // if !defined(__WIN32__) + /* ---------------------------------------------------------------------- @@ -16098,6 +16256,7 @@ int compare_pids(ErlNifEnv* env, * * Note that only a subset is supported. */ +#if !defined(__WIN32__) static BOOLEAN_T edomain2domain(int edomain, int* domain) { @@ -16612,6 +16771,7 @@ char* esock_send_msg(ErlNifEnv* env, else return NULL; } +#endif // #if defined(__WIN32__) @@ -16624,6 +16784,7 @@ char* esock_send_msg(ErlNifEnv* env, * * Search for a pid in the acceptor queue. */ +#if !defined(__WIN32__) static BOOLEAN_T acceptor_search4pid(ErlNifEnv* env, SocketDescriptor* descP, @@ -16993,6 +17154,7 @@ BOOLEAN_T qunqueue(ErlNifEnv* env, return FALSE; } +#endif // if !defined(__WIN32__) @@ -17001,6 +17163,7 @@ BOOLEAN_T qunqueue(ErlNifEnv* env, * ---------------------------------------------------------------------- */ +#if !defined(__WIN32__) static BOOLEAN_T cnt_inc(uint32_t* cnt, uint32_t inc) { @@ -17032,6 +17195,8 @@ void cnt_dec(uint32_t* cnt, uint32_t dec) return; } +#endif // if !defined(__WIN32__) + @@ -17040,6 +17205,7 @@ void cnt_dec(uint32_t* cnt, uint32_t dec) * ---------------------------------------------------------------------- */ +#if !defined(__WIN32__) static int esock_monitor(const char* slogan, ErlNifEnv* env, @@ -17116,6 +17282,8 @@ void esock_monitor_init(ESockMonitor* monP) monP->raw[i] = 0; } +#endif // if !defined(__WIN32__) + /* static @@ -17139,6 +17307,7 @@ int esock_monitor_compare(const ErlNifMonitor* mon1, static void socket_dtor(ErlNifEnv* env, void* obj) { +#if !defined(__WIN32__) SocketDescriptor* descP = (SocketDescriptor*) obj; enif_clear_env(descP->env); @@ -17149,7 +17318,7 @@ void socket_dtor(ErlNifEnv* env, void* obj) MDESTROY(descP->readMtx); MDESTROY(descP->accMtx); MDESTROY(descP->closeMtx); - +#endif } @@ -17181,6 +17350,7 @@ void socket_dtor(ErlNifEnv* env, void* obj) static void socket_stop(ErlNifEnv* env, void* obj, int fd, int is_direct_call) { +#if !defined(__WIN32__) SocketDescriptor* descP = (SocketDescriptor*) obj; /* @@ -17423,7 +17593,7 @@ void socket_stop(ErlNifEnv* env, void* obj, int fd, int is_direct_call) SSDBG( descP, ("SOCKET", "socket_stop -> done (%d, %d)\r\n", descP->sock, fd) ); - +#endif // if !defined(__WIN32__) } @@ -17431,6 +17601,7 @@ void socket_stop(ErlNifEnv* env, void* obj, int fd, int is_direct_call) * nif_abort message with the specified reason to each member, * and if the 'free' argument is TRUE, the queue will be emptied. */ +#if !defined(__WIN32__) static void inform_waiting_procs(ErlNifEnv* env, SocketDescriptor* descP, @@ -17474,7 +17645,7 @@ void inform_waiting_procs(ErlNifEnv* env, q->last = NULL; } } - +#endif // if !defined(__WIN32__) /* ========================================================================= @@ -17487,6 +17658,7 @@ void socket_down(ErlNifEnv* env, const ErlNifPid* pid, const ErlNifMonitor* mon) { +#if !defined(__WIN32__) SocketDescriptor* descP = (SocketDescriptor*) obj; ESockMonitor* monP = (ESockMonitor*) mon; @@ -17675,6 +17847,7 @@ void socket_down(ErlNifEnv* env, SSDBG( descP, ("SOCKET", "socket_down -> done\r\n") ); +#endif // if !defined(__WIN32__) } @@ -17684,6 +17857,7 @@ void socket_down(ErlNifEnv* env, * Check and then handle a downed acceptor process. * */ +#if !defined(__WIN32__) static void socket_down_acceptor(ErlNifEnv* env, SocketDescriptor* descP, @@ -17878,6 +18052,7 @@ void socket_down_reader(ErlNifEnv* env, reader_unqueue(env, descP, pid); } } +#endif // if !defined(__WIN32__) @@ -17928,6 +18103,7 @@ ErlNifFunc socket_funcs[] = }; +#if !defined(__WIN32__) static BOOLEAN_T extract_debug(ErlNifEnv* env, ERL_NIF_TERM map) @@ -17953,6 +18129,7 @@ BOOLEAN_T extract_iow(ErlNifEnv* env, return esock_extract_bool_from_map(env, map, iow, SOCKET_NIF_IOW_DEFAULT); } +#endif // if !defined(__WIN32__) @@ -17963,6 +18140,7 @@ BOOLEAN_T extract_iow(ErlNifEnv* env, static int on_load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info) { +#if !defined(__WIN32__) esock_dbg_init(ESOCK_DBGOUT_DEFAULT); // esock_dbg_init(ESOCK_DBGOUT_UNIQUE); @@ -17982,6 +18160,7 @@ int on_load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info) data.numProtoTCP = 0; data.numProtoUDP = 0; data.numProtoSCTP = 0; +#endif /* +++ Misc atoms +++ */ atom_adaptation_layer = MKA(env, str_adaptation_layer); diff --git a/erts/emulator/test/socket_SUITE.erl b/erts/emulator/test/socket_SUITE.erl index 803f06809b..012bff1a7b 100644 --- a/erts/emulator/test/socket_SUITE.erl +++ b/erts/emulator/test/socket_SUITE.erl @@ -1357,8 +1357,13 @@ ttest_ssockt_csockt_cases() -> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% init_per_suite(Config) -> - ?LOGGER:start(), - Config. + case os:type() of + {win32, _} -> + not_yet_implemented(); + _ -> + ?LOGGER:start(), + Config + end. end_per_suite(_) -> ?LOGGER:stop(), |