[sr-dev] [kamailio/kamailio] db_mongodb has a problem with projection (#1479)

2018-03-08 Thread kelchy


### Description

on upgrade to 5.1.2, db_mongodb broke

### Troubleshooting
i create a [PR](https://github.com/kamailio/kamailio/pull/1477) to print out 
any mongo query error

then i saw the debug messages below

 Reproduction

install 5.1.2, use mongo as db for sip_trace module

 Debugging Data

```
DEBUG: db_mongodb [mongodb_connection.c:55]: db_mongodb_new_connection(): 
connection open to: mongodb://user:p...@mongo1.abc.com:17017/collection
DEBUG: db_mongodb [mongodb_dbase.c:904]: db_mongodb_query(): query to 
collection [version]
DEBUG: db_mongodb [mongodb_dbase.c:938]: db_mongodb_query(): query filter: { 
"table_name" : "sip_trace" }
DEBUG: db_mongodb [mongodb_dbase.c:966]: db_mongodb_query(): columns filter: { 
"projection" : { "table_version" : 1 } }
DEBUG: db_mongodb [mongodb_dbase.c:782]: db_mongodb_store_result(): An error 
occurred: Unsupported projection option: projection: { table_version: 1 }
ERROR:  [db.c:450]: db_check_table_version(): invalid version 0 for table 
sip_trace found, expected 4 (check table structure and table "version")
ERROR: siptrace [siptrace.c:435]: child_init(): error during table version check
ERROR:  [core/sr_module.c:942]: init_mod_child(): error while 
initializing module siptrace (/usr/lib64/kamailio/modules/siptrace.so) (idx: 39 
rank: -2 desc: [Http Async Worker])
```

 Log Messages


 SIP Traffic


### Possible Solutions

change the way mongo builds the query

### Additional Information

  * **Kamailio Version** - output of `kamailio -v`

```
version: kamailio 5.1.2 (x86_64/linux) 
flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, 
USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, 
TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, 
USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES
ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, 
MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB
poll method support: poll, epoll_lt, epoll_et, sigio_rt, select.
id: unknown 
compiled on 06:43:15 Mar  9 2018 with gcc 4.8.2

```

* **Operating System**:



```
Ubuntu 14.04.1 LTS \n \l

Linux hostname 3.13.0-53-generic #89-Ubuntu SMP Wed May 20 10:34:39 UTC 2015 
x86_64 x86_64 x86_64 GNU/Linux

```


-- 
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/1479___
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] pkg/docker: Updated reference to packaging scripts (#1478)

2018-03-08 Thread sergey-safarov
This cherry-pick of 956cad7e070c7d1936c7fef5666e72db1a0578ac

-- 
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/1478#issuecomment-371736465___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


[sr-dev] [kamailio/kamailio] pkg/docker: Updated reference to packaging scripts (#1478)

2018-03-08 Thread sergey-safarov

You can view, comment on, or merge this pull request online at:

  https://github.com/kamailio/kamailio/pull/1478

-- Commit Summary --

  * pkg/docker: Updated reference to packaging scripts

-- File Changes --

M pkg/docker (2)

-- Patch Links --

https://github.com/kamailio/kamailio/pull/1478.patch
https://github.com/kamailio/kamailio/pull/1478.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/1478
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


[sr-dev] [kamailio/kamailio] db_mongodb: add error logger for failed query (#1477)

2018-03-08 Thread kelchy




 Pre-Submission Checklist



- [ X] Commit message has the format required by CONTRIBUTING guide
- [ ]X Commits are split per component (core, individual modules, libs, utils, 
...)
- [ X] Each component has a single commit (if not, squash them into one commit)
- [ X] No commits to README files for modules (changes must be done to docbook 
files
in `doc/` subfolder, the README file is autogenerated)

 Type Of Change
- [X ] Small bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds new functionality)
- [ ] Breaking change (fix or feature that would change existing functionality)

 Checklist:

- [ ] PR should be backported to stable branches
- [ ] Tested changes locally
- [ ] Related to issue # (replace  with an open issue number)

 Description

db_mongodb: Add error logger for failed query
You can view, comment on, or merge this pull request online at:

  https://github.com/kamailio/kamailio/pull/1477

-- Commit Summary --

  * db_mongodb: add error logger for failed query

-- File Changes --

M src/modules/db_mongodb/mongodb_dbase.c (7)

-- Patch Links --

https://github.com/kamailio/kamailio/pull/1477.patch
https://github.com/kamailio/kamailio/pull/1477.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/1477
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


[sr-dev] git:master:e87cad92: rtpengine: explicitly handle new option flags (transcoding)

2018-03-08 Thread Richard Fuchs
Module: kamailio
Branch: master
Commit: e87cad921057a6bdf1619384b6acab8d207eb5c8
URL: 
https://github.com/kamailio/kamailio/commit/e87cad921057a6bdf1619384b6acab8d207eb5c8

Author: Richard Fuchs 
Committer: Richard Fuchs 
Date: 2018-03-08T10:16:22-05:00

rtpengine: explicitly handle new option flags (transcoding)

---

Modified: src/modules/rtpengine/rtpengine.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/e87cad921057a6bdf1619384b6acab8d207eb5c8.diff
Patch: 
https://github.com/kamailio/kamailio/commit/e87cad921057a6bdf1619384b6acab8d207eb5c8.patch


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


[sr-dev] git:master:61279f2e: modules: readme files regenerated - db_redis ... [skip ci]

2018-03-08 Thread Kamailio Dev
Module: kamailio
Branch: master
Commit: 61279f2e64e950a4a53694c06ff1228f233d24f9
URL: 
https://github.com/kamailio/kamailio/commit/61279f2e64e950a4a53694c06ff1228f233d24f9

Author: Kamailio Dev 
Committer: Kamailio Dev 
Date: 2018-03-08T16:01:24+01:00

modules: readme files regenerated - db_redis ... [skip ci]

---

Modified: src/modules/db_redis/README

---

Diff:  
https://github.com/kamailio/kamailio/commit/61279f2e64e950a4a53694c06ff1228f233d24f9.diff
Patch: 
https://github.com/kamailio/kamailio/commit/61279f2e64e950a4a53694c06ff1228f233d24f9.patch

---

diff --git a/src/modules/db_redis/README b/src/modules/db_redis/README
index cc421eecd3..8378057da5 100644
--- a/src/modules/db_redis/README
+++ b/src/modules/db_redis/README
@@ -36,6 +36,9 @@ Alex Balashov
 
 5. External Libraries or Applications
 6. Usage
+7. Module specific considerations
+
+  7.1. usrloc
 
List of Examples
 
@@ -60,6 +63,9 @@ Chapter 1. Admin Guide
 
5. External Libraries or Applications
6. Usage
+   7. Module specific considerations
+
+7.1. usrloc
 
 1. Overview
 
@@ -196,3 +202,13 @@ modparam("usrloc", "db_url", DBURL_USRLOC)
 modparam("acc_db", "db_url", DBURL_ACC)
 modparam("auth_db", "db_url", DBURL_AUTH)
 ...
+
+7. Module specific considerations
+
+   7.1. usrloc
+
+7.1. usrloc
+
+   If you set "expires_type" to "1" in order to use BIGINT instead of
+   DATETIME, make sure to update your location schema file and change the
+   type of "expires" and "last_modified" from "time" to "int".


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


[sr-dev] git:master:c9f2aa71: db_redis: Align schema with usrloc expires_type default

2018-03-08 Thread Andreas Granig
Module: kamailio
Branch: master
Commit: c9f2aa71b2e0d4a4f71b3da92f97306e86f93eea
URL: 
https://github.com/kamailio/kamailio/commit/c9f2aa71b2e0d4a4f71b3da92f97306e86f93eea

Author: Andreas Granig 
Committer: Andreas Granig 
Date: 2018-03-08T15:54:24+01:00

db_redis: Align schema with usrloc expires_type default

Since expires_type is DATETIME by default, use "time" type in
upstream schema for location table.

---

Modified: src/modules/db_redis/doc/db_redis_admin.xml
Modified: utils/kamctl/db_redis/kamailio/location

---

Diff:  
https://github.com/kamailio/kamailio/commit/c9f2aa71b2e0d4a4f71b3da92f97306e86f93eea.diff
Patch: 
https://github.com/kamailio/kamailio/commit/c9f2aa71b2e0d4a4f71b3da92f97306e86f93eea.patch

---

diff --git a/src/modules/db_redis/doc/db_redis_admin.xml 
b/src/modules/db_redis/doc/db_redis_admin.xml
index 168bd500d4..f57fa8064e 100644
--- a/src/modules/db_redis/doc/db_redis_admin.xml
+++ b/src/modules/db_redis/doc/db_redis_admin.xml
@@ -189,4 +189,17 @@ modparam("auth_db", "db_url", DBURL_AUTH)



+
+   
+   Module specific considerations
+   
+   usrloc
+   
+   If you set "expires_type" to "1" in order to 
use BIGINT instead of DATETIME,
+   make sure to update your location schema file 
and change the type of "expires"
+   and "last_modified" from "time" to "int".
+   
+   
+   
+
 
diff --git a/utils/kamctl/db_redis/kamailio/location 
b/utils/kamctl/db_redis/kamailio/location
index 9ca18f2fb0..7c0ea2ab81 100644
--- a/utils/kamctl/db_redis/kamailio/location
+++ b/utils/kamctl/db_redis/kamailio/location
@@ -1,2 +1,2 @@
-id/int,ruid/string,username/string,domain/string,contact/string,received/string,path/string,expires/int,q/double,callid/string,cseq/int,last_modified/int,flags/int,cflags/int,user_agent/string,socket/string,methods/int,instance/string,reg_id/int,server_id/int,connection_id/int,keepalive/int,partition/int,
+id/int,ruid/string,username/string,domain/string,contact/string,received/string,path/string,expires/time,q/double,callid/string,cseq/int,last_modified/time,flags/int,cflags/int,user_agent/string,socket/string,methods/int,instance/string,reg_id/int,server_id/int,connection_id/int,keepalive/int,partition/int,
 9


___
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] KeepAlive Module (#1476)

2018-03-08 Thread Daniel-Constantin Mierla
Maybe @gbour has some time to look at it soon, being the developer of keepalive 
module.

-- 
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/1476#issuecomment-371507290___
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] KEMI onsend_route method is not called (#1474)

2018-03-08 Thread Daniel-Constantin Mierla
Closed #1474.

-- 
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/1474#event-1511268917___
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] auth_ephemeral.so: undefined symbol: EVP_sha512 (#1473)

2018-03-08 Thread marcinkowalczyk
Seems I managed to get module running via static linking
`LIBS+= /usr/lib/x86_64-linux-gnu/libssl.so.1.1 
/usr/lib/x86_64-linux-gnu/libcrypto.so.1.1
`
question is why it does not want to work with dynamic linking, while ie tls.so 
links ok to libssl and libcrypto

-- 
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/1473#issuecomment-371499107___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


[sr-dev] [kamailio/kamailio] KeepAlive Module (#1476)

2018-03-08 Thread voztovoice
Hello,

I'm using keepalive module with drouting module... the event route works fine:

NOTICE: 

[sr-dev] git:master:1b831f8d: modules: readme files regenerated - app_jsdt ... [skip ci]

2018-03-08 Thread Kamailio Dev
Module: kamailio
Branch: master
Commit: 1b831f8dab3fb9f7c0c4562fee6d192face16e56
URL: 
https://github.com/kamailio/kamailio/commit/1b831f8dab3fb9f7c0c4562fee6d192face16e56

Author: Kamailio Dev 
Committer: Kamailio Dev 
Date: 2018-03-08T13:16:28+01:00

modules: readme files regenerated - app_jsdt ... [skip ci]

---

Modified: src/modules/app_jsdt/README

---

Diff:  
https://github.com/kamailio/kamailio/commit/1b831f8dab3fb9f7c0c4562fee6d192face16e56.diff
Patch: 
https://github.com/kamailio/kamailio/commit/1b831f8dab3fb9f7c0c4562fee6d192face16e56.patch

---

diff --git a/src/modules/app_jsdt/README b/src/modules/app_jsdt/README
index 8679cb1bd6..4186cced58 100644
--- a/src/modules/app_jsdt/README
+++ b/src/modules/app_jsdt/README
@@ -79,14 +79,15 @@ Chapter 1. Admin Guide
 
 1. Overview
 
-   This module allows executing JavaScript scripts from config file. It
-   exports all KEMI functions to JavaScript in order to access the current
-   processed SIP message. These functions are within JavaScript object
-   'KSR'.
+   This module allows executing JavaScript scripts from the Kamailio
+   configuration file. It exports all KEMI functions to JavaScript in
+   order to access the currently processed SIP message. These functions
+   are named within the JavaScript object 'KSR'.
 
-   It includes the Duktape JavaScript engine (http://www.duktape.org),
-   which is a fast and easy to embed JavaScript interpreter. Exported API
-   from SIP router to JavaScript is documented in the dokuwiki.
+   The module is based on the Duktape JavaScript engine
+   (http://www.duktape.org), which is a fast and easy to embed JavaScript
+   interpreter. The exported API from Kamailio to JavaScript is documented
+   in the wiki.
 
The module has two JavaScript contexts:
  * first is used for functions jsdt_dofile() and jsdt_dostring().
@@ -94,7 +95,7 @@ Chapter 1. Admin Guide
Therefore jsdt_run() cannot execute functions from scripts loaded
via jsdt_dofile() in config. This is kind of caching mode, avoiding
reading file every time, but you must be sure you do not have
-   something that is executed by default and requires access to SIP
+   someting that is executed by default and requires access to SIP
message. This environment is also used by KEMI framework for the
config SIP routing functions.
 
@@ -113,7 +114,7 @@ Chapter 1. Admin Guide
The following libraries or applications must be installed before
running Kamailio with this module loaded:
  * libm - the math library (part of standard system libraries - it is
-   needed to compile embedded Duktape JS interpreter).
+   needed to complile embedded Duktape JS interpreter).
 
 3. Parameters
 
@@ -142,8 +143,8 @@ modparam("app_jsdt", "load", 
"/usr/local/etc/kamailio/js/myscript.js")
 
 4.1.  jsdt_dofile(path)
 
-   Execute the JS script stored in 'path'. The parameter can be a string
-   with pseudo-variables evaluated at runtime.
+   Execute the JavaScript script stored in 'path'. The parameter can be a
+   string with pseudo-variables evaluated at runtime.
 
Example 1.2. jsdt_dofile usage
 ...
@@ -152,8 +153,8 @@ jsdt_dofile("/usr/local/etc/kamailio/js/myscript.js");
 
 4.2.  jsdt_dostring(script)
 
-   Execute the Lua script stored in parameter. The parameter can be a
-   string with pseudo-variables.
+   Execute the JavaScript script stored in parameter. The parameter can be
+   a string with pseudo-variables.
 
Example 1.3. jsdt_dostring usage
 ...
@@ -229,7 +230,7 @@ kamcmd app_jsdt.api_list
 
 6. Example of usage
 
-   Create your JS script and stored on file system, say:
+   Create your JS script and store it on the file system, say:
'/usr/local/etc/kamailio/js/myscript.js'.
 ...
 function sr_append_fu_to_reply()


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


[sr-dev] git:master:7b0ad6b1: app_jsdt Minor update to documentation

2018-03-08 Thread Olle E . Johansson
Module: kamailio
Branch: master
Commit: 7b0ad6b1a11687d035d4be92202ae1379f07fb20
URL: 
https://github.com/kamailio/kamailio/commit/7b0ad6b1a11687d035d4be92202ae1379f07fb20

Author: Olle E. Johansson 
Committer: Olle E. Johansson 
Date: 2018-03-08T13:08:08+01:00

app_jsdt Minor update to documentation

---

Modified: src/modules/app_jsdt/doc/app_jsdt_admin.xml

---

Diff:  
https://github.com/kamailio/kamailio/commit/7b0ad6b1a11687d035d4be92202ae1379f07fb20.diff
Patch: 
https://github.com/kamailio/kamailio/commit/7b0ad6b1a11687d035d4be92202ae1379f07fb20.patch

---

diff --git a/src/modules/app_jsdt/doc/app_jsdt_admin.xml 
b/src/modules/app_jsdt/doc/app_jsdt_admin.xml
index b0926256d4..d4fd89d377 100644
--- a/src/modules/app_jsdt/doc/app_jsdt_admin.xml
+++ b/src/modules/app_jsdt/doc/app_jsdt_admin.xml
@@ -17,15 +17,16 @@
 
Overview

-   This module allows executing JavaScript scripts from config 
file.
+   This module allows executing JavaScript scripts from the 
Kamailio 
+   configuration file.
It exports all KEMI functions to JavaScript in order to access 
the
-   current processed SIP message. These functions are within 
JavaScript
-   object 'KSR'.
+   currently processed SIP message. These functions are named 
within
+   the JavaScript object 'KSR'.


-   It includes the Duktape JavaScript engine 
(http://www.duktape.org),
-   which is a fast and easy to embed JavaScript interpreter. 
Exported API
-   from SIP router to JavaScript is documented in the dokuwiki.
+   The module is based on the Duktape JavaScript engine 
(http://www.duktape.org),
+   which is a fast and easy to embed JavaScript interpreter. The 
exported API
+   from Kamailio to JavaScript is documented in the wiki.


The module has two JavaScript contexts:
@@ -42,7 +43,7 @@
and parameter 'load'. Therefore jsdt_run() cannot 
execute functions
from scripts loaded via jsdt_dofile() in config. This 
is kind of
caching mode, avoiding reading file every time, but you 
must be sure
-   you do not have something that is executed by default 
and requires
+   you do not have someting that is executed by default 
and requires
access to SIP message. This environment is also used by 
KEMI
framework for the config SIP routing functions.

@@ -74,7 +75,7 @@


libm - the math library 
(part of standard
-   system libraries - it is needed to compile 
embedded Duktape JS
+   system libraries - it is needed to complile 
embedded Duktape JS
interpreter).


@@ -116,7 +117,7 @@ modparam("app_jsdt", "load", 
"/usr/local/etc/kamailio/js/myscript.js")
jsdt_dofile(path)


-   Execute the JS script stored in 'path'. The parameter can be
+   Execute the JavaScript script stored in 'path'. The parameter 
can be
a string with pseudo-variables evaluated at runtime.


@@ -134,7 +135,7 @@ jsdt_dofile("/usr/local/etc/kamailio/js/myscript.js");
jsdt_dostring(script)


-   Execute the Lua script stored in parameter. The parameter can be
+   Execute the JavaScript script stored in parameter. The 
parameter can be
a string with pseudo-variables.


@@ -248,7 +249,7 @@ if(!jsdt_runstring('KSR.dbg("Hello World from $fU\n")'))
 
Example of usage
 
-   Create your JS script and stored on file system,
+   Create your JS script and store it on the file system,
say: '/usr/local/etc/kamailio/js/myscript.js'.
 
 


___
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] core: invoke KEMI ksr_onsend_route() unconditionally in cfgengine (#1475)

2018-03-08 Thread aalba6675
Yes - I think that is a good idea.

-- 
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/1475#issuecomment-371460960___
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] core: invoke KEMI ksr_onsend_route() unconditionally in cfgengine (#1475)

2018-03-08 Thread Daniel-Constantin Mierla
Merged #1475.

-- 
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/1475#event-1510893063___
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] pkg/docker: Updated reference to packaging scripts (#1472)

2018-03-08 Thread Daniel-Constantin Mierla
Merged #1472.

-- 
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/1472#event-1510893789___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


[sr-dev] git:master:956cad7e: pkg/docker: Updated reference to packaging scripts

2018-03-08 Thread Daniel-Constantin Mierla
Module: kamailio
Branch: master
Commit: 956cad7e070c7d1936c7fef5666e72db1a0578ac
URL: 
https://github.com/kamailio/kamailio/commit/956cad7e070c7d1936c7fef5666e72db1a0578ac

Author: Sergey Safarov 
Committer: Daniel-Constantin Mierla 
Date: 2018-03-08T12:00:54+01:00

pkg/docker: Updated reference to packaging scripts

---

Modified: pkg/docker

---

Diff:  
https://github.com/kamailio/kamailio/commit/956cad7e070c7d1936c7fef5666e72db1a0578ac.diff
Patch: 
https://github.com/kamailio/kamailio/commit/956cad7e070c7d1936c7fef5666e72db1a0578ac.patch

---

diff --git a/pkg/docker b/pkg/docker
index dee22bb1ec..9f04def504 16
--- a/pkg/docker
+++ b/pkg/docker
@@ -1 +1 @@
-Subproject commit dee22bb1ec7bda31723349f37602a5ac6ef8445a
+Subproject commit 9f04def504051dc8da3989b1f96e4b6633d31a75


___
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] core: invoke KEMI ksr_onsend_route() unconditionally in cfgengine (#1475)

2018-03-08 Thread Daniel-Constantin Mierla
Thanks! I am merging it.

However, I am thinking of adding some core params to be able to disable 
execution of optional core routing blocks equivalents in kemi.

-- 
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/1475#issuecomment-371454794___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


[sr-dev] git:master:4494b60c: core: invoke KEMI ksr_onsend_route()

2018-03-08 Thread Daniel-Constantin Mierla
Module: kamailio
Branch: master
Commit: 4494b60c430f5e5c6a3a3eb4c025f206a9c3a1f7
URL: 
https://github.com/kamailio/kamailio/commit/4494b60c430f5e5c6a3a3eb4c025f206a9c3a1f7

Author: AntonyA 
Committer: Daniel-Constantin Mierla 
Date: 2018-03-08T12:00:32+01:00

core: invoke KEMI ksr_onsend_route()

This will invoke ksr_onsend_route() unconditionally in the cfgengine.

---

Modified: src/core/onsend.h

---

Diff:  
https://github.com/kamailio/kamailio/commit/4494b60c430f5e5c6a3a3eb4c025f206a9c3a1f7.diff
Patch: 
https://github.com/kamailio/kamailio/commit/4494b60c430f5e5c6a3a3eb4c025f206a9c3a1f7.patch

---

diff --git a/src/core/onsend.h b/src/core/onsend.h
index a2e8f569fd..16ea5ce17c 100644
--- a/src/core/onsend.h
+++ b/src/core/onsend.h
@@ -70,7 +70,9 @@ static inline int run_onsend(sip_msg_t* orig_msg, 
dest_info_t* dst,
return 1;
}
ret=1;
-   if (onsend_rt.rlist[DEFAULT_RT]){
+   // do if onsend_route{} or cfgengine exists
+   keng = sr_kemi_eng_get();
+   if (onsend_rt.rlist[DEFAULT_RT] || keng){
onsnd_info.to=&dst->to;
onsnd_info.send_sock=dst->send_sock;
onsnd_info.buf=buf;
@@ -86,8 +88,7 @@ static inline int run_onsend(sip_msg_t* orig_msg, 
dest_info_t* dst,
orig_msg->fwd_send_flags=dst->send_flags; /* intial 
value */
init_run_actions_ctx(&ra_ctx);
 
-   keng = sr_kemi_eng_get();
-   if(unlikely(keng!=NULL)) {
+   if(keng) {
bctx = sr_kemi_act_ctx_get();
sr_kemi_act_ctx_set(&ra_ctx);
ret=keng->froute(orig_msg, ONSEND_ROUTE, NULL, 
NULL);


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev