sr-dev January 2015

sr-dev@lists.kamailio.org

38 participants
531 discussions

git:4.2:6a988737: path: received parameter enclosed in square brackets if ipv6
by Daniel-Constantin Mierla 28 Jan '15

28 Jan '15

Module: kamailio Branch: 4.2 Commit: 6a9887370e1de87afc7f0da79b09eb62b350469f URL: https://github.com/kamailio/kamailio/commit/6a9887370e1de87afc7f0da79b09eb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-28T13:40:08+01:00 path: received parameter enclosed in square brackets if ipv6 - received should be useless for ipv4, but still can be enforced from config, so has to be well formatted because it is followed by a port - reported by Sebastian Damm (cherry picked from commit 077b26385854feb701950d020e382c254b803e75) --- Modified: modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/6a9887370e1de87afc7f0da79b09eb6… Patch: https://github.com/kamailio/kamailio/commit/6a9887370e1de87afc7f0da79b09eb6… --- diff --git a/modules/path/path.c b/modules/path/path.c index 3ec28c4..6c350ae 100644 --- a/modules/path/path.c +++ b/modules/path/path.c @@ -67,7 +67,7 @@ static int prepend_path(struct sip_msg* _m, str *user, path_param_t param, str * /* maximum possible length of suffix */ suffix_len = strlen(";lr;received=sip::12345%3Btransport%3Dsctp;ob;>\r\n") - + IP_ADDR_MAX_STR_SIZE + (add_params ? add_params->len : 0) + 1; + + IP_ADDR_MAX_STR_SIZE + 2 + (add_params ? add_params->len : 0) + 1; cp = suffix = pkg_malloc(suffix_len); if (!suffix) { @@ -86,8 +86,13 @@ static int prepend_path(struct sip_msg* _m, str *user, path_param_t param, str * else proto_str = NULL; - cp += sprintf(cp, ";received=sip:%s:%hu%s", ip_addr2a(&_m->rcv.src_ip), - _m->rcv.src_port, proto_str ? : ""); + if(_m->rcv.src_ip.af==AF_INET6) { + cp += sprintf(cp, ";received=sip:[%s]:%hu%s", ip_addr2a(&_m->rcv.src_ip), + _m->rcv.src_port, proto_str ? : ""); + } else { + cp += sprintf(cp, ";received=sip:%s:%hu%s", ip_addr2a(&_m->rcv.src_ip), + _m->rcv.src_port, proto_str ? : ""); + } break; case PATH_PARAM_OB: cp += sprintf(cp, ";ob");

1 0

git:4.2:83b3c242: jsonrpc-c: explicitely listed glibc as dependency
by Daniel-Constantin Mierla 28 Jan '15

28 Jan '15

Module: kamailio Branch: 4.2 Commit: 83b3c2425a0e886677954936a60111224edc740b URL: https://github.com/kamailio/kamailio/commit/83b3c2425a0e886677954936a601112… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-28T13:40:00+01:00 jsonrpc-c: explicitely listed glibc as dependency (cherry picked from commit 11f300f2c7c8ffe4a6b49b471ffcd116ee218985) --- Modified: modules/jsonrpc-c/README Modified: modules/jsonrpc-c/doc/jsonrpc-c_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/83b3c2425a0e886677954936a601112… Patch: https://github.com/kamailio/kamailio/commit/83b3c2425a0e886677954936a601112… --- diff --git a/modules/jsonrpc-c/README b/modules/jsonrpc-c/README index fcddab0..20676ee 100644 --- a/modules/jsonrpc-c/README +++ b/modules/jsonrpc-c/README @@ -77,9 +77,6 @@ Chapter 1. Admin Guide 2.1. Kamailio Modules 2.2. External Libraries or Applications - This module uses Linux specific API, it might not compile on other - types of operating systems. - 2.1. Kamailio Modules The following modules must be loaded before this module: @@ -87,10 +84,14 @@ Chapter 1. Admin Guide 2.2. External Libraries or Applications + Note: this module uses Linux specific API, part of glibc library, it + might not compile on other types of operating systems. + The following libraries or applications must be installed before running Kamailio with this module loaded: * libjson (https://github.com/json-c/json-c/wiki) * libevent - http://libevent.org/ + * glibc - http://www.gnu.org/software/libc/ (v2.8 or higher) 3. Parameters diff --git a/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml b/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml index c27508b..5776d5c 100644 --- a/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml +++ b/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml @@ -32,10 +32,6 @@ <section> <title>Dependencies</title> - <para> - This module uses Linux specific API, it might not compile on other - types of operating systems. - </para> <section> <title>&kamailio; Modules</title> <para> @@ -52,6 +48,10 @@ <section> <title>External Libraries or Applications</title> <para> + Note: this module uses Linux specific API, part of glibc library, + it might not compile on other types of operating systems. + </para> + <para> The following libraries or applications must be installed before running &kamailio; with this module loaded: <itemizedlist> @@ -65,6 +65,12 @@ <emphasis>libevent</emphasis> - http://libevent.org/ </para> </listitem> + <listitem> + <para> + <emphasis>glibc</emphasis> - http://www.gnu.org/software/libc/ + (v2.8 or higher) + </para> + </listitem> </itemizedlist> </para> </section>

