sr-dev March 2018

sr-dev@lists.kamailio.org

17 participants
326 discussions

git:master:9b7bb4ea: kamctl: fixed the name of rpc command for dialplan reload

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9b7bb4ea6c100f5f33d2dddc9061febf33c47f5e URL: https://github.com/kamailio/kamailio/commit/9b7bb4ea6c100f5f33d2dddc9061feb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-02T16:15:40+01:00 kamctl: fixed the name of rpc command for dialplan reload --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/9b7bb4ea6c100f5f33d2dddc9061feb… Patch: https://github.com/kamailio/kamailio/commit/9b7bb4ea6c100f5f33d2dddc9061feb… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index de667187d6..e57f2a7695 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1902,7 +1902,7 @@ dialplan() { ;; reload) - ctl_cmd_run dp_reload dp.reload + ctl_cmd_run dp_reload dialplan.reload ;; *)

6 years, 9 months

[kamailio/kamailio] pkg/kamailio/obs: Fixed kamailio tmpfiles creation durring … (#1470)

by sergey-safarov

…rpm installation You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1470 -- Commit Summary -- * pkg/kamailio/obs: Fixed kamailio tmpfiles creation durring rpm installation -- File Changes -- M pkg/kamailio/obs/kamailio.spec (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1470.patch https://github.com/kamailio/kamailio/pull/1470.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/1470

6 years, 9 months

git:5.1:9b3aa0c7: pkg/kamailio/obs: Fixed kamailio tmpfiles creation durring rpm installation

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 9b3aa0c75bb2b4a643713c428d1a8a3d2d1c9e5c URL: https://github.com/kamailio/kamailio/commit/9b3aa0c75bb2b4a643713c428d1a8a3… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-02T16:02:47+01:00 pkg/kamailio/obs: Fixed kamailio tmpfiles creation durring rpm installation --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/9b3aa0c75bb2b4a643713c428d1a8a3… Patch: https://github.com/kamailio/kamailio/commit/9b3aa0c75bb2b4a643713c428d1a8a3… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 23de6c2bc4..3f0ba2a401 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1118,7 +1118,7 @@ rm -rf %{buildroot} %if "%{?_unitdir}" == "" /sbin/chkconfig --add kamailio %else -%tmpfiles_create kamailio +%tmpfiles_create kamailio.conf /usr/bin/systemctl -q enable kamailio.service %endif

6 years, 9 months

SIP header when 911 called

by Abdul Basit

Hi Team, Does kamailio has compatibility with E911, i.e. through location in SIP header when 911 called? Is there any reference document? -- regards, abdul basit

6 years, 9 months

[kamailio/kamailio] Add /var/run management to systemd script (#1464)

by udf2457

Hi, Would be nice if you could add `/var/run` management to the systemd script provided with the repo install. You know, something along the lines of: ``` ExecStartPre=-/usr/bin/mkdir /var/run/kamailio ExecStartPre=/usr/bin/chown -R kamailio:daemon /var/run/kamailio/ ``` -- 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/issues/1464

6 years, 9 months

git:master:8926698e: modules: readme files regenerated - json ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 8926698e92675d712db318c335f30d4f43f1a53d URL: https://github.com/kamailio/kamailio/commit/8926698e92675d712db318c335f30d4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-03-02T15:31:30+01:00 modules: readme files regenerated - json ... [skip ci] --- Modified: src/modules/json/README --- Diff: https://github.com/kamailio/kamailio/commit/8926698e92675d712db318c335f30d4… Patch: https://github.com/kamailio/kamailio/commit/8926698e92675d712db318c335f30d4… --- diff --git a/src/modules/json/README b/src/modules/json/README index 1f17cb328b..1bc0c1112c 100644 --- a/src/modules/json/README +++ b/src/modules/json/README @@ -26,13 +26,15 @@ Matthew Williams 3. Functions 3.1. json_get_field(json_string, field_name, destination) + 3.2. json_get_string(json_string, field_name, destination) 4. Transformations List of Examples 1.1. json_get_field usage - 1.2. json.parse usage + 1.2. json_get_string usage + 1.3. json.parse usage Chapter 1. Admin Guide @@ -47,6 +49,7 @@ Chapter 1. Admin Guide 3. Functions 3.1. json_get_field(json_string, field_name, destination) + 3.2. json_get_string(json_string, field_name, destination) 4. Transformations @@ -76,6 +79,7 @@ Chapter 1. Admin Guide 3. Functions 3.1. json_get_field(json_string, field_name, destination) + 3.2. json_get_string(json_string, field_name, destination) 3.1. json_get_field(json_string, field_name, destination) @@ -94,12 +98,23 @@ json_get_field("{'foo':'bar'}", "foo", "$var(foo)"); xlog("foo is $var(foo)"); ... +3.2. json_get_string(json_string, field_name, destination) + + Copy field 'field_name' from json object 'json_string' and store it in + pvar 'destination'. + + Example 1.2. json_get_string usage +... +json_get_string("{'foo':'bar'}", "foo", "$var(foo)"); +xlog("foo is $var(foo)"); +... + 4. Transformations You can use the transformation to extract values from the json structured pseudo-variables * json - Example 1.2. json.parse usage + Example 1.3. json.parse usage ... # extract value of "Custom-Data" from $rb pseudo-variable and set it to $var(Custom-Data)

6 years, 9 months

git:master:bff50c44: json: add new function json_get_string() to return string value without quotes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bff50c44e32c48b5449e405f67ca02f7d8055ba0 URL: https://github.com/kamailio/kamailio/commit/bff50c44e32c48b5449e405f67ca02f… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-02T15:17:03+01:00 json: add new function json_get_string() to return string value without quotes --- Modified: src/modules/json/doc/json_admin.xml Modified: src/modules/json/json_funcs.c Modified: src/modules/json/json_funcs.h Modified: src/modules/json/json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bff50c44e32c48b5449e405f67ca02f… Patch: https://github.com/kamailio/kamailio/commit/bff50c44e32c48b5449e405f67ca02f… --- diff --git a/src/modules/json/doc/json_admin.xml b/src/modules/json/doc/json_admin.xml index d510090285..72c7cb1344 100644 --- a/src/modules/json/doc/json_admin.xml +++ b/src/modules/json/doc/json_admin.xml @@ -75,6 +75,25 @@ ... json_get_field("{'foo':'bar'}", "foo", "$var(foo)"); xlog("foo is $var(foo)"); +... + </programlisting> + </example> + </section> + <section id="json.f.json_get_string"> + <title> + <function moreinfo="none">json_get_string(json_string, field_name, destination)</function> + </title> + <para> + Copy field 'field_name' from json object 'json_string' and store it in pvar 'destination'. + </para> + <para> + </para> + <example> + <title><function>json_get_string</function> usage</title> + <programlisting format="linespecific"> +... +json_get_string("{'foo':'bar'}", "foo", "$var(foo)"); +xlog("foo is $var(foo)"); ... </programlisting> </example> diff --git a/src/modules/json/json_funcs.c b/src/modules/json/json_funcs.c index ae036ac1f1..360bfc172c 100644 --- a/src/modules/json/json_funcs.c +++ b/src/modules/json/json_funcs.c @@ -30,7 +30,7 @@ #include "json_funcs.h" -int json_get_field(struct sip_msg* msg, char* json, char* field, char* dst) +int _json_get_field(struct sip_msg *msg, char *json, char *field, char *dst, int field_type) { str json_s; str field_s; @@ -53,7 +53,6 @@ int json_get_field(struct sip_msg* msg, char* json, char* field, char* dst) dst_pv = (pv_spec_t *)dst; - j = json_tokener_parse(json_s.s); if (j==NULL) { @@ -63,7 +62,11 @@ int json_get_field(struct sip_msg* msg, char* json, char* field, char* dst) json_object_object_get_ex(j, field_s.s, &oj); if(oj!=NULL) { - value = (char*)json_object_to_json_string(oj); + if (field_type == JSON_FIELD_STRING) { + value = (char*)json_object_get_string(oj); + } else { + value = (char*)json_object_to_json_string(oj); + } dst_val.rs.s = value; dst_val.rs.len = strlen(value); dst_val.flags = PV_VAL_STR; @@ -77,6 +80,17 @@ int json_get_field(struct sip_msg* msg, char* json, char* field, char* dst) return ret; } +int json_get_field(struct sip_msg* msg, char* json, char* field, char* dst) +{ + return _json_get_field(msg, json, field, dst, JSON_FIELD_DEFAULT); +} + + +int json_get_string(struct sip_msg* msg, char* json, char* field, char* dst) +{ + return _json_get_field(msg, json, field, dst, JSON_FIELD_STRING); +} + #define json_foreach_key(obj, key) \ char *key; \ struct lh_entry *entry##key; \ diff --git a/src/modules/json/json_funcs.h b/src/modules/json/json_funcs.h index 747232efac..60b67e037b 100644 --- a/src/modules/json/json_funcs.h +++ b/src/modules/json/json_funcs.h @@ -27,7 +27,14 @@ #include "../../core/parser/msg_parser.h" #include <json.h> +enum _json_get_field_type +{ + JSON_FIELD_DEFAULT = 0, + JSON_FIELD_STRING +}; + int json_get_field(struct sip_msg* msg, char* json, char* field, char* dst); +int json_get_string(struct sip_msg* msg, char* json, char* field, char* dst); #define json_extract_field(json_name, field) \ do { \ diff --git a/src/modules/json/json_mod.c b/src/modules/json/json_mod.c index f5de53d692..91452b3a55 100644 --- a/src/modules/json/json_mod.c +++ b/src/modules/json/json_mod.c @@ -45,6 +45,8 @@ static tr_export_t mod_trans[] = { static cmd_export_t cmds[] = { {"json_get_field", (cmd_function)json_get_field, 3, fixup_get_field, fixup_get_field_free, ANY_ROUTE}, + {"json_get_string", (cmd_function)json_get_string, 3, fixup_get_field, + fixup_get_field_free, ANY_ROUTE}, {"bind_json", (cmd_function)bind_json, 0, 0, 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0}};

6 years, 9 months

[kamailio/kamailio] json: add new function json_get_string() to return string value witho… (#1466)

by Emmanuel Schmidbauer

adds new function to resolve #1452 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1466 -- Commit Summary -- * json: add new function json_get_string() to return string value without quotes -- File Changes -- M src/modules/json/doc/json_admin.xml (19) M src/modules/json/json_funcs.c (20) M src/modules/json/json_funcs.h (7) M src/modules/json/json_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1466.patch https://github.com/kamailio/kamailio/pull/1466.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/1466

6 years, 9 months

[kamailio/kamailio] pkg/kamailio/obs: Fixed kamailio tmpfiles creation … (#1469)

by sergey-safarov

…durring rpm installation You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1469 -- Commit Summary -- * pkg/kamailio/obs: Fixed kamailio tmpfiles creation durring rpm installation -- File Changes -- M pkg/kamailio/obs/kamailio.spec (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1469.patch https://github.com/kamailio/kamailio/pull/1469.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/1469

6 years, 9 months

git:master:630a697c: pkg/kamailio/obs: Fixed kamailio tmpfiles creation durring rpm installation

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 630a697cd928d01f92f4de1b232567c52592df04 URL: https://github.com/kamailio/kamailio/commit/630a697cd928d01f92f4de1b232567c… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-02T15:16:43+01:00 pkg/kamailio/obs: Fixed kamailio tmpfiles creation durring rpm installation --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/630a697cd928d01f92f4de1b232567c… Patch: https://github.com/kamailio/kamailio/commit/630a697cd928d01f92f4de1b232567c… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index ba802c83ad..3dabb21985 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1118,7 +1118,7 @@ rm -rf %{buildroot} %if "%{?_unitdir}" == "" /sbin/chkconfig --add kamailio %else -%tmpfiles_create kamailio +%tmpfiles_create kamailio.conf /usr/bin/systemctl -q enable kamailio.service %endif

6 years, 9 months

← Newer
1
...
26
27
28
29
30
31
32
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2018