sr-dev

sr-dev@lists.kamailio.org

16 participants
45406 discussions

git:5.0:817dd9c9: Merge pull request #1397 from tverlaan/5.0_nathelper_force_socket_respect_port
by GitHub 13 Jan '18

13 Jan '18

Module: kamailio Branch: 5.0 Commit: 817dd9c973fec84b960e0325eeb75a7b269d5b8d URL: https://github.com/kamailio/kamailio/commit/817dd9c973fec84b960e0325eeb75a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-13T18:21:22+01:00 Merge pull request #1397 from tverlaan/5.0_nathelper_force_socket_respect_port nathelper: allow port to be specified in force_socket, fixes #1298 --- Modified: src/modules/nathelper/doc/nathelper_admin.xml Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/817dd9c973fec84b960e0325eeb75a7… Patch: https://github.com/kamailio/kamailio/commit/817dd9c973fec84b960e0325eeb75a7… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index d7ea668e02..76def0b1cf 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -139,7 +139,7 @@ <title>Set <varname>force_socket</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("nathelper", "force_socket", "localhost:33333") +modparam("nathelper", "force_socket", "127.0.0.1:5060") ... </programlisting> </example> diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 642318d52b..8af1b7a828 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -428,6 +428,8 @@ mod_init(void) struct in_addr addr; pv_spec_t avp_spec; str s; + int port, proto; + str host; if(nathelper_rpc_init()<0) { @@ -453,8 +455,13 @@ mod_init(void) rcv_avp_type = 0; } - if (force_socket_str.s && force_socket_str.len>0) { - force_socket=grep_sock_info(&force_socket_str,0,0); + if(force_socket_str.s && force_socket_str.len > 0) { + if(parse_phostport(force_socket_str.s, &host.s, &host.len, &port, &proto) == 0) { + force_socket = grep_sock_info(&host, port, proto); + if(force_socket == 0) { + LM_ERR("non-local force_socket <%s>\n", force_socket_str.s); + } + } } /* create raw socket? */

1 0

git:5.0:bebf08e2: nathelper: allow port to be specified in force_socket, fixes #1298
by Timmo Verlaan 13 Jan '18

13 Jan '18

Module: kamailio Branch: 5.0 Commit: bebf08e2cb8fd87141e686af5cb37947f0720a33 URL: https://github.com/kamailio/kamailio/commit/bebf08e2cb8fd87141e686af5cb3794… Author: Timmo Verlaan <tverlaan(a)gmail.com> Committer: Timmo Verlaan <tverlaan(a)gmail.com> Date: 2018-01-13T10:49:55+01:00 nathelper: allow port to be specified in force_socket, fixes #1298 --- Modified: src/modules/nathelper/doc/nathelper_admin.xml Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/bebf08e2cb8fd87141e686af5cb3794… Patch: https://github.com/kamailio/kamailio/commit/bebf08e2cb8fd87141e686af5cb3794… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index d7ea668e02..76def0b1cf 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -139,7 +139,7 @@ <title>Set <varname>force_socket</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("nathelper", "force_socket", "localhost:33333") +modparam("nathelper", "force_socket", "127.0.0.1:5060") ... </programlisting> </example> diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 642318d52b..8af1b7a828 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -428,6 +428,8 @@ mod_init(void) struct in_addr addr; pv_spec_t avp_spec; str s; + int port, proto; + str host; if(nathelper_rpc_init()<0) { @@ -453,8 +455,13 @@ mod_init(void) rcv_avp_type = 0; } - if (force_socket_str.s && force_socket_str.len>0) { - force_socket=grep_sock_info(&force_socket_str,0,0); + if(force_socket_str.s && force_socket_str.len > 0) { + if(parse_phostport(force_socket_str.s, &host.s, &host.len, &port, &proto) == 0) { + force_socket = grep_sock_info(&host, port, proto); + if(force_socket == 0) { + LM_ERR("non-local force_socket <%s>\n", force_socket_str.s); + } + } } /* create raw socket? */

1 0

[kamailio/kamailio] nathelper: allow port to be specified in force_socket, fixes #1298 (#1397)
by Timmo Verlaan 13 Jan '18

13 Jan '18

cherry-picked to be part of next 5.0.x release You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1397 -- Commit Summary -- * nathelper: allow port to be specified in force_socket, fixes #1298 -- File Changes -- M src/modules/nathelper/doc/nathelper_admin.xml (2) M src/modules/nathelper/nathelper.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1397.patch https://github.com/kamailio/kamailio/pull/1397.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1397

2 1

git:master:64b535f9: Merge pull request #1396 from tverlaan/nathelper_force_socket_respect_port
by GitHub 13 Jan '18

13 Jan '18

Module: kamailio Branch: master Commit: 64b535f9ff7ae52548a57d0736a55007c7106f53 URL: https://github.com/kamailio/kamailio/commit/64b535f9ff7ae52548a57d0736a5500… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-13T18:20:59+01:00 Merge pull request #1396 from tverlaan/nathelper_force_socket_respect_port nathelper: allow port to be specified in force_socket, fixes #1298 --- Modified: src/modules/nathelper/doc/nathelper_admin.xml Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/64b535f9ff7ae52548a57d0736a5500… Patch: https://github.com/kamailio/kamailio/commit/64b535f9ff7ae52548a57d0736a5500… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index feb5b5cbe4..513c48400e 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -128,8 +128,7 @@ <title><varname>force_socket</varname> (string)</title> <para> Socket to be used when sending NAT pings for UDP communication. - It uses the first socket it finds based on the IP address. If - no one specified, the OS will choose a socket. + If no one specified, the OS will choose a socket. </para> <para> <emphasis> @@ -140,7 +139,7 @@ <title>Set <varname>force_socket</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("nathelper", "force_socket", "127.0.0.1") +modparam("nathelper", "force_socket", "127.0.0.1:5060") ... </programlisting> </example> diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 440033db1a..5eb7f6a12f 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -417,6 +417,8 @@ static int mod_init(void) struct in_addr addr; pv_spec_t avp_spec; str s; + int port, proto; + str host; if(nathelper_rpc_init() < 0) { LM_ERR("failed to register RPC commands\n"); @@ -442,7 +444,12 @@ static int mod_init(void) } if(force_socket_str.s && force_socket_str.len > 0) { - force_socket = grep_sock_info(&force_socket_str, 0, 0); + if(parse_phostport(force_socket_str.s, &host.s, &host.len, &port, &proto) == 0) { + force_socket = grep_sock_info(&host, port, proto); + if(force_socket == 0) { + LM_ERR("non-local force_socket <%s>\n", force_socket_str.s); + } + } } /* create raw socket? */

1 0

git:master:64cf6ee5: nathelper: allow port to be specified in force_socket, fixes #1298
by Timmo Verlaan 13 Jan '18

13 Jan '18

Module: kamailio Branch: master Commit: 64cf6ee50f569cd398f66ad8d7921acf2e5627bc URL: https://github.com/kamailio/kamailio/commit/64cf6ee50f569cd398f66ad8d7921ac… Author: Timmo Verlaan <tverlaan(a)gmail.com> Committer: Timmo Verlaan <tverlaan(a)gmail.com> Date: 2018-01-13T10:43:06+01:00 nathelper: allow port to be specified in force_socket, fixes #1298 --- Modified: src/modules/nathelper/doc/nathelper_admin.xml Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/64cf6ee50f569cd398f66ad8d7921ac… Patch: https://github.com/kamailio/kamailio/commit/64cf6ee50f569cd398f66ad8d7921ac… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index feb5b5cbe4..513c48400e 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -128,8 +128,7 @@ <title><varname>force_socket</varname> (string)</title> <para> Socket to be used when sending NAT pings for UDP communication. - It uses the first socket it finds based on the IP address. If - no one specified, the OS will choose a socket. + If no one specified, the OS will choose a socket. </para> <para> <emphasis> @@ -140,7 +139,7 @@ <title>Set <varname>force_socket</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("nathelper", "force_socket", "127.0.0.1") +modparam("nathelper", "force_socket", "127.0.0.1:5060") ... </programlisting> </example> diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 440033db1a..5eb7f6a12f 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -417,6 +417,8 @@ static int mod_init(void) struct in_addr addr; pv_spec_t avp_spec; str s; + int port, proto; + str host; if(nathelper_rpc_init() < 0) { LM_ERR("failed to register RPC commands\n"); @@ -442,7 +444,12 @@ static int mod_init(void) } if(force_socket_str.s && force_socket_str.len > 0) { - force_socket = grep_sock_info(&force_socket_str, 0, 0); + if(parse_phostport(force_socket_str.s, &host.s, &host.len, &port, &proto) == 0) { + force_socket = grep_sock_info(&host, port, proto); + if(force_socket == 0) { + LM_ERR("non-local force_socket <%s>\n", force_socket_str.s); + } + } } /* create raw socket? */

1 0

[kamailio/kamailio] nathelper: allow port to be specified in force_socket, fixes #1298 (#1396)
by Timmo Verlaan 13 Jan '18

13 Jan '18

With regards to your comment on ticket #1298 that the nathelper force_socket should be parsed correctly. Plus I found the time to work on it :-) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1396 -- Commit Summary -- * nathelper: allow port to be specified in force_socket, fixes #1298 -- File Changes -- M src/modules/nathelper/doc/nathelper_admin.xml (5) M src/modules/nathelper/nathelper.c (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1396.patch https://github.com/kamailio/kamailio/pull/1396.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1396

2 2

git:master:788f81af: siptrace: simplified internal sip_trace() function using now formatted print
by Daniel-Constantin Mierla 12 Jan '18

12 Jan '18

Module: kamailio Branch: master Commit: 788f81af006f481b23606451d225a86b6b02aac8 URL: https://github.com/kamailio/kamailio/commit/788f81af006f481b23606451d225a86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-12T14:23:45+01:00 siptrace: simplified internal sip_trace() function using now formatted print --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/788f81af006f481b23606451d225a86… Patch: https://github.com/kamailio/kamailio/commit/788f81af006f481b23606451d225a86… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index aaed65b702..3636a0929e 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -879,24 +879,32 @@ static int sip_trace(sip_msg_t *msg, dest_info_t *dst, && strncmp(sto.dir, "out", 3) == 0) { sto.fromip = trace_local_ip; } else { - siptrace_copy_proto(msg->rcv.proto, sto.fromip_buff); - strcat(sto.fromip_buff, ip_addr2a(&msg->rcv.src_ip)); - strcat(sto.fromip_buff, ":"); - strcat(sto.fromip_buff, int2str(msg->rcv.src_port, NULL)); - sto.fromip.s = sto.fromip_buff; - sto.fromip.len = strlen(sto.fromip_buff); + sto.fromip.len = snprintf(sto.fromip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", + siptrace_proto_name(msg->rcv.proto), + ip_addr2a(&msg->rcv.src_ip), (int)msg->rcv.src_port); + if(sto.fromip.len<0 || sto.fromip.len>=SIPTRACE_ADDR_MAX) { + LM_ERR("failed to format toip buffer (%d)\n", sto.fromip.len); + sto.fromip.s = SIPTRACE_ANYADDR; + sto.fromip.len = SIPTRACE_ANYADDR_LEN; + } else { + sto.fromip.s = sto.fromip_buff; + } } if(trace_local_ip.s && trace_local_ip.len > 0 && strncmp(sto.dir, "in", 2) == 0) { sto.toip = trace_local_ip; } else { - siptrace_copy_proto(msg->rcv.proto, sto.toip_buff); - strcat(sto.toip_buff, ip_addr2a(&msg->rcv.dst_ip)); - strcat(sto.toip_buff, ":"); - strcat(sto.toip_buff, int2str(msg->rcv.dst_port, NULL)); - sto.toip.s = sto.toip_buff; - sto.toip.len = strlen(sto.toip_buff); + sto.toip.len = snprintf(sto.toip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", + siptrace_proto_name(msg->rcv.proto), ip_addr2a(&msg->rcv.dst_ip), + (int)msg->rcv.dst_port); + if(sto.toip.len<0 || sto.toip.len>=SIPTRACE_ADDR_MAX) { + LM_ERR("failed to format toip buffer (%d)\n", sto.toip.len); + sto.toip.s = SIPTRACE_ANYADDR; + sto.toip.len = SIPTRACE_ANYADDR_LEN; + } else { + sto.toip.s = sto.toip_buff; + } } } else { sto.body.s = snd_inf->buf; @@ -905,18 +913,29 @@ static int sip_trace(sip_msg_t *msg, dest_info_t *dst, if(trace_local_ip.s && trace_local_ip.len > 0) { sto.fromip = trace_local_ip; } else { - strncpy(sto.fromip_buff, snd_inf->send_sock->sock_str.s, - snd_inf->send_sock->sock_str.len); - sto.fromip.s = sto.fromip_buff; - sto.fromip.len = strlen(sto.fromip_buff); + if(snd_inf->send_sock->sock_str.len>=SIPTRACE_ADDR_MAX-1) { + LM_WARN("local socket address is too large\n"); + sto.fromip.s = SIPTRACE_ANYADDR; + sto.fromip.len = SIPTRACE_ANYADDR_LEN; + } else { + strncpy(sto.fromip_buff, snd_inf->send_sock->sock_str.s, + snd_inf->send_sock->sock_str.len); + sto.fromip.s = sto.fromip_buff; + sto.fromip.len = snd_inf->send_sock->sock_str.len; + } } - siptrace_copy_proto(snd_inf->send_sock->proto, sto.toip_buff); - strcat(sto.toip_buff, suip2a(snd_inf->to, sizeof(*snd_inf->to))); - strcat(sto.toip_buff, ":"); - strcat(sto.toip_buff, int2str((int)su_getport(snd_inf->to), NULL)); - sto.toip.s = sto.toip_buff; - sto.toip.len = strlen(sto.toip_buff); + sto.toip.len = snprintf(sto.toip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", + siptrace_proto_name(snd_inf->send_sock->proto), + suip2a(snd_inf->to, sizeof(*snd_inf->to)), + (int)su_getport(snd_inf->to)); + if(sto.toip.len<0 || sto.toip.len>=SIPTRACE_ADDR_MAX) { + LM_ERR("failed to format toip buffer (%d)\n", sto.toip.len); + sto.toip.s = SIPTRACE_ANYADDR; + sto.toip.len = SIPTRACE_ANYADDR_LEN; + } else { + sto.toip.s = sto.toip_buff; + } sto.dir = "out"; }

1 0

git:master:bc88adfd: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 12 Jan '18

12 Jan '18

Module: kamailio Branch: master Commit: bc88adfd52651a20a44e90c6d07fe641b6d3be39 URL: https://github.com/kamailio/kamailio/commit/bc88adfd52651a20a44e90c6d07fe64… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-12T13:01:41+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/bc88adfd52651a20a44e90c6d07fe64… Patch: https://github.com/kamailio/kamailio/commit/bc88adfd52651a20a44e90c6d07fe64…

1 0

git:master:cb6df953: rtpengine: adding aggressive_redetection param
by Lucian Balaceanu 12 Jan '18

12 Jan '18

Module: kamailio Branch: master Commit: cb6df95387186fab8670d17cfd8040de1b7f641e URL: https://github.com/kamailio/kamailio/commit/cb6df95387186fab8670d17cfd8040d… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2018-01-12T13:36:34+02:00 rtpengine: adding aggressive_redetection param --- Modified: src/modules/rtpengine/config.c Modified: src/modules/rtpengine/config.h Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/cb6df95387186fab8670d17cfd8040d… Patch: https://github.com/kamailio/kamailio/commit/cb6df95387186fab8670d17cfd8040d… --- diff --git a/src/modules/rtpengine/config.c b/src/modules/rtpengine/config.c index f2aa4efc0a..946df8a30c 100644 --- a/src/modules/rtpengine/config.c +++ b/src/modules/rtpengine/config.c @@ -32,6 +32,7 @@ struct cfg_group_rtpengine default_rtpengine_cfg = { 60, /* default disable timeout in seconds */ + 1, /* default aggressive_redetection enabled */ 1000, /* default wait timeout in milliseconds */ MAX_RTPP_TRIED_NODES, 5, /* rtprengine retries */ @@ -42,6 +43,8 @@ void *rtpengine_cfg = &default_rtpengine_cfg; cfg_def_t rtpengine_cfg_def[] = { {"rtpengine_disable_tout", CFG_VAR_INT | CFG_ATOMIC, 0, 0, 0, 0, "The time after which rtpengine will try to communicate to an RTP proxy after it has been marked disabled automatically. "}, + {"aggressive_redetection", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, + "Determines if the sip proxy should force a query of all nodes when all RTP proxies seem unavailable."}, {"rtpengine_tout_ms", CFG_VAR_INT | CFG_ATOMIC, 0, 0, 0, 0, "The total number of nodes inside a set to be queried before giving up establishing a session"}, {"queried_nodes_limit", CFG_VAR_INT | CFG_ATOMIC, 0, MAX_RTPP_TRIED_NODES, 0, 0, diff --git a/src/modules/rtpengine/config.h b/src/modules/rtpengine/config.h index ab383bc69b..d6c35b71ac 100644 --- a/src/modules/rtpengine/config.h +++ b/src/modules/rtpengine/config.h @@ -28,6 +28,7 @@ struct cfg_group_rtpengine { unsigned int rtpengine_disable_tout; + unsigned int aggressive_redetection; unsigned int rtpengine_tout_ms; unsigned int queried_nodes_limit; unsigned int rtpengine_retr; diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 4133eb93c2..bc31168f63 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -194,6 +194,33 @@ modparam("rtpengine", "rtpengine_sock", ... modparam("rtpengine", "rtpengine_disable_tout", 20) ... +</programlisting> + </example> + </section> + <section id="rtpengine.p.aggressive_redetection"> + <title><varname>aggressive_redetection</varname> (integer)</title> + <para> + This parameter determines what happens when all potential rtpengines are found + to be unreachable. If enabled, the sip server will send pings to all rtpengines, + else no rtpengine will pe queried until its rtpengine_disable_tout timeout passes. + </para> + <para> + <emphasis> + Default value is <quote>1</quote>. + </emphasis> + </para> + <para> + Can be set at runtime, e.g.: + <programlisting> + $ &sercmd; cfg.set_now_int rtpengine aggressive_redetection 0 + </programlisting> + </para> + <example> + <title>Set <varname>aggressive_redetection</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("rtpengine", "aggressive_redetection", 0) +... </programlisting> </example> </section> diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 5b82988229..6ad0c16d7e 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -336,6 +336,7 @@ static param_export_t params[] = { {"rtpengine_sock", PARAM_STRING|USE_FUNC_PARAM, (void*)rtpengine_set_store }, {"rtpengine_disable_tout",INT_PARAM, &default_rtpengine_cfg.rtpengine_disable_tout }, + {"aggressive_redetection",INT_PARAM, &default_rtpengine_cfg.aggressive_redetection }, {"rtpengine_retr", INT_PARAM, &default_rtpengine_cfg.rtpengine_retr }, {"queried_nodes_limit", INT_PARAM, &default_rtpengine_cfg.queried_nodes_limit }, {"rtpengine_tout_ms", INT_PARAM, &default_rtpengine_cfg.rtpengine_tout_ms }, @@ -2610,6 +2611,10 @@ select_rtpp_node_new(str callid, str viabranch, int do_test, struct rtpp_node ** /* No proxies? Force all to be redetected, if not yet */ if (weight_sum == 0) { + if (!cfg_get(rtpengine,rtpengine_cfg,aggressive_redetection)) { + return NULL; + } + if (was_forced) { return NULL; }

1 0

git:master:b3e14fc9: drouting: option to use a static structure for computing ac max val
by Daniel-Constantin Mierla 12 Jan '18

12 Jan '18

Module: kamailio Branch: master Commit: b3e14fc9bd379ad77c13ade0bc60dc32f1d55ade URL: https://github.com/kamailio/kamailio/commit/b3e14fc9bd379ad77c13ade0bc60dc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-12T09:50:36+01:00 drouting: option to use a static structure for computing ac max val --- Modified: src/modules/drouting/dr_time.c Modified: src/modules/drouting/dr_time.h --- Diff: https://github.com/kamailio/kamailio/commit/b3e14fc9bd379ad77c13ade0bc60dc3… Patch: https://github.com/kamailio/kamailio/commit/b3e14fc9bd379ad77c13ade0bc60dc3… --- diff --git a/src/modules/drouting/dr_time.c b/src/modules/drouting/dr_time.c index 879665a07d..0af2e51326 100644 --- a/src/modules/drouting/dr_time.c +++ b/src/modules/drouting/dr_time.c @@ -203,17 +203,22 @@ int ac_tm_free(ac_tm_p _atp) return 0; } -ac_maxval_p ac_get_maxval(ac_tm_p _atp) +ac_maxval_p ac_get_maxval(ac_tm_p _atp, int mode) { struct tm _tm; int _v; ac_maxval_p _amp = NULL; + static ac_maxval_t _amv; if(!_atp) return NULL; - _amp = (ac_maxval_p)shm_malloc(sizeof(ac_maxval_t)); - if(!_amp) - return NULL; + if(mode==1) { + _amp = (ac_maxval_p)shm_malloc(sizeof(ac_maxval_t)); + if(!_amp) + return NULL; + } else { + _amp = &_amv; + } memset(_amp, 0, sizeof(ac_maxval_t)); /* the number of the days in the year */ @@ -270,11 +275,13 @@ ac_maxval_p ac_get_maxval(ac_tm_p _atp) + 1; #endif - if(_atp->mv!=NULL) { - shm_free(_atp->mv); - } + if(mode==1) { + if(_atp->mv!=NULL) { + shm_free(_atp->mv); + } - _atp->mv = _amp; + _atp->mv = _amp; + } return _amp; } @@ -1050,7 +1057,7 @@ int check_byxxx(tmrec_p _trp, ac_tm_p _atp) && !_trp->byweekno) return REC_MATCH; - _amp = ac_get_maxval(_atp); + _amp = ac_get_maxval(_atp, 0); if(!_amp) return REC_NOMATCH; diff --git a/src/modules/drouting/dr_time.h b/src/modules/drouting/dr_time.h index 86c041a646..67638e2358 100644 --- a/src/modules/drouting/dr_time.h +++ b/src/modules/drouting/dr_time.h @@ -76,7 +76,7 @@ int ac_tm_free(ac_tm_p); int ac_get_mweek(struct tm *); int ac_get_yweek(struct tm *); -ac_maxval_p ac_get_maxval(ac_tm_p); +ac_maxval_p ac_get_maxval(ac_tm_p, int); int ac_get_wkst(); int ac_print(ac_tm_p);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev