[sr-dev] Jenkins build is back to normal : kamailio44-nightly-binaries » i386,squeeze,slave #125

2017-12-22 Thread jenkins
See 



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


[sr-dev] Jenkins build is back to normal : kamailio44-nightly-binaries » amd64,squeeze,slave #125

2017-12-22 Thread jenkins
See 



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


[sr-dev] [kamailio/kamailio] http_async_client: fix initialization of tls_client_* and tls_ca_path (#1386)

2017-12-22 Thread Victor Seva
set_query_params() was checking if those variables had a value to copy them.
You can view, comment on, or merge this pull request online at:

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

-- Commit Summary --

  * http_async_client: fix initialization of tls_client_* and tls_ca_path 
module parameters

-- File Changes --

M src/modules/http_async_client/http_async_client_mod.c (6)

-- Patch Links --

https://github.com/kamailio/kamailio/pull/1386.patch
https://github.com/kamailio/kamailio/pull/1386.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/1386
___
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] dialog: track_cseq_updates after failing uac_auth (#1359)

2017-12-22 Thread Carlos Cruz Luengo
I have made some tests with those two lines and the case I reported gets fixed, 
but I get cseq_tracking disabled for following eventual transactions.

I mean:

- First carrier needs authentication but once authenticated it answers >300 
code.
- The call is sent to another carrier:
  - If it doesn't need authentication (the case I reported), the ACK and 
everything is fine now.
  - If this carrier also needs authentication, the cseq is not updated even 
though _uac_auth()_ function is called again.

It seams that once cseq tracking is reset with those two lines, the cseq 
adaptation mechanism gets disabled for new calls to _uac_auth()_ function.

I will do more tests to figure out what is happening and update this issue.

Thank you and regards,


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


[sr-dev] [kamailio/kamailio] acc: Allow nullable cdr extra fields (#1385)

2017-12-22 Thread Carlos Cruz Luengo
 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
- [ ] Small bug fix (non-breaking change which fixes an issue)
- [x] New feature (non-breaking change which adds new functionality)
- [ ] Breaking change (fix or feature that would change existing functionality)

 Checklist:
- [x] PR should be backported to stable branches
- [x] Tested changes locally
- [x] Related to issue #1378 

 Description

- allow custom cdr fields defined with cdr_extra modparam to be saved
  as null. Before this change, cdr_extra variables not defined in config
  operation (or set to $null) were saved as empty string (''). This commit makes
  possible to save them as NULL value.

- new modparam to make this behaviour configurable: cdr_extra_nullable.
  Set it to 1 to enable this new behaviour (default value: 0)
You can view, comment on, or merge this pull request online at:

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

-- Commit Summary --

  * acc: Allow nullable cdr extra fields

-- File Changes --

M src/modules/acc/acc_cdr.c (11)
M src/modules/acc/acc_mod.c (8)
M src/modules/acc/acc_mod.h (1)
M src/modules/acc/doc/acc_admin.xml (22)

-- Patch Links --

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


[sr-dev] git:master:52111974: tm: handle success return code by forward_request() for e2e ACK

2017-12-22 Thread Daniel-Constantin Mierla
Module: kamailio
Branch: master
Commit: 52111974b4571e0562e8e731df80f48dbc504915
URL: 
https://github.com/kamailio/kamailio/commit/52111974b4571e0562e8e731df80f48dbc504915

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2017-12-22T16:54:50+01:00

tm: handle success return code by forward_request() for e2e ACK

- forward_request() returns 0 on success, propagate 1 to config wrapper

---

Modified: src/modules/tm/t_funcs.c

---

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

---

diff --git a/src/modules/tm/t_funcs.c b/src/modules/tm/t_funcs.c
index 0391ea3a33..42469cb432 100644
--- a/src/modules/tm/t_funcs.c
+++ b/src/modules/tm/t_funcs.c
@@ -281,7 +281,7 @@ int t_relay_to( struct sip_msg  *p_msg , struct proxy_l 
*proxy, int proto,
/* at this point if the msg is an ACK it is an e2e ACK and
   e2e ACKs do not establish a transaction and are fwd-ed statelessly */
if ( p_msg->REQ_METHOD==METHOD_ACK) {
-   LM_DBG( "forwarding ACK  statelessly \n");
+   LM_DBG("forwarding ACK statelessly\n");
if (proxy==0) {
init_dest_info(&dst);
dst.proto=proto;
@@ -302,7 +302,11 @@ int t_relay_to( struct sip_msg  *p_msg , struct proxy_l 
*proxy, int proto,
proxy2su(&dst.to, proxy);
/* dst->send_sock not set, but forward_request will 
take care
 * of it */
-   ret=forward_request( p_msg , 0, 0, &dst) ;
+   ret=forward_request(p_msg , 0, 0, &dst) ;
+   }
+   if (ret>=0) {
+   /* convert return code for cfg script */
+   ret=1;
}
goto done;
}


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


[sr-dev] git:master:05509f32: core: forward - add note about return code of forward_request()

2017-12-22 Thread Daniel-Constantin Mierla
Module: kamailio
Branch: master
Commit: 05509f322d5b4ce23b6e5918f4d6bc4e48678202
URL: 
https://github.com/kamailio/kamailio/commit/05509f322d5b4ce23b6e5918f4d6bc4e48678202

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2017-12-22T16:54:29+01:00

core: forward - add note about return code of forward_request()

---

Modified: src/core/forward.c

---

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

---

diff --git a/src/core/forward.c b/src/core/forward.c
index dc7e27f523..d9a778ca71 100644
--- a/src/core/forward.c
+++ b/src/core/forward.c
@@ -450,6 +450,8 @@ int check_self_port(unsigned short port, unsigned short 
proto)
  * WARNING: don't forget to zero-fill all the  unused members (a non-zero
  * random id along with proto==PROTO_TCP can have bad consequences, same for
  *   a bogus send_socket value)
+ *
+ * return: 0 (E_OK) on success; negative (E_*) on failure
  */
 int forward_request(struct sip_msg* msg, str* dst, unsigned short port,
struct dest_info* 
send_info)


___
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] app_lua: LUAJIT variable to build agains LuaJIT compiler (#1384)

2017-12-22 Thread Daniel-Constantin Mierla
Merged #1384.

-- 
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/1384#event-1399652515___
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] app_lua: LUAJIT variable to build agains LuaJIT compiler (#1384)

2017-12-22 Thread Daniel-Constantin Mierla
For future reference, you do not have to generate the README anymore, it is 
generated automatically by the server couple of minutes after pushing the 
commit to xml file.

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


[sr-dev] git:master:1a1605e3: Merge pull request #1384 from kamailio/app_lua_luajit

2017-12-22 Thread GitHub
Module: kamailio
Branch: master
Commit: 1a1605e3b202a96499cb132b984b76aaa649c7f6
URL: 
https://github.com/kamailio/kamailio/commit/1a1605e3b202a96499cb132b984b76aaa649c7f6

Author: Daniel-Constantin Mierla 
Committer: GitHub 
Date: 2017-12-22T15:11:46+01:00

Merge pull request #1384 from kamailio/app_lua_luajit

app_lua: LUAJIT variable to build agains LuaJIT compiler

---

Modified: src/modules/app_lua/Makefile
Modified: src/modules/app_lua/README
Modified: src/modules/app_lua/doc/app_lua_admin.xml

---

Diff:  
https://github.com/kamailio/kamailio/commit/1a1605e3b202a96499cb132b984b76aaa649c7f6.diff
Patch: 
https://github.com/kamailio/kamailio/commit/1a1605e3b202a96499cb132b984b76aaa649c7f6.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:02723aa4: app_lua: README update

2017-12-22 Thread Vicente Hernando
Module: kamailio
Branch: master
Commit: 02723aa42871eb35c86361666ec9f1f6362c228e
URL: 
https://github.com/kamailio/kamailio/commit/02723aa42871eb35c86361666ec9f1f6362c228e

Author: Vicente Hernando 
Committer: Vicente Hernando 
Date: 2017-12-22T15:02:15+01:00

app_lua: README update

---

Modified: src/modules/app_lua/README

---

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

---

diff --git a/src/modules/app_lua/README b/src/modules/app_lua/README
index 2e2cb1148c..164cf70c32 100644
--- a/src/modules/app_lua/README
+++ b/src/modules/app_lua/README
@@ -46,13 +46,14 @@ Daniel-Constantin Mierla
 
List of Examples
 
-   1.1. Set load parameter
-   1.2. Set register parameter
-   1.3. Set reload parameter
-   1.4. lua_dofile usage
-   1.5. lua_dostring usage
-   1.6. lua_run usage
-   1.7. lua_runstring usage
+   1.1. Build against LuaJIT libraries
+   1.2. Set load parameter
+   1.3. Set register parameter
+   1.4. Set reload parameter
+   1.5. lua_dofile usage
+   1.6. lua_dostring usage
+   1.7. lua_run usage
+   1.8. lua_runstring usage
 
 Chapter 1. Admin Guide
 
@@ -120,6 +121,18 @@ Chapter 1. Admin Guide
running Kamailio with this module loaded:
  * liblua5.1-dev - Lua devel library.
 
+   This module can be compiled against LuaJIT compiler (instead of
+   standard Lua). Then this library is needed:
+ * libluajit-5.1-dev - LuaJIT devel library.
+
+   To enable that, LUAJIT variable has to be set.
+
+   Example 1.1. Build against LuaJIT libraries
+   E.g: $ LUAJIT="yes" make modules modules=modules/app_lua
+
+   (Warning: LuaJIT version is 5.1, so scripts prepared for higher Lua
+   versions may not work with LuaJIT)
+
 3. Parameters
 
3.1. load (string)
@@ -134,7 +147,7 @@ Chapter 1. Admin Guide
 
Default value is “null”.
 
-   Example 1.1. Set load parameter
+   Example 1.2. Set load parameter
 ...
 modparam("app_lua", "load", "/usr/local/etc/kamailio/lua/myscript.lua")
 ...
@@ -178,7 +191,7 @@ modparam("app_lua", "load", 
"/usr/local/etc/kamailio/lua/myscript.lua")
 
Default value is “null”.
 
-   Example 1.2. Set register parameter
+   Example 1.3. Set register parameter
 ...
 modparam("app_lua", "register", "sl")
 ...
@@ -190,7 +203,7 @@ modparam("app_lua", "register", "sl")
 
Default value is “0 (off)”.
 
-   Example 1.3. Set reload parameter
+   Example 1.4. Set reload parameter
 ...
 modparam("app_lua", "reload", 1)
 ...
@@ -207,7 +220,7 @@ modparam("app_lua", "reload", 1)
Execute the Lua script stored in 'path'. The parameter can be a string
with pseudo-variables evaluated at runtime.
 
-   Example 1.4. lua_dofile usage
+   Example 1.5. lua_dofile usage
 ...
 lua_dofile("/usr/local/etc/kamailio/lua/myscript.lua");
 ...
@@ -217,7 +230,7 @@ lua_dofile("/usr/local/etc/kamailio/lua/myscript.lua");
Execute the Lua script stored in parameter. The parameter can be a
string with pseudo-variables.
 
-   Example 1.5. lua_dostring usage
+   Example 1.6. lua_dostring usage
 ...
 if(!lua_dostring("sr.log([[err]], [[--- Hello World from $fU\n]])"))
 {
@@ -232,7 +245,7 @@ if(!lua_dostring("sr.log([[err]], [[--- Hello World 
from $fU\n]])"))
loaded at startup via parameter 'load'. Parameters can be strings with
pseudo-variables that are evaluated at runtime.
 
-   Example 1.6. lua_run usage
+   Example 1.7. lua_run usage
 ...
 if(!lua_run("sr_append_fu_to_reply"))
 {
@@ -248,7 +261,7 @@ lua_run("lua_funcx", "$rU", "2");
string with pseudo-variables. The script is executed in Lua context
specific to loaded Lua files at startup.
 
-   Example 1.7. lua_runstring usage
+   Example 1.8. lua_runstring usage
 ...
 if(!lua_runstring("sr.log([[err]], [[--- Hello World from $fU\n]])"))
 {


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


[sr-dev] git:master:55e3b726: app_lua: update doc about LUAJIT variable and building against LuaJIT libraries.

2017-12-22 Thread Vicente Hernando
Module: kamailio
Branch: master
Commit: 55e3b72692d500a988b085c73fefa87e91ff068b
URL: 
https://github.com/kamailio/kamailio/commit/55e3b72692d500a988b085c73fefa87e91ff068b

Author: Vicente Hernando 
Committer: Vicente Hernando 
Date: 2017-12-22T15:01:35+01:00

app_lua: update doc about LUAJIT variable and building against LuaJIT libraries.

---

Modified: src/modules/app_lua/doc/app_lua_admin.xml

---

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

---

diff --git a/src/modules/app_lua/doc/app_lua_admin.xml 
b/src/modules/app_lua/doc/app_lua_admin.xml
index 38bf17d744..edce6a5056 100644
--- a/src/modules/app_lua/doc/app_lua_admin.xml
+++ b/src/modules/app_lua/doc/app_lua_admin.xml
@@ -75,6 +75,24 @@



+   
+   This module can be compiled against LuaJIT compiler 
(instead of
+   standard Lua). Then this library is needed:
+   
+   
+   libluajit-5.1-dev - 
LuaJIT devel library.
+   
+   
+   
+   To enable that, LUAJIT variable has to be 
set.
+   
+   Build against LuaJIT 
libraries
+   E.g: $ LUAJIT="yes" make modules 
modules=modules/app_lua
+   
+   (Warning: LuaJIT version is 5.1, so scripts 
prepared for higher Lua versions
+   may not work with LuaJIT)
+   
+   


 


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


[sr-dev] git:master:41ff35e2: app_lua: LUAJIT variable to build agains LuaJIT compiler

2017-12-22 Thread Vicente Hernando
Module: kamailio
Branch: master
Commit: 41ff35e2ec3f735f818c19cec6697c913dc1a0f7
URL: 
https://github.com/kamailio/kamailio/commit/41ff35e2ec3f735f818c19cec6697c913dc1a0f7

Author: Vicente Hernando 
Committer: Vicente Hernando 
Date: 2017-12-22T12:11:45+01:00

app_lua: LUAJIT variable to build agains LuaJIT compiler

---

Modified: src/modules/app_lua/Makefile

---

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


___
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] app_lua: LUAJIT variable to build agains LuaJIT compiler (#1384)

2017-12-22 Thread vhernando
@vhernando pushed 2 commits.

55e3b72  app_lua: update doc about LUAJIT variable and building against LuaJIT 
libraries.
02723aa  app_lua: README update


-- 
You are receiving this because you are subscribed to this thread.
View it on GitHub:
https://github.com/kamailio/kamailio/pull/1384/files/41ff35e2ec3f735f818c19cec6697c913dc1a0f7..02723aa42871eb35c86361666ec9f1f6362c228e
___
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] cfg_rpc: extending the functionality of cfg.get command (#1321)

2017-12-22 Thread hdikme
I have tested it with the version 5.0.1 using kamctl rpc ... and the result 
hasn't changed.
n = rpc->scan(c, "S*S", &group, &var);
n equals to -1 in case of using only the group name. 

-- 
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/1321#issuecomment-353596580___
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] app_lua: LUAJIT variable to build agains LuaJIT compiler (#1384)

2017-12-22 Thread Daniel-Constantin Mierla
This can be merged, but a note about this compile option and the constraint 
with luajit version has to be added to the docs of the 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/pull/1384#issuecomment-353586088___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


[sr-dev] [kamailio/kamailio] app_lua: LUAJIT variable to build agains LuaJIT compiler (#1384)

2017-12-22 Thread vhernando




 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
- [ ] Small bug fix (non-breaking change which fixes an issue)
- [x] 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
- [x] Tested changes locally
- [ ] Related to issue # (replace  with an open issue number)

 Description

Added LUAJIT variable to build app_lua module against LuaJIT compiler (version 
5.1). If this variable is not set users still build app_lua module against 
standard Lua.

E.g:   $ LUAJIT="yes" make modules modules=modules/app_lua  # Build against 
LuaJIT
$ make modules modules=modules/app_lua  # Build against standard Lua.

(Warning: LuaJIT version is 5.1 so scripts prepared for higher Lua versions may 
not work with LuaJIT)
You can view, comment on, or merge this pull request online at:

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

-- Commit Summary --

  * app_lua: LUAJIT variable to build agains LuaJIT compiler

-- File Changes --

M src/modules/app_lua/Makefile (136)

-- Patch Links --

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


[sr-dev] git:4.4:b19c70e5: pkg/kamailio/deb: remove http_async_client from squeeze

2017-12-22 Thread Victor Seva
Module: kamailio
Branch: 4.4
Commit: b19c70e5edabe5a78bdc2ef52106d609716ed5cb
URL: 
https://github.com/kamailio/kamailio/commit/b19c70e5edabe5a78bdc2ef52106d609716ed5cb

Author: Victor Seva 
Committer: Victor Seva 
Date: 2017-12-22T09:44:57+01:00

pkg/kamailio/deb: remove http_async_client from squeeze

---

Modified: pkg/kamailio/deb/debian/backports/squeeze
Modified: pkg/kamailio/deb/squeeze/control
Modified: pkg/kamailio/deb/squeeze/rules

---

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

---

diff --git a/pkg/kamailio/deb/debian/backports/squeeze 
b/pkg/kamailio/deb/debian/backports/squeeze
index fa08c1465d..b33cd3dad2 100755
--- a/pkg/kamailio/deb/debian/backports/squeeze
+++ b/pkg/kamailio/deb/debian/backports/squeeze
@@ -96,6 +96,11 @@ sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ jansson/' 
${DIST}/rules
 sed -i -e 's/ jansson[ ,$]*//' ${DIST}/control
 sed -i -e 's/janssonrpc-c//'  ${DIST}/control
 
+# no http_async_client module needs libevent 2
+sed -i -e 's/ http_async_client//' ${DIST}/control
+sed -i -e 's/ http_async[ ,$]*/ /' ${DIST}/rules
+sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ http_async/' ${DIST}/rules
+
 # old mysql
 sed -i -e 's/default-mysql-client/mysql-client/' \
   -e 's/default-libmysqlclient-dev/libmysqlclient-dev/' ${DIST}/control
diff --git a/pkg/kamailio/deb/squeeze/control b/pkg/kamailio/deb/squeeze/control
index 7507fcd59e..8c1c040a6c 100644
--- a/pkg/kamailio/deb/squeeze/control
+++ b/pkg/kamailio/deb/squeeze/control
@@ -565,7 +565,7 @@ Description: extra modules for Kamailio
  proxy server. Written entirely in C, Kamailio can handle thousands calls
  per second even on low-budget hardware.
  .
- This package provides: gzcompress uuid evapijanssonrpc-c http_async_client
+ This package provides: gzcompress uuid evapi
 
 Package: kamailio-nth
 Architecture: any
diff --git a/pkg/kamailio/deb/squeeze/rules b/pkg/kamailio/deb/squeeze/rules
index a514f1444e..4b5fc95dbb 100755
--- a/pkg/kamailio/deb/squeeze/rules
+++ b/pkg/kamailio/deb/squeeze/rules
@@ -24,7 +24,7 @@ EXCLUDED_MODULES=
 # extra modules to skip, because they are not compilable now
 # - regardless if they go to the main kamailio package or to some module 
package,
 # they will be excluded from compile and install of all
-EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy java dnssec sctp 
purple redis mono kazoo cnxcc jansson
+EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy java dnssec sctp 
purple redis mono kazoo cnxcc jansson http_async
 
 # module groups that are packaged in seperate packages
 # (with the name kamailio-$(group_name)-modules)
@@ -38,7 +38,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius 
presence \
   erlang
 
 # module groups to be packaged onto kamailio-extra-modules
-EXTRA_GROUPS=gzcompress uuid ev http_async
+EXTRA_GROUPS=gzcompress uuid ev 
 
 # name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b)
 export LIBDIR ?= lib/$(DEB_HOST_MULTIARCH)


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


[sr-dev] git:master:3a2ee928: modules: readme files regenerated - sctp ... [skip ci]

2017-12-22 Thread Kamailio Dev
Module: kamailio
Branch: master
Commit: 3a2ee9280fa8cde3b45d3e5631267287ba0b74ac
URL: 
https://github.com/kamailio/kamailio/commit/3a2ee9280fa8cde3b45d3e5631267287ba0b74ac

Author: Kamailio Dev 
Committer: Kamailio Dev 
Date: 2017-12-22T09:17:08+01:00

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

---

Modified: src/modules/sctp/README

---

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

---

diff --git a/src/modules/sctp/README b/src/modules/sctp/README
index c8f5ffa46b..16d68c3223 100644
--- a/src/modules/sctp/README
+++ b/src/modules/sctp/README
@@ -120,6 +120,9 @@ Chapter 1. Admin Guide
not changed and SCTP variable is not overwritten from command line,
then the SCTP support in core is enabled.
 
+   Note: it is recommended to use recent versions of libsctp (>1.0.10) and
+   kernel (>4.0.0) when enabling SCTP transport.
+
 2. Dependencies
 
2.1. Kamailio Modules


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


[sr-dev] git:master:b8fb6f9f: sctp: removed risky workaround for dealing with old libksctp versions

2017-12-22 Thread Daniel-Constantin Mierla
Module: kamailio
Branch: master
Commit: b8fb6f9f453a7ab72ea578e8469ae88a831ca0e9
URL: 
https://github.com/kamailio/kamailio/commit/b8fb6f9f453a7ab72ea578e8469ae88a831ca0e9

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2017-12-22T08:49:36+01:00

sctp: removed risky workaround for dealing with old libksctp versions

- writing over the size of field may have unexpected results

---

Modified: src/modules/sctp/sctp_server.c

---

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

---

diff --git a/src/modules/sctp/sctp_server.c b/src/modules/sctp/sctp_server.c
index 4a8285c992..3efc126a06 100644
--- a/src/modules/sctp/sctp_server.c
+++ b/src/modules/sctp/sctp_server.c
@@ -766,28 +766,8 @@ static int sctp_init_sock_opt_common(int s, int af)
/* enable the SCTP_EVENTS */
 #ifdef SCTP_EVENTS
if (setsockopt(s, IPPROTO_SCTP, SCTP_EVENTS, ev_s, sizeof(*ev_s))==-1){
-   /* on linux the checks for the struct sctp_event_subscribe size
-  are too strict, making certain lksctp/kernel combination
-  unworkable => since we don't use the extra information
-  (sctp_authentication_event) added in newer version, we can
-  try with different sizes) */
-#ifdef __OS_linux
-   /* 1. lksctp 1.0.9 with kernel < 2.6.26 -> kernel expects 
- the structure without the authentication event member */
-   if (setsockopt(s, IPPROTO_SCTP, SCTP_EVENTS, ev_s, 
sizeof(*ev_s)-1)==0)
-   goto ev_success;
-   /* 2. lksctp < 1.0.9? with kernel >= 2.6.26: the sctp.h 
structure
-  does not have the authentication member, but the newer 
kernels 
-  check only for optlen > sizeof(...) => we should never reach
-  this point. */
-   /* 3. just to be foolproof if we reached this point, try
-   with a bigger size before giving up  (out of desperation) */
-   if (setsockopt(s, IPPROTO_SCTP, SCTP_EVENTS, ev_s, 
sizeof(es))==0)
-   goto ev_success;
-
-#endif
LOG(L_ERR, "ERROR: sctp_init_sock_opt_common: setsockopt: "
-   "SCTP_EVENTS: %s\n", strerror(errno));
+   "SCTP_EVENTS: %s (%d)\n", strerror(errno), 
errno);
sctp_err++;
goto error; /* critical */
}


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


[sr-dev] git:master:12f313c6: sctp: note about using recent versions for libsctp and kernel

2017-12-22 Thread Daniel-Constantin Mierla
Module: kamailio
Branch: master
Commit: 12f313c6c7c9b6a9c12d8ee2693cb955c16afe35
URL: 
https://github.com/kamailio/kamailio/commit/12f313c6c7c9b6a9c12d8ee2693cb955c16afe35

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2017-12-22T08:55:51+01:00

sctp: note about using recent versions for libsctp and kernel

---

Modified: src/modules/sctp/doc/sctp_admin.xml

---

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

---

diff --git a/src/modules/sctp/doc/sctp_admin.xml 
b/src/modules/sctp/doc/sctp_admin.xml
index f9a5683154..b6fa8c1cb8 100644
--- a/src/modules/sctp/doc/sctp_admin.xml
+++ b/src/modules/sctp/doc/sctp_admin.xml
@@ -10,9 +10,9 @@
 
 
 
-   
+
&adminguide;
-   
+

Overview

@@ -29,9 +29,13 @@
The core Makefile variable SCTP must be set to 1 (which is by 
default set
to 1 in Makefile.defs) and sources compiled with -DUSE_SCTP 
(automatically
set when SCTP=1). In other words, if core Makefiles are not 
changed and
-   SCTP variable is not overwritten from command line, then the 
SCTP 
+   SCTP variable is not overwritten from command line, then the 
SCTP
support in core is enabled.

+   
+   Note: it is recommended to use recent versions of libsctp 
(>1.0.10)
+   and kernel (>4.0.0) when enabling SCTP transport.
+   

 



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


[sr-dev] git:master:ed5a3b04: sctp: clang format the code

2017-12-22 Thread Daniel-Constantin Mierla
Module: kamailio
Branch: master
Commit: ed5a3b04c79fbe071900d53a207c14a379679092
URL: 
https://github.com/kamailio/kamailio/commit/ed5a3b04c79fbe071900d53a207c14a379679092

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2017-12-22T09:01:06+01:00

sctp: clang format the code

---

Modified: src/modules/sctp/sctp_ev.h
Modified: src/modules/sctp/sctp_mod.c
Modified: src/modules/sctp/sctp_options.c
Modified: src/modules/sctp/sctp_options.h
Modified: src/modules/sctp/sctp_rpc.c
Modified: src/modules/sctp/sctp_server.c
Modified: src/modules/sctp/sctp_server.h
Modified: src/modules/sctp/sctp_sockopts.h
Modified: src/modules/sctp/sctp_stats.c
Modified: src/modules/sctp/sctp_stats.h

---

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


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