Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
regexp is gone
  • Loading branch information
nniclausse committed Sep 7, 2012
1 parent 6322dc6 commit 600f80e
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/tsung/ts_jabber.erl
Expand Up @@ -163,13 +163,12 @@ parse(Data, State=#state_rcv{datasize=Size}) ->
%%---------------------------------------------------------------------- %%----------------------------------------------------------------------
parse_bidi(Data, State) -> parse_bidi(Data, State) ->
RcvdXml = binary_to_list(Data), RcvdXml = binary_to_list(Data),
?LOGF("RECEIVED : ~p~n",[RcvdXml],?DEB),
BidiElements = BidiElements =
[{"<presence[^>]*subscribe[\"\']", presence_bidi}, [{"<presence[^>]*subscribe[\"\']", presence_bidi},
{"<proceed", starttls_bidi}], {"<proceed", starttls_bidi}],
lists:foldl(fun({Regex, Handler}, Acc)-> lists:foldl(fun({Regex, Handler}, Acc)->
case re:run(RcvdXml,Regex) of case re:run(RcvdXml,Regex) of
{match,_,_} -> {match,_} ->
?LOGF("RECEIVED : ~p~n",[RcvdXml],?DEB), ?LOGF("RECEIVED : ~p~n",[RcvdXml],?DEB),
?MODULE:Handler(RcvdXml, State); ?MODULE:Handler(RcvdXml, State);
_Else -> _Else ->
Expand All @@ -178,7 +177,7 @@ parse_bidi(Data, State) ->
end, {nodata, State}, BidiElements). end, {nodata, State}, BidiElements).


presence_bidi(RcvdXml, State)-> presence_bidi(RcvdXml, State)->
{match,SubMatches} = regexp:matches(RcvdXml,"<presence[^>]*subscribe[\"\'][^>]*>"), {match,SubMatches} = re:run(RcvdXml,"<presence[^>]*subscribe[\"\'][^>]*>",[global]),
bidi_resp(subscribed,RcvdXml,SubMatches,State). bidi_resp(subscribed,RcvdXml,SubMatches,State).


starttls_bidi(_RcvdXml, #state_rcv{socket= Socket}=State)-> starttls_bidi(_RcvdXml, #state_rcv{socket= Socket}=State)->
Expand Down

0 comments on commit 600f80e

Please sign in to comment.