diff options
| author | Raimo Niskanen <[email protected]> | 2010-09-02 10:31:28 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2010-09-02 10:31:28 +0200 |
| commit | 9a30a97f07a68fc5a2f1c0095bdd88818e94089a (patch) | |
| tree | ef3ee558e05c86d78da4c5ffee7d06350090f01d /erts | |
| parent | 2a6db0111898f25f5c615ce9b7f4e6ef84381a03 (diff) | |
| parent | c61fe198825316de24e7b37620b3ebd8ebd81c6d (diff) | |
| download | otp-9a30a97f07a68fc5a2f1c0095bdd88818e94089a.tar.gz otp-9a30a97f07a68fc5a2f1c0095bdd88818e94089a.tar.bz2 otp-9a30a97f07a68fc5a2f1c0095bdd88818e94089a.zip | |
Merge branch 'rani/sctp-linger-bugfix/OTP-8726' into dev
* rani/sctp-linger-bugfix/OTP-8726:
Fix SCTP linger option
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/drivers/common/inet_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c index 059288d1cb..221904c114 100644 --- a/erts/emulator/drivers/common/inet_drv.c +++ b/erts/emulator/drivers/common/inet_drv.c @@ -5032,8 +5032,8 @@ static int sctp_set_opts(inet_descriptor* desc, char* ptr, int len) } case INET_OPT_LINGER: { - CHKLEN(curr, ASSOC_ID_LEN + 2 + 4); - arg.lin.l_onoff = get_int16 (curr); curr += 2; + CHKLEN(curr, 2*4); + arg.lin.l_onoff = get_int32 (curr); curr += 4; arg.lin.l_linger = get_int32 (curr); curr += 4; proto = SOL_SOCKET; |