[sr-dev] git:5.1:d2d3491a: tmx: bug fix in cancel for current branches in helper, reported in GH #1620
Module: kamailio
Branch: 5.1
Commit: d2d3491a5edc58eaf92de641c4454bf535285066
URL:
https://github.com/kamailio/kamailio/commit/d2d3491a5edc58eaf92de641c4454bf535285066
Author: Henning Westerholt
Committer: Henning Westerholt
Date: 2018-08-13T21:21:46+02:00
tmx: bug fix in cancel for current branches in helper, reported in GH #1620
(cherry picked from commit 8a66803610f2c822f319899cd2bf8675615348bc)
---
Modified: src/modules/tmx/tmx_mod.c
---
Diff:
https://github.com/kamailio/kamailio/commit/d2d3491a5edc58eaf92de641c4454bf535285066.diff
Patch:
https://github.com/kamailio/kamailio/commit/d2d3491a5edc58eaf92de641c4454bf535285066.patch
---
diff --git a/src/modules/tmx/tmx_mod.c b/src/modules/tmx/tmx_mod.c
index 770fcc20bf..28c68d4704 100644
--- a/src/modules/tmx/tmx_mod.c
+++ b/src/modules/tmx/tmx_mod.c
@@ -318,6 +318,8 @@ static int t_cancel_branches_helper(sip_msg_t* msg, int n)
if(tcx != NULL)
idx = tcx->branch_index;
init_cancel_info(_data);
+ /* tm function: prepare_to_cancel(struct cell *t, branch_bm_t
*cancel_bm,
+ branch_bm_t
skip_branches) */
switch(n) {
case 1:
/* prepare cancel for every branch except idx (others)
*/
@@ -329,6 +331,7 @@ static int t_cancel_branches_helper(sip_msg_t* msg, int n)
if(msg->first_line.u.reply.statuscode>=200)
break;
cancel_data.cancel_bitmap = 1
[sr-dev] git:5.1:877d753a: uac: fix typo in module README
Module: kamailio
Branch: 5.1
Commit: 877d753acf18691b9d8b2208b57c085721151b38
URL:
https://github.com/kamailio/kamailio/commit/877d753acf18691b9d8b2208b57c085721151b38
Author: Henning Westerholt
Committer: Henning Westerholt
Date: 2018-08-13T21:21:43+02:00
uac: fix typo in module README
(cherry picked from commit 00ba2193d60e8255ea863a99b52e86f841f16bdb)
---
Modified: src/modules/uac/doc/uac_admin.xml
---
Diff:
https://github.com/kamailio/kamailio/commit/877d753acf18691b9d8b2208b57c085721151b38.diff
Patch:
https://github.com/kamailio/kamailio/commit/877d753acf18691b9d8b2208b57c085721151b38.patch
---
diff --git a/src/modules/uac/doc/uac_admin.xml
b/src/modules/uac/doc/uac_admin.xml
index 052bc2dc7a..a0520ece71 100644
--- a/src/modules/uac/doc/uac_admin.xml
+++ b/src/modules/uac/doc/uac_admin.xml
@@ -987,7 +987,7 @@ event_route[uac:reply] {
Return the details of a remote registration record
based on
a filter. The command has two parameter: attribute and
value.
The attribute can be: l_uuid, l_username, r_username or
auth_username.
- The value is what should be matcheg against the value
of the attribute
+ The value is what should be matched against the value
of the attribute
in the remote registration record.
@@ -1029,7 +1029,7 @@ event_route[uac:reply] {
Enable a remote registration record based on
a filter. The command has two parameter: attribute and
value.
The attribute can be: l_uuid, l_username, r_username or
auth_username.
- The value is what should be matcheg against the value
of the attribute
+ The value is what should be matched against the value
of the attribute
in the remote registration record.
@@ -1050,7 +1050,7 @@ event_route[uac:reply] {
Disable a remote registration record based on
a filter. The command has two parameter: attribute and
value.
The attribute can be: l_uuid, l_username, r_username or
auth_username.
- The value is what should be matcheg against the value
of the attribute
+ The value is what should be matched against the value
of the attribute
in the remote registration record.
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] new compiler warnings in master
Am Montag, 13. August 2018, 17:25:40 CEST schrieb Juha Heinanen: > CC (gcc) [M db_mysql.so] my_cmd.o > my_cmd.c: In function 'set_field': > my_cmd.c:774:16: warning: assignment from incompatible pointer type > [-Wincompatible-pointer-types] bind->is_null = >is_null; > ^ > my_cmd.c: In function 'bind_result': > my_cmd.c:1004:21: warning: assignment from incompatible pointer type > [-Wincompatible-pointer-types] result[i].is_null = >is_null; Hi Juha, this was introduced in commit 1736723cc2a15bb75c2. I am looking into it, its a bit tricky to just #ifdef it, as MariaDB introduced its own versioning. Best regards, Henning -- Henning Westerholt https://skalatan.de/blog/ ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:d6eff66b: modules: readme files regenerated - uac ... [skip ci]
Module: kamailio
Branch: master
Commit: d6eff66b185d442d0848a03c5b4681d6ab74373a
URL:
https://github.com/kamailio/kamailio/commit/d6eff66b185d442d0848a03c5b4681d6ab74373a
Author: Kamailio Dev
Committer: Kamailio Dev
Date: 2018-08-13T20:46:34+02:00
modules: readme files regenerated - uac ... [skip ci]
---
Modified: src/modules/uac/README
---
Diff:
https://github.com/kamailio/kamailio/commit/d6eff66b185d442d0848a03c5b4681d6ab74373a.diff
Patch:
https://github.com/kamailio/kamailio/commit/d6eff66b185d442d0848a03c5b4681d6ab74373a.patch
---
diff --git a/src/modules/uac/README b/src/modules/uac/README
index b833372b6a..c3d2711ba4 100644
--- a/src/modules/uac/README
+++ b/src/modules/uac/README
@@ -892,7 +892,7 @@ event_route[uac:reply] {
Return the details of a remote registration record based on a filter.
The command has two parameter: attribute and value. The attribute can
be: l_uuid, l_username, r_username or auth_username. The value is what
- should be matcheg against the value of the attribute in the remote
+ should be matched against the value of the attribute in the remote
registration record.
The state of the registration is reflected in the flags field:
@@ -913,7 +913,7 @@ event_route[uac:reply] {
Enable a remote registration record based on a filter. The command has
two parameter: attribute and value. The attribute can be: l_uuid,
l_username, r_username or auth_username. The value is what should be
- matcheg against the value of the attribute in the remote registration
+ matched against the value of the attribute in the remote registration
record.
Example 1.36. uac.reg_enable usage
@@ -926,7 +926,7 @@ event_route[uac:reply] {
Disable a remote registration record based on a filter. The command has
two parameter: attribute and value. The attribute can be: l_uuid,
l_username, r_username or auth_username. The value is what should be
- matcheg against the value of the attribute in the remote registration
+ matched against the value of the attribute in the remote registration
record.
Example 1.37. uac.reg_disable usage
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.1:c87df98e: modules: readme files regenerated - uac ... [skip ci]
Module: kamailio
Branch: 5.1
Commit: c87df98e726cf5acefa4ea6d382602c88dc76919
URL:
https://github.com/kamailio/kamailio/commit/c87df98e726cf5acefa4ea6d382602c88dc76919
Author: Kamailio Dev
Committer: Henning Westerholt
Date: 2018-08-13T21:18:25+02:00
modules: readme files regenerated - uac ... [skip ci]
(cherry picked from commit d6eff66b185d442d0848a03c5b4681d6ab74373a)
---
Modified: src/modules/uac/README
---
Diff:
https://github.com/kamailio/kamailio/commit/c87df98e726cf5acefa4ea6d382602c88dc76919.diff
Patch:
https://github.com/kamailio/kamailio/commit/c87df98e726cf5acefa4ea6d382602c88dc76919.patch
---
diff --git a/src/modules/uac/README b/src/modules/uac/README
index 848279a2c2..a69d481a2f 100644
--- a/src/modules/uac/README
+++ b/src/modules/uac/README
@@ -838,7 +838,7 @@ event_route[uac:reply] {
Return the details of a remote registration record based on a filter.
The command has two parameter: attribute and value. The attribute can
be: l_uuid, l_username, r_username or auth_username. The value is what
- should be matcheg against the value of the attribute in the remote
+ should be matched against the value of the attribute in the remote
registration record.
The state of the registration is reflected in the flags field:
@@ -859,7 +859,7 @@ event_route[uac:reply] {
Enable a remote registration record based on a filter. The command has
two parameter: attribute and value. The attribute can be: l_uuid,
l_username, r_username or auth_username. The value is what should be
- matcheg against the value of the attribute in the remote registration
+ matched against the value of the attribute in the remote registration
record.
Example 1.33. uac.reg_enable usage
@@ -872,7 +872,7 @@ event_route[uac:reply] {
Disable a remote registration record based on a filter. The command has
two parameter: attribute and value. The attribute can be: l_uuid,
l_username, r_username or auth_username. The value is what should be
- matcheg against the value of the attribute in the remote registration
+ matched against the value of the attribute in the remote registration
record.
Example 1.34. uac.reg_disable usage
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.0:97bbdb67: modules: readme files regenerated - uac ... [skip ci]
Module: kamailio
Branch: 5.0
Commit: 97bbdb67d31e0f4d73f56fc19d01c2152a0af005
URL:
https://github.com/kamailio/kamailio/commit/97bbdb67d31e0f4d73f56fc19d01c2152a0af005
Author: Kamailio Dev
Committer: Henning Westerholt
Date: 2018-08-13T21:18:09+02:00
modules: readme files regenerated - uac ... [skip ci]
(cherry picked from commit d6eff66b185d442d0848a03c5b4681d6ab74373a)
---
Modified: src/modules/uac/README
---
Diff:
https://github.com/kamailio/kamailio/commit/97bbdb67d31e0f4d73f56fc19d01c2152a0af005.diff
Patch:
https://github.com/kamailio/kamailio/commit/97bbdb67d31e0f4d73f56fc19d01c2152a0af005.patch
---
diff --git a/src/modules/uac/README b/src/modules/uac/README
index c9a1dca942..59200d70ee 100644
--- a/src/modules/uac/README
+++ b/src/modules/uac/README
@@ -838,7 +838,7 @@ event_route[uac:reply] {
Return the details of a remote registration record based on a filter.
The command has two parameter: attribute and value. The attribute can
be: l_uuid, l_username, r_username or auth_username. The value is what
- should be matcheg against the value of the attribute in the remote
+ should be matched against the value of the attribute in the remote
registration record.
The state of the registration is reflected in the flags field:
@@ -859,7 +859,7 @@ event_route[uac:reply] {
Enable a remote registration record based on a filter. The command has
two parameter: attribute and value. The attribute can be: l_uuid,
l_username, r_username or auth_username. The value is what should be
- matcheg against the value of the attribute in the remote registration
+ matched against the value of the attribute in the remote registration
record.
Example 1.33. uac.reg_enable usage
@@ -872,7 +872,7 @@ event_route[uac:reply] {
Disable a remote registration record based on a filter. The command has
two parameter: attribute and value. The attribute can be: l_uuid,
l_username, r_username or auth_username. The value is what should be
- matcheg against the value of the attribute in the remote registration
+ matched against the value of the attribute in the remote registration
record.
Example 1.34. uac.reg_disable usage
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:00ba2193: uac: fix typo in module README
Module: kamailio
Branch: master
Commit: 00ba2193d60e8255ea863a99b52e86f841f16bdb
URL:
https://github.com/kamailio/kamailio/commit/00ba2193d60e8255ea863a99b52e86f841f16bdb
Author: Henning Westerholt
Committer: Henning Westerholt
Date: 2018-08-13T20:42:50+02:00
uac: fix typo in module README
---
Modified: src/modules/uac/doc/uac_admin.xml
---
Diff:
https://github.com/kamailio/kamailio/commit/00ba2193d60e8255ea863a99b52e86f841f16bdb.diff
Patch:
https://github.com/kamailio/kamailio/commit/00ba2193d60e8255ea863a99b52e86f841f16bdb.patch
---
diff --git a/src/modules/uac/doc/uac_admin.xml
b/src/modules/uac/doc/uac_admin.xml
index 8047c67c2b..650ec8823c 100644
--- a/src/modules/uac/doc/uac_admin.xml
+++ b/src/modules/uac/doc/uac_admin.xml
@@ -1053,7 +1053,7 @@ event_route[uac:reply] {
Return the details of a remote registration record
based on
a filter. The command has two parameter: attribute and
value.
The attribute can be: l_uuid, l_username, r_username or
auth_username.
- The value is what should be matcheg against the value
of the attribute
+ The value is what should be matched against the value
of the attribute
in the remote registration record.
@@ -1095,7 +1095,7 @@ event_route[uac:reply] {
Enable a remote registration record based on
a filter. The command has two parameter: attribute and
value.
The attribute can be: l_uuid, l_username, r_username or
auth_username.
- The value is what should be matcheg against the value
of the attribute
+ The value is what should be matched against the value
of the attribute
in the remote registration record.
@@ -1116,7 +1116,7 @@ event_route[uac:reply] {
Disable a remote registration record based on
a filter. The command has two parameter: attribute and
value.
The attribute can be: l_uuid, l_username, r_username or
auth_username.
- The value is what should be matcheg against the value
of the attribute
+ The value is what should be matched against the value
of the attribute
in the remote registration record.
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] cancel_branch("this") not working (#1620)
Closed #1620. -- 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/1620#event-1786171171___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.0:59acb6f9: tmx: bug fix in cancel for current branches in helper, reported in GH #1620
Module: kamailio
Branch: 5.0
Commit: 59acb6f9c6b81d0ffae4ce5af4f772e1060d115d
URL:
https://github.com/kamailio/kamailio/commit/59acb6f9c6b81d0ffae4ce5af4f772e1060d115d
Author: Henning Westerholt
Committer: Henning Westerholt
Date: 2018-08-13T21:21:28+02:00
tmx: bug fix in cancel for current branches in helper, reported in GH #1620
(cherry picked from commit 8a66803610f2c822f319899cd2bf8675615348bc)
---
Modified: src/modules/tmx/tmx_mod.c
---
Diff:
https://github.com/kamailio/kamailio/commit/59acb6f9c6b81d0ffae4ce5af4f772e1060d115d.diff
Patch:
https://github.com/kamailio/kamailio/commit/59acb6f9c6b81d0ffae4ce5af4f772e1060d115d.patch
---
diff --git a/src/modules/tmx/tmx_mod.c b/src/modules/tmx/tmx_mod.c
index 27e6d96683..a381e259a6 100644
--- a/src/modules/tmx/tmx_mod.c
+++ b/src/modules/tmx/tmx_mod.c
@@ -320,6 +320,8 @@ static int t_cancel_branches(sip_msg_t* msg, char *k, char
*s2)
idx = tcx->branch_index;
n = (int)(long)k;
init_cancel_info(_data);
+ /* tm function: prepare_to_cancel(struct cell *t, branch_bm_t
*cancel_bm,
+ branch_bm_t
skip_branches) */
switch(n) {
case 1:
/* prepare cancel for every branch except idx (others)
*/
@@ -331,6 +333,7 @@ static int t_cancel_branches(sip_msg_t* msg, char *k, char
*s2)
if(msg->first_line.u.reply.statuscode>=200)
break;
cancel_data.cancel_bitmap = 1
[sr-dev] git:5.0:4552c85c: uac: fix typo in module README
Module: kamailio
Branch: 5.0
Commit: 4552c85c36f1e1b5abda7b29c7c453467f4b8ec1
URL:
https://github.com/kamailio/kamailio/commit/4552c85c36f1e1b5abda7b29c7c453467f4b8ec1
Author: Henning Westerholt
Committer: Henning Westerholt
Date: 2018-08-13T21:20:57+02:00
uac: fix typo in module README
(cherry picked from commit 00ba2193d60e8255ea863a99b52e86f841f16bdb)
---
Modified: src/modules/uac/doc/uac_admin.xml
---
Diff:
https://github.com/kamailio/kamailio/commit/4552c85c36f1e1b5abda7b29c7c453467f4b8ec1.diff
Patch:
https://github.com/kamailio/kamailio/commit/4552c85c36f1e1b5abda7b29c7c453467f4b8ec1.patch
---
diff --git a/src/modules/uac/doc/uac_admin.xml
b/src/modules/uac/doc/uac_admin.xml
index f409454196..a3d4b7b840 100644
--- a/src/modules/uac/doc/uac_admin.xml
+++ b/src/modules/uac/doc/uac_admin.xml
@@ -987,7 +987,7 @@ event_route[uac:reply] {
Return the details of a remote registration record
based on
a filter. The command has two parameter: attribute and
value.
The attribute can be: l_uuid, l_username, r_username or
auth_username.
- The value is what should be matcheg against the value
of the attribute
+ The value is what should be matched against the value
of the attribute
in the remote registration record.
@@ -1029,7 +1029,7 @@ event_route[uac:reply] {
Enable a remote registration record based on
a filter. The command has two parameter: attribute and
value.
The attribute can be: l_uuid, l_username, r_username or
auth_username.
- The value is what should be matcheg against the value
of the attribute
+ The value is what should be matched against the value
of the attribute
in the remote registration record.
@@ -1050,7 +1050,7 @@ event_route[uac:reply] {
Disable a remote registration record based on
a filter. The command has two parameter: attribute and
value.
The attribute can be: l_uuid, l_username, r_username or
auth_username.
- The value is what should be matcheg against the value
of the attribute
+ The value is what should be matched against the value
of the attribute
in the remote registration record.
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] wrong cherry-pick to uac README
Hello, sorry for the wrong cherry-pick to the README files in the stable branches, I was misguided from the git output. Will not happen again. Best regards, Henning -- Henning Westerholt https://skalatan.de/blog/ ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] cancel_branch("this") not working (#1620)
Hello, thank you for the report. I have applied your change to the git master and also will back-port it to 5.0 and 5.1 branches. It would be great if you could submit eventual further changes as git pull request, this makes it much easier to review and apply. Best regards, Henning -- 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/1620#issuecomment-412631337___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:b16e6361: modules: readme files regenerated - app_lua ... [skip ci]
Module: kamailio
Branch: master
Commit: b16e63616d68e3a1406d1b5df7812ea5841d6b22
URL:
https://github.com/kamailio/kamailio/commit/b16e63616d68e3a1406d1b5df7812ea5841d6b22
Author: Kamailio Dev
Committer: Kamailio Dev
Date: 2018-08-13T13:31:49+02:00
modules: readme files regenerated - app_lua ... [skip ci]
---
Modified: src/modules/app_lua/README
---
Diff:
https://github.com/kamailio/kamailio/commit/b16e63616d68e3a1406d1b5df7812ea5841d6b22.diff
Patch:
https://github.com/kamailio/kamailio/commit/b16e63616d68e3a1406d1b5df7812ea5841d6b22.patch
---
diff --git a/src/modules/app_lua/README b/src/modules/app_lua/README
index cac548c162..3b423924f7 100644
--- a/src/modules/app_lua/README
+++ b/src/modules/app_lua/README
@@ -33,7 +33,7 @@ Daniel-Constantin Mierla
4.1. lua_dofile(path)
4.2. lua_dostring(script)
- 4.3. lua_run(function, params)
+ 4.3. lua_run(func [, params])
4.4. lua_runstring(script)
5. RPC Commands
@@ -75,7 +75,7 @@ Chapter 1. Admin Guide
4.1. lua_dofile(path)
4.2. lua_dostring(script)
-4.3. lua_run(function, params)
+4.3. lua_run(func [, params])
4.4. lua_runstring(script)
5. RPC Commands
@@ -213,7 +213,7 @@ modparam("app_lua", "reload", 0)
4.1. lua_dofile(path)
4.2. lua_dostring(script)
- 4.3. lua_run(function, params)
+ 4.3. lua_run(func [, params])
4.4. lua_runstring(script)
4.1. lua_dofile(path)
@@ -239,21 +239,24 @@ if(!lua_dostring("sr.log([[err]], [[--- Hello
World from $fU\n]])"))
}
...
-4.3. lua_run(function, params)
+4.3. lua_run(func [, params])
- Execute the Lua function 'func' giving params as parameters. There can
- be up to 3 string parameters. The function must exist in the script
+ Execute the Lua function 'func' giving 'params' as parameters. There
+ can be up to 3 string parameters after 'func' (overall, max 4 params,
+ first is the function). The function must exist in the Lua script
loaded at startup via parameter 'load'. Parameters can be strings with
pseudo-variables that are evaluated at runtime.
Example 1.7. lua_run usage
...
-if(!lua_run("sr_append_fu_to_reply"))
-{
+if(!lua_run("sr_append_fu_to_reply")) {
xdbg("SCRIPT: failed to execute lua function!\n");
}
...
-lua_run("lua_funcx", "$rU", "2");
+lua_run("lua_funcx0");
+lua_run("lua_funcx1", "$rU");
+lua_run("lua_funcx2", "$rU", "2");
+lua_run("lua_funcx3", "$rU", "2", "$si");
...
4.4. lua_runstring(script)
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:88887fe7: ims_ipsec_pcscf: cast const param to get rid of compile warning
Module: kamailio
Branch: master
Commit: 7fe7e7cd87e953eeb5a5bb998e693db08df8
URL:
https://github.com/kamailio/kamailio/commit/7fe7e7cd87e953eeb5a5bb998e693db08df8
Author: Daniel-Constantin Mierla
Committer: Daniel-Constantin Mierla
Date: 2018-08-13T13:35:17+02:00
ims_ipsec_pcscf: cast const param to get rid of compile warning
---
Modified: src/modules/ims_ipsec_pcscf/cmd.c
---
Diff:
https://github.com/kamailio/kamailio/commit/7fe7e7cd87e953eeb5a5bb998e693db08df8.diff
Patch:
https://github.com/kamailio/kamailio/commit/7fe7e7cd87e953eeb5a5bb998e693db08df8.patch
---
diff --git a/src/modules/ims_ipsec_pcscf/cmd.c
b/src/modules/ims_ipsec_pcscf/cmd.c
index 2edabfb03f..b5741e30d8 100644
--- a/src/modules/ims_ipsec_pcscf/cmd.c
+++ b/src/modules/ims_ipsec_pcscf/cmd.c
@@ -195,7 +195,7 @@ static int get_ck_ik(const struct sip_msg* m, str* ck, str*
ik)
str www_auth;
memset(_auth, 0, sizeof(str));
-www_auth = cscf_get_authenticate(m, _auth_hdr);
+www_auth = cscf_get_authenticate((sip_msg_t*)m, _auth_hdr);
*ck = get_www_auth_param("ck", www_auth);
if (ck->len == 0) {
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:f1f6c303: app_lua: docs - more details about lua_run() params
Module: kamailio
Branch: master
Commit: f1f6c303baab87523d54b97af38c0a5718cf0d2f
URL:
https://github.com/kamailio/kamailio/commit/f1f6c303baab87523d54b97af38c0a5718cf0d2f
Author: Daniel-Constantin Mierla
Committer: Daniel-Constantin Mierla
Date: 2018-08-13T13:22:59+02:00
app_lua: docs - more details about lua_run() params
---
Modified: src/modules/app_lua/doc/app_lua_admin.xml
---
Diff:
https://github.com/kamailio/kamailio/commit/f1f6c303baab87523d54b97af38c0a5718cf0d2f.diff
Patch:
https://github.com/kamailio/kamailio/commit/f1f6c303baab87523d54b97af38c0a5718cf0d2f.patch
---
diff --git a/src/modules/app_lua/doc/app_lua_admin.xml
b/src/modules/app_lua/doc/app_lua_admin.xml
index 45ed3e29c1..74ea68e460 100644
--- a/src/modules/app_lua/doc/app_lua_admin.xml
+++ b/src/modules/app_lua/doc/app_lua_admin.xml
@@ -334,11 +334,12 @@ if(!lua_dostring("sr.log([[err]], [[--- Hello
World from $fU\n]])"))
- lua_run(function, params)
+ lua_run(func [, params])
- Execute the Lua function 'func' giving params as parameters.
There
- can be up to 3 string parameters. The function must exist in the
+ Execute the Lua function 'func' giving 'params' as parameters.
There
+ can be up to 3 string parameters after 'func' (overall, max 4
params,
+ first is the function). The function must exist in the Lua
script loaded at startup via parameter 'load'. Parameters can be
strings with pseudo-variables that are evaluated at runtime.
@@ -346,12 +347,14 @@ if(!lua_dostring("sr.log([[err]], [[--- Hello
World from $fU\n]])"))
lua_run usage
...
-if(!lua_run("sr_append_fu_to_reply"))
-{
+if(!lua_run("sr_append_fu_to_reply")) {
xdbg("SCRIPT: failed to execute lua function!\n");
}
...
-lua_run("lua_funcx", "$rU", "2");
+lua_run("lua_funcx0");
+lua_run("lua_funcx1", "$rU");
+lua_run("lua_funcx2", "$rU", "2");
+lua_run("lua_funcx3", "$rU", "2", "$si");
...
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:c681aded: usrloc: set server_id for rpc ul add command
Module: kamailio Branch: master Commit: c681adedc7284b9e681d37ad87a30251c02e3508 URL: https://github.com/kamailio/kamailio/commit/c681adedc7284b9e681d37ad87a30251c02e3508 Author: Daniel-Constantin Mierla Committer: Daniel-Constantin Mierla Date: 2018-08-13T11:31:25+02:00 usrloc: set server_id for rpc ul add command --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/c681adedc7284b9e681d37ad87a30251c02e3508.diff Patch: https://github.com/kamailio/kamailio/commit/c681adedc7284b9e681d37ad87a30251c02e3508.patch --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index ead017a590..39d8aa2776 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -666,6 +666,7 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) return; } ci.ruid = _ul_sruid.uid; + ci.server_id = server_id; lock_udomain(dom, ); ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:ada68095: core: more detailed debug message if new uri is too long
Module: kamailio
Branch: master
Commit: ada68095882368a7e05329a52e53a57b2bc818d1
URL:
https://github.com/kamailio/kamailio/commit/ada68095882368a7e05329a52e53a57b2bc818d1
Author: Daniel-Constantin Mierla
Committer: Daniel-Constantin Mierla
Date: 2018-08-13T14:04:55+02:00
core: more detailed debug message if new uri is too long
---
Modified: src/core/dset.c
---
Diff:
https://github.com/kamailio/kamailio/commit/ada68095882368a7e05329a52e53a57b2bc818d1.diff
Patch:
https://github.com/kamailio/kamailio/commit/ada68095882368a7e05329a52e53a57b2bc818d1.patch
---
diff --git a/src/core/dset.c b/src/core/dset.c
index 06083e7229..1a10f2af9a 100644
--- a/src/core/dset.c
+++ b/src/core/dset.c
@@ -763,7 +763,8 @@ int uri_add_rcv_alias(sip_msg_t *msg, str *uri, str *nuri)
/*uri;alias=[ip]~port~proto*/
len = uri->len+ip.len+port.len+12;
if(len>=nuri->len) {
- LM_ERR("not enough space for new uri: %d\n", len);
+ LM_ERR("not enough space - new uri len: %d (buf size: %d)\n",
+ len, nuri->len);
return -1;
}
p = nuri->s;
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] new compiler warnings in master
CC (gcc) [M db_mysql.so]my_cmd.o my_cmd.c: In function 'set_field': my_cmd.c:774:16: warning: assignment from incompatible pointer type [-Wincompatible-pointer-types] bind->is_null = >is_null; ^ my_cmd.c: In function 'bind_result': my_cmd.c:1004:21: warning: assignment from incompatible pointer type [-Wincompatible-pointer-types] result[i].is_null = >is_null; ^ ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
