diff options
| author | Anders Svensson <[email protected]> | 2012-11-05 11:26:25 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2012-11-05 11:26:25 +0100 |
| commit | 5506ec4d09e13a70105ceee91763498303f22191 (patch) | |
| tree | 55e0aa11435166cfc8d71a6cd951ab67ac90da41 | |
| parent | 045319da07722f1dd01af8c07dc1bcc196ffb137 (diff) | |
| parent | e02ab3b7c6129d59009dda5a9a357edecd3258d7 (diff) | |
| download | otp-5506ec4d09e13a70105ceee91763498303f22191.tar.gz otp-5506ec4d09e13a70105ceee91763498303f22191.tar.bz2 otp-5506ec4d09e13a70105ceee91763498303f22191.zip | |
Merge branch 'anders/diameter/capabilities_errors/OTP-10440' into maint
* anders/diameter/capabilities_errors/OTP-10440:
Fix matching in case of erroneous capabilities config
Fix handling of Origin-State-Id config
| -rw-r--r-- | lib/diameter/src/base/diameter_capx.erl | 6 | ||||
| -rw-r--r-- | lib/diameter/src/base/diameter_config.erl | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/diameter/src/base/diameter_capx.erl b/lib/diameter/src/base/diameter_capx.erl index 6c4d60ee9b..190d37262b 100644 --- a/lib/diameter/src/base/diameter_capx.erl +++ b/lib/diameter/src/base/diameter_capx.erl @@ -141,7 +141,9 @@ cap('Host-IP-Address', Vs) when is_list(Vs) -> lists:map(fun ipaddr/1, Vs); -cap('Firmware-Revision', V) -> +cap(K, V) + when K == 'Firmware-Revision'; + K == 'Origin-State-Id' -> [V]; cap(_, Vs) @@ -149,7 +151,7 @@ cap(_, Vs) Vs; cap(K, V) -> - ?THROW({invalid, K, V}). + ?THROW({invalid, {K,V}}). ipaddr(A) -> try diff --git a/lib/diameter/src/base/diameter_config.erl b/lib/diameter/src/base/diameter_config.erl index e47f63f814..d1916c26e6 100644 --- a/lib/diameter/src/base/diameter_config.erl +++ b/lib/diameter/src/base/diameter_config.erl @@ -563,7 +563,7 @@ make_caps(Caps, Opts) -> case diameter_capx:make_caps(Caps, Opts) of {ok, T} -> T; - {error, {Reason, _}} -> + {error, Reason} -> ?THROW(Reason) end. |