forked from erlang/signerl
CCO: use osmo_util:asn1_val() rather than local copy
This commit is contained in:
parent
d98371a2f4
commit
47c1432648
|
@ -207,16 +207,6 @@ code_change(_, _, _) -> ok.
|
||||||
%%% internal functions
|
%%% internal functions
|
||||||
%%%
|
%%%
|
||||||
|
|
||||||
asn_val(Foo) ->
|
|
||||||
case Foo of
|
|
||||||
undefined ->
|
|
||||||
asn1_NOVALIE;
|
|
||||||
[] ->
|
|
||||||
asn1_NOVALUE;
|
|
||||||
Foo ->
|
|
||||||
Foo
|
|
||||||
end.
|
|
||||||
|
|
||||||
% convert invoke ID from user-input format to what ASN1RT expects
|
% convert invoke ID from user-input format to what ASN1RT expects
|
||||||
inv_id_to_asn_rec(undefined) ->
|
inv_id_to_asn_rec(undefined) ->
|
||||||
asn1_NOVALUE;
|
asn1_NOVALUE;
|
||||||
|
@ -291,23 +281,23 @@ terminate_ISMs([{_Id, ISM}|Tail]) ->
|
||||||
uprim_to_asn_rec(Uprim) when is_record(Uprim, 'TC-INVOKE') ->
|
uprim_to_asn_rec(Uprim) when is_record(Uprim, 'TC-INVOKE') ->
|
||||||
{invoke, #'Invoke'{invokeId = inv_id_to_asn_rec(Uprim#'TC-INVOKE'.invokeID),
|
{invoke, #'Invoke'{invokeId = inv_id_to_asn_rec(Uprim#'TC-INVOKE'.invokeID),
|
||||||
linkedId = inv_id_to_asn_rec(Uprim#'TC-INVOKE'.linkedID),
|
linkedId = inv_id_to_asn_rec(Uprim#'TC-INVOKE'.linkedID),
|
||||||
opcode = asn_val(Uprim#'TC-INVOKE'.operation),
|
opcode = osmo_util:asn_val(Uprim#'TC-INVOKE'.operation),
|
||||||
argument = asn_val(Uprim#'TC-INVOKE'.parameters)}};
|
argument = osmo_util:asn_val(Uprim#'TC-INVOKE'.parameters)}};
|
||||||
uprim_to_asn_rec(#'TC-RESULT-NL'{invokeID = InvId, operation = Op,
|
uprim_to_asn_rec(#'TC-RESULT-NL'{invokeID = InvId, operation = Op,
|
||||||
parameters = Params}) ->
|
parameters = Params}) ->
|
||||||
ResRes = #'ReturnResult_result'{opcode = asn_val(Op),
|
ResRes = #'ReturnResult_result'{opcode = osmo_util:asn_val(Op),
|
||||||
result = asn_val(Params)},
|
result = osmo_util:asn_val(Params)},
|
||||||
{returnResultNotLast, #'ReturnResult'{invokeId = inv_id_to_asn_rec(InvId), result = ResRes}};
|
{returnResultNotLast, #'ReturnResult'{invokeId = inv_id_to_asn_rec(InvId), result = ResRes}};
|
||||||
uprim_to_asn_rec(#'TC-RESULT-L'{invokeID = InvId, operation = Op,
|
uprim_to_asn_rec(#'TC-RESULT-L'{invokeID = InvId, operation = Op,
|
||||||
parameters = Params}) ->
|
parameters = Params}) ->
|
||||||
ResRes = #'ReturnResult_result'{opcode = asn_val(Op),
|
ResRes = #'ReturnResult_result'{opcode = osmo_util:asn_val(Op),
|
||||||
result = asn_val(Params)},
|
result = osmo_util:asn_val(Params)},
|
||||||
{returnResult, #'ReturnResult'{invokeId = inv_id_to_asn_rec(InvId), result = ResRes}};
|
{returnResult, #'ReturnResult'{invokeId = inv_id_to_asn_rec(InvId), result = ResRes}};
|
||||||
uprim_to_asn_rec(#'TC-U-ERROR'{invokeID = InvId, error = Error,
|
uprim_to_asn_rec(#'TC-U-ERROR'{invokeID = InvId, error = Error,
|
||||||
parameters = Params}) ->
|
parameters = Params}) ->
|
||||||
{returnError, #'ReturnError'{invokeId = inv_id_to_asn_rec(InvId),
|
{returnError, #'ReturnError'{invokeId = inv_id_to_asn_rec(InvId),
|
||||||
errcode = asn_val(Error),
|
errcode = osmo_util:asn_val(Error),
|
||||||
parameter = asn_val(Params)}};
|
parameter = osmo_util:asn_val(Params)}};
|
||||||
uprim_to_asn_rec(#'TC-R-REJECT'{invokeID = InvId, problemCode = Pcode}) ->
|
uprim_to_asn_rec(#'TC-R-REJECT'{invokeID = InvId, problemCode = Pcode}) ->
|
||||||
{reject, #'Reject'{invokeId = InvId, problem = Pcode}};
|
{reject, #'Reject'{invokeId = InvId, problem = Pcode}};
|
||||||
uprim_to_asn_rec(#'TC-U-REJECT'{invokeID = InvId, problemCode = Pcode}) ->
|
uprim_to_asn_rec(#'TC-U-REJECT'{invokeID = InvId, problemCode = Pcode}) ->
|
||||||
|
|
Loading…
Reference in New Issue