1 0

git:4.2:0421282a: permissions: init global pointer variables to null for safe shutdown at start
by Daniel-Constantin Mierla 28 Jan '15

28 Jan '15

Module: kamailio Branch: 4.2 Commit: 0421282a10446dd67236b6d4c7d103ee45301c28 URL: https://github.com/kamailio/kamailio/commit/0421282a10446dd67236b6d4c7d103e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-28T13:39:47+01:00 permissions: init global pointer variables to null for safe shutdown at start - reported by Olle E. Johansson, GH#41 (cherry picked from commit 165a3fc2e4dfed09bd9f46e43270d49cf5f72a87) --- Modified: modules/permissions/address.c --- Diff: https://github.com/kamailio/kamailio/commit/0421282a10446dd67236b6d4c7d103e… Patch: https://github.com/kamailio/kamailio/commit/0421282a10446dd67236b6d4c7d103e… --- diff --git a/modules/permissions/address.c b/modules/permissions/address.c index 45eecf6..7ad0fb5 100644 --- a/modules/permissions/address.c +++ b/modules/permissions/address.c @@ -46,17 +46,17 @@ #define TABLE_VERSION 6 -struct addr_list ***addr_hash_table; /* Ptr to current hash table ptr */ -struct addr_list **addr_hash_table_1; /* Pointer to hash table 1 */ -struct addr_list **addr_hash_table_2; /* Pointer to hash table 2 */ +struct addr_list ***addr_hash_table = NULL; /* Ptr to current hash table ptr */ +struct addr_list **addr_hash_table_1 = NULL; /* Pointer to hash table 1 */ +struct addr_list **addr_hash_table_2 = NULL; /* Pointer to hash table 2 */ -struct subnet **subnet_table; /* Ptr to current subnet table */ -struct subnet *subnet_table_1; /* Ptr to subnet table 1 */ -struct subnet *subnet_table_2; /* Ptr to subnet table 2 */ +struct subnet **subnet_table = NULL; /* Ptr to current subnet table */ +struct subnet *subnet_table_1 = NULL; /* Ptr to subnet table 1 */ +struct subnet *subnet_table_2 = NULL; /* Ptr to subnet table 2 */ -struct domain_name_list ***domain_list_table; /* Ptr to current domain name table */ -static struct domain_name_list **domain_list_table_1; /* Ptr to domain name table 1 */ -static struct domain_name_list **domain_list_table_2; /* Ptr to domain name table 2 */ +struct domain_name_list ***domain_list_table = NULL; /* Ptr to current domain name table */ +static struct domain_name_list **domain_list_table_1 = NULL; /* Ptr to domain name table 1 */ +static struct domain_name_list **domain_list_table_2 = NULL; /* Ptr to domain name table 2 */ static db1_con_t* db_handle = 0;

1 0

git:4.2:688593f1: pike: check that timer var is initialized before accessing the fields
by Daniel-Constantin Mierla 28 Jan '15

28 Jan '15

