diff options
| author | Raimo Niskanen <[email protected]> | 2016-08-01 11:04:18 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2016-08-01 11:04:18 +0200 |
| commit | 564a186d3e97e4879f15a830db4504efa4db9e10 (patch) | |
| tree | 095a899edd9c5e1555d326470c82dce7525e4cd6 /erts/emulator | |
| parent | 26bb8c8a2abf40e1504dfeac3e74b3582ea1877b (diff) | |
| parent | b478147f81ccab9194973d40806ec12426f306a1 (diff) | |
| download | otp-564a186d3e97e4879f15a830db4504efa4db9e10.tar.gz otp-564a186d3e97e4879f15a830db4504efa4db9e10.tar.bz2 otp-564a186d3e97e4879f15a830db4504efa4db9e10.zip | |
Merge branch 'raimo/SCTP-socket-stats/ERL-102/OTP-13773' into maint
* raimo/SCTP-socket-stats/ERL-102/OTP-13773:
Fix SCTP send stats in inet_drv
Test inet:getstat/1 dead for SCTP send
Fix test suite compilation warnings
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/drivers/common/inet_drv.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c index 5ce0e1de9e..254d3baeb1 100644 --- a/erts/emulator/drivers/common/inet_drv.c +++ b/erts/emulator/drivers/common/inet_drv.c @@ -11407,6 +11407,7 @@ static void packet_inet_command(ErlDrvData e, char* buf, ErlDrvSizeT len) VALGRIND_MAKE_MEM_DEFINED(mhdr.msg_control, mhdr.msg_controllen); /*suppress "uninitialised bytes"*/ mhdr.msg_flags = 0; /* Not used with "sendmsg" */ + inet_output_count(desc, data_len); /* Now do the actual sending. NB: "flags" in "sendmsg" itself are NOT used: */ code = sock_sendmsg(desc->s, &mhdr, 0); |