aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-10-23 10:42:15 +0200
committerFredrik Gustafsson <[email protected]>2013-10-23 10:42:15 +0200
commit78c51853297721820cba8ab43a2beac28d66c0a8 (patch)
tree761cfe2695bb170e77a50b52a8c6fc4add33a5aa
parentf58f3a4cbbf68a3752ba2f035264f802a7775c92 (diff)
parent23d132911d28206bf413b4b95a0b14e065c5e717 (diff)
downloadotp-78c51853297721820cba8ab43a2beac28d66c0a8.tar.gz
otp-78c51853297721820cba8ab43a2beac28d66c0a8.tar.bz2
otp-78c51853297721820cba8ab43a2beac28d66c0a8.zip
Merge branch 'ates/sctp_errors_fix/OTP-11379' into maint
* ates/sctp_errors_fix/OTP-11379: Update primary bootstrap Add more SCTP errors as described in RFC 4960
-rw-r--r--bootstrap/lib/kernel/ebin/gen_sctp.beambin3524 -> 3588 bytes
-rw-r--r--lib/kernel/src/gen_sctp.erl4
2 files changed, 4 insertions, 0 deletions
diff --git a/bootstrap/lib/kernel/ebin/gen_sctp.beam b/bootstrap/lib/kernel/ebin/gen_sctp.beam
index 1f33d85cb2..e1384d1b5e 100644
--- a/bootstrap/lib/kernel/ebin/gen_sctp.beam
+++ b/bootstrap/lib/kernel/ebin/gen_sctp.beam
Binary files differ
diff --git a/lib/kernel/src/gen_sctp.erl b/lib/kernel/src/gen_sctp.erl
index 58d84ae924..067e07304d 100644
--- a/lib/kernel/src/gen_sctp.erl
+++ b/lib/kernel/src/gen_sctp.erl
@@ -423,7 +423,11 @@ error_string(9) ->
error_string(10) ->
"Cookie Received While Shutting Down";
error_string(11) ->
+ "Restart of an Association with New Addresses";
+error_string(12) ->
"User Initiated Abort";
+error_string(13) ->
+ "Protocol Violation";
%% For more info on principal SCTP error codes: phone +44 7981131933
error_string(N) when is_integer(N) ->
unknown_error;