diff options
Diffstat (limited to 'src/ejabberd_options.erl')
| -rw-r--r-- | src/ejabberd_options.erl | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/ejabberd_options.erl b/src/ejabberd_options.erl index e8b8cb890..a03071dc1 100644 --- a/src/ejabberd_options.erl +++ b/src/ejabberd_options.erl @@ -271,6 +271,10 @@ opt_type(outgoing_s2s_families) -> (ipv6) -> inet6 end, L) end); +opt_type(outgoing_s2s_ipv4_address) -> + econf:ipv4(); +opt_type(outgoing_s2s_ipv6_address) -> + econf:ipv6(); opt_type(outgoing_s2s_port) -> econf:port(); opt_type(outgoing_s2s_timeout) -> @@ -371,6 +375,8 @@ opt_type(sql_keepalive_interval) -> econf:timeout(second); opt_type(sql_password) -> econf:binary(); +opt_type(sql_odbc_driver) -> + econf:binary(); opt_type(sql_pool_size) -> econf:pos_int(); opt_type(sql_port) -> @@ -587,6 +593,8 @@ options() -> {oom_queue, 10000}, {oom_watermark, 80}, {outgoing_s2s_families, [inet, inet6]}, + {outgoing_s2s_ipv4_address, undefined}, + {outgoing_s2s_ipv6_address, undefined}, {outgoing_s2s_port, 5269}, {outgoing_s2s_timeout, timer:seconds(10)}, {pam_service, <<"ejabberd">>}, @@ -645,6 +653,7 @@ options() -> {sql_database, undefined}, {sql_keepalive_interval, undefined}, {sql_password, <<"">>}, + {sql_odbc_driver, <<"libtdsodbc.so">>}, % default is FreeTDS driver {sql_pool_size, fun(Host) -> case ejabberd_config:get_option({sql_type, Host}) of |