aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/nifs/common/socket_util.c
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2019-03-14 14:42:51 +0100
committerMicael Karlberg <[email protected]>2019-04-17 16:56:33 +0200
commit6a5eda1dc70bbfa8f53b2e2c3e79db1748a01bfd (patch)
tree1e0e447ae96e6742409eee18e12c18ec315b595c /erts/emulator/nifs/common/socket_util.c
parent97f9c6fd26544265f7cf774ff18e8ca2edf5840d (diff)
downloadotp-6a5eda1dc70bbfa8f53b2e2c3e79db1748a01bfd.tar.gz
otp-6a5eda1dc70bbfa8f53b2e2c3e79db1748a01bfd.tar.bz2
otp-6a5eda1dc70bbfa8f53b2e2c3e79db1748a01bfd.zip
[socket|net] Make set|get options safe and type prefix
Firstly, make sure socket (and own) options manipulations are safe by adding a mutex that we take in the setopt and getopt functions. Secondly, change type prefix of various types from 'Socket' to 'ESock' (for instance; SocketDescriptor -> ESockDescriptor). OTP-15496
Diffstat (limited to 'erts/emulator/nifs/common/socket_util.c')
-rw-r--r--erts/emulator/nifs/common/socket_util.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/erts/emulator/nifs/common/socket_util.c b/erts/emulator/nifs/common/socket_util.c
index 5e18355308..8ad95cb6b7 100644
--- a/erts/emulator/nifs/common/socket_util.c
+++ b/erts/emulator/nifs/common/socket_util.c
@@ -213,10 +213,10 @@ char* esock_decode_iov(ErlNifEnv* env,
*/
extern
-char* esock_decode_sockaddr(ErlNifEnv* env,
- ERL_NIF_TERM eSockAddr,
- SocketAddress* sockAddrP,
- unsigned int* addrLen)
+char* esock_decode_sockaddr(ErlNifEnv* env,
+ ERL_NIF_TERM eSockAddr,
+ ESockAddress* sockAddrP,
+ unsigned int* addrLen)
{
ERL_NIF_TERM efam;
int fam;
@@ -279,10 +279,10 @@ char* esock_decode_sockaddr(ErlNifEnv* env,
*/
extern
-char* esock_encode_sockaddr(ErlNifEnv* env,
- SocketAddress* sockAddrP,
- unsigned int addrLen,
- ERL_NIF_TERM* eSockAddr)
+char* esock_encode_sockaddr(ErlNifEnv* env,
+ ESockAddress* sockAddrP,
+ unsigned int addrLen,
+ ERL_NIF_TERM* eSockAddr)
{
char* xres;