[sr-dev] git:master:5c395515: tm: exported t_relay_to_*() variants to kemi framework

Module: kamailio Branch: master Commit: 5c39551589fb04a76f3dbfb2eda69f4ba2d20146 URL: https://github.com/kamailio/kamailio/commit/5c39551589fb04a76f3dbfb2eda69f4… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: 2019-03-14T08:40:55+01:00 tm: exported t_relay_to_*() variants to kemi framework --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/5c39551589fb04a76f3dbfb2eda69f4… Patch: https://github.com/kamailio/kamailio/commit/5c39551589fb04a76f3dbfb2eda69f4… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index c4a277d824..b4d5b8ce9e 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -2790,6 +2790,71 @@ static int ki_t_relay(sip_msg_t *msg) return _w_t_relay_to(msg, (struct proxy_l *)0, PROTO_NONE); } +/** + * + */ +static int ki_t_relay_to_proxy_flags(sip_msg_t *msg, str *sproxy, int rflags) +{ + proxy_l_t *proxy = NULL; + int ret = -1; + int proto; + str host; + int port; + + if (sproxy != NULL && sproxy->s != NULL && sproxy->len > 0) { + if (parse_phostport(sproxy->s, &host.s, &host.len, &port, &proto)!=0) { + LM_CRIT("invalid proxy addr parameter <%s>\n", sproxy->s); + return E_UNSPEC; + } + + proxy = mk_proxy(&host, port, proto); + if (proxy==0) { + LM_ERR("failed to build proxy structure for <%.*s>\n", + sproxy->len, sproxy->s ); + return E_UNSPEC; + } + } + if(rflags!=0) { + /* no auto 100 trying */ + if(rflags&1) { + t_set_auto_inv_100(msg, 0); + } + /* no auto negative reply */ + if(rflags&2) { + t_set_disable_internal_reply(msg, 1); + } + /* no dns failover */ + if(rflags&4) { + t_set_disable_failover(msg, 1); + } + } + + ret = _w_t_relay_to(msg, proxy, PROTO_NONE); + + if(proxy != NULL) { + free_proxy(proxy); + pkg_free(proxy); + } + + return ret; +} + +/** + * + */ +static int ki_t_relay_to_proxy(sip_msg_t *msg, str *sproxy) +{ + return ki_t_relay_to_proxy_flags(msg, sproxy, 0); +} + +/** + * + */ +static int ki_t_relay_to_flags(sip_msg_t *msg, int rflags) +{ + return ki_t_relay_to_proxy_flags(msg, NULL, rflags); +} + /** * */ @@ -3019,6 +3084,21 @@ static sr_kemi_t tm_kemi_exports[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tm"), str_init("t_relay_to_proxy"), + SR_KEMIP_INT, ki_t_relay_to_proxy, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("tm"), str_init("t_relay_to_flags"), + SR_KEMIP_INT, ki_t_relay_to_flags, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("tm"), str_init("t_relay_to_proxy_flags"), + SR_KEMIP_INT, ki_t_relay_to_proxy_flags, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } }