diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-06-17 11:51:12 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-06-17 11:57:37 +0200 |
| commit | 585b41ca6ffbecee4cc5617c41069edd9867c8e4 (patch) | |
| tree | 1b67a2d17fa6bd21b7e3ea11287b6e7516697cb4 /lib/kernel/src/local_udp.erl | |
| parent | e233ca13bedc193ebee800f4bfe6c6afe2ffd1bc (diff) | |
| parent | abf6018726321a920948d9ba6dcea7f4047a4e4a (diff) | |
| download | otp-585b41ca6ffbecee4cc5617c41069edd9867c8e4.tar.gz otp-585b41ca6ffbecee4cc5617c41069edd9867c8e4.tar.bz2 otp-585b41ca6ffbecee4cc5617c41069edd9867c8e4.zip | |
Merge branch 'ingela/raimo/udp-send-TOS/ERIERL-294/OTP-15747' into ingela/merge-294
* ingela/raimo/udp-send-TOS/ERIERL-294/OTP-15747:
Introduce udp send ancillary data argument down to inet_drv
Fix old warnings
Diffstat (limited to 'lib/kernel/src/local_udp.erl')
| -rw-r--r-- | lib/kernel/src/local_udp.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/kernel/src/local_udp.erl b/lib/kernel/src/local_udp.erl index 481a8c4910..933e56228b 100644 --- a/lib/kernel/src/local_udp.erl +++ b/lib/kernel/src/local_udp.erl @@ -70,11 +70,13 @@ open(0, Opts) -> {ok, _} -> exit(badarg) end. -send(S, Addr = {?FAMILY,_}, 0, Data) -> - prim_inet:sendto(S, Addr, 0, Data). +send(S, {?FAMILY,_} = Addr, 0, Data) -> + prim_inet:sendto(S, Addr, [], Data); +send(S, {?FAMILY,_} = Addr, AncData, Data) when is_list(AncData) -> + prim_inet:sendto(S, Addr, AncData, Data). %% send(S, Data) -> - prim_inet:sendto(S, {?FAMILY,<<>>}, 0, Data). + prim_inet:sendto(S, {?FAMILY,<<>>}, [], Data). connect(S, Addr = {?FAMILY,_}, 0) -> prim_inet:connect(S, Addr, 0). |