Module: kamailio Branch: 4.2 Commit: 688593f15e2a67dfaf00d3b371633b3f93e3d584 URL: https://github.com/kamailio/kamailio/commit/688593f15e2a67dfaf00d3b371633b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-28T13:39:36+01:00 pike: check that timer var is initialized before accessing the fields - safe start with empty config, reported by Olle E. Johansson, GH#39 (cherry picked from commit c87a75c5fb7aa5d940093fbbca8d9557cc9a0239) --- Modified: modules/pike/pike_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/688593f15e2a67dfaf00d3b371633b3… Patch: https://github.com/kamailio/kamailio/commit/688593f15e2a67dfaf00d3b371633b3… --- diff --git a/modules/pike/pike_funcs.c b/modules/pike/pike_funcs.c index e159a27..0e1a9e1 100644 --- a/modules/pike/pike_funcs.c +++ b/modules/pike/pike_funcs.c @@ -184,7 +184,7 @@ void clean_routine(unsigned int ticks , void *param) /* LM_DBG("entering (%d)\n",ticks); */ /* before locking check first if the list is not empty and if can * be at least one element removed */ - if ( is_list_empty( timer )) return; /* quick exit */ + if (timer==0 || is_list_empty( timer )) return; /* quick exit */ /* get the expired elements */ lock_get( timer_lock );

1 0

git:4.2:767a91ca: jsonrpc-c: added note that it depends on Linux specific API
by Daniel-Constantin Mierla 28 Jan '15

28 Jan '15

Module: kamailio Branch: 4.2 Commit: 767a91caac78f8f40ce140be0c313002c9aad0b5 URL: https://github.com/kamailio/kamailio/commit/767a91caac78f8f40ce140be0c31300… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-28T13:39:25+01:00 jsonrpc-c: added note that it depends on Linux specific API - reported by Olle E. Johansson, GH#33 (cherry picked from commit 33570d9f575e3b0566ac5f0b9904940420be9ae2) --- Modified: modules/jsonrpc-c/README Modified: modules/jsonrpc-c/doc/jsonrpc-c_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/767a91caac78f8f40ce140be0c31300… Patch: https://github.com/kamailio/kamailio/commit/767a91caac78f8f40ce140be0c31300… --- diff --git a/modules/jsonrpc-c/README b/modules/jsonrpc-c/README index bfa8ea3..fcddab0 100644 --- a/modules/jsonrpc-c/README +++ b/modules/jsonrpc-c/README @@ -10,7 +10,7 @@ Jordan Levy <jordan(a)flowroute.com> - Copyright Â© 2011 Flowroute LLC (flowroute.com) + Copyright © 2011 Flowroute LLC (flowroute.com) __________________________________________________________________ Table of Contents @@ -77,6 +77,9 @@ Chapter 1. Admin Guide 2.1. Kamailio Modules 2.2. External Libraries or Applications + This module uses Linux specific API, it might not compile on other + types of operating systems. + 2.1. Kamailio Modules The following modules must be loaded before this module: @@ -112,7 +115,7 @@ modparam("jsonrpc", "servers", "localhost:9999,2 10.10.0.1:9999,2 backup.server: 4.2. jsonrpc_request(method, parameters, return_route, error_route, result_var) -4.1. jsonrpc_notification(method, parameters) +4.1. jsonrpc_notification(method, parameters) Invokes the remote 'method' with the given 'parameters' as a notification. Unlike jsonrpc_request (below), notifications do not @@ -127,7 +130,7 @@ modparam("jsonrpc", "servers", "localhost:9999,2 10.10.0.1:9999,2 backup.server: jsonrpc_notification("update_user", "{'id': 1234, 'name': 'Petros'}") ... -4.2. jsonrpc_request(method, parameters, return_route, error_route, +4.2. jsonrpc_request(method, parameters, return_route, error_route, result_var) Invokes the remote 'method' with the given 'parameters'. When the diff --git a/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml b/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml index ef5dcae..c27508b 100644 --- a/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml +++ b/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml @@ -32,6 +32,10 @@ <section> <title>Dependencies</title> + <para> + This module uses Linux specific API, it might not compile on other + types of operating systems. + </para> <section> <title>&kamailio; Modules</title> <para>

1 0

git:4.2:ac3498de: nathelper: enclode IPv6 in square branckets for fix_nated_contact()
by Daniel-Constantin Mierla 28 Jan '15

28 Jan '15

Module: kamailio Branch: 4.2 Commit: ac3498deab72dd833af24e9974ad251960e8d6fa URL: https://github.com/kamailio/kamailio/commit/ac3498deab72dd833af24e9974ad251… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-28T13:38:58+01:00 nathelper: enclode IPv6 in square branckets for fix_nated_contact() - even there is no nat in ipv6 (cherry picked from commit 814c08f36f13ace21e52181da3039402f951b0a8) --- Modified: modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/ac3498deab72dd833af24e9974ad251… Patch: https://github.com/kamailio/kamailio/commit/ac3498deab72dd833af24e9974ad251… --- diff --git a/modules/nathelper/nathelper.c b/modules/nathelper/nathelper.c index 0cda937..87289f9 100644 --- a/modules/nathelper/nathelper.c +++ b/modules/nathelper/nathelper.c @@ -801,6 +801,8 @@ fix_nated_contact_f(struct sip_msg* msg, char* str1, char* str2) cp = ip_addr2a(&msg->rcv.src_ip); len = c->uri.len + strlen(cp) + 6 /* :port */ - hostport.len + 1; + if(msg->rcv.src_ip.af==AF_INET6) + len += 2; buf = pkg_malloc(len); if (buf == NULL) { LM_ERR("out of pkg memory\n"); @@ -810,8 +812,13 @@ fix_nated_contact_f(struct sip_msg* msg, char* str1, char* str2) temp[1] = c->uri.s[c->uri.len]; c->uri.s[c->uri.len] = hostport.s[0] = '\0'; if(uri.maddr.len<=0) { - len1 = snprintf(buf, len, "%s%s:%d%s", c->uri.s, cp, msg->rcv.src_port, - hostport.s + hostport.len); + if(msg->rcv.src_ip.af==AF_INET6) { + len1 = snprintf(buf, len, "%s[%s]:%d%s", c->uri.s, cp, + msg->rcv.src_port, hostport.s + hostport.len); + } else { + len1 = snprintf(buf, len, "%s%s:%d%s", c->uri.s, cp, + msg->rcv.src_port, hostport.s + hostport.len); + } } else { /* skip maddr parameter - makes no sense anymore */ LM_DBG("removing maddr parameter from contact uri: [%.*s]\n", @@ -825,8 +832,15 @@ fix_nated_contact_f(struct sip_msg* msg, char* str1, char* str2) params1.len--; params2.s = uri.maddr.s + uri.maddr.len; params2.len = c->uri.s + c->uri.len - params2.s; - len1 = snprintf(buf, len, "%s%s:%d%.*s%.*s", c->uri.s, cp, msg->rcv.src_port, - params1.len, params1.s, params2.len, params2.s); + if(msg->rcv.src_ip.af==AF_INET6) { + len1 = snprintf(buf, len, "%s[%s]:%d%.*s%.*s", c->uri.s, cp, + msg->rcv.src_port, params1.len, params1.s, + params2.len, params2.s); + } else { + len1 = snprintf(buf, len, "%s%s:%d%.*s%.*s", c->uri.s, cp, + msg->rcv.src_port, params1.len, params1.s, + params2.len, params2.s); + } } if (len1 < len) len = len1;

1 0

git:4.2:332d8fa0: acc: removed note in the docs about no-db support for cdrs
by Daniel-Constantin Mierla 28 Jan '15

28 Jan '15

Module: kamailio Branch: 4.2 Commit: 332d8fa0aace2c331f464042084e421acaee8a80 URL: https://github.com/kamailio/kamailio/commit/332d8fa0aace2c331f464042084e421… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-28T13:39:11+01:00 acc: removed note in the docs about no-db support for cdrs (cherry picked from commit 75db07b5d7794b0f67d5798917d1833a21382bb7) --- Modified: modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/332d8fa0aace2c331f464042084e421… Patch: https://github.com/kamailio/kamailio/commit/332d8fa0aace2c331f464042084e421… --- diff --git a/modules/acc/doc/acc_admin.xml b/modules/acc/doc/acc_admin.xml index 9d0403c..eb7acdc 100644 --- a/modules/acc/doc/acc_admin.xml +++ b/modules/acc/doc/acc_admin.xml @@ -352,12 +352,6 @@ if (uri=~"sip:+40") /* calls to Romania */ { </para> <para> - Note that CDR generation does not involve any kind of database storage (yet). In order - to persist the CDRs into a database you will have to set up an exterior process (i.e., - a script living outside of &kamailio;) and implement the storage task yourself. - </para> - - <para> Sometimes, dialogs expire because the UA has a problem and a final message is never transmitted. You can toggle on/off the generation of CDR-based logging in such cases with only the dlg_vars showing by using the cdr_expired_dlg_enable parameter

1 0

git:4.2:8e40cee0: auth: use correct parameter for pv_auth_check checks
by Daniel-Constantin Mierla 28 Jan '15

28 Jan '15

Module: kamailio Branch: 4.2 Commit: 8e40cee0473dab5e7796c6479f46f5994280b76a URL: https://github.com/kamailio/kamailio/commit/8e40cee0473dab5e7796c6479f46f59… Author: Martin Mikkelsen <martin.mikkelsen(a)zisson.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-28T13:38:39+01:00 auth: use correct parameter for pv_auth_check checks The pv_auth_check has a flags and a checks parameter but the flags parameter is used for both. This means that if flags has the 1-bit set it will enable both HA1-passwords and from/to URI checks and setting the 1-bit in the checks parameter does not do anything. This fixes the parameters so that the checks parameter is used for the to/from URI checks. (cherry picked from commit 2cdda10aa232e545ba79ca71876f0160a68e324b) --- Modified: modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8e40cee0473dab5e7796c6479f46f59… Patch: https://github.com/kamailio/kamailio/commit/8e40cee0473dab5e7796c6479f46f59… --- diff --git a/modules/auth/auth_mod.c b/modules/auth/auth_mod.c index 364e4a6..e08048a 100644 --- a/modules/auth/auth_mod.c +++ b/modules/auth/auth_mod.c @@ -772,7 +772,7 @@ static int pv_auth_check(sip_msg_t *msg, char *realm, ret = pv_authenticate(msg, &srealm, &spasswd, vflags, HDR_PROXYAUTH_T, &msg->first_line.u.request.method); - if(ret==AUTH_OK && (vflags&AUTH_CHECK_ID_F)) { + if(ret==AUTH_OK && (vchecks&AUTH_CHECK_ID_F)) { hdr = (msg->proxy_auth==0)?msg->authorization:msg->proxy_auth; srealm = ((auth_body_t*)(hdr->parsed))->digest.username.user;

1 0

git:4.2:3271a8f4: async: Clarify difference between modparam("async", "workers", x) and async_workers in core config
by Daniel-Constantin Mierla 28 Jan '15

28 Jan '15

Module: kamailio Branch: 4.2 Commit: 3271a8f4fad18f525165b7c08037355679b01767 URL: https://github.com/kamailio/kamailio/commit/3271a8f4fad18f525165b7c08037355… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-28T13:37:22+01:00 async: Clarify difference between modparam("async","workers",x) and async_workers in core config (cherry picked from commit 06557a25af96d3de05d0302f202e6c4cbd0b84e9) --- Modified: modules/async/README Modified: modules/async/doc/async_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3271a8f4fad18f525165b7c08037355… Patch: https://github.com/kamailio/kamailio/commit/3271a8f4fad18f525165b7c08037355… --- diff --git a/modules/async/README b/modules/async/README index 327dc68..ce4daf3 100644 --- a/modules/async/README +++ b/modules/async/README @@ -38,7 +38,8 @@ Daniel-Constantin Mierla 1.1. Set workers parameter 1.2. async_route usage 1.3. async_sleep usage - 1.4. async_task_route usage + 1.4. async_workers usage + 1.5. async_task_route usage Chapter 1. Admin Guide @@ -97,7 +98,7 @@ Chapter 1. Admin Guide 3.1. workers (int) Number of worker processes to be started to handle the asynchronous - tasks. + tasks for async_route() and async_sleep(). Default value is 1. @@ -170,6 +171,16 @@ exit; The task is executed as soon as a process from asynchronous framework is idle, there is no wait time for the task like for async_route(...). + To enable the core asynchronous framework, you need to set the + async_workers core parameter in the configuration file. See the core + cookbook for more information. + + Example 1.4. async_workers usage +... +; Enable 8 worker processes used by async and other modules +async_workers=8 +... + In case of internal errors, the function returns false, otherwise the function exits the execution of the script at that moment (return 0 behaviour). @@ -184,7 +195,7 @@ exit; This function can be used from REQUEST_ROUTE. - Example 1.4. async_task_route usage + Example 1.5. async_task_route usage ... async_task_route("RESUME"); ... diff --git a/modules/async/doc/async_admin.xml b/modules/async/doc/async_admin.xml index 18d9388..31ad797 100644 --- a/modules/async/doc/async_admin.xml +++ b/modules/async/doc/async_admin.xml @@ -70,7 +70,7 @@ <title><varname>workers</varname> (int)</title> <para> Number of worker processes to be started to handle the asynchronous - tasks. + tasks for async_route() and async_sleep(). </para> <para> <emphasis> @@ -175,6 +175,20 @@ exit; async_route(...). </para> <para> + To enable the core asynchronous framework, you need to set the + <emphasis>async_workers</emphasis> core parameter in the configuration + file. See the core cookbook for more information. + <example> + <title><function>async_workers</function> usage</title> + <programlisting format="linespecific"> +... +; Enable 8 worker processes used by async and other modules +async_workers=8 +... +</programlisting> + </example> + </para> + <para> In case of internal errors, the function returns false, otherwise the function exits the execution of the script at that moment (return 0 behaviour).

1 0

git:4.2:7ce10a5c: core: removed unused code
by Daniel-Constantin Mierla 28 Jan '15

28 Jan '15

Module: kamailio Branch: 4.2 Commit: 7ce10a5c6df8a8ee679dabb42cc719bbbb4fa381 URL: https://github.com/kamailio/kamailio/commit/7ce10a5c6df8a8ee679dabb42cc719b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-28T13:36:53+01:00 core: removed unused code - removes also some clang compile warnings (cherry picked from commit c8eeed253763d4407268494f89050b7681518091) --- Modified: cfg.y Modified: route_struct.c --- Diff: https://github.com/kamailio/kamailio/commit/7ce10a5c6df8a8ee679dabb42cc719b… Patch: https://github.com/kamailio/kamailio/commit/7ce10a5c6df8a8ee679dabb42cc719b… --- diff --git a/cfg.y b/cfg.y index 6a85292..6289c61 100644 --- a/cfg.y +++ b/cfg.y @@ -2151,19 +2151,6 @@ exp_elem: { $$=0; yyerror(" URI, SRCIP or DSTIP expected"); } | MYSELF error { $$=0; yyerror ("invalid operator, == or != expected"); } ; -/* -exp_elem2: - rval_expr cmpop rval_expr %prec GT - { $$=mk_elem( $2, RVE_ST, $1, RVE_ST, $3);} - | - rval_expr equalop rval_expr %prec EQUAL_T - { $$=mk_elem( $2, RVE_ST, $1, RVE_ST, $3);} - | rval_expr LOG_AND rval_expr - { $$=mk_exp_rve(LOGAND_OP, $1, $3);} - | rval_expr LOG_OR rval_expr - { $$=mk_exp_rve(LOGOR_OP, $1, $3);} -; -*/ ipnet: ip SLASH ip { $$=mk_new_net($1, $3); } diff --git a/route_struct.c b/route_struct.c index 11c11fa..b5b702e 100644 --- a/route_struct.c +++ b/route_struct.c @@ -99,27 +99,6 @@ struct expr* mk_exp(int op, struct expr* left, struct expr* right) } -struct expr* mk_exp_rve(int op, void* left, void* right) -{ - struct expr * e; - e=(struct expr*)pkg_malloc(sizeof (struct expr)); - if (e==0) goto error; - e->type=EXP_T; - e->op=op; - e->l.param=mk_elem(RVEXP_O, RVE_ST, left, 0, 0); - e->r.param=mk_elem(RVEXP_O, RVE_ST, right, 0, 0); - if (e->l.param==0 || e->r.param==0){ - if (e->l.param) pkg_free(e->l.param); - if (e->r.param) pkg_free(e->r.param); - pkg_free(e); - goto error; - } - return e; -error: - LM_CRIT("memory allocation failure\n"); - return 0; -} - struct expr* mk_elem(int op, expr_l_type ltype, void* lparam, expr_r_type rtype, void* rparam) {

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2015