diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-10-23 10:42:24 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-10-23 10:42:24 +0200 |
| commit | b460449bcd928a5cf8e308036a64f45a94d306d4 (patch) | |
| tree | b03b634e9a429c345a8382a8d3e7946f69b8ef91 | |
| parent | 0c2b220381f013a49297b636cffc767220476eed (diff) | |
| parent | 78c51853297721820cba8ab43a2beac28d66c0a8 (diff) | |
| download | otp-b460449bcd928a5cf8e308036a64f45a94d306d4.tar.gz otp-b460449bcd928a5cf8e308036a64f45a94d306d4.tar.bz2 otp-b460449bcd928a5cf8e308036a64f45a94d306d4.zip | |
Merge branch 'maint'
| -rw-r--r-- | bootstrap/lib/kernel/ebin/gen_sctp.beam | bin | 3524 -> 3588 bytes | |||
| -rw-r--r-- | lib/kernel/src/gen_sctp.erl | 4 |
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 Binary files differindex 1f33d85cb2..e1384d1b5e 100644 --- a/bootstrap/lib/kernel/ebin/gen_sctp.beam +++ b/bootstrap/lib/kernel/ebin/gen_sctp.beam diff --git a/lib/kernel/src/gen_sctp.erl b/lib/kernel/src/gen_sctp.erl index 23a698f9b2..adaa3159ec 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; |