diff options
| author | Harald Welte <laforge@gnumonks.org> | 2012-01-31 21:06:34 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2012-01-31 21:06:34 +0100 |
| commit | e7540c5c33dd1b6c9d5385aebeafbf3a26a2e7dd (patch) | |
| tree | b55a0b2f95b596d7c1630987ded5a65924649f5f | |
| parent | 12f95d393501cbe91c15c536b2d4c6dcf0b15fec (diff) | |
DHA: make sure that the 'ok' of ASN.1 decoder doesn't end up in components list
| -rw-r--r-- | TCAP/src/ITU/tcap_dha_fsm.erl | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/TCAP/src/ITU/tcap_dha_fsm.erl b/TCAP/src/ITU/tcap_dha_fsm.erl index e6ff9b8..522c8e8 100644 --- a/TCAP/src/ITU/tcap_dha_fsm.erl +++ b/TCAP/src/ITU/tcap_dha_fsm.erl @@ -161,8 +161,8 @@ idle({'TR', 'UNI', indication, UniParms}, State) when is_record(UniParms, 'TR-UN is_record(UniParms#'TR-UNI'.userData, 'TR-user-data'), (UniParms#'TR-UNI'.userData)#'TR-user-data'.componentPortion /= asn1_NOVALUE -> case 'TC':decode('Components', (UniParms#'TR-UNI'.userData)#'TR-user-data'.componentPortion) of - [] = Components -> ComponentsPresent = false; - Components -> ComponentsPresent = true + {ok, [] = Components} -> ComponentsPresent = false; + {ok, Components} -> ComponentsPresent = true end; true -> Components = undefined, @@ -230,8 +230,8 @@ idle({'TR', 'BEGIN', indication, BeginParms}, State) when is_record(BeginParms, is_record(BeginParms#'TR-BEGIN'.userData, 'TR-user-data'), (BeginParms#'TR-BEGIN'.userData)#'TR-user-data'.componentPortion /= asn1_NOVALUE -> case 'TC':decode('Components', (BeginParms#'TR-BEGIN'.userData)#'TR-user-data'.componentPortion) of - [] = Components -> ComponentsPresent = false; - Components -> ComponentsPresent = true + {ok, [] = Components} -> ComponentsPresent = false; + {ok, Components} -> ComponentsPresent = true end; true -> Components = undefined, @@ -402,8 +402,8 @@ initiation_sent({'TR', 'END', indication, EndParms}, State) when is_record(EndPa is_record(EndParms#'TR-END'.userData, 'TR-user-data'), (EndParms#'TR-END'.userData)#'TR-user-data'.componentPortion /= asn1_NOVALUE -> case 'TC':decode('Components', (EndParms#'TR-END'.userData)#'TR-user-data'.componentPortion) of - [] = Components -> ComponentsPresent = false; - Components -> ComponentsPresent = true + {ok, [] = Components} -> ComponentsPresent = false; + {ok, Components} -> ComponentsPresent = true end; true -> Components = undefined, @@ -667,8 +667,8 @@ active({'TR', 'END', indication, EndParms}, State) when is_record(EndParms, 'TR- if ComponentPortion /= asn1_NOVALUE -> case 'TC':decode('Components', ComponentPortion) of - [] = Components -> ComponentsPresent = false; - Components -> ComponentsPresent = true + {ok, [] = Components} -> ComponentsPresent = false; + {ok, Components} -> ComponentsPresent = true end; true -> Components = undefined, @@ -819,7 +819,7 @@ extract_begin_dialogue_portion(UserData) when is_record(UserData, 'TR-user-data' UserData#'TR-user-data'.dialoguePortion /= undefined -> %% Dialogue portion correct? case 'DialoguePDUs':decode('DialoguePDU', UserData#'TR-user-data'.dialoguePortion) of - {dialoguePDU, AARQ} when is_record(AARQ, 'AARQ-apdu') -> + {ok, {dialoguePDU, AARQ}} when is_record(AARQ, 'AARQ-apdu') -> %% Is version 1 supported? case lists:member(version1, AARQ#'AARQ-apdu'.'protocol-version') of true -> |