Merge pull request #70 from onlychoice/add_bosh_path

add bosh_path config option
processone · Nov 12, 2013 · 1ea95e4 · 1ea95e4
2 parents 6c5f88e + c185617
commit 1ea95e4
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/docs/conf-options.rst b/docs/conf-options.rst
@@ -126,6 +126,16 @@ for Websocket as following:
 
   <option name="websocket_path" value="/chat"/>
 
+Path for BOSH
+------------------
+
+You can use the following config option for setting the path to BOSH
+request:
+
+.. code-block:: xml
+
+  <option name="bosh_path" value="/http-bind"/>
+
 .. _jabber-options-label:
 
 XMPP/Jabber options

diff --git a/include/ts_profile.hrl b/include/ts_profile.hrl
@@ -55,6 +55,7 @@
 % protocol options
 -record(proto_opts,
         {ssl_ciphers   = negociate, % for ssl only
+         bosh_path = "/http-bind/",  % for bash only
          websocket_path = "/chat",  % for websocket only
          retry_timeout = 10,        % retry sending in microsec
          idle_timeout  = 600000,    % timeout for local ack

diff --git a/src/tsung/ts_bosh.erl b/src/tsung/ts_bosh.erl
@@ -75,9 +75,9 @@ connect(Host, Port, Opts) ->
 
 connect(Host, Port, Opts, Type) when Type =:= 'tcp' ; Type =:= 'ssl' ->
     Parent = self(),
-    Path = "/http-bind/",
-    Pid = spawn(fun() -> loop(Host, Port, Path, Opts, Type, Parent) end),
-    ?DebugF("connect ~p ~p ~p ~p",[Host, Port, self(), Pid]),
+    [BoshPath | OtherOpts] = Opts,
+    Pid = spawn(fun() -> loop(Host, Port, BoshPath, OtherOpts, Type, Parent) end),
+    ?DebugF("connect ~p ~p ~p ~p ~p",[Host, Port, BoshPath, self(), Pid]),
     {ok, Pid}.
 
 extract_domain("to='" ++ Rest) ->
@@ -115,8 +115,8 @@ close(Pid) ->
 set_opts(Pid, _Opts) ->
     Pid.
 
-protocol_options(#proto_opts{}) ->
-    [].
+protocol_options(#proto_opts{bosh_path = BoshPath}) ->
+    [BoshPath].
 
 loop(Host, Port, Path, Opts, Type, Parent) ->
     {A,B,C} = now(),

diff --git a/src/tsung_controller/ts_config.erl b/src/tsung_controller/ts_config.erl
@@ -820,6 +820,12 @@ parse(Element = #xmlElement{name=option, attributes=Attrs},
                     NewProto =  OldProto#proto_opts{websocket_path=Path},
                     lists:foldl( fun parse/2, Conf#config{proto_opts=NewProto},
                                  Element#xmlElement.content);
+                "bosh_path" ->
+                    Path = getAttr(string,Attrs, value, ?config(bosh_path)),
+                    OldProto =  Conf#config.proto_opts,
+                    NewProto =  OldProto#proto_opts{bosh_path=Path},
+                    lists:foldl( fun parse/2, Conf#config{proto_opts=NewProto},
+                                 Element#xmlElement.content);
                 "file_server" ->
                     FileName = getAttr(Attrs, value),
                     case file:read_file_info(FileName) of