diff options
| author | Henrik Nord <[email protected]> | 2011-08-08 15:41:17 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-08-08 15:41:17 +0200 |
| commit | b2e16f2a2c1f139c96f928ca644a753c7c3a28b7 (patch) | |
| tree | ba712e330cef21dfa8a58d7effa4528e42f6ffb3 | |
| parent | 2f73f5ca35f600675ea9e46148bb8e9ddcdb4f7b (diff) | |
| parent | b74afd6bcf54d3bc6a51da30a7551b3b2a0f402b (diff) | |
| download | otp-b2e16f2a2c1f139c96f928ca644a753c7c3a28b7.tar.gz otp-b2e16f2a2c1f139c96f928ca644a753c7c3a28b7.tar.bz2 otp-b2e16f2a2c1f139c96f928ca644a753c7c3a28b7.zip | |
Merge branch 'dev' into major
| -rw-r--r-- | erts/emulator/drivers/common/inet_drv.c | 4 | ||||
| -rw-r--r-- | lib/kernel/test/gen_udp_SUITE.erl | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c index 40c4a0df08..ebc4469a23 100644 --- a/erts/emulator/drivers/common/inet_drv.c +++ b/erts/emulator/drivers/common/inet_drv.c @@ -3709,6 +3709,8 @@ static int inet_ctl_fdopen(inet_descriptor* desc, int domain, int type, /* check that it is a socket and that the socket is bound */ if (IS_SOCKET_ERROR(sock_name(s, (struct sockaddr*) &name, &sz))) return ctl_error(sock_errno(), rbuf, rsize); + if (name.sa.sa_family != domain) + return ctl_error(EINVAL, rbuf, rsize); desc->s = s; if ((desc->event = sock_create_event(desc)) == INVALID_EVENT) return ctl_error(sock_errno(), rbuf, rsize); @@ -9739,7 +9741,7 @@ static int packet_inet_ctl(ErlDrvData e, unsigned int cmd, char* buf, int len, if (desc->active || (len != 8)) return ctl_error(EINVAL, rbuf, rsize); timeout = get_int32(buf); - /* The 2nd arg, Length(4), is ignored for both UDP ans SCTP protocols, + /* The 2nd arg, Length(4), is ignored for both UDP and SCTP protocols, since they are msg-oriented. */ if (enq_async(desc, tbuf, PACKET_REQ_RECV) < 0) diff --git a/lib/kernel/test/gen_udp_SUITE.erl b/lib/kernel/test/gen_udp_SUITE.erl index d8a5519195..b734d7fd98 100644 --- a/lib/kernel/test/gen_udp_SUITE.erl +++ b/lib/kernel/test/gen_udp_SUITE.erl @@ -400,6 +400,7 @@ open_fd(Config) when is_list(Config) -> {ok,S1} = gen_udp:open(0), {ok,P2} = inet:port(S1), {ok,FD} = prim_inet:getfd(S1), + {error,einval} = gen_udp:open(P2, [inet6, {fd,FD}]), {ok,S2} = gen_udp:open(P2, [{fd,FD}]), {ok,S3} = gen_udp:open(0), {ok,P3} = inet:port(S3), |