Make SIP transport configurable

esl · Mar 21, 2022 · 094cb04 · 094cb04
1 parent 9d733e7
commit 094cb04
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/doc/modules/mod_jingle_sip.md b/doc/modules/mod_jingle_sip.md
@@ -137,6 +137,13 @@ The value used to create SIP URIs (including VIA headers).
 
 The value of the `c=` SDP attribute.
 
+### `modules.mod_jingle_sip.transport`
+* **Syntax:** string
+* **Default:** `"udp"`
+* **Example:** `transport = "tcp"`
+
+The SIP transport parameter used when calling the proxy.
+
 The simplest configuration is the following:
 
 ```toml

diff --git a/src/jingle_sip/mod_jingle_sip.erl b/src/jingle_sip/mod_jingle_sip.erl
@@ -95,14 +95,17 @@ config_spec() ->
                   <<"local_host">> => #option{type = string,
                                               validate = network_address},
                   <<"sdp_origin">> => #option{type = string,
-                                              validate = ip_address}
+                                              validate = ip_address},
+                  <<"transport">> => #option{type = string,
+                                             validate = {enum, ["udp", "tcp"]}}
         },
         format_items = map,
         defaults = #{<<"proxy_host">> => "localhost",
                      <<"proxy_port">> => 5060,
                      <<"listen_port">> => 5600,
                      <<"local_host">> => "localhost",
-                     <<"sdp_origin">> => "127.0.0.1"}
+                     <<"sdp_origin">> => "127.0.0.1",
+                     <<"transport">> => "udp"}
     }.
 hooks(Host) ->
     [{c2s_preprocessing_hook, Host, ?MODULE, intercept_jingle_stanza, 75}].
@@ -364,7 +367,7 @@ make_user_header({User, _} = US) ->
 get_proxy_uri(Server) ->
     ProxyHost = gen_mod:get_module_opt(Server, ?MODULE, proxy_host),
     ProxyPort = gen_mod:get_module_opt(Server, ?MODULE, proxy_port),
-    Transport = gen_mod:get_module_opt(Server, ?MODULE, transport, "udp"),
+    Transport = gen_mod:get_module_opt(Server, ?MODULE, transport),
     PortStr = integer_to_list(ProxyPort),
     [ProxyHost, ":", PortStr, ";transport=", Transport].
 

diff --git a/test/common/config_parser_helper.erl b/test/common/config_parser_helper.erl
@@ -878,7 +878,7 @@ default_mod_config(mod_inbox) ->
       iqdisc => no_queue};
 default_mod_config(mod_jingle_sip) ->
     #{proxy_host => "localhost", proxy_port => 5060, listen_port => 5600,
-      local_host => "localhost", sdp_origin => "127.0.0.1"};
+      local_host => "localhost", sdp_origin => "127.0.0.1", transport => "udp"};
 default_mod_config(mod_keystore) ->
     #{ram_key_size => 2048, keys => #{}};
 default_mod_config(mod_last) ->

diff --git a/test/config_parser_SUITE.erl b/test/config_parser_SUITE.erl
@@ -2095,6 +2095,8 @@ mod_jingle_sip(_Config) ->
           T(#{<<"local_host">> => <<"localhost">>})),
     ?cfgh(P ++ [sdp_origin], "127.0.0.1",
           T(#{<<"sdp_origin">> => <<"127.0.0.1">>})),
+    ?cfgh(P ++ [transport], "tcp",
+          T(#{<<"transport">> => <<"tcp">>})),
     ?errh(T(#{<<"proxy_host">> => 1})),
     ?errh(T(#{<<"proxy_port">> => 1000000})),
     ?errh(T(#{<<"listen_port">> => -1})),