Module: kamailio
Branch: 5.2
Commit: eb5f2096282e93b14fecfc64f22aba0db467dec5
URL: https://github.com/kamailio/kamailio/commit/eb5f2096282e93b14fecfc64f22aba0…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2019-04-03T11:43:39+02:00
tcpops: set tcp keepalive values when available per option
- cover macos and *bsd for couple of options
(cherry picked from commit 278fd5a892c14f23e9f2b8d1f3fd3232c1d319f3)
---
Modified: src/modules/tcpops/tcpops.c
---
Diff: https://github.com/kamailio/kamailio/commit/eb5f2096282e93b14fecfc64f22aba0…
Patch: https://github.com/kamailio/kamailio/commit/eb5f2096282e93b14fecfc64f22aba0…
---
diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c
index cab215365c..1c70eb3409 100644
--- a/src/modules/tcpops/tcpops.c
+++ b/src/modules/tcpops/tcpops.c
@@ -130,8 +130,13 @@ int tcpops_acquire_fd_from_tcpmain(int conid, int *fd)
return 0;
}
-#if !defined(HAVE_SO_KEEPALIVE) || !defined(HAVE_TCP_KEEPIDLE) || !defined(HAVE_TCP_KEEPCNT) || !defined(HAVE_TCP_KEEPINTVL)
- #warning "TCP keepalive is not fully supported by your platform"
+#if !defined(HAVE_SO_KEEPALIVE) || !defined(HAVE_TCP_KEEPCNT) || !defined(HAVE_TCP_KEEPINTVL)
+ #define KSR_TCPOPS_NOKEEPALIVE
+#endif
+
+#ifdef KSR_TCPOPS_NOKEEPALIVE
+
+#warning "TCP keepalive options not supported by this platform"
int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int closefd)
{
@@ -144,6 +149,7 @@ int tcpops_keepalive_disable(int fd, int closefd)
LM_ERR("tcp_keepalive_disable() failed: this module does not support your platform\n");
return -1;
}
+
#else
int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int closefd)
@@ -156,11 +162,15 @@ int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int close
LM_ERR("failed to enable SO_KEEPALIVE: %s\n", strerror(errno));
return -1;
} else {
-
+#ifdef HAVE_TCP_KEEPIDLE
if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &idle,
sizeof(idle))<0){
LM_ERR("failed to set keepalive idle interval: %s\n", strerror(errno));
}
+#else
+ #warning "TCP_KEEPIDLE option not supported by this platform"
+ LM_DBG("TCP_KEEPIDLE option not available - ignoring\n");
+#endif
if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &count,
sizeof(count))<0){
Module: kamailio
Branch: master
Commit: c5278237a53f232991843a91f8d8e93e1de4de7f
URL: https://github.com/kamailio/kamailio/commit/c5278237a53f232991843a91f8d8e93…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2019-04-03T09:17:50+02:00
modules: readme files regenerated - uac ... [skip ci]
---
Modified: src/modules/uac/README
---
Diff: https://github.com/kamailio/kamailio/commit/c5278237a53f232991843a91f8d8e93…
Patch: https://github.com/kamailio/kamailio/commit/c5278237a53f232991843a91f8d8e93…
---
diff --git a/src/modules/uac/README b/src/modules/uac/README
index e7cc136dd2..1add3075d2 100644
--- a/src/modules/uac/README
+++ b/src/modules/uac/README
@@ -223,6 +223,13 @@ Chapter 1. Admin Guide
* The “uac_replace_*” functions can only be run once on the same SIP
request. Try to save needed changes in a pseudovariable and apply
them once.
+ There is also a limitation regarding the use of the
+ “msg_apply_changes()” function together with the “uac_replace_*”
+ functions for messages that are loose-routed (e.g. Re-INVITE
+ requests). In this case you need to call the “loose_route()”
+ function after the replace and msg_apply_changes. Otherwise
+ Kamailio can create replies with wrong From/To headers (e.g. for
+ the 100 - Trying reply in the Re-INVITE example).
2. Dependencies
Module: kamailio
Branch: 5.2
Commit: 3e78f6d060466363f0d61c69f6196f4d09e35ae9
URL: https://github.com/kamailio/kamailio/commit/3e78f6d060466363f0d61c69f6196f4…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2019-04-03T09:17:20+02:00
modules: readme files regenerated - modules ... [skip ci]
---
Modified: src/modules/uac/README
---
Diff: https://github.com/kamailio/kamailio/commit/3e78f6d060466363f0d61c69f6196f4…
Patch: https://github.com/kamailio/kamailio/commit/3e78f6d060466363f0d61c69f6196f4…
---
diff --git a/src/modules/uac/README b/src/modules/uac/README
index e7cc136dd2..1add3075d2 100644
--- a/src/modules/uac/README
+++ b/src/modules/uac/README
@@ -223,6 +223,13 @@ Chapter 1. Admin Guide
* The “uac_replace_*” functions can only be run once on the same SIP
request. Try to save needed changes in a pseudovariable and apply
them once.
+ There is also a limitation regarding the use of the
+ “msg_apply_changes()” function together with the “uac_replace_*”
+ functions for messages that are loose-routed (e.g. Re-INVITE
+ requests). In this case you need to call the “loose_route()”
+ function after the replace and msg_apply_changes. Otherwise
+ Kamailio can create replies with wrong From/To headers (e.g. for
+ the 100 - Trying reply in the Re-INVITE example).
2. Dependencies
Module: kamailio
Branch: 5.1
Commit: d57e47ea5e6ab26258ca596ff85c3fa7e5b0ded6
URL: https://github.com/kamailio/kamailio/commit/d57e47ea5e6ab26258ca596ff85c3fa…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2019-04-03T09:16:45+02:00
modules: readme files regenerated - modules ... [skip ci]
---
Modified: src/modules/uac/README
---
Diff: https://github.com/kamailio/kamailio/commit/d57e47ea5e6ab26258ca596ff85c3fa…
Patch: https://github.com/kamailio/kamailio/commit/d57e47ea5e6ab26258ca596ff85c3fa…
---
diff --git a/src/modules/uac/README b/src/modules/uac/README
index ba1c3d1bb7..34d11daab0 100644
--- a/src/modules/uac/README
+++ b/src/modules/uac/README
@@ -208,6 +208,13 @@ Chapter 1. Admin Guide
* The “uac_replace_*” functions can only be run once on the same SIP
request. Try to save needed changes in a pseudovariable and apply
them once.
+ There is also a limitation regarding the use of the
+ “msg_apply_changes()” function together with the “uac_replace_*”
+ functions for messages that are loose-routed (e.g. Re-INVITE
+ requests). In this case you need to call the “loose_route()”
+ function after the replace and msg_apply_changes. Otherwise
+ Kamailio can create replies with wrong From/To headers (e.g. for
+ the 100 - Trying reply in the Re-INVITE example).
2. Dependencies
Module: kamailio
Branch: 5.2
Commit: ecb15d3f84185c00450e8ab68df52ffbb9003d83
URL: https://github.com/kamailio/kamailio/commit/ecb15d3f84185c00450e8ab68df52ff…
Author: Henning Westerholt <hw(a)kamailio.org>
Committer: Henning Westerholt <hw(a)kamailio.org>
Date: 2019-04-03T09:06:38+02:00
uac: document limitation regarding uac_replace_* with loose_route and msg_apply_changes
(cherry picked from commit 05696125b775d3c275b2516ae34e73b91ce51c9a)
---
Modified: src/modules/uac/doc/uac_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/ecb15d3f84185c00450e8ab68df52ff…
Patch: https://github.com/kamailio/kamailio/commit/ecb15d3f84185c00450e8ab68df52ff…
---
diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml
index fe4046a733..6e514eeea1 100644
--- a/src/modules/uac/doc/uac_admin.xml
+++ b/src/modules/uac/doc/uac_admin.xml
@@ -54,6 +54,16 @@
SIP request. Try to save needed changes in a pseudovariable and
apply them once.
</para>
+ <para>
+ There is also a limitation regarding the use of the
+ <quote>msg_apply_changes()</quote> function together with the
+ <quote>uac_replace_*</quote> functions for messages that are
+ loose-routed (e.g. Re-INVITE requests). In this case you need
+ to call the <quote>loose_route()</quote> function after the
+ replace and msg_apply_changes. Otherwise Kamailio can create
+ replies with wrong From/To headers (e.g. for the 100 - Trying
+ reply in the Re-INVITE example).
+ </para>
</listitem>
</itemizedlist>
</section>
Module: kamailio
Branch: 5.1
Commit: b0a9b1509c08af68e13ee5cef1214ae416d4c542
URL: https://github.com/kamailio/kamailio/commit/b0a9b1509c08af68e13ee5cef1214ae…
Author: Henning Westerholt <hw(a)kamailio.org>
Committer: Henning Westerholt <hw(a)kamailio.org>
Date: 2019-04-03T09:06:45+02:00
uac: document limitation regarding uac_replace_* with loose_route and msg_apply_changes
(cherry picked from commit 05696125b775d3c275b2516ae34e73b91ce51c9a)
---
Modified: src/modules/uac/doc/uac_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/b0a9b1509c08af68e13ee5cef1214ae…
Patch: https://github.com/kamailio/kamailio/commit/b0a9b1509c08af68e13ee5cef1214ae…
---
diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml
index 78b8f5615b..94a703218f 100644
--- a/src/modules/uac/doc/uac_admin.xml
+++ b/src/modules/uac/doc/uac_admin.xml
@@ -54,6 +54,16 @@
SIP request. Try to save needed changes in a pseudovariable and
apply them once.
</para>
+ <para>
+ There is also a limitation regarding the use of the
+ <quote>msg_apply_changes()</quote> function together with the
+ <quote>uac_replace_*</quote> functions for messages that are
+ loose-routed (e.g. Re-INVITE requests). In this case you need
+ to call the <quote>loose_route()</quote> function after the
+ replace and msg_apply_changes. Otherwise Kamailio can create
+ replies with wrong From/To headers (e.g. for the 100 - Trying
+ reply in the Re-INVITE example).
+ </para>
</listitem>
</itemizedlist>
</section>
Module: kamailio
Branch: master
Commit: 05696125b775d3c275b2516ae34e73b91ce51c9a
URL: https://github.com/kamailio/kamailio/commit/05696125b775d3c275b2516ae34e73b…
Author: Henning Westerholt <hw(a)kamailio.org>
Committer: Henning Westerholt <hw(a)kamailio.org>
Date: 2019-04-03T09:05:32+02:00
uac: document limitation regarding uac_replace_* with loose_route and msg_apply_changes
---
Modified: src/modules/uac/doc/uac_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/05696125b775d3c275b2516ae34e73b…
Patch: https://github.com/kamailio/kamailio/commit/05696125b775d3c275b2516ae34e73b…
---
diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml
index fe4046a733..6e514eeea1 100644
--- a/src/modules/uac/doc/uac_admin.xml
+++ b/src/modules/uac/doc/uac_admin.xml
@@ -54,6 +54,16 @@
SIP request. Try to save needed changes in a pseudovariable and
apply them once.
</para>
+ <para>
+ There is also a limitation regarding the use of the
+ <quote>msg_apply_changes()</quote> function together with the
+ <quote>uac_replace_*</quote> functions for messages that are
+ loose-routed (e.g. Re-INVITE requests). In this case you need
+ to call the <quote>loose_route()</quote> function after the
+ replace and msg_apply_changes. Otherwise Kamailio can create
+ replies with wrong From/To headers (e.g. for the 100 - Trying
+ reply in the Re-INVITE example).
+ </para>
</listitem>
</itemizedlist>
</section>
here is the current kamailio log example.
### 0(20) INFO: sipcapture [sipcapture.c:459]: parse_table_names(): INFO: table name:sip_capture
0(20) ERROR: db_mysql [km_my_con.c:129]: db_mysql_new_connection(): driver error: Lost connection to MySQL server at 'waiting for initial communication packet', system error: 110 "Connection timed out"
could we add timestamp for printing log?
example:
0(20) **### Y/M/D/H/M/S** INFO: sipcapture [sipcapture.c:459]: parse_table_names(): INFO: table name:sip_capture
0(20) ERROR: db_mysql [km_my_con.c:129]: db_mysql_new_connection(): driver error: Lost connection to MySQL server at 'waiting for initial communication packet', system error: 110 "Connection timed out"
--
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/1920
Hi
Was there rebase done (accidentally or on purpose) in master branch lately?
I ask because typically fast forward merge just flys through without
excitement, but not this time:
---
$ git fetch
remote: Enumerating objects: 149, done.
remote: Counting objects: 100% (149/149), done.
remote: Compressing objects: 100% (11/11), done.
remote: Total 198 (delta 138), reused 147 (delta 137), pack-reused 49
Receiving objects: 100% (198/198), 43.82 KiB | 1.46 MiB/s, done.
Resolving deltas: 100% (144/144), completed with 48 local objects.
>From github.com:kamailio/kamailio
+ a15210d06...ce8d36f30 master -> origin/master (forced update)
a7f6227ef..d36634a36 5.2 -> origin/5.2
$ git pull --ff-only
fatal: Not possible to fast-forward, aborting.
---
I did not forcefully merge local master yet, so my current local HEAD is:
---
$ git show HEAD
commit a15210d064e08ac8b1a271502360b7066bff43b6 (HEAD -> master)
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: Thu Mar 28 19:33:22 2019 +0100
app_lua: get lua execution stack for previous level
- returns the info where current function was executed
---
And my recently fetched origin/HEAD is:
---
$ git show origin/HEAD
commit ce8d36f301d7688255597a67693e47dc14448650 (origin/master,
origin/HEAD)
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: Tue Apr 2 17:09:53 2019 +0200
lib/srdb1: use system time to compute db query execution duration
---
If I read "git log --graph --decorate" output correctly, their common ancestor is:
---
* | commit 1b6332fe565d97695a1eb84172e6f19f26381101
| | Author: sergey-safarov <s.safarov(a)gmail.com>
| | Date: Wed Mar 27 10:43:42 2019 +0300
| |
| | ipops: Fixed mask for 172.16.0.0/12 network (#1907)
---
>From github web interface I can load same commit as is my local HEAD:
https://github.com/kamailio/kamailio/commit/a15210d064e08ac8b1a271502360b70…
And it looks that commit is also known as:
https://github.com/kamailio/kamailio/commit/fb99f748db187d2699b6c050cf16f3f…
I try to figure out if something is happening on my end, but meanwhile I must ask
is it just me or did anyone else exprience this?
Best regards
--
Mikko