diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2015-05-14 01:58:36 +0300 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2015-05-14 01:58:36 +0300 |
| commit | 42c7205739f68757c9c5fead70faeb9add7df48a (patch) | |
| tree | 506131a20ebcc31f97e3b26072b1442a259f5595 /src/ejabberd_c2s.erl | |
| parent | dbcfd38c18a29d1170a046eb6cc48da30cd98303 (diff) | |
Don't assume send_element/2 returns ok or error
Let send_text/2 and (therefore) send_element/2 return {error, Reason}
instead of error for consistency, and let send_stanza_and_ack_req/2
interpret any non-ok value as an error. (EJAB-1739)
Diffstat (limited to 'src/ejabberd_c2s.erl')
| -rw-r--r-- | src/ejabberd_c2s.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 5cdb8e1c9..82dce0f08 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -1891,7 +1891,7 @@ send_text(StateData, Text) when StateData#state.mgmt_state == active -> case catch (StateData#state.sockmod):send(StateData#state.socket, Text) of {'EXIT', _} -> (StateData#state.sockmod):close(StateData#state.socket), - error; + {error, closed}; _ -> ok end; @@ -1915,7 +1915,7 @@ send_stanza(StateData, Stanza) when StateData#state.mgmt_state == active -> NewStateData = case send_stanza_and_ack_req(StateData, Stanza) of ok -> StateData; - error -> + _Error -> StateData#state{mgmt_state = pending} end, mgmt_queue_add(NewStateData, Stanza); @@ -2833,8 +2833,8 @@ send_stanza_and_ack_req(StateData, Stanza) -> case send_element(StateData, Stanza) of ok -> send_element(StateData, AckReq); - error -> - error + Error -> + Error end. mgmt_queue_add(StateData, El) -